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

Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr

Browse Source 
# Conflicts:
#	zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java
This commit is contained in:
郭飞 2025-05-14 20:18:39 +08:00
commit 986382f077
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,8 +561,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
lotname, receiveActNo, erpLocation, erpFactory, locationName, requestName, lotname, receiveActNo, erpLocation, erpFactory, locationName, requestName,
productSpecName); productSpecName);
} }
}else if ("0".equals(operationType) && "CBT".equals(stockInType)){ }else if ("0".equals(operationType)){
String insertBS_MES_SHIP_PEDSql = SystemPropHelper.CR + "INSERT INTO BS_MES_SHIPPED(LOTNAME,QTY, UNIT, REQUESTNAME, AREA, " 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, "
+ "SHIPUSER, SITENAME, MATERIALSPECTYPE," + "SHIPUSER, SITENAME, MATERIALSPECTYPE,"