From 0748ab9dce0670b1b79e2070c87f94c76f32b306 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Sun, 26 Jun 2022 00:43:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E9=AA=8C=E6=94=B6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/sale/admin/entity/sync/EntrustReceEntity.java    | 2 ++
 .../glxp/sale/admin/req/sync/BasicExportStatusRequest.java    | 1 +
 .../java/com/glxp/sale/admin/thread/DlAllDataService.java     | 3 ++-
 .../src/main/resources/mybatis/mapper/sync/BasicExportDao.xml | 4 ++++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/EntrustReceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/EntrustReceEntity.java
index ad8559b..bf3bfca 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/EntrustReceEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/EntrustReceEntity.java
@@ -17,5 +17,7 @@ public class EntrustReceEntity {
     private Date updateTime;
     private String remark;
     private boolean finishRece;
+    private String entrustSubInv;
+    private String invWarehouseCode;
 
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/BasicExportStatusRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/BasicExportStatusRequest.java
index 7febd3e..b4b29d0 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/sync/BasicExportStatusRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/sync/BasicExportStatusRequest.java
@@ -10,4 +10,5 @@ public class BasicExportStatusRequest extends ListPageRequest {
     private Integer type;
     private Integer scheduleType;
     private String idDatas;
+    private String taskId;
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java
index a1768af..b061ccc 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java
@@ -242,7 +242,8 @@ public class DlAllDataService {
                         if (syncOrderResponse != null &&
                                 (CollUtil.isNotEmpty(syncOrderResponse.getBussinessTypeEntities())
                                         || CollUtil.isNotEmpty(syncOrderResponse.getBussinessOriginTypeEntities())
-                                        || CollUtil.isNotEmpty(syncOrderResponse.getBussinessLocalTypeEntities()))
+                                        || CollUtil.isNotEmpty(syncOrderResponse.getBussinessLocalTypeEntities())
+                                        || CollUtil.isNotEmpty(syncOrderResponse.getEntrustReceEntities()))
                         ) {
                             String key = gennerOrderUtils.getBusType();
                             BasicExportStatusEntity myEntity = new BasicExportStatusEntity();
diff --git a/api-admin/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml b/api-admin/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml
index fa54f37..f6d31f4 100644
--- a/api-admin/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml
@@ -19,6 +19,10 @@
             <if test="scheduleType != '' and scheduleType!=null">
                 and scheduleType = #{scheduleType}
             </if>
+            <if test="taskId != '' and taskId!=null">
+                and taskId = #{taskId}
+            </if>
+
         </where>
         order by updateTime desc
     </select>