10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

update MES物料入库请求接口,1.增加stockInType='CBT'的业务处理2.BS_MES_SHIPPED表新增shipRequestName、shipRequestDetailName字段，并更新

Browse Source
This commit is contained in:
18110972313 2025-05-08 19:20:54 +08:00
parent 9a778c95e4
commit 8f5ce2eda2
1 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<String, Object> 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);
}