调整

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

@@ -10,5 +10,7 @@ import java.util.List;
  */
 public interface MetaHanaDeliverOrderMapper {
 
-    public List<MetaHanaDeliverOrder> selectMetaDeliverOrderList();
+    public List<MetaHanaDeliverOrder> selectMetaDeliverOrderListByNo();
+
+    public List<MetaHanaDeliverOrder> selectMetaDeliverOrderListByYes();
 }

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

@@ -497,9 +497,9 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         if(deliverNumber !=null && deliverNumber.size()>0){
          deliverNumbers = deliverNumber.stream().map(DeliverQuantityConfirm::getCode).collect(Collectors.toList());
         }
-        List<MetaHanaDeliverOrder> deliverOrderList=metaHanaDeliverOrderMapper.selectMetaDeliverOrderList();
-        if(deliverOrderList !=null && deliverOrderList.size()>0){
-            for (MetaHanaDeliverOrder deliver:deliverOrderList
+        List<MetaHanaDeliverOrder> deliverOrderListstatusNo=metaHanaDeliverOrderMapper.selectMetaDeliverOrderListByNo();
+        if(deliverOrderListstatusNo !=null && deliverOrderListstatusNo.size()>0){
+            for (MetaHanaDeliverOrder deliver:deliverOrderListstatusNo
                  ) {
                 if(("未复核").equals(deliver.getReviewStatus())){
                     List<String> tms = tmslist.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
@@ -527,7 +527,14 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                                tmsLogisticsStatus.setTransferOrder("n");
                                tmslist.add(tmsLogisticsStatus);
                     }
-                }else if(("已复核").equals(deliver.getReviewStatus())){
+                }
+            }
+        }
+        List<MetaHanaDeliverOrder> deliverOrderListstatusYes=metaHanaDeliverOrderMapper.selectMetaDeliverOrderListByYes();
+        if(deliverOrderListstatusYes !=null && deliverOrderListstatusYes.size()>0){
+            for (MetaHanaDeliverOrder deliver:deliverOrderListstatusYes
+            ) {
+                if(("已复核").equals(deliver.getReviewStatus())){
                     List<String> tms = tmslist.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
                         if((keytmsMap ==null && !tms.contains(deliver.getDeliverNumber())) || (!keytmsMap.containsKey(deliver.getDeliverNumber())  && !tms.contains(deliver.getDeliverNumber()))){
                                 TmsLogisticsStatus tmsLogisticsStatus=new TmsLogisticsStatus();

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

@@ -46,7 +46,7 @@
 
 
 
-    <select id="selectMetaDeliverOrderList" parameterType="MetaHanaDeliverOrder" resultMap="MetaHanaDeliverOrderResult"   >
+    <select id="selectMetaDeliverOrderListByNo" parameterType="MetaHanaDeliverOrder" resultMap="MetaHanaDeliverOrderResult"   >
         SELECT
             ( m.DELIVER_NUMBER+m.DELIVER_ITEM) as code,
             m.DELIVER_NUMBER ,
@@ -69,7 +69,33 @@
             m.NET_VALUE ,
             m.POSTING_DATE
         FROM
-            meta_hana_deliver_order m  where m.PLANT not in(select plant_code from tms_plant)
+            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
     </select>
+    <select id="selectMetaDeliverOrderListByYes" parameterType="MetaHanaDeliverOrder" resultMap="MetaHanaDeliverOrderResult"   >
+        SELECT
+            ( m.DELIVER_NUMBER+m.DELIVER_ITEM) as code,
+            m.DELIVER_NUMBER ,
+            m.DELIVER_ITEM ,
+            m.DOC_NUMBER ,
+            m.DOC_ITEM ,
+            m.CREATE_DATE_DOC ,
+            m.CUSTOMER_CODE ,
+            m.CUSTOMER_NAME ,
+            m.PLANT,
+            m.PLANT_NAME ,
+            m.MATERIAL_CODE ,
+            m.MATERIAL_NAME ,
+            m.SIZE_DIM ,
+            m.SHIPMENT_NUMBER ,
+            m.SHIP_TO_ADDRESS ,
+            m.REVIEW_STATUS ,
+            m.DELIVER_WT ,
+            m.DELIVER_QTY ,
+            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
+    </select>
 </mapper>