Browse Source

无tms工厂的自提单未复核不在处理

njs 2 năm trước cách đây
mục cha
commit
fda8f2dde1

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

@@ -18,4 +18,13 @@ public interface MetaHanaDeliverOrderMapper {
    int  selectCount();
 
     public  List<String> selectPlant();
+
+    /**
+     * @description: 查询所有自提的订单号
+     * @param: []
+     * @return:
+     * @author: njs
+     * @date: 2023/3/21 13:51
+     */
+    List<String> selectDocNumberByVSBED12();
 }

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

@@ -62,6 +62,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
     @Autowired
     private SysBatchSignForMapper sysBatchSignForMapper;
 
+
     @Autowired
     private CustomerMapper customersMapper;
     @Value(value = "${spring.mail.username}")
@@ -496,6 +497,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         }
         DeliverQuantityConfirm numbernull = new DeliverQuantityConfirm();
         List<DeliverQuantityConfirm> deliverNumber = deliverQuantityConfirmMapper.selectDeliverQuantityConfirmList(numbernull);
+        List<String> OrderNumbers=metaHanaDeliverOrderMapper.selectDocNumberByVSBED12();
         List<String> deliverNumbers = new ArrayList<>();
         if (deliverNumber != null && deliverNumber.size() > 0) {
             deliverNumbers = deliverNumber.stream().map(DeliverQuantityConfirm::getCode).collect(Collectors.toList());
@@ -527,6 +529,11 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                         }
                     }
                     if (("未复核").equals(deliver.getReviewStatus())) {
+                        if(OrderNumbers !=null && OrderNumbers.size()>0){
+                            if (OrderNumbers.contains(deliver.getDocNumber())) {
+                                continue;
+                            }
+                        }
                         List<String> tms=new ArrayList<>();
                         if(tmslistNo !=null && tmslistNo.size()>0){
                              tms = tmslistNo.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());

+ 4 - 0
suishenbang-system/src/main/resources/mapper/system/MetaHanaDeliverOrderMapper.xml

@@ -107,4 +107,8 @@
     <select id="selectPlant" resultType="java.lang.String">
         select distinct  plant_code from tms_plant
     </select>
+
+    <select id="selectDocNumberByVSBED12" resultType="java.lang.String">
+        SELECT distinct DOC_NUMBER FROM `meta_hana_sales_order` where 1=1  and ( VSBED='12' or VSBED='14')
+    </select>
 </mapper>