From 2cb223ad7154b9188739de4f0de189cab84fdc34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Mon, 19 May 2025 09:06:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=80=80=E6=96=99?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idm/service/impl/ToSAPServiceImpl.java | 65 +++++++++++++------ .../idm/service/Impl/MESToWMSServiceImpl.java | 8 ++- 2 files changed, 50 insertions(+), 23 deletions(-) diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java index 429beca..5b93614 100644 --- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java +++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java @@ -5093,24 +5093,49 @@ public class ToSAPServiceImpl { * @throws Exception */ public String ReturnStockInNew(String siteName, String eventUser, String shipRequestName, String commitDate, String opCode) throws Exception { - String sql="SELECT T.RECEIVEREQUESTNAME ," + SystemPropHelper.CR+ - " D.REQUESTNAME PRODUCTORDER," +SystemPropHelper.CR+ - " T.ERPFACTORY, " + SystemPropHelper.CR+ - " T.ERPLOCATION, " + SystemPropHelper.CR+ - " T.MATERIALSPECNAME, " + SystemPropHelper.CR+ - " T.UNIT, " + SystemPropHelper.CR+ - " T.PACKINGGRADE," + SystemPropHelper.CR+ - " D.MATERIALSPECTYPE," + SystemPropHelper.CR+ - " D.SHIPREQUESTNAME," + SystemPropHelper.CR+ - " D.SHIPREQUESTDETAILNAME," + SystemPropHelper.CR+ - " SUM(T.MATERIALQUANTITY) AS MATERIALQUANTITY" + SystemPropHelper.CR+ - " FROM MATERIALPACKING T LEFT JOIN BS_MES_SHIPPED D ON D.LOTNAME = T.MATERIALPACKINGNAME" + SystemPropHelper.CR+ - " WHERE 1 = 1 " + SystemPropHelper.CR+ - " AND T.receiveActNo = :SHIPREQUESTNAME" + SystemPropHelper.CR+ - " AND T.SITENAME = :SITENAME " + SystemPropHelper.CR+ - " AND T.STOCKSTATE = 'Created' " + SystemPropHelper.CR+ - "GROUP BY T.RECEIVEREQUESTNAME, D.REQUESTNAME, T.ERPFACTORY,T.ERPLOCATION, " + SystemPropHelper.CR+ - " T.MATERIALSPECNAME,T.UNIT,T.PACKINGGRADE,D.MATERIALSPECTYPE,D.SHIPREQUESTNAME,D.SHIPREQUESTDETAILNAME "; +// String sql="SELECT T.RECEIVEREQUESTNAME ," + SystemPropHelper.CR+ +// " D.REQUESTNAME PRODUCTORDER," +SystemPropHelper.CR+ +// " T.ERPFACTORY, " + SystemPropHelper.CR+ +// " T.ERPLOCATION, " + SystemPropHelper.CR+ +// " T.MATERIALSPECNAME, " + SystemPropHelper.CR+ +// " T.UNIT, " + SystemPropHelper.CR+ +// " T.PACKINGGRADE," + SystemPropHelper.CR+ +// " D.MATERIALSPECTYPE," + SystemPropHelper.CR+ +// " D.SHIPREQUESTNAME," + SystemPropHelper.CR+ +// " D.SHIPREQUESTDETAILNAME," + SystemPropHelper.CR+ +// " SUM(T.MATERIALQUANTITY) AS MATERIALQUANTITY" + SystemPropHelper.CR+ +// " FROM MATERIALPACKING T LEFT JOIN BS_MES_SHIPPED D ON D.LOTNAME = T.MATERIALPACKINGNAME" + SystemPropHelper.CR+ +// " WHERE 1 = 1 " + SystemPropHelper.CR+ +// " AND T.receiveActNo = :SHIPREQUESTNAME" + SystemPropHelper.CR+ +// " AND T.SITENAME = :SITENAME " + SystemPropHelper.CR+ +// " AND T.STOCKSTATE = 'Created' " + SystemPropHelper.CR+ +// "GROUP BY T.RECEIVEREQUESTNAME, D.REQUESTNAME, T.ERPFACTORY,T.ERPLOCATION, " + SystemPropHelper.CR+ +// " T.MATERIALSPECNAME,T.UNIT,T.PACKINGGRADE,D.MATERIALSPECTYPE,D.SHIPREQUESTNAME,D.SHIPREQUESTDETAILNAME "; + + String sql="SELECT T.RECEIVEREQUESTNAME , \n" + + " D.REQUESTNAME PRODUCTORDER, \n" + + " T.ERPFACTORY, \n" + + " T.ERPLOCATION, \n" + + " T.MATERIALSPECNAME, \n" + + " T.UNIT, \n" + + " T.PACKINGGRADE, \n" + + " D.MATERIALSPECTYPE, \n" + + " D.SHIPREQUESTNAME, \n" + + " D.SHIPREQUESTDETAILNAME, \n" + + " B.RECEIVEREQUESTNAME PRERECEIVEREQUESTNAME,\n" + + " B.RECEIVEREQUESTDETAILNAME PRERECEIVEREQUESTDETAILNAME,\n" + + " SUM(T.MATERIALQUANTITY) AS MATERIALQUANTITY \n" + + " FROM BS_MES_SHIPPED D LEFT JOIN MATERIALPACKING T ON D.LOTNAME = T.MATERIALPACKINGNAME\n" + + " LEFT JOIN MATERIALPACKINGSUB B ON D.MATERIALPACKINGNAME = B.MATERIALPACKINGNAME\n" + + " LEFT JOIN MATERIALSHIPREQUESTDETAIL m ON m.SHIPREQUESTNAME = B.RECEIVEREQUESTNAME AND m.SHIPREQUESTDETAILNAME = B.RECEIVEREQUESTDETAILNAME\n" + + " AND (m.RECEIVEPRODUCTIONORDERNUMBER = D.REQUESTNAME OR m.RECEIVEPRODUCTIONORDERNUMBER = '0000' || D.REQUESTNAME)\n" + + "WHERE 1 = 1 \n" + + " AND T.receiveActNo = :SHIPREQUESTNAME \n" + + " AND T.SITENAME = :SITENAME \n" + + " AND T.STOCKSTATE = 'Created' \n" + + " GROUP BY T.RECEIVEREQUESTNAME, D.REQUESTNAME, T.ERPFACTORY,T.ERPLOCATION, \n" + + " T.MATERIALSPECNAME,T.UNIT,T.PACKINGGRADE,D.MATERIALSPECTYPE,D.SHIPREQUESTNAME,D.SHIPREQUESTDETAILNAME,\n" + + " B.RECEIVEREQUESTNAME,B.RECEIVEREQUESTDETAILNAME"; Map hashMap = new HashMap(); hashMap.put("SITENAME", siteName); // hashMap.put("SHIPREQUESTNAME", shipRequestName); @@ -5213,14 +5238,14 @@ public class ToSAPServiceImpl { } if(moveType.equals("262")) { item.put("AUFNR", mm.get("PRODUCTORDER"));; //生产工单 + item.put("ZLLORDER", mm.get("PRERECEIVEREQUESTNAME")); // 自定义单号 + item.put("ZLLITEM", mm.get("PRERECEIVEREQUESTDETAILNAME")); // 自定义单号行项 } if(moveType.equals("Z62")) { item.put("AUFNR", mm.get("RECEIVEREQUESTNAME"));; //内部订单号，对于研发品来说 } item.put("MENGE", mm.get("MATERIALQUANTITY")); item.put("MEINS", mm.get("UNIT")); - item.put("ZLLORDER", mm.get("SHIPREQUESTNAME")); - item.put("ZLLITEM", mm.get("SHIPREQUESTDETAILNAME")); item.put("SGTXT", mm.get("REMARK")); String insmk = ""; 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 11ed4e4..ec11eec 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 @@ -489,7 +489,9 @@ public class MESToWMSServiceImpl implements MESToWMSService { String gxId = jo.getString("gxId"); // 增加管芯字段 String makeDate = jo.getString("makeDate"); erpFactory = jo.getString("erpFactory"); - String materialPackingName = jo.getString("materialPackingName"); // 生成退料原条码二维码 + String materialPackingName = jo.getString("materialPackingName"); // 退料原条码二维码 + String saleShipRequestName = jo.getString("SALESHIPREQUESTNAME"); // 销售订单号 + String saleShipRequestDetailName = jo.getString("SALESHIPREQUESTDETAILNAME"); // 销售订单号行项 if (i == 0) { stockInType = jo.getString("stockInType"); @@ -565,12 +567,12 @@ public class MESToWMSServiceImpl implements MESToWMSService { } }else if ("0".equals(operationType)){ 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, " + + "PRODUCTSPECNAME, PRODUCTNAME, SDK_ID, PHASE, RECEIVE_FLAG, REMARK, SHIPTIME, MATERIALPACKINGNAME," + "SHIPUSER, SITENAME, MATERIALSPECTYPE," + "INVENTORYTYPE, SALENO, SALEDETAILNO, ERPLOCATION, CHARGE, LOCATIONNAME, " + "OPERATIONTYPE, MAKEDATE,ERPFACTORY,GXID,SHIPREQUESTNAME, SHIPREQUESTDETAILNAME)" + SystemPropHelper.CR + " VALUES(:LOTNAME,:QTY,:UNIT,:REQUESTNAME, :AREA, " - + ":PRODUCTSPECNAME, :PRODUCTNAME, :SDK_ID, :PHASE, 'N', :REMARK, :SHIPTIME, " + + ":PRODUCTSPECNAME, :PRODUCTNAME, :SDK_ID, :PHASE, 'N', :REMARK, :SHIPTIME, :MATERIALPACKINGNAME," + "'MES', 'SDK', :MATERIALSPECTYPE, " + ":INVENTORYTYPE, :SALENO, :SALEDETAILNO, :ERPLOCATION, :CHARGE, :LOCATIONNAME, " + ":OPERATIONTYPE,TO_DATE(:MAKEDATE, 'YYYY-MM-DD'),:ERPFACTORY,:GXID,:SHIPREQUESTNAME, :SHIPREQUESTDETAILNAME)";