调整

suishenbang-system/src/main/java/com/dgtly/system/mapper/MetaHanaDeliverOrderMapper.java

@@ -13,4 +13,6 @@ public interface MetaHanaDeliverOrderMapper {
     public List<MetaHanaDeliverOrder> selectMetaDeliverOrderListByNo();
 
     public List<MetaHanaDeliverOrder> selectMetaDeliverOrderListByYes();
+
+    public  List<String> selectPlant();
 }

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -483,6 +483,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
      */
     @Override
     public void tmsPlantByOrder() {
+        List<String> plants=metaHanaDeliverOrderMapper.selectPlant();
         List<TmsLogisticsStatus> tmsStatusLog=sysBatchSignForMapper.selectByDelivery();
         Map<Object,List<TmsLogisticsStatus>> keytmsMap=new HashMap<>();
        if(tmsStatusLog !=null && tmsStatusLog.size()>0){
@@ -499,6 +500,11 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
             List<TmsLogisticsStatus> tmslistNo = new ArrayList<TmsLogisticsStatus>();
             for (MetaHanaDeliverOrder deliver:deliverOrderListstatusNo
                  ) {
+                if(plants !=null && plants.size()>0){
+                    if(plants.contains(deliver.getPlant())){
+                        continue;
+                    }
+                }
                 if(("未复核").equals(deliver.getReviewStatus())){
                     List<String> tms = tmslistNo.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
                     if((keytmsMap ==null && !tms.contains(deliver.getDeliverNumber())) || (!keytmsMap.containsKey(deliver.getDeliverNumber()) && !tms.contains(deliver.getDeliverNumber())) ){
@@ -538,6 +544,11 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
             List<DeliverQuantityConfirm> deliverlist = new ArrayList<DeliverQuantityConfirm>();
             for (MetaHanaDeliverOrder deliver:deliverOrderListstatusYes
             ) {
+                if(plants !=null && plants.size()>0){
+                    if(plants.contains(deliver.getPlant())){
+                        continue;
+                    }
+                }
                 if(("已复核").equals(deliver.getReviewStatus())){
                     List<String> tms = tmslistYes.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
                         if((keytmsMap ==null && !tms.contains(deliver.getDeliverNumber())) || (!keytmsMap.containsKey(deliver.getDeliverNumber())  && !tms.contains(deliver.getDeliverNumber()))){

suishenbang-system/src/main/resources/mapper/system/MetaHanaDeliverOrderMapper.xml

@@ -69,8 +69,8 @@
             m.NET_VALUE ,
             m.POSTING_DATE
         FROM
-            meta_hana_deliver_order m  where  m.REVIEW_STATUS='未复核' and  m.PLANT not in(select plant_code from tms_plant)
-           and m.REVIEW_STATUS !='' and m.REVIEW_STATUS is not null
+            meta_hana_deliver_order m  where  m.REVIEW_STATUS='未复核'
+
     </select>
     <select id="selectMetaDeliverOrderListByYes" parameterType="MetaHanaDeliverOrder" resultMap="MetaHanaDeliverOrderResult"   >
         SELECT
@@ -95,7 +95,11 @@
             m.NET_VALUE ,
             m.POSTING_DATE
         FROM
-            meta_hana_deliver_order m  where  m.REVIEW_STATUS='已复核' and  m.PLANT not in(select plant_code from tms_plant)
-                                         and m.REVIEW_STATUS !='' and m.REVIEW_STATUS is not null
+            meta_hana_deliver_order m  where  m.REVIEW_STATUS='已复核'
+
+    </select>
+
+    <select id="selectPlant" resultType="java.lang.String">
+        select distinct  plant_code from tms_plant
     </select>
 </mapper>

suishenbang-system/src/main/resources/mapper/system/SysBatchSignForMapper.xml

@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach item="item" index="index" collection="list" open="" separator=";" close="">
             update tms_logistics_status
             <set>
-                create_by =#{item.item.createBy},
+                create_by =#{item.createBy},
                 create_time =#{item.createTime},
                 update_by =#{item.updateBy},
                 update_time =#{item.updateTime},