委托验收问题

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;
 
 }

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;
 }

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();

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>