From 3b672a220a63e2393bfdb3d175653eda1872b043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Fri, 6 Jun 2025 14:16:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E4=BA=A7=E6=88=90?= =?UTF-8?q?=E5=93=81=E5=85=A5=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cim/idm/service/impl/MESServiceImpl.java | 3 ++- .../idm/controller/FGStockInController.java | 20 ++++++++++++++++--- .../com/cim/idm/controller/QMSController.java | 2 +- .../idm/service/Impl/InvoiceServiceImpl.java | 1 - .../idm/service/Impl/MESToWMSServiceImpl.java | 12 +++++++---- 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java index dfcfc7e..b3c0ba8 100644 --- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java +++ b/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 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java index 56bf99e..71b974f 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java +++ b/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; @@ -84,7 +90,7 @@ public class FGStockInController { " BMS.LOTNAME MATERIALPACKINGNAME,\r\n" + " BMS.PRODUCTSPECNAME MATERIALSPECNAME,\r\n" + " BMS.PHASE ,BMS.SDK_ID,\r\n" + - " SS.SPECNAME ,\r\n" + + " SS.SPECNAME ,\r\n" + " m.DESC_CN ,\r\n" + " BMS.QTY MATERIALQUANTITY ,\r\n" + " BMS.REQUESTNAME RECEIVEREQUESTNAME ,\r\n" + @@ -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> list4 = produceReturnService.getMesShip(materialPackingName); + if(list4.isEmpty()){ + throw new GlobalException("未打印成品标签！"); + } + Map mapAll = new HashMap<>(); + mapAll.put("list2",list2); + mapAll.put("list4",list4); + return AjaxResult.me().setResultObj(mapAll); +// return AjaxResult.me().setResultObj(list2); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/QMSController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/QMSController.java index 0397f2c..bda7b17 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/QMSController.java +++ b/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 hashMap = new HashMap (); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java index 63c5694..98bc45d 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java +++ b/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); } - } } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java index c1fa707..225d767 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java +++ b/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 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);