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

Compare commits

base: 10539622:c28d4205db4d0e9b678c22ced464dc232d2a1961
Branches Tags
10539622:main
...
compare: 10539622:a3c5d53f38b69dd211b037841e71251a71dc705f
Branches Tags
10539622:main

2 Commits
c28d4205db ... a3c5d53f38

Author SHA1 Message Date
郭飞
a3c5d53f38 Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr 2025-05-19 09:06:14 +08:00
郭飞
2cb223ad71 fix:修改退料入库 2025-05-19 09:06:07 +08:00
2 changed files with 50 additions and 23 deletions
Show Stats Expand all files Collapse all files

65
zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
View File

@ -5100,24 +5100,49 @@ public class ToSAPServiceImpl {
* @throws Exception * @throws Exception
*/ */
public String ReturnStockInNew(String siteName, String eventUser, String shipRequestName, String commitDate, String opCode) throws Exception { public String ReturnStockInNew(String siteName, String eventUser, String shipRequestName, String commitDate, String opCode) throws Exception {
String sql="SELECT T.RECEIVEREQUESTNAME ," + SystemPropHelper.CR+ // String sql="SELECT T.RECEIVEREQUESTNAME ," + SystemPropHelper.CR+
" D.REQUESTNAME PRODUCTORDER," +SystemPropHelper.CR+ // " D.REQUESTNAME PRODUCTORDER," +SystemPropHelper.CR+
" T.ERPFACTORY, " + SystemPropHelper.CR+ // " T.ERPFACTORY, " + SystemPropHelper.CR+
" T.ERPLOCATION, " + SystemPropHelper.CR+ // " T.ERPLOCATION, " + SystemPropHelper.CR+
" T.MATERIALSPECNAME, " + SystemPropHelper.CR+ // " T.MATERIALSPECNAME, " + SystemPropHelper.CR+
" T.UNIT, " + SystemPropHelper.CR+ // " T.UNIT, " + SystemPropHelper.CR+
" T.PACKINGGRADE," + SystemPropHelper.CR+ // " T.PACKINGGRADE," + SystemPropHelper.CR+
" D.MATERIALSPECTYPE," + SystemPropHelper.CR+ // " D.MATERIALSPECTYPE," + SystemPropHelper.CR+
" D.SHIPREQUESTNAME," + SystemPropHelper.CR+ // " D.SHIPREQUESTNAME," + SystemPropHelper.CR+
" D.SHIPREQUESTDETAILNAME," + SystemPropHelper.CR+ // " D.SHIPREQUESTDETAILNAME," + SystemPropHelper.CR+
" SUM(T.MATERIALQUANTITY) AS MATERIALQUANTITY" + 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+ // " FROM MATERIALPACKING T LEFT JOIN BS_MES_SHIPPED D ON D.LOTNAME = T.MATERIALPACKINGNAME" + SystemPropHelper.CR+
" WHERE 1 = 1 " + SystemPropHelper.CR+ // " WHERE 1 = 1 " + SystemPropHelper.CR+
" AND T.receiveActNo = :SHIPREQUESTNAME" + SystemPropHelper.CR+ // " AND T.receiveActNo = :SHIPREQUESTNAME" + SystemPropHelper.CR+
" AND T.SITENAME = :SITENAME " + SystemPropHelper.CR+ // " AND T.SITENAME = :SITENAME " + SystemPropHelper.CR+
" AND T.STOCKSTATE = 'Created' " + SystemPropHelper.CR+ // " AND T.STOCKSTATE = 'Created' " + SystemPropHelper.CR+
"GROUP BY T.RECEIVEREQUESTNAME, D.REQUESTNAME, T.ERPFACTORY,T.ERPLOCATION, " + 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 "; // " 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<String, Object> hashMap = new HashMap<String, Object>(); Map<String, Object> hashMap = new HashMap<String, Object>();
hashMap.put("SITENAME", siteName); hashMap.put("SITENAME", siteName);
// hashMap.put("SHIPREQUESTNAME", shipRequestName); // hashMap.put("SHIPREQUESTNAME", shipRequestName);
@ -5220,14 +5245,14 @@ public class ToSAPServiceImpl {
} }
if(moveType.equals("262")) { if(moveType.equals("262")) {
item.put("AUFNR", mm.get("PRODUCTORDER"));; //生产工单 item.put("AUFNR", mm.get("PRODUCTORDER"));; //生产工单
item.put("ZLLORDER", mm.get("PRERECEIVEREQUESTNAME")); // 自定义单号
item.put("ZLLITEM", mm.get("PRERECEIVEREQUESTDETAILNAME")); // 自定义单号行项
} }
if(moveType.equals("Z62")) { if(moveType.equals("Z62")) {
item.put("AUFNR", mm.get("RECEIVEREQUESTNAME"));; //内部订单号，对于研发品来说 item.put("AUFNR", mm.get("RECEIVEREQUESTNAME"));; //内部订单号，对于研发品来说
} }
item.put("MENGE", mm.get("MATERIALQUANTITY")); item.put("MENGE", mm.get("MATERIALQUANTITY"));
item.put("MEINS", mm.get("UNIT")); item.put("MEINS", mm.get("UNIT"));
item.put("ZLLORDER", mm.get("SHIPREQUESTNAME"));
item.put("ZLLITEM", mm.get("SHIPREQUESTDETAILNAME"));
item.put("SGTXT", mm.get("REMARK")); item.put("SGTXT", mm.get("REMARK"));
String insmk = ""; String insmk = "";

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

@ -489,7 +489,9 @@ public class MESToWMSServiceImpl implements MESToWMSService {
String gxId = jo.getString("gxId"); // 增加管芯字段 String gxId = jo.getString("gxId"); // 增加管芯字段
String makeDate = jo.getString("makeDate"); String makeDate = jo.getString("makeDate");
erpFactory = jo.getString("erpFactory"); 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) { if (i == 0) {
stockInType = jo.getString("stockInType"); stockInType = jo.getString("stockInType");
@ -565,12 +567,12 @@ public class MESToWMSServiceImpl implements MESToWMSService {
} }
}else if ("0".equals(operationType)){ }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, MATERIALPACKINGNAME,"
+ "SHIPUSER, SITENAME, MATERIALSPECTYPE," + "SHIPUSER, SITENAME, MATERIALSPECTYPE,"
+ "INVENTORYTYPE, SALENO, SALEDETAILNO, ERPLOCATION, CHARGE, LOCATIONNAME, " + "INVENTORYTYPE, SALENO, SALEDETAILNO, ERPLOCATION, CHARGE, LOCATIONNAME, "
+ "OPERATIONTYPE, MAKEDATE,ERPFACTORY,GXID,SHIPREQUESTNAME, SHIPREQUESTDETAILNAME)" + SystemPropHelper.CR + "OPERATIONTYPE, MAKEDATE,ERPFACTORY,GXID,SHIPREQUESTNAME, SHIPREQUESTDETAILNAME)" + SystemPropHelper.CR
+ " VALUES(:LOTNAME,:QTY,:UNIT,:REQUESTNAME, :AREA, " + " 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, " + "'MES', 'SDK', :MATERIALSPECTYPE, "
+ ":INVENTORYTYPE, :SALENO, :SALEDETAILNO, :ERPLOCATION, :CHARGE, :LOCATIONNAME, " + ":INVENTORYTYPE, :SALENO, :SALEDETAILNO, :ERPLOCATION, :CHARGE, :LOCATIONNAME, "
+ ":OPERATIONTYPE,TO_DATE(:MAKEDATE, 'YYYY-MM-DD'),:ERPFACTORY,:GXID,:SHIPREQUESTNAME, :SHIPREQUESTDETAILNAME)"; + ":OPERATIONTYPE,TO_DATE(:MAKEDATE, 'YYYY-MM-DD'),:ERPFACTORY,:GXID,:SHIPREQUESTNAME, :SHIPREQUESTDETAILNAME)";