出库人单完成回传ERP中间表

warewms-ams/src/main/java/com/ruoyi/ams/erp/service/impl/SyncServiceImpl.java

@@ -187,12 +187,11 @@ public class SyncServiceImpl implements ISyncService {
             // 循环明细调updateErpOrderStatus方法 setOrderState setOrderName setOrderNo
             for (WmsDocAsnDetails wmsDocAsnDetails2:wmsDocAsnDetails1) {
                 ErpOrderList erpOrderList = new ErpOrderList();
-                erpOrderList.setOrderNo(wmsDocAsnDetails2.getAsnLineNo().intValue());
-                erpOrderList.setOrderName(wmsDocAsnDetails2.getAsnNo());
+                erpOrderList.setOrderNo(Integer.parseInt(wmsDocAsnDetails2.getdEdi07()));
+                erpOrderList.setOrderName(wmsDocAsnHeader1.getAsnReference1());
                 erpOrderList.setOrderState("2");
                 boolean b = updateErpOrderStatus(erpOrderList);
-                // 成功之后修改edi_send_flag为Y
-                if (b = true){
+                if (b){
                     wmsDocAsnHeader1.setEdiSendFlag("Y");
                     wmsDocAsnHeaderService.updateWmsDocAsnHeader(wmsDocAsnHeader1);
                 }
@@ -214,12 +213,12 @@ public class SyncServiceImpl implements ISyncService {
             List<WmsDocOrderDetails> list = wmsDocOrderDetailsService.selectWmsDocOrderDetailsList(wmsDocOrderDetails);
             for (WmsDocOrderDetails wmsDocOrderDetails1:list) {
                 ErpOrderList erpOrderList = new ErpOrderList();
-                erpOrderList.setOrderNo(wmsDocOrderDetails1.getOrderLineNo().intValue());
-                erpOrderList.setOrderName(wmsDocOrderDetails1.getOrderNo());
+                erpOrderList.setOrderNo(Integer.parseInt(wmsDocOrderDetails1.getdEdi07()));
+                erpOrderList.setOrderName(wmsDocOrderHeader1.getSoReference1());
                 erpOrderList.setOrderState("2");
                 boolean b = updateErpOrderStatus(erpOrderList);
                 // 成功之后修改edi_send_flag为Y
-                if (b = true){
+                if (b){
                     wmsDocOrderHeader1.setEdiSendFlag("Y");
                     wmsDocOrderHeaderService.updateWmsDocOrderHeader(wmsDocOrderHeader1);
             }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -1555,7 +1555,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             details.setdEdi04(erpOrder.getVaild());         //单据状态
             details.setdEdi05(erpOrder.getStockId());       //仓库编号
             details.setdEdi06(erpOrder.getOrderState());    //是否扫描完成
-            details.setdEdi07(orderNo);    //项次
+            details.setdEdi07(erpOrderNo);    //项次
             details.setdEdi08(erpOrder.getOrderType());     //erp单据类型
             details.setdEdi09(erpOrder.getInout());         //erp出入库类型
             details.setLineStatus("00");