From 8f5ce2eda23572dd0e24ce06f702aef1c9a23342 Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Thu, 8 May 2025 19:20:54 +0800 Subject: [PATCH] =?UTF-8?q?update=20MES=E7=89=A9=E6=96=99=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E8=AF=B7=E6=B1=82=E6=8E=A5=E5=8F=A3,1.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0stockInType=3D'CBT'=E7=9A=84=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=A4=84=E7=90=862.BS=5FMES=5FSHIPPED=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9EshipRequestName=E3=80=81shipRequestDetailName=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=B9=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idm/service/Impl/MESToWMSServiceImpl.java | 44 ++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) 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 8f76687..8fa6da0 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 @@ -525,7 +525,49 @@ public class MESToWMSServiceImpl implements MESToWMSService { lotname, receiveActNo, erpLocation, erpFactory, locationName, requestName, productSpecName); } - } else { + }else if ("0".equals(operationType) && "CBT".equals(stockInType)){ + 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, " + + "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, " + + "'MES', 'SDK', :MATERIALSPECTYPE, " + + ":INVENTORYTYPE, :SALENO, :SALEDETAILNO, :ERPLOCATION, :CHARGE, :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); + insertBS_MES_SHIP_PEDMap.put("QTY", qty); + insertBS_MES_SHIP_PEDMap.put("UNIT", unit); + insertBS_MES_SHIP_PEDMap.put("REQUESTNAME", requestName); + insertBS_MES_SHIP_PEDMap.put("AREA", area); + insertBS_MES_SHIP_PEDMap.put("PRODUCTSPECNAME", productSpecName); + insertBS_MES_SHIP_PEDMap.put("PRODUCTNAME", productName); + insertBS_MES_SHIP_PEDMap.put("SDK_ID", sdkId); + insertBS_MES_SHIP_PEDMap.put("TRUEGG", sdkId); // sap用于实际规格 + insertBS_MES_SHIP_PEDMap.put("PHASE", phase); + insertBS_MES_SHIP_PEDMap.put("REMARK", remark); + insertBS_MES_SHIP_PEDMap.put("SHIPTIME", shipTime); + insertBS_MES_SHIP_PEDMap.put("SHIPUSER", shipUser); + insertBS_MES_SHIP_PEDMap.put("INVENTORYTYPE", inventoryType); + insertBS_MES_SHIP_PEDMap.put("SALENO", saleNo); + insertBS_MES_SHIP_PEDMap.put("SALEDETAILNO", saleDetailNo); + insertBS_MES_SHIP_PEDMap.put("ERPLOCATION", erpLocation); + insertBS_MES_SHIP_PEDMap.put("LOCATIONNAME", locationName); + insertBS_MES_SHIP_PEDMap.put("OPERATIONTYPE", operationType); + insertBS_MES_SHIP_PEDMap.put("ERPFACTORY", erpFactory); + insertBS_MES_SHIP_PEDMap.put("MATERIALSPECTYPE", stockInType); + insertBS_MES_SHIP_PEDMap.put("CHARGE", charge); + insertBS_MES_SHIP_PEDMap.put("GXID", gxId); + insertBS_MES_SHIP_PEDMap.put("MATERIALPACKINGNAME", materialPackingName); + insertBS_MES_SHIP_PEDMap.put("MAKEDATE", makeDate); + String shipRequestName = jo.getString("shipRequestName"); // 增加管芯字段 + insertBS_MES_SHIP_PEDMap.put("SHIPREQUESTNAME", shipRequestName); + String shipRequestDetailName = jo.getString("shipRequestDetailName"); + insertBS_MES_SHIP_PEDMap.put("SHIPREQUESTDETAILNAME", shipRequestDetailName); + sqlTemplate.update(insertBS_MES_SHIP_PEDSql, insertBS_MES_SHIP_PEDMap); + }else { sqlTemplate.update(insertSql, bindMap); }