From 5463ced953c77b4a1d147d4ca9cdfdb7d4fc3e22 Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 10 Mar 2025 21:19:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E4=B8=8A=E8=B4=A7=E8=BD=AC?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/entity/auth/SysWorkplace.java | 2 - .../api/req/inout/FilterOrderRequest.java | 8 +- .../collect/IoCollectOrderService.java | 9 + .../task/AsyncIoCollectOrderDownloadTask.java | 55 ++-- .../mybatis/mapper/inout/IoOrderDao.xml | 239 +++++++++--------- 5 files changed, 163 insertions(+), 150 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java index 6d5306788..dd17c78a4 100644 --- a/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java +++ b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java @@ -133,8 +133,6 @@ public class SysWorkplace implements Serializable { public Integer jobMode; - - @TableField(exist = false) private String invName; diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java index 5d1d57b10..a5f58f7b9 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -200,7 +200,7 @@ public class FilterOrderRequest extends ListPageRequest { private String unionRemark; private String remark; -// private String keywords; + // private String keywords; private Integer confirmStatus; private Boolean filterSelected; private List inOrders; @@ -235,11 +235,15 @@ public class FilterOrderRequest extends ListPageRequest { private String keyWords; + /** + * 工位列表 + */ + private List workplaceCodes; + /** * 上货货位编码 */ private String workPlaceQueueCode; - } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index f5675fb1d..785e81bcc 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -262,6 +262,14 @@ public class IoCollectOrderService extends ServiceImpl sysWorkplaceList = sysWorkplaceService.list(new LambdaQueryWrapper().eq(SysWorkplace::getJobMode, 1)); + if (CollUtil.isNotEmpty(sysWorkplaceList)) { + List workplaceCodes = sysWorkplaceList.stream().map(SysWorkplace::getWorkplaceId).collect(Collectors.toList()); + filterOrderRequest.setWorkplaceCodes(workplaceCodes); + filterOrderRequest.setStatus(7); + } + } List list = orderService.filterList(filterOrderRequest); if (list == null) { @@ -338,6 +346,7 @@ public class IoCollectOrderService extends ServiceImpl process(), @@ -57,39 +58,39 @@ public class AsyncIoCollectOrderDownloadTask implements SchedulingConfigurer { } private void process() { - //获取下载的起始时间 - IoCollectSet ioCollectSet = collectSetService.getSet(); - Date startDownloadTime = ioCollectSet.getStartDownloadTime(); - String startDownloadTimes = MsDateUtil.formatDateTime(startDownloadTime); - Boolean autoDownload = ioCollectSet.getAutoDownload(); + //获取下载的起始时间 + IoCollectSet ioCollectSet = collectSetService.getSet(); + Date startDownloadTime = ioCollectSet.getStartDownloadTime(); + String startDownloadTimes = MsDateUtil.formatDateTime(startDownloadTime); + Boolean autoDownload = ioCollectSet.getAutoDownload(); - if (StrUtil.isNotBlank(startDownloadTimes) && autoDownload){ - //获取当前时间 - String paramValue = startDownloadTimes; - String nowTime = MsDateUtil.getDateTime(); - CollectOrderRequest collectOrderRequest = new CollectOrderRequest(); + if (StrUtil.isNotBlank(startDownloadTimes) && autoDownload) { + //获取当前时间 + String paramValue = startDownloadTimes; + String nowTime = MsDateUtil.getDateTime(); + CollectOrderRequest collectOrderRequest = new CollectOrderRequest(); - collectOrderRequest.setStartTime(paramValue); - collectOrderRequest.setEndTime(nowTime); + collectOrderRequest.setStartTime(paramValue); + collectOrderRequest.setEndTime(nowTime); - WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest(); - List sysWorkplaceDocumentResponses = sysWorkplaceDocumentDao.filterList(workBindBusTypeRequest); - if (CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)) { - for (SysWorkplaceDocumentResponse sysWorkplaceDocumentResponse : sysWorkplaceDocumentResponses) { - String documentTypeCode = sysWorkplaceDocumentResponse.getDocumentTypeCode(); - collectOrderRequest.setBusType(documentTypeCode); - try{ - collectOriginService.downloadOrderV2(collectOrderRequest); - }catch (Exception e){ - log.error("自动下载原始单据出错:{}", e.getMessage()); - } + WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest(); + List sysWorkplaceDocumentResponses = sysWorkplaceDocumentDao.filterList(workBindBusTypeRequest); + if (CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)) { + for (SysWorkplaceDocumentResponse sysWorkplaceDocumentResponse : sysWorkplaceDocumentResponses) { + String documentTypeCode = sysWorkplaceDocumentResponse.getDocumentTypeCode(); + collectOrderRequest.setBusType(documentTypeCode); + try { + collectOriginService.downloadOrderV2(collectOrderRequest); + } catch (Exception e) { + log.error("自动下载原始单据出错:{}", e.getMessage()); } } - - ioCollectSet.setStartDownloadTime(MsDateUtil.parseDate(nowTime)); - collectSetService.updateById(ioCollectSet); } -} + ioCollectSet.setStartDownloadTime(MsDateUtil.parseDate(nowTime)); + collectSetService.updateById(ioCollectSet); + } + + } } diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 61402f1e4..83e96cac6 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -3,48 +3,48 @@ @@ -331,46 +334,44 @@ select t.billNo from io_order t - left join thr_system_bus_api t1 on t.action = t1.code + left join thr_system_bus_api t1 on t.action = t1.code t.status = 7 - and exportStatus = 0 + and exportStatus = 0 AND t1.thirdSys = #{thirdSys} @@ -455,13 +456,13 @@ SELECT io.*, - bus.NAME AS billTypeName, - ad.NAME AS deptName, - aw.NAME AS invName, - bc.NAME AS fromCorpName + bus.NAME AS billTypeName, + ad.NAME AS deptName, + aw.NAME AS invName, + bc.NAME AS fromCorpName FROM io_order io - LEFT JOIN basic_bussiness_type bus ON io.action = bus.action - LEFT JOIN auth_dept ad ON io.deptCode = ad.CODE - LEFT JOIN auth_warehouse aw ON io.invCode = aw.CODE - LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId - left join io_order_invoice on io_order_invoice.orderIdFk = io.billNo + LEFT JOIN basic_bussiness_type bus ON io.action = bus.action + LEFT JOIN auth_dept ad ON io.deptCode = ad.CODE + LEFT JOIN auth_warehouse aw ON io.invCode = aw.CODE + LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId + left join io_order_invoice on io_order_invoice.orderIdFk = io.billNo AND io.checkStatus = #{confirmStatus} @@ -492,7 +493,7 @@ AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like - concat('%', #{corpName}, '%') + concat('%', #{corpName}, '%') AND io.action = #{action} @@ -502,10 +503,10 @@ AND (io.remark like concat('%', #{unionRemark}, '%') - or io.outSickInfo like concat('%', #{unionRemark}, '%')) + or io.outSickInfo like concat('%', #{unionRemark}, '%')) - AND io.billNo like concat( #{billNo}, '%') + AND io.billNo like concat(#{billNo}, '%') AND io.corpOrderId = #{corpOrderId} @@ -540,11 +541,11 @@ AND date_format(io.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and - date_format(#{endTime}, '%Y-%m-%d') + date_format(#{endTime}, '%Y-%m-%d') AND date_format(io.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and - date_format(#{endAduditTime}, '%Y-%m-%d') + date_format(#{endAduditTime}, '%Y-%m-%d') AND io.`action` in @@ -601,7 +602,7 @@ #{item} and io.status = 7 - ) + ) @@ -610,13 +611,13 @@ #{item} and io.status = 10) - or ( + or ( io.`action` in #{item} and io.status = 7) - ) + )