From a1b735dc8031ee1d20994c54a420e77bf01f5917 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Fri, 20 May 2022 14:17:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=EF=BC=9A?= =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BB=93=E5=BA=93=EF=BC=8C=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E5=8D=95=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/SpsSyncDownloadController.java | 10 ++++++++++ .../controller/thrsys/ThrInvWarehouseController.java | 7 +++++++ .../sale/admin/res/basic/SpsSyncOrderResponse.java | 1 + .../sale/admin/res/thrsys/ThrInvWarehouseResponse.java | 10 ++++++++++ .../main/resources/mybatis/mapper/inout/OrderDao.xml | 4 ++-- 5 files changed, 30 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index d849ecf..c9014d7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java @@ -108,6 +108,12 @@ public class SpsSyncDownloadController { syncDataResponse.setCompanyProductRelevanceEntities(companyProductRelevanceEntities); syncDataResponse.setUdiInfoEntities(udiInfoEntities); syncDataResponse.setUdiRelevanceEntities(udiRelevanceEntities); + + if (!syncDataSetEntity.isBasicThirdProducts()) { + + } + + } @@ -219,6 +225,7 @@ public class SpsSyncDownloadController { if (syncDataSetEntity.isOrderScanFinish()) { OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); + orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes()); orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_ED); List temps = orderService.findAllByTime(orderFilterRequest); @@ -230,6 +237,7 @@ public class SpsSyncDownloadController { if (syncDataSetEntity.isOrderUnReceive()) { OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); + orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes()); orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_UN); List temps = orderService.findAllByTime(orderFilterRequest); @@ -241,6 +249,7 @@ public class SpsSyncDownloadController { if (syncDataSetEntity.isOrderUnCheck()) { OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); + orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes()); orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_CHECK); List temps = orderService.findAllByTime(orderFilterRequest); if (CollUtil.isNotEmpty(temps)) { @@ -251,6 +260,7 @@ public class SpsSyncDownloadController { if (syncDataSetEntity.isOrderScanFinish()) { OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); + orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes()); orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_ED); List temps = orderService.findAllByTime(orderFilterRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrInvWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrInvWarehouseController.java index 9c2639d..2c331de 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrInvWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrInvWarehouseController.java @@ -1,5 +1,7 @@ package com.glxp.sale.admin.controller.thrsys; +import com.glxp.sale.admin.dao.basic.BasicThirdSysDao; +import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; import com.glxp.sale.admin.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.sale.admin.req.inout.DeleteRequest; import com.glxp.sale.admin.req.thrsys.FilterThrInvWarehouseRequest; @@ -29,6 +31,8 @@ public class ThrInvWarehouseController { @Resource ThrInvWarehouseService thrInvWarehouseService; + @Resource + private BasicThirdSysDao basicThirdSysDao; @GetMapping("spms/thrsys/warehouse/filter") public BaseResponse filterInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest) { @@ -45,6 +49,9 @@ public class ThrInvWarehouseController { for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) { ThrInvWarehouseResponse thrInvWarehouseResponse = new ThrInvWarehouseResponse(); BeanUtils.copyProperties(thrInvWarehouseEntity, thrInvWarehouseResponse); + //查询第三方系统名称 + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysDao.selectByThirdId(thrInvWarehouseEntity.getThirdSysFk()); + thrInvWarehouseResponse.setThirdName(basicThirdSysEntity.getThirdName()); if (pid.equals(thrInvWarehouseEntity.getPid())) { thrInvWarehouseResponse.setChildren(merge(thrInvWarehouseEntities, thrInvWarehouseEntity.getId())); thrInvWarehouseResponses.add(thrInvWarehouseResponse); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncOrderResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncOrderResponse.java index 73a5cca..3571486 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncOrderResponse.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.res.basic; import com.glxp.sale.admin.entity.inout.ErpOrderEntity; import com.glxp.sale.admin.entity.inout.OrderEntity; +import com.glxp.sale.admin.entity.inout.StockOrderEntity; import com.glxp.sale.admin.entity.inout.WarehouseEntity; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/thrsys/ThrInvWarehouseResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/thrsys/ThrInvWarehouseResponse.java index 175ede7..704a8a5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/thrsys/ThrInvWarehouseResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/thrsys/ThrInvWarehouseResponse.java @@ -19,6 +19,16 @@ public class ThrInvWarehouseResponse { private Date updateTime; private String remark; + /** + * 第三方系统标识 + */ + private String thirdSysFk; + + /** + * 第三方系统名称 + */ + private String thirdName; + private List children; } diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index bd2e6ee..0459c3b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -512,10 +512,10 @@ and receiveStatus = #{receiveStatus} - = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + and = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> - action in + and `action` in #{item}