【越加红】【WMS对接】【出库确认】

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

@@ -43,6 +43,7 @@ public class OUTConfirm {
         private String status;
         /** 支持出库单多次发货 多次发货确认时 0=发货单最终状态确认: 1=发货单中间状态确认 */
         private Integer confirmType;
+        private String outBizCode;
 
         /** 物流公司编码 长度:50 SF=顺丰、EMS=标准快递、EYB=经济快件、ZJS=宅急送、YTO=圆通 、ZTO=中通 (ZTO) 、HTKY=百世汇通、BSKY=百世快运、UC=优速、STO=申通、TTKDEX=天天快递 、QFKD=全峰、FAST=快捷、POSTB=邮政小包 、GTO=国通、YUNDA=韵达、JD=京东配送、DD=当当宅配、AMAZON=亚马逊物流、DBWL=德邦物流、DBKD=德邦快递、DBKY=德邦快运、RRS=日日顺、OTHER=其他 ，(只传英文编码) 如果没有购买OMS系统请不要传OTHER，可以传其他自定义的 */
         private String logisticsCode;
@@ -108,6 +109,7 @@ public class OUTConfirm {
                 .append("'").append(StringUtil.nvl(deliveryOrder.getInWarehouseCode(), "")).append("' inWarehouseCode, ")
                 .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("'").append(StringUtil.nvl(deliveryOrder.getLogisticsCode(), "")).append("' logisticsCode, ")
@@ -125,7 +127,7 @@ public class OUTConfirm {
 //                .append("wmsl.inWarehouseCode = doc.inWarehouseCode, ")
 //                .append("wmsl.WMSORDERID = doc.WMSORDERID, ")
 //                .append("wmsl.WMSORDERTYPE = doc.WMSORDERTYPE, ")
-                .append("wmsl.OUTBIZCODE = doc.OUTBIZCODE, ")
+                .append("wmsl.outBizCode = nvl(doc.outBizCode,wmsl.outBizCode), ")
                 .append("wmsl.CONFIRMTYPE = doc.CONFIRMTYPE, ")
                 .append("wmsl.STATUS = doc.STATUS, ")
                 .append("wmsl.logisticsCode = doc.logisticsCode, ")
@@ -135,9 +137,9 @@ public class OUTConfirm {
                 .append("wmsl.operateTime = doc.operateTime, ")
                 .append("wmsl.operatorName = doc.operatorName, ")
                 .append("wmsl.UTIME = SYSDATE ")
-                .append("WHEN NOT MATCHED THEN INSERT (ITIME,PIID, PIINOUTNO, ORDERCODE, OWNERCODE,TOOWNERCODE, WAREHOUSECODE,INWAREHOUSECODE, WMSORDERID, WMSORDERTYPE, OUTBIZCODE, CONFIRMTYPE, STATUS" +
+                .append("WHEN NOT MATCHED THEN INSERT (ITIME,PIID, PIINOUTNO, ORDERCODE, OWNERCODE,TOOWNERCODE, WAREHOUSECODE,INWAREHOUSECODE, WMSORDERID, WMSORDERTYPE,outBizCode, CONFIRMTYPE, STATUS" +
                         ", ORDERFINISHEDTIME, operatorName, OPERATETIME,logisticsCode,logisticsName,expressCode) ")
-                .append("VALUES (SYSDATE,doc.PIID, doc.PIINOUTNO, doc.ORDERCODE, doc.OWNERCODE,doc.inOwnerCode,doc.WAREHOUSECODE,doc.inWarehouseCode,doc.WMSORDERID,doc.OUTBIZCODE,doc.CONFIRMTYPE,doc.STATUS" +
+                .append("VALUES (SYSDATE,doc.PIID, doc.PIINOUTNO, doc.ORDERCODE, doc.OWNERCODE,doc.inOwnerCode,doc.WAREHOUSECODE,doc.inWarehouseCode,doc.WMSORDERID,doc.WMSORDERTYPE,doc.outBizCode,doc.CONFIRMTYPE,doc.STATUS" +
                         " ,doc.orderConfirmTime,doc.operatorName,doc.operateTime,doc.logisticsCode,doc.logisticsName,doc.expressCode" +
                         ")");
         return sql.toString();
@@ -161,11 +163,11 @@ public class OUTConfirm {
                 .append(line.getOrderLineNo()).append(" LINENO, ")
                 .append("'").append(line.getItemCode()).append("' ITEMCODE, ")
                 .append("'").append(StringUtil.nvl(line.getPlanQty(), "")).append("' PLANQTY, ")
-                .append(StringUtil.nvl(line.getActualQty(), "0")).append(" ACTUALQTY, ")
+                .append(StringUtil.nvl(line.getActualQty(), "0")).append(" ACTUALQTY ")
                 .append("FROM dual) doc ON (wmsl.PL_PIID = doc.PIID AND wmsl.LINENO = doc.LINENO) ")
                 .append("WHEN MATCHED THEN UPDATE SET ")
                 .append("wmsl.OUTBIZCODE = doc.OUTBIZCODE, ")
-                .append("wmsl.ACTUALQTY = NVL(msl.ACTUALQTY,0)+doc.ACTUALQTY, ")
+                .append("wmsl.ACTUALQTY = NVL(wmsl.ACTUALQTY,0)+doc.ACTUALQTY, ")
                 .append("wmsl.UTIME = SYSDATE ")
                 .append("WHEN NOT MATCHED THEN INSERT (PL_PIID,OUTBIZCODE,LINENO, ITEMCODE, PLANQTY,ACTUALQTY) ")
                 .append("VALUES (doc.PIID,doc.OUTBIZCODE, doc.LINENO, doc.ITEMCODE, doc.PLANQTY, doc.ACTUALQTY)");

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

@@ -61,22 +61,13 @@ public class ERPSWMServiceImpl implements ERPWMSService {
         if ("stockout.confirm".equals(method)) {
             outConfirm = xmlMapper.readValue(confirmBody,OUTConfirm.class);
             OUTConfirm.DeliveryOrder deliveryOrder = outConfirm.getDeliveryOrder();
-            masterCode = inConfirm.getMasterCode();
+            masterCode = outConfirm.getMasterCode();
             orderCode = deliveryOrder.getDeliveryOrderCode();
         }
-       /* if ("openapi.adjustmentorder.confirm".equals(method)) {
-            req = objectMapper.readValue(confirmBody,
-                    objectMapper.getTypeFactory().constructParametricType(BaseReq.class, AdjustConfirm.class));
-            AdjustConfirm adjustConfirm = (AdjustConfirm) req.getRequest();
-            AdjustConfirm.AdjustmentOrder order = adjustConfirm.getAdjustmentOrder();
-            masterName = adjustConfirm.getMasterName();
-            orderCode = order.getAdjustmentOrderCode();
-        }*/
         if (orderCode == null || orderCode.equals("")) {
             wmsApiResult.setFlag("failure");
             wmsApiResult.setCode("400");
             wmsApiResult.setMessage("没有找到对应的单据");
-//            resp.setResponse(wmsApiResult);
             return wmsApiResult;
         }
         if (masterCode == null || masterCode.equals("")) {