【华信科】【富勒WMS对接】【出库单创建】【出库单确认】

src/main/java/com/uas/eis/entity/vwms/req/INConfirm.java

@@ -289,11 +289,11 @@ public class INConfirm {
                 .append("SELECT ")
                 .append("@PIID").append(" PIID, ")
                 .append("'").append("@INOUTNO").append("' PIINOUTNO, ")
-                .append("'").append(StringUtil.nvl(entryOrder.getEntryOrderCode(), "")).append("' ENTRYORDERCODE, ")
+                .append("'").append(StringUtil.nvl(entryOrder.getEntryOrderCode(), "")).append("' ORDERCODE, ")
                 .append("'").append(StringUtil.nvl(entryOrder.getOwnerCode(), "")).append("' OWNERCODE, ")
                 .append("'").append(StringUtil.nvl(entryOrder.getWarehouseCode(), "")).append("' WAREHOUSECODE, ")
-                .append("'").append(StringUtil.nvl(entryOrder.getEntryOrderId(), "")).append("' ENTRYORDERID, ")
-                .append("'").append(StringUtil.nvl(entryOrder.getEntryOrderType(), "")).append("' ENTRYORDERTYPE, ")
+                .append("'").append(StringUtil.nvl(entryOrder.getEntryOrderId(), "")).append("' WMSORDERID, ")
+                .append("'").append(StringUtil.nvl(entryOrder.getEntryOrderType(), "")).append("' WMSORDERTYPE, ")
                 .append("'").append(StringUtil.nvl(entryOrder.getOutBizCode(), "")).append("' OUTBIZCODE, ")
                 .append(StringUtil.nvl(entryOrder.getConfirmType(), "0")).append(" CONFIRMTYPE, ")
                 .append("'").append(StringUtil.nvl(entryOrder.getStatus(), "")).append("' STATUS, ")
@@ -306,11 +306,11 @@ public class INConfirm {
                 .append("'").append(StringUtil.nvl(entryOrder.getUserDefined4(), "")).append("' USERDEFINED4 ")
                 .append("FROM dual) doc ON (wmsl.PIID = doc.PIID AND wmsl.PIINOUTNO = doc.PIINOUTNO) ")
                 .append("WHEN MATCHED THEN UPDATE SET ")
-                .append("wmsl.ENTRYORDERCODE = doc.ENTRYORDERCODE, ")
+                .append("wmsl.ORDERCODE = doc.ORDERCODE, ")
                 .append("wmsl.OWNERCODE = doc.OWNERCODE, ")
                 .append("wmsl.WAREHOUSECODE = doc.WAREHOUSECODE, ")
-                .append("wmsl.ENTRYORDERID = doc.ENTRYORDERID, ")
-                .append("wmsl.ENTRYORDERTYPE = doc.ENTRYORDERTYPE, ")
+                .append("wmsl.WMSORDERID = doc.WMSORDERID, ")
+                .append("wmsl.WMSORDERTYPE = doc.WMSORDERTYPE, ")
                 .append("wmsl.OUTBIZCODE = doc.OUTBIZCODE, ")
                 .append("wmsl.CONFIRMTYPE = doc.CONFIRMTYPE, ")
                 .append("wmsl.STATUS = doc.STATUS, ")
@@ -322,8 +322,8 @@ public class INConfirm {
                 .append("wmsl.USERDEFINED3 = doc.USERDEFINED3, ")
                 .append("wmsl.USERDEFINED4 = doc.USERDEFINED4, ")
                 .append("wmsl.UTIME = SYSDATE ")
-                .append("WHEN NOT MATCHED THEN INSERT (ITIME,PIID, PIINOUTNO, ENTRYORDERCODE, OWNERCODE, WAREHOUSECODE, ENTRYORDERID, ENTRYORDERTYPE, OUTBIZCODE, CONFIRMTYPE, STATUS, ORDERFINISHEDTIME, RECEIVER, REMARK, USERDEFINED1, USERDEFINED2, USERDEFINED3, USERDEFINED4) ")
-                .append("VALUES (SYSDATE,doc.PIID, doc.PIINOUTNO, doc.ENTRYORDERCODE, doc.OWNERCODE, doc.WAREHOUSECODE, doc.ENTRYORDERID, doc.ENTRYORDERTYPE, doc.OUTBIZCODE, doc.CONFIRMTYPE, doc.STATUS, doc.ORDERFINISHEDTIME, doc.RECEIVER, doc.REMARK, doc.USERDEFINED1, doc.USERDEFINED2, doc.USERDEFINED3, doc.USERDEFINED4)");
+                .append("WHEN NOT MATCHED THEN INSERT (ITIME,PIID, PIINOUTNO, ORDERCODE, OWNERCODE, WAREHOUSECODE, WMSORDERID, WMSORDERTYPE, OUTBIZCODE, CONFIRMTYPE, STATUS, ORDERFINISHEDTIME, RECEIVER, REMARK, USERDEFINED1, USERDEFINED2, USERDEFINED3, USERDEFINED4) ")
+                .append("VALUES (SYSDATE,doc.PIID, doc.PIINOUTNO, doc.ORDERCODE, doc.OWNERCODE, doc.WAREHOUSECODE, doc.WMSORDERID, doc.WMSORDERTYPE, doc.OUTBIZCODE, doc.CONFIRMTYPE, doc.STATUS, doc.ORDERFINISHEDTIME, doc.RECEIVER, doc.REMARK, doc.USERDEFINED1, doc.USERDEFINED2, doc.USERDEFINED3, doc.USERDEFINED4)");
         return sql.toString();
     }
 

src/main/java/com/uas/eis/entity/vwms/req/OUTConfirm.java

@@ -86,7 +86,8 @@ public class OUTConfirm {
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Packages {
         @JsonProperty("package")
-        private List<Pkg> pkg;
+//        private List<Pkg> pkg;
+        private Pkg pkg;
 
         @Data
         @JsonIgnoreProperties(ignoreUnknown = true)
@@ -264,16 +265,16 @@ public class OUTConfirm {
                 .append("SELECT ")
                 .append("@PIID").append(" PIID, ")
                 .append("'").append("@INOUTNO").append("' PIINOUTNO, ")
-                .append("'").append(StringUtil.nvl(deliveryOrder.getDeliveryOrderCode(), "")).append("' ENTRYORDERCODE, ")
+                .append("'").append(StringUtil.nvl(deliveryOrder.getDeliveryOrderCode(), "")).append("' ORDERCODE, ")
                 .append("'").append(StringUtil.nvl(deliveryOrder.getOwnerCode(), "")).append("' OWNERCODE, ")
                 .append("'").append(StringUtil.nvl(deliveryOrder.getWarehouseCode(), "")).append("' WAREHOUSECODE, ")
-                .append("'").append(StringUtil.nvl(deliveryOrder.getDeliveryOrderId(), "")).append("' ENTRYORDERID, ")
-                .append("'").append(StringUtil.nvl(deliveryOrder.getOrderType(), "")).append("' ENTRYORDERTYPE, ")
+                .append("'").append(StringUtil.nvl(deliveryOrder.getDeliveryOrderId(), "")).append("' WMSORDERID, ")
+                .append("'").append(StringUtil.nvl(deliveryOrder.getOrderType(), "")).append("' WMSORDERTYPE, ")
                 .append("'").append(StringUtil.nvl(deliveryOrder.getOutBizCode(), "")).append("' OUTBIZCODE, ")
                 .append(StringUtil.nvl(deliveryOrder.getConfirmType(), "0")).append(" CONFIRMTYPE, ")
                 .append("'").append(StringUtil.nvl(deliveryOrder.getStatus(), "")).append("' STATUS, ")
-//                .append((StringUtil.hasText(deliveryOrder.getOrderFinishedTime()) ? "to_date('" + deliveryOrder.getOrderFinishedTime() + "','yyyy-mm-dd hh24:mi:ss')" : "null")).append(" ORDERFINISHEDTIME, ")
-//                .append("'").append(StringUtil.nvl(deliveryOrder.getReceiver(), "")).append("' RECEIVER, ")
+                .append((StringUtil.hasText(deliveryOrder.getDeliveryTime()) ? "to_date('" + deliveryOrder.getDeliveryTime() + "','yyyy-mm-dd hh24:mi:ss')" : "null")).append(" deliveryTime, ")
+                .append("'").append(StringUtil.nvl(deliveryOrder.getShipper(), "")).append("' shipper, ")
                 .append("'").append(StringUtil.nvl(deliveryOrder.getRemark(), "")).append("' REMARK, ")
                 .append("'").append(StringUtil.nvl(deliveryOrder.getUserDefined1(), "")).append("' USERDEFINED1, ")
                 .append("'").append(StringUtil.nvl(deliveryOrder.getUserDefined2(), "")).append("' USERDEFINED2, ")
@@ -281,24 +282,24 @@ public class OUTConfirm {
                 .append("'").append(StringUtil.nvl(deliveryOrder.getUserDefined4(), "")).append("' USERDEFINED4 ")
                 .append("FROM dual) doc ON (wmsl.PIID = doc.PIID AND wmsl.PIINOUTNO = doc.PIINOUTNO) ")
                 .append("WHEN MATCHED THEN UPDATE SET ")
-                .append("wmsl.ENTRYORDERCODE = doc.ENTRYORDERCODE, ")
+                .append("wmsl.ORDERCODE = doc.ORDERCODE, ")
                 .append("wmsl.OWNERCODE = doc.OWNERCODE, ")
                 .append("wmsl.WAREHOUSECODE = doc.WAREHOUSECODE, ")
-                .append("wmsl.ENTRYORDERID = doc.ENTRYORDERID, ")
-                .append("wmsl.ENTRYORDERTYPE = doc.ENTRYORDERTYPE, ")
+                .append("wmsl.WMSORDERID = doc.WMSORDERID, ")
+                .append("wmsl.WMSORDERTYPE = doc.WMSORDERTYPE, ")
                 .append("wmsl.OUTBIZCODE = doc.OUTBIZCODE, ")
                 .append("wmsl.CONFIRMTYPE = doc.CONFIRMTYPE, ")
                 .append("wmsl.STATUS = doc.STATUS, ")
-                .append("wmsl.ORDERFINISHEDTIME = doc.ORDERFINISHEDTIME, ")
-                .append("wmsl.RECEIVER = doc.RECEIVER, ")
+                .append("wmsl.deliveryTime = doc.deliveryTime, ")
+                .append("wmsl.shipper = doc.shipper, ")
                 .append("wmsl.REMARK = doc.REMARK, ")
                 .append("wmsl.USERDEFINED1 = doc.USERDEFINED1, ")
                 .append("wmsl.USERDEFINED2 = doc.USERDEFINED2, ")
                 .append("wmsl.USERDEFINED3 = doc.USERDEFINED3, ")
                 .append("wmsl.USERDEFINED4 = doc.USERDEFINED4, ")
                 .append("wmsl.UTIME = SYSDATE ")
-                .append("WHEN NOT MATCHED THEN INSERT (ITIME,PIID, PIINOUTNO, ENTRYORDERCODE, OWNERCODE, WAREHOUSECODE, ENTRYORDERID, ENTRYORDERTYPE, OUTBIZCODE, CONFIRMTYPE, STATUS, ORDERFINISHEDTIME, RECEIVER, REMARK, USERDEFINED1, USERDEFINED2, USERDEFINED3, USERDEFINED4) ")
-                .append("VALUES (SYSDATE,doc.PIID, doc.PIINOUTNO, doc.ENTRYORDERCODE, doc.OWNERCODE, doc.WAREHOUSECODE, doc.ENTRYORDERID, doc.ENTRYORDERTYPE, doc.OUTBIZCODE, doc.CONFIRMTYPE, doc.STATUS, doc.ORDERFINISHEDTIME, doc.RECEIVER, doc.REMARK, doc.USERDEFINED1, doc.USERDEFINED2, doc.USERDEFINED3, doc.USERDEFINED4)");
+                .append("WHEN NOT MATCHED THEN INSERT (ITIME,PIID, PIINOUTNO, ORDERCODE, OWNERCODE, WAREHOUSECODE, WMSORDERID, WMSORDERTYPE, OUTBIZCODE, CONFIRMTYPE, STATUS, deliveryTime, shipper, REMARK, USERDEFINED1, USERDEFINED2, USERDEFINED3, USERDEFINED4) ")
+                .append("VALUES (SYSDATE,doc.PIID, doc.PIINOUTNO, doc.ORDERCODE, doc.OWNERCODE, doc.WAREHOUSECODE, doc.WMSORDERID, doc.WMSORDERTYPE, doc.OUTBIZCODE, doc.CONFIRMTYPE, doc.STATUS, doc.deliveryTime, doc.shipper, doc.REMARK, doc.USERDEFINED1, doc.USERDEFINED2, doc.USERDEFINED3, doc.USERDEFINED4)");
         return sql.toString();
     }
 
@@ -308,7 +309,7 @@ public class OUTConfirm {
             sqls.add(getGenerateLinesSql(line));
             for (int i = 0; i < line.getBatchs().getBatch().size(); i++) {
                 OUTConfirm.OrderLines.OrderLine.Batchs.Batch batch = line.getBatchs().getBatch().get(i);
-                sqls.add(getGenerateBatchsSql(line.getLineNo(), (i + 1), batch));
+                sqls.add(getGenerateBatchsSql(line,line.getLineNo(), (i + 1), batch));
             }
         }
         return sqls;
@@ -321,15 +322,10 @@ public class OUTConfirm {
                 .append("@PIID").append(" PIID, ")
                 .append(line.getLineNo()).append(" LINENO, ")
                 .append("'").append(line.getItemCode()).append("' ITEMCODE, ")
-//                .append("'").append(line.getItemId()).append("' ITEMID, ")
-                .append("'").append(StringUtil.nvl(line.getPackUom(), "")).append("' PACKUOM, ")
                 .append("'").append(StringUtil.nvl(line.getPlanQty(), "")).append("' PLANQTY, ")
                 .append(StringUtil.nvl(line.getActualQty(), "0")).append(" ACTUALQTY, ")
                 .append(StringUtil.nvl(line.getActualPackUomQty(), "0")).append(" ACTUALPACKUOMQTY, ")
-//                .append("'").append(StringUtil.nvl(line.getVirtualWarehouse(), "")).append("' virtualWarehouse, ")
-//                .append(StringUtil.nvl(line.getRejectQty(), "0")).append(" REJECTQTY, ")
-//                .append("'").append(StringUtil.nvl(line.getRejectReason(), "")).append("' REJECTREASON, ")
-//                .append("'").append(StringUtil.nvl(line.getSerialno(), "")).append("' SERIALNO, ")
+                .append("'").append(StringUtil.nvl(line.getSerialNo(), "")).append("' SERIALNO, ")
                 .append("'").append(StringUtil.nvl(line.getCustomField1(), "")).append("' CUSTOMFIELD1, ")
                 .append("'").append(StringUtil.nvl(line.getCustomField2(), "")).append("' CUSTOMFIELD2, ")
                 .append("'").append(StringUtil.nvl(line.getCustomField3(), "")).append("' CUSTOMFIELD3, ")
@@ -337,18 +333,11 @@ public class OUTConfirm {
                 .append("'").append(StringUtil.nvl(line.getCustomField5(), "")).append("' CUSTOMFIELD5, ")
                 .append("'").append(StringUtil.nvl(line.getCustomField6(), "")).append("' CUSTOMFIELD6, ")
                 .append("'").append(StringUtil.nvl(line.getCustomField7(), "")).append("' CUSTOMFIELD7, ")
-                .append("'").append(StringUtil.nvl(line.getCustomField8(), "")).append("' CUSTOMFIELD8, ")
-//                .append("'").append(StringUtil.nvl(line.getUserDefined1(), "")).append("' USERDEFINED1, ")
-//                .append("'").append(StringUtil.nvl(line.getUserDefined2(), "")).append("' USERDEFINED2, ")
-//                .append("'").append(StringUtil.nvl(line.getUserDefined3(), "")).append("' USERDEFINED3, ")
-//                .append("'").append(StringUtil.nvl(line.getUserDefined4(), "")).append("' USERDEFINED4 ")
+                .append("'").append(StringUtil.nvl(line.getCustomField8(), "")).append("' CUSTOMFIELD8 ")
                 .append("FROM dual) doc ON (wmsl.PL_PIID = doc.PIID AND wmsl.LINENO = doc.LINENO AND wmsl.ITEMCODE = doc.ITEMCODE) ")
                 .append("WHEN MATCHED THEN UPDATE SET ")
                 .append("wmsl.ACTUALQTY = doc.ACTUALQTY, ")
                 .append("wmsl.ACTUALPACKUOMQTY = doc.ACTUALPACKUOMQTY, ")
-                .append("wmsl.virtualWarehouse = doc.virtualWarehouse, ")
-                .append("wmsl.REJECTQTY = doc.REJECTQTY, ")
-                .append("wmsl.REJECTREASON = doc.REJECTREASON, ")
                 .append("wmsl.SERIALNO = doc.SERIALNO, ")
                 .append("wmsl.CUSTOMFIELD1 = doc.CUSTOMFIELD1, ")
                 .append("wmsl.CUSTOMFIELD2 = doc.CUSTOMFIELD2, ")
@@ -358,20 +347,16 @@ public class OUTConfirm {
                 .append("wmsl.CUSTOMFIELD6 = doc.CUSTOMFIELD6, ")
                 .append("wmsl.CUSTOMFIELD7 = doc.CUSTOMFIELD7, ")
                 .append("wmsl.CUSTOMFIELD8 = doc.CUSTOMFIELD8, ")
-//                .append("wmsl.USERDEFINED1 = doc.USERDEFINED1, ")
-//                .append("wmsl.USERDEFINED2 = doc.USERDEFINED2, ")
-//                .append("wmsl.USERDEFINED3 = doc.USERDEFINED3, ")
-//                .append("wmsl.USERDEFINED4 = doc.USERDEFINED4, ")
                 .append("wmsl.UTIME = SYSDATE ")
-                .append("WHEN NOT MATCHED THEN INSERT (ITIME,PL_PIID, LINENO, ITEMCODE, ITEMID, PACKUOM, PLANQTY, ACTUALQTY, ACTUALPACKUOMQTY,virtualWarehouse, REJECTQTY, REJECTREASON, SERIALNO, ")
-                .append("CUSTOMFIELD1, CUSTOMFIELD2, CUSTOMFIELD3, CUSTOMFIELD4, CUSTOMFIELD5, CUSTOMFIELD6, CUSTOMFIELD7, CUSTOMFIELD8,USERDEFINED1,USERDEFINED2,USERDEFINED3,USERDEFINED4) ")
-                .append("VALUES (SYSDATE,doc.PIID, doc.LINENO, doc.ITEMCODE, doc.ITEMID, doc.PACKUOM, doc.PLANQTY, doc.ACTUALQTY,doc.virtualWarehouse, doc.ACTUALPACKUOMQTY, ")
-                .append("doc.REJECTQTY, doc.REJECTREASON, doc.SERIALNO, doc.CUSTOMFIELD1, doc.CUSTOMFIELD2, doc.CUSTOMFIELD3, doc.CUSTOMFIELD4, doc.CUSTOMFIELD5, ")
-                .append("doc.CUSTOMFIELD6, doc.CUSTOMFIELD7, doc.CUSTOMFIELD8, doc.USERDEFINED1, doc.USERDEFINED2, doc.USERDEFINED3, doc.USERDEFINED4)");
+                .append("WHEN NOT MATCHED THEN INSERT (ITIME,PL_PIID, LINENO, ITEMCODE, PLANQTY, ACTUALQTY, ACTUALPACKUOMQTY, SERIALNO, ")
+                .append("CUSTOMFIELD1, CUSTOMFIELD2, CUSTOMFIELD3, CUSTOMFIELD4, CUSTOMFIELD5, CUSTOMFIELD6, CUSTOMFIELD7, CUSTOMFIELD8) ")
+                .append("VALUES (SYSDATE,doc.PIID, doc.LINENO, doc.ITEMCODE, doc.PLANQTY, doc.ACTUALQTY,doc.ACTUALPACKUOMQTY, ")
+                .append(" doc.SERIALNO, doc.CUSTOMFIELD1, doc.CUSTOMFIELD2, doc.CUSTOMFIELD3, doc.CUSTOMFIELD4, doc.CUSTOMFIELD5, ")
+                .append("doc.CUSTOMFIELD6, doc.CUSTOMFIELD7, doc.CUSTOMFIELD8)");
         return sql.toString();
     }
 
-    public String getGenerateBatchsSql(Integer lineNo, Integer detno, OUTConfirm.OrderLines.OrderLine.Batchs.Batch batch) {
+    public String getGenerateBatchsSql(OUTConfirm.OrderLines.OrderLine line,Integer lineNo, Integer detno, OUTConfirm.OrderLines.OrderLine.Batchs.Batch batch) {
         StringBuilder sql = new StringBuilder();
         sql.append("INSERT INTO ").append("@MASTERCODE")
                 .append(".prodiowms_batchs(ITIME,PB_PIID, PD_DETNO, LINENO, ACTUALQTY, ACTUALPACKUOMQTY, INVENTORYTYPE, VIRTUALWAREHOUSE, PRODUCTDATE, EXPIREDATE, BATCHCODE, STOCKINDATE, USERDEFINED1, USERDEFINED2, USERDEFINED3, USERDEFINED4, LPN) VALUES(");
@@ -382,7 +367,7 @@ public class OUTConfirm {
         sql.append(lineNo).append(", "); // LINENO
         sql.append(StringUtil.nvl(batch.getActualQty(), "0")).append(", ");
         sql.append(StringUtil.nvl(batch.getActualPackUomQty(), "0")).append(", ");
-        sql.append("'").append(StringUtil.nvl(batch.getInventoryType(), "")).append("', ");
+        sql.append("'").append(StringUtil.nvl(line.getInventoryType(), "")).append("', ");
         sql.append("'").append(StringUtil.nvl(batch.getVirtualWarehouse(), "")).append("', ");
         if (StringUtil.hasText(batch.getProductDate())) {
             sql.append("to_date('").append(batch.getProductDate()).append("','yyyy-mm-dd hh24:mi:ss'), ");

src/main/java/com/uas/eis/service/Impl/ERPSWMServiceImpl.java

@@ -5,6 +5,7 @@ import com.uas.eis.dao.BaseDao;
 import com.uas.eis.dao.SqlRowList;
 import com.uas.eis.entity.vwms.req.BaseReq;
 import com.uas.eis.entity.vwms.req.INConfirm;
+import com.uas.eis.entity.vwms.req.OUTConfirm;
 import com.uas.eis.sdk.entity.WMSApiResult;
 import com.uas.eis.sdk.entity.WMSApiResultResp;
 import com.uas.eis.service.ERPWMSService;
@@ -39,19 +40,25 @@ public class ERPSWMServiceImpl implements ERPWMSService {
         String confirmBody = (String) request.getAttribute("cachedRequestBody");
         // 使用Jackson将JSON字符串转换为BaseReq<IOConfirm>对象
         ObjectMapper objectMapper = new ObjectMapper();
+        BaseReq req = null;
         //入库确认 openapi.entryorder.confirm
         if("openapi.entryorder.confirm".equals(method)){
-            BaseReq<INConfirm> inConfirmBaseReq = objectMapper.readValue(confirmBody,
+            req = objectMapper.readValue(confirmBody,
                     objectMapper.getTypeFactory().constructParametricType(BaseReq.class, INConfirm.class));
-            INConfirm inConfirm = inConfirmBaseReq.getRequest();
+            INConfirm inConfirm = (INConfirm)req.getRequest();
             INConfirm.EntryOrder entryOrder = inConfirm.getEntryOrder();
             masterName = inConfirm.getMasterName();
             orderCode = entryOrder.getEntryOrderCode();
-            sqls.add(inConfirm.getGenerateMainSql());
-            sqls.addAll(inConfirm.getGenerateLinesSql());
         }
         //出库确认 openapi.stockout.confirm
-
+        if("openapi.stockout.confirm".equals(method)){
+            req = objectMapper.readValue(confirmBody,
+                    objectMapper.getTypeFactory().constructParametricType(BaseReq.class, OUTConfirm.class));
+            OUTConfirm outConfirm = (OUTConfirm) req.getRequest();
+            OUTConfirm.DeliveryOrder order = outConfirm.getDeliveryOrder();
+            masterName = outConfirm.getMasterName();
+            orderCode = order.getDeliveryOrderCode();
+        }
         if(orderCode == null || orderCode.equals("")){
             wmsApiResult.setFlag("failure");
             wmsApiResult.setCode("400");
@@ -92,9 +99,19 @@ public class ERPSWMServiceImpl implements ERPWMSService {
             resp.setResponse(wmsApiResult);
             return resp;
         }
+        if("openapi.entryorder.confirm".equals(method)){
+            INConfirm inf = (INConfirm) req.getRequest();
+            sqls.add(inf.getGenerateMainSql());
+            sqls.addAll(inf.getGenerateLinesSql());
+        }
+        if("openapi.stockout.confirm".equals(method)){
+            OUTConfirm outf = (OUTConfirm) req.getRequest();
+            sqls.add(outf.getGenerateMainSql());
+            sqls.addAll(outf.getGenerateLinesSql());
+        }
         // 使用循环遍历并替换每个SQL语句中的占位符
         for (int i = 0; i < sqls.size(); i++) {
-            sqls.set(i, sqls.get(i).replace("@MASRERCODE", masterCode));
+            sqls.set(i, sqls.get(i).replace("@MASTERCODE", masterCode));
             sqls.set(i, sqls.get(i).replace("@PIID", piId.toString()));
             sqls.set(i, sqls.get(i).replace("@INOUTNO", inoutno));
         }
@@ -102,14 +119,14 @@ public class ERPSWMServiceImpl implements ERPWMSService {
         //根据下载采集数据分配采集数并自动过账
         String res = baseDao.callProcedure(masterCode+".DOCWMS_IO_CONFIRM",new Object[] { piId,null });
         if (res != null && !res.trim().equals("")) {
-            logger.info("InConfirm-Err: {}",res);
+            logger.info("IOConfirm-Err: {}",res);
             wmsApiResult.setFlag("failure");
             wmsApiResult.setCode("403");
             wmsApiResult.setMessage(res);
             resp.setResponse(wmsApiResult);
             return resp;
         }
-        logger.info("InConfirm-End:method {} inoutno {}",method, orderCode);
+        logger.info("IOConfirm-End:method {} inoutno {}",method, orderCode);
         resp.setResponse(wmsApiResult);
         return resp;
     }