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 @@ and scheduleType = #{scheduleType} + + and taskId = #{taskId} + + order by updateTime desc