diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
index 4c69d13..4d29daf 100644
--- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
+++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
@@ -2754,24 +2754,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 		ik.getLotInfo().setPropLC1(ptd.getPickTicket().getRelatedBill3());//配料工单
 		commonDao.store(ik);
 		
-		/**工单退料回传EMS*/
-		String ldbz=getPropertiesParm("ldxt.bz");
-		if(ldbz.equals("1")){
-			String propC3="";
-			if(str.indexOf("DG")!=-1 || str.indexOf("FM")!=-1){
-				if(tl_quantity>0){
-					propC3="CG01";
-				}else{
-					propC3="ZZ05";
-				}
-			}else{
-				propC3="CG01";
-			}
-			 System.out.println(t.getPickTicketDetail().getPickTicket().getRelatedBill3()+"/"+t.getPickTicketDetail().getItem().getCode()+"退料!");
-				jdbcManager.return_out_back(t.getPickTicketDetail().getPickTicket().getRelatedBill3(),t.getPickTicketDetail().getItem().getCode(),
-						t.getPickTicketDetail().getItem().getName(), t.getItemKey().getLotInfo().getPropC9(),
-						t.getPickTicketDetail().getItem().getWork_name(), propC3, t.getPickTicketDetail().getItem().getCriterion_loc_code(), planQuantity, t.getSrcLoc().getCode(), t.getPickTicketDetail().getItem().getWork_name(),t.getItemKey().getLotInfo()==null?"":t.getItemKey().getLotInfo().getPropC8());
-		}
+
 		
 		//写库存日志
 		InventoryLog log = new InventoryLog(InventoryLogType.CONVERT_PACKAGEUNIT, 1, operator, t.getSrcLoc(), ik, new Date(), planQuantity, t.getPackageUnit(), null, null, null);
@@ -2812,6 +2795,25 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
 			this.commonDao.delete(t);
 		}
 		
+		/**工单退料回传EMS*/
+		String ldbz=getPropertiesParm("ldxt.bz");
+		if(ldbz.equals("1")){
+			String propC3="";
+			if(str.indexOf("DG")!=-1 || str.indexOf("FM")!=-1){
+				if(tl_quantity>0){
+					propC3="CG01";
+				}else{
+					propC3="ZZ05";
+				}
+			}else{
+				propC3="CG01";
+			}
+			 System.out.println(t.getPickTicketDetail().getPickTicket().getRelatedBill3()+"/"+t.getPickTicketDetail().getItem().getCode()+"退料!");
+				jdbcManager.return_out_back(t.getPickTicketDetail().getPickTicket().getRelatedBill3(),t.getPickTicketDetail().getItem().getCode(),
+						t.getPickTicketDetail().getItem().getName(), t.getItemKey().getLotInfo().getPropC9(),
+						t.getPickTicketDetail().getItem().getWork_name(), propC3, t.getPickTicketDetail().getItem().getCriterion_loc_code(), planQuantity, t.getSrcLoc().getCode(), t.getPickTicketDetail().getItem().getWork_name(),t.getItemKey().getLotInfo()==null?"":t.getItemKey().getLotInfo().getPropC8());
+		}
+		
 
 	}