【越加红】【WMS对接】【新增件数、物料费用对接】

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

@@ -56,6 +56,8 @@ public class OUTConfirm {
         private String operateTime;//当前状态操作时间, string (19) , YYYY-MM-DD HH:MM:SS
         /*当前状态操作员姓名, string (50)*/
         private String operatorName;
+        private Double logisticsCosts;
+        private Integer logisticsPackages;
     }
 
     @Data
@@ -117,7 +119,9 @@ public class OUTConfirm {
                 .append("'").append(StringUtil.nvl(deliveryOrder.getExpressCode(), "")).append("' expressCode, ")
                 .append((StringUtil.hasText(deliveryOrder.getOrderConfirmTime()) ? "to_date('" + deliveryOrder.getOrderConfirmTime() + "','yyyy-mm-dd hh24:mi:ss')" : "null")).append(" orderConfirmTime,  ")
                 .append((StringUtil.hasText(deliveryOrder.getOperateTime()) ? "to_date('" + deliveryOrder.getOperateTime() + "','yyyy-mm-dd hh24:mi:ss')" : "null")).append(" operateTime,  ")
-                .append("'").append(StringUtil.nvl(deliveryOrder.getOperatorName(), "")).append("' operatorName ")
+                .append("'").append(StringUtil.nvl(deliveryOrder.getOperatorName(), "")).append("' operatorName, ")
+                .append("'").append(StringUtil.nvl(deliveryOrder.getLogisticsCosts(), "0")).append("' logisticsCosts, ")
+                .append("'").append(StringUtil.nvl(deliveryOrder.getLogisticsPackages(), "0")).append("' logisticsPackages ")
                 .append("FROM dual) doc ON (wmsl.PIID = doc.PIID AND wmsl.PIINOUTNO = doc.PIINOUTNO) ")
                 .append("WHEN MATCHED THEN UPDATE SET ")
                 .append("wmsl.ORDERCODE = doc.ORDERCODE, ")
@@ -136,11 +140,13 @@ public class OUTConfirm {
                 .append("wmsl.ORDERFINISHEDTIME = doc.orderConfirmTime, ")
                 .append("wmsl.operateTime = doc.operateTime, ")
                 .append("wmsl.operatorName = doc.operatorName, ")
+                .append("wmsl.logisticsCosts = doc.logisticsCosts, ")
+                .append("wmsl.logisticsPackages = doc.logisticsPackages, ")
                 .append("wmsl.UTIME = SYSDATE ")
                 .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) ")
+                        ", ORDERFINISHEDTIME, operatorName, OPERATETIME,logisticsCode,logisticsName,expressCode,logisticsCosts,logisticsPackages) ")
                 .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" +
+                        " ,doc.orderConfirmTime,doc.operatorName,doc.operateTime,doc.logisticsCode,doc.logisticsName,doc.expressCode,doc.logisticsCosts,doc.logisticsPackages" +
                         ")");
         return sql.toString();
     }

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

@@ -185,9 +185,9 @@ public class DocCommonServiceImpl implements DocCommonService {
         }else{
             String insertDetailSql = new StringBuilder()
                     .append("INSERT INTO ").append(master).append(".prodiowms_Lines(ITIME,PL_PIID,LOGICWAREHOUSECODE,LINENO, ITEMCODE, PLANQTY" +
-                            ",custItemCode,custItemName,custItemSkuProperty,custLotNumber,custPO,contractNo,retailPrice)")
+                            ",custItemCode,custItemName,custItemSkuProperty,custPO,contractNo,retailPrice,REMARK)")
                     .append(" select sysdate,pdPiid,pdWhcode,pdPdno,pdProdcode,pdQty" +
-                            ",PDCUSTPRODCODE,PDCUSTPRODDETAIL, PDCUSTPRODSPEC, PDPOCODE, PDORDERCODE, PDREMARK, PDSENDPRICE " +
+                            ",PDCUSTPRODCODE,PDCUSTPRODDETAIL, PDCUSTPRODSPEC, PDPOCODE, PDORDERCODE, PDSENDPRICE, PDREMARK " +
                             " from (").append(detSql).append(")")
                     .toString();
             baseDao.execute(insertDetailSql);