出入库完成回传ERP同步表

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

@@ -185,7 +185,7 @@ public class SyncServiceImpl implements ISyncService {
             }
             if (erpOrderList_failed.size() > 0) {
                 redisTemplate.opsForValue().set("erpOrderList_failed", JSON.toJSONString(erpOrderList_failed));
-            }else {
+            } else {
                 redisTemplate.delete("erpOrderList_failed");
             }
         }
@@ -221,15 +221,17 @@ public class SyncServiceImpl implements ISyncService {
             // 循环明细调updateErpOrderStatus方法 setOrderState setOrderName setOrderNo
             for (WmsDocAsnDetails wmsDocAsnDetails2 : wmsDocAsnDetails1) {
                 ErpOrderList erpOrderList = new ErpOrderList();
+                if (StringUtils.isEmpty(wmsDocAsnHeader1.getAsnReference1())
+                        || StringUtils.isEmpty(wmsDocAsnDetails2.getdEdi07())) {
+                    continue;
+                }
                 erpOrderList.setOrderNo(Integer.parseInt(wmsDocAsnDetails2.getdEdi07()));
                 erpOrderList.setOrderName(wmsDocAsnHeader1.getAsnReference1());
                 erpOrderList.setOrderState("2");
-                boolean b = updateErpOrderStatus(erpOrderList);
-                if (b) {
-                    wmsDocAsnHeader1.setEdiSendFlag("Y");
-                    wmsDocAsnHeaderService.updateWmsDocAsnHeader(wmsDocAsnHeader1);
-                }
+                updateErpOrderStatus(erpOrderList);
             }
+            wmsDocAsnHeader1.setEdiSendFlag("Y");
+            wmsDocAsnHeaderService.updateWmsDocAsnHeader(wmsDocAsnHeader1);
         }
 
     }
@@ -250,17 +252,20 @@ public class SyncServiceImpl implements ISyncService {
             wmsDocOrderDetails.setOrderNo(orderNo);
             List<WmsDocOrderDetails> list = wmsDocOrderDetailsService.selectWmsDocOrderDetailsList(wmsDocOrderDetails);
             for (WmsDocOrderDetails wmsDocOrderDetails1 : list) {
+                if (StringUtils.isEmpty(wmsDocOrderHeader1.getSoReference1())
+                        || StringUtils.isEmpty(wmsDocOrderDetails1.getdEdi07())) {
+                    continue;
+                }
                 ErpOrderList erpOrderList = new ErpOrderList();
                 erpOrderList.setOrderNo(Integer.parseInt(wmsDocOrderDetails1.getdEdi07()));
                 erpOrderList.setOrderName(wmsDocOrderHeader1.getSoReference1());
                 erpOrderList.setOrderState("2");
                 boolean b = updateErpOrderStatus(erpOrderList);
-                // 成功之后修改edi_send_flag为Y
-                if (b) {
-                    wmsDocOrderHeader1.setEdiSendFlag("Y");
-                    wmsDocOrderHeaderService.updateWmsDocOrderHeader(wmsDocOrderHeader1);
-                }
+
             }
+            // 成功之后修改edi_send_flag为Y
+            wmsDocOrderHeader1.setEdiSendFlag("Y");
+            wmsDocOrderHeaderService.updateWmsDocOrderHeader(wmsDocOrderHeader1);
         }
     }
 }

warewms-ams/src/main/resources/mapper/docAsn/WmsDocAsnHeaderMapper.xml

@@ -264,6 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="activeFlag != null">active_flag,</if>
+            <if test="ediSendFlag != null">edi_send_flag,</if>
             <if test="hEdi01 != null">h_edi_01,</if>
             <if test="hEdi02 != null">h_edi_02,</if>
             <if test="hEdi03 != null">h_edi_03,</if>
@@ -304,6 +305,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="activeFlag != null">#{activeFlag},</if>
+            <if test="ediSendFlag != null">#{ediSendFlag},</if>
             <if test="hEdi01 != null">#{hEdi01},</if>
             <if test="hEdi02 != null">#{hEdi02},</if>
             <if test="hEdi03 != null">#{hEdi03},</if>
@@ -347,6 +349,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="activeFlag != null">active_flag = #{activeFlag},</if>
+            <if test="ediSendFlag != null">edi_send_flag = #{ediSendFlag},</if>
             <if test="hEdi01 != null">h_edi_01 = #{hEdi01},</if>
             <if test="hEdi02 != null">h_edi_02 = #{hEdi02},</if>
             <if test="hEdi03 != null">h_edi_03 = #{hEdi03},</if>

warewms-ams/src/main/resources/mapper/docOrder/WmsDocOrderHeaderMapper.xml

@@ -154,8 +154,9 @@
         <include refid="selectWmsDocOrderHeaderVo"/>
         <where>
             <if test="orderNo != null  and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if>
+            <if test="orderStatus != null  and orderStatus != ''"> and order_status = #{orderStatus}</if>
             <if test="consigneeName != null  and consigneeName != ''"> and consignee_name like concat('%', #{consigneeName}, '%')</if>
-            <if test="ediSendFlag != null  and ediSendFlag != ''"> and edi_send_flag like concat('%', #{ediSendFlag}, '%')</if>
+            <if test="ediSendFlag != null  and ediSendFlag != ''"> and edi_send_flag = #{ediSendFlag}</if>
             <if test="carrierName != null  and carrierName != ''"> and carrier_name like concat('%', #{carrierName}, '%')</if>
             <if test="soReference1 != null  and soReference1 != ''"> and so_reference1 like concat('%', #{soReference1}, '%')</if>
         </where>