Browse Source

自提线下单拿取3个月内的

njs 2 years ago
parent
commit
ce08e0bb61

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

@@ -27,4 +27,7 @@ public interface MetaHanaDeliverOrderMapper {
      * @date: 2023/3/21 13:51
      * @date: 2023/3/21 13:51
      */
      */
     List<String> selectDocNumberByVSBED12();
     List<String> selectDocNumberByVSBED12();
+
+    /** 查询手动过账自提单*/
+    List<String>  selectSelfDeliverNumber();
 }
 }

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

@@ -533,6 +533,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
      */
      */
     @Override
     @Override
     public void tmsPlantByOrder() {
     public void tmsPlantByOrder() {
+        List<String> selfDeliver = metaHanaDeliverOrderMapper.selectSelfDeliverNumber();
         List<String> plants = metaHanaDeliverOrderMapper.selectPlant();
         List<String> plants = metaHanaDeliverOrderMapper.selectPlant();
         List<TmsLogisticsStatus> tmsStatusLog = sysBatchSignForMapper.selectByDelivery();
         List<TmsLogisticsStatus> tmsStatusLog = sysBatchSignForMapper.selectByDelivery();
         Map<Object, List<TmsLogisticsStatus>> keytmsMap = new HashMap<>();
         Map<Object, List<TmsLogisticsStatus>> keytmsMap = new HashMap<>();
@@ -568,6 +569,11 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
             if (deliverOrderListstatusNo != null && deliverOrderListstatusNo.size() > 0) {
             if (deliverOrderListstatusNo != null && deliverOrderListstatusNo.size() > 0) {
                 for (MetaHanaDeliverOrder deliver : deliverOrderListstatusNo
                 for (MetaHanaDeliverOrder deliver : deliverOrderListstatusNo
                 ) {
                 ) {
+                    if(selfDeliver !=null && selfDeliver.size()>0){
+                        if(selfDeliver.contains(deliver)){
+                            continue;
+                        }
+                    }
                     if (plants != null && plants.size() > 0) {
                     if (plants != null && plants.size() > 0) {
                         if (plants.contains(deliver.getPlant())) {
                         if (plants.contains(deliver.getPlant())) {
                             continue;
                             continue;

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

@@ -111,4 +111,8 @@
     <select id="selectDocNumberByVSBED12" resultType="java.lang.String">
     <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 distinct DOC_NUMBER FROM `meta_hana_sales_order` where 1=1  and ( VSBED='12' or VSBED='14')
     </select>
     </select>
+
+    <select id="selectSelfDeliverNumber" resultType="java.lang.String" >
+       select deliver_number from meta_hana_self_deliver_order
+    </select>
 </mapper>
 </mapper>