【华信科】【富勒WMS对接】【入库确认】【虚拟仓库】

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

@@ -77,6 +77,9 @@ public class IOConfirm {
             private Double actualQty;
             /** 实收包装数量 */
             private Double actualPackUomQty;
+            /** 虚拟仓库 条件必填, 条件为使用虚拟仓库 */
+            private String virtualWarehouse;
+            private String documentMaker;
             /** 拒收数量 */
             private Double rejectQty;
             /** 拒收原因 */
@@ -240,6 +243,7 @@ public List<String> getGenerateLinesSql(String masterCode,Long piId) {
                 .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(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, ")
@@ -259,6 +263,7 @@ public List<String> getGenerateLinesSql(String masterCode,Long piId) {
                 .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, ")
@@ -275,9 +280,9 @@ public List<String> getGenerateLinesSql(String masterCode,Long piId) {
                 .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, REJECTQTY, REJECTREASON, SERIALNO, ")
+                .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.ACTUALPACKUOMQTY, ")
+                .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)");
         return sql.toString();

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

@@ -903,13 +903,13 @@ public class ERPServiceImpl implements ERPService {
             if(!prodInOut.getPiWmsstatus().equals("已确认")){
                 baseDao.execute("delete from "+master+".prodiowms where PIID = "+prodInOut.getPiId());
                 baseDao.execute("INSERT INTO "+master+".prodiowms(ITIME,PIID, PIINOUTNO, ENTRYORDERCODE, OWNERCODE, WAREHOUSECODE, ENTRYORDERID, ENTRYORDERTYPE" +
-                        ", USERDEFINED1, USERDEFINED2, USERDEFINED3, USERDEFINED4)" +
+                        ")" +
                         "select sysdate,pi_id,pi_inoutno,pi_inoutno,'"+vwmsConfig.getOwnerCode()+"','"+vwmsConfig.getWarehouseCode()+"',PI_WMSORDERCODE,PI_WMSORDERTYPE" +
                         " from "+master+".prodinout where pi_id = "+prodInOut.getPiId());
-                //写入 prodiowms_Lines
+                //写入 prodiowms_Lines 账套
                 baseDao.execute("delete from "+master+".prodiowms_lines where pl_piid = "+prodInOut.getPiId());
-                baseDao.execute("INSERT INTO "+master+".prodiowms_Lines(ITIME,PL_PIID,LINENO, ITEMCODE, PLANQTY,ITIME)" +
-                        "select sysdate,pdPiid,pdPdno,pdProdcode,pdQty,SYSDATE from ("+detSql+") ");
+                baseDao.execute("INSERT INTO "+master+".prodiowms_Lines(ITIME,PL_PIID,LINENO, ITEMCODE, PLANQTY,ITIME,virtualWarehouse, USERDEFINED1,userDefined3,USERDEFINED4)" +
+                        "select sysdate,pdPiid,pdPdno,pdProdcode,pdQty,SYSDATE,pdWhname,pdInBatch,pdBrandName,'"+master+"' from ("+detSql+") ");
             }
         }
         return prodInOut;