Merge branch 'orderhana23913' into prd

# Conflicts:
#	suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/HanaOrderComponent.java

suishenbang-quartz/src/main/java/com/dgtly/quartz/task/RyTask.java

@@ -76,6 +76,12 @@ public class RyTask
         hanaOrderComponent.hanaDeliverOrderSync();
     }
 
+    /**HANA已复核线下月底手动过账的交货单仍需自提同步*/
+    public void hanaSelfReviewedDeliverOrderSync()throws Exception{
+        hanaOrderComponent.hanaSelfReviewedDeliverOrderSync();
+    }
+
+
     /*关联经销商上线定时任务*/
     public void relationCustomerOnlineSync() throws Exception {
         relationCustomerOnlineComponent.relationCustomerOnlineSync();

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/HanaOrderComponent.java

@@ -867,7 +867,7 @@ public class HanaOrderComponent {
 
 
 
-    public int bulkLoadFromInputStream(String loadDataSql,
+    public int bulkLoadFromInputStream (String loadDataSql,
                                        InputStream dataStream) throws Exception {
         if(dataStream==null){
             log.info("InputStream is null ,No data is imported");
@@ -967,6 +967,7 @@ public class HanaOrderComponent {
         }
     }
 
+
     public void runLoadDeliverOrder() throws Exception{
         Connection conn = null;
         PreparedStatement pstm =null;

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

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

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

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

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

@@ -111,4 +111,8 @@
     <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>
+
+    <select id="selectSelfDeliverNumber" resultType="java.lang.String" >
+       select distinct deliver_number from meta_hana_self_deliver_order
+    </select>
 </mapper>

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

@@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from tms_logistics_status tms LEFT JOIN meta_hana_deliver_order d on d.DELIVER_NUMBER = tms.delivery_number
         where 1=1
           and tms.is_delete=0
-          and d.REVIEW_STATUS='未复核'
+          and ( d.REVIEW_STATUS='未复核' or (tms.delivery_number in(select distinct deliver_number from meta_hana_self_deliver_order)))
           and tms.get_goods_time IS NULL
           AND tms.self_pick_time BETWEEN DATE_SUB( NOW(), INTERVAL 46 DAY ) AND DATE_SUB(NOW(), INTERVAL 1 DAY )
         group by tms.customer_code