【华信科】【富勒WMS对接】【库存转移确认】

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

@@ -117,7 +117,7 @@ public class AdjustConfirm {
 
     public String getMasterName() {
         if (orderLines.getOrderLine() != null) {//账套名称
-            return orderLines.getOrderLine().get(0).getSource().getUserDefined1();
+            return orderLines.getOrderLine().get(0).getSource().getUserDefined4();
         } else {
             return null;
         }
@@ -133,7 +133,7 @@ public class AdjustConfirm {
                 .append("'").append(StringUtil.nvl(adjustmentOrder.getAdjustmentOrderCode(), "")).append("' WMSORDERID, ")
                 .append("'").append(StringUtil.nvl(adjustmentOrder.getAdjustmentOrderType(), "")).append("' WMSORDERTYPE, ")
                 .append("'").append(StringUtil.nvl(adjustmentOrder.getOutBizCode(), "")).append("' OUTBIZCODE, ")
-                .append((StringUtil.hasText(adjustmentOrder.getOrderConfirmTime()) ? "to_date('" + adjustmentOrder.getOrderConfirmTime() + "','yyyy-mm-dd hh24:mi:ss')" : "null")).append(" deliveryTime, ")
+                .append((StringUtil.hasText(adjustmentOrder.getOrderConfirmTime()) ? "to_date('" + adjustmentOrder.getOrderConfirmTime() + "','yyyy-mm-dd hh24:mi:ss')" : "null")).append(" deliveryTime ")
                 .append("FROM dual) doc ON (wmsl.PIID = doc.PIID AND wmsl.PIINOUTNO = doc.PIINOUTNO) ")
                 .append("WHEN MATCHED THEN UPDATE SET ")
                 .append("wmsl.OWNERCODE = doc.OWNERCODE, ")
@@ -189,11 +189,11 @@ public class AdjustConfirm {
                 .append("wmsl.T_USERDEFINED3 = doc.T_USERDEFINED3, ")
                 .append("wmsl.T_USERDEFINED4 = doc.T_USERDEFINED4, ")
                 .append("wmsl.UTIME = SYSDATE ")
-                .append("WHEN NOT MATCHED THEN INSERT (ITIME,PL_PIID, LINENO, ITEMCODE, PLANQTY, ACTUALQTY, ACTUALPACKUOMQTY, SERIALNO ")
+                .append("WHEN NOT MATCHED THEN INSERT (ITIME,PL_PIID, LINENO, ITEMCODE, PLANQTY, ACTUALQTY,SERIALNO ")
                 .append(",S_VIRTUALWAREHOUSE,S_USERDEFINED1,S_USERDEFINED3,S_USERDEFINED4,T_VIRTUALWAREHOUSE,T_USERDEFINED1,T_USERDEFINED3,T_USERDEFINED4) ")
-                .append("VALUES (SYSDATE,doc.PIID, doc.LINENO, doc.ITEMCODE, doc.PLANQTY, doc.ACTUALQTY,doc.ACTUALPACKUOMQTY,doc.SERIALNO")
+                .append("VALUES (SYSDATE,doc.PIID, doc.LINENO, doc.ITEMCODE, doc.PLANQTY, doc.ACTUALQTY,doc.SERIALNO")
                 .append(" ")
-                .append(",S_VIRTUALWAREHOUSE,S_USERDEFINED1,S_USERDEFINED3,S_USERDEFINED4,T_VIRTUALWAREHOUSE,T_USERDEFINED1,T_USERDEFINED3,T_USERDEFINED4)");
+                .append(",doc.S_VIRTUALWAREHOUSE,doc.S_USERDEFINED1,doc.S_USERDEFINED3,doc.S_USERDEFINED4,doc.T_VIRTUALWAREHOUSE,doc.T_USERDEFINED1,doc.T_USERDEFINED3,doc.T_USERDEFINED4)");
         return sql.toString();
     }
 }