fix:添加产成品入库修改

zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java

@@ -23,7 +23,8 @@ public class MESServiceImpl implements MESService{
 	@Autowired
 	MESHttpUtil mesHttpUtil;
 
-	private static String  baseUrl = "http://172.22.10.213:8190";
+	private static String  baseUrl = "http://172.22.10.213:8190";  //sap测试环境
+//private static String  baseUrl = "http://172.22.10.219:8190";  // sap正式环境
 	
 	/*
 	 * 领料单出库信息发送MES

zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java

@@ -8,6 +8,7 @@ import com.cim.idm.model.MaterialPacking;
 import com.cim.idm.model.po.MaterialReceiveRequest;
 import com.cim.idm.response.BaseResponse;
 import com.cim.idm.response.RespGenerator;
+import com.cim.idm.service.IProduceReturnService;
 import com.cim.idm.utils.AjaxResult;
 import com.cim.idm.utils.CommonUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +23,8 @@ import java.util.List;
 import java.util.Map;
 import com.cim.idm.service.Impl.ProductIntoServiceImpl;
 
+import javax.annotation.Resource;
+
 /**
  * 成品入库控制器
  * @author ZXYGY17
@@ -32,6 +35,9 @@ import com.cim.idm.service.Impl.ProductIntoServiceImpl;
 @EnableAutoConfiguration
 public class FGStockInController {
 
+	@Resource
+	private IProduceReturnService produceReturnService;
+
 	@Autowired
 	private ProductIntoServiceImpl ProductIntoServiceImpl;
 
@@ -164,8 +170,16 @@ public class FGStockInController {
 //			list2.get(0).put("QTY", djsl);
 //			list2.get(0).put("RECEIVEREQUESTNAME", djdh);
 //		}
-		
+		// 查看单号
-		return AjaxResult.me().setResultObj(list2);
+		List<Map<String, Object>> list4 = produceReturnService.getMesShip(materialPackingName);
+		if(list4.isEmpty()){
+			throw new GlobalException("未打印成品标签！");
+		}
+		Map<String, Object> mapAll = new HashMap<>();
+		mapAll.put("list2",list2);
+		mapAll.put("list4",list4);
+		return AjaxResult.me().setResultObj(mapAll);
+//		return AjaxResult.me().setResultObj(list2);
 	}
 
 

zi-wms-pda/src/main/java/com/cim/idm/controller/QMSController.java

@@ -433,7 +433,7 @@ public class QMSController {
 					MaterialPackingServiceProxy.getMaterialPackingService().setEvent(mpList, eventInfo, setEventInfo2);
 				}
 			}
-			else if ("6".equals(tpType)) {//投放计划单
+			else if ("6".equals(tpType)) {//投放计划单 胶水质检
 				String sql = "SELECT M.SITENAME ,M.MATERIALPACKINGNAME FROM MATERIALPACKING M "
 						+ "WHERE M.MESSAGEID  = :RECEIVEREQUESTNAME";
 				Map<String, Object> hashMap = new HashMap<String,Object> ();

zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java

@@ -4025,7 +4025,6 @@ public class InvoiceServiceImpl implements InvoiceService {
 						if (deletePacking) {
 							materialPackingKeyList.add(newPalletNo);
 						}
-
 					}
 
 				}

zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java

@@ -646,12 +646,12 @@ public class MESToWMSServiceImpl implements MESToWMSService {
                     + "PRODUCTSPECNAME, PRODUCTNAME, SDK_ID, PHASE, RECEIVE_FLAG,  REMARK, SHIPTIME, "
                     + "SHIPUSER, SITENAME, MATERIALSPECTYPE,SALESHIPREQUESTNAME,SALESHIPREQUESTDETAILNAME,"
                     + "INVENTORYTYPE, SALENO, SALEDETAILNO, ERPLOCATION, CHARGE, LOCATIONNAME, "
-                    + "OPERATIONTYPE, MAKEDATE,ERPFACTORY,GXID)" + SystemPropHelper.CR
+                    + "OPERATIONTYPE, MAKEDATE,ERPFACTORY,PACKINGGRADE,GXID)" + SystemPropHelper.CR
                     + "                     VALUES(:LOTNAME,:QTY,:UNIT,:REQUESTNAME, :AREA, "
                     + ":PRODUCTSPECNAME, :PRODUCTNAME, :SDK_ID, :PHASE, 'N',  :REMARK, :SHIPTIME, "
                     + "'MES', 'SDK', :MATERIALSPECTYPE, :SALESHIPREQUESTNAME,:SALESHIPREQUESTDETAILNAME,"
                     + ":INVENTORYTYPE, :SALENO, :SALEDETAILNO, :ERPLOCATION, :CHARGE, :LOCATIONNAME, "
-                    + ":OPERATIONTYPE,TO_DATE(:MAKEDATE, 'YYYY-MM-DD'),:ERPFACTORY,:GXID)";
+                    + ":OPERATIONTYPE,TO_DATE(:MAKEDATE, 'YYYY-MM-DD'),:ERPFACTORY,:PACKINGGRADE,:GXID)";
             String receiveActNo = "";
             String productSpecName = "";
             String erpFactory = "";
@@ -683,6 +683,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
                 String materialPackingName = jo.getString("materialPackingName"); // 退料原条码二维码
                 String saleShipRequestName = jo.getString("saleShipRequestName") == null ? "" : jo.getString("saleShipRequestName"); // 销售订单号   e库存
                 String saleShipRequestDetailName = jo.getString("saleShipRequestDetailName") == null ? "" : jo.getString("saleShipRequestDetailName"); // 销售订单号行项 e库存
+                String packingGrade = jo.getString("packingGrade");
 
                 if (i == 0) {
                     stockInType = jo.getString("stockInType");
@@ -728,6 +729,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
                 bindMap.put("MAKEDATE", makeDate);
                 bindMap.put("SALESHIPREQUESTNAME", saleShipRequestName);  // e库存 销售订单号
                 bindMap.put("SALESHIPREQUESTDETAILNAME", saleShipRequestDetailName); // e库存 销售订单行项
+                bindMap.put("PACKINGGRADE", packingGrade);
 
                 if ("1".equals(operationType)) { // 自动入库
                     if ("FG".equals(stockInType) || "BFG".equals(stockInType)) { // 产成品入库  增加回收例子入库
@@ -762,12 +764,12 @@ public class MESToWMSServiceImpl implements MESToWMSService {
                     String insertBS_MES_SHIP_PEDSql = SystemPropHelper.CR + "INSERT INTO BS_MES_SHIPPED(LOTNAME,QTY, UNIT, REQUESTNAME, AREA, "
                             + "PRODUCTSPECNAME, PRODUCTNAME, SDK_ID, PHASE, RECEIVE_FLAG,  REMARK, SHIPTIME, MATERIALPACKINGNAME,"
                             + "SHIPUSER, SITENAME, MATERIALSPECTYPE,"
-                            + "INVENTORYTYPE, SALENO, SALEDETAILNO, ERPLOCATION, CHARGE, LOCATIONNAME, "
+                            + "INVENTORYTYPE, SALENO, SALEDETAILNO, ERPLOCATION, CHARGE, PACKINGGRADE, LOCATIONNAME, "
                             + "OPERATIONTYPE, MAKEDATE,ERPFACTORY,GXID,SHIPREQUESTNAME, SHIPREQUESTDETAILNAME)" + SystemPropHelper.CR
                             + "                     VALUES(:LOTNAME,:QTY,:UNIT,:REQUESTNAME, :AREA, "
                             + ":PRODUCTSPECNAME, :PRODUCTNAME, :SDK_ID, :PHASE, 'N',  :REMARK, :SHIPTIME, :MATERIALPACKINGNAME,"
                             + "'MES', 'SDK', :MATERIALSPECTYPE, "
-                            + ":INVENTORYTYPE, :SALENO, :SALEDETAILNO, :ERPLOCATION, :CHARGE, :LOCATIONNAME, "
+                            + ":INVENTORYTYPE, :SALENO, :SALEDETAILNO, :ERPLOCATION, :CHARGE, :PACKINGGRADE, :LOCATIONNAME, "
                             + ":OPERATIONTYPE,TO_DATE(:MAKEDATE, 'YYYY-MM-DD'),:ERPFACTORY,:GXID,:SHIPREQUESTNAME, :SHIPREQUESTDETAILNAME)";
                     Map<String, Object> insertBS_MES_SHIP_PEDMap = new HashMap<>();
                     insertBS_MES_SHIP_PEDMap.put("LOTNAME", lotname);
@@ -799,6 +801,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
                     insertBS_MES_SHIP_PEDMap.put("SHIPREQUESTNAME", shipRequestName);
                     String shipRequestDetailName = jo.getString("shipRequestDetailName");
                     insertBS_MES_SHIP_PEDMap.put("SHIPREQUESTDETAILNAME", shipRequestDetailName);
+                    insertBS_MES_SHIP_PEDMap.put("PACKINGGRADE", packingGrade);
                     sqlTemplate.update(insertBS_MES_SHIP_PEDSql, insertBS_MES_SHIP_PEDMap);
                 }else {
                     sqlTemplate.update(insertSql, bindMap);
@@ -1127,6 +1130,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
             }
             */
 
+
             String MESsQL = " DELETE FROM BS_MES_SHIPPED T WHERE T.LOTNAME = :MATERIALPACKINGNAME ";
             IDMFrameServiceProxy.getSqlTemplate().update(MESsQL, hashMap);