From fec801b31e663f1c979f460b878d6ad41d3d5c14 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 11:42:15 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E6=8C=89?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 39 +++++++++++++++++-- .../glxp/api/req/inout/AddOrderRequest.java | 2 + .../service/inout/IoCheckInoutService.java | 2 - .../InvPreInProductDetailServiceImpl.java | 2 +- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 52cf48da4..ef55450a6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -495,7 +495,7 @@ public class IoCodeTempController extends BaseController { //校验预验收库存是否已存在 if (bussinessTypeEntity.isScanPreIn()) { - if (bussinessTypeEntity.getBackPreinType() == 1 && bussinessTypeEntity.isPreInBack()) {//按单出库 + if (bussinessTypeEntity.getBackPreinType() == 1) {//按单出库&& bussinessTypeEntity.isPreInBack() String orderIds = addOrderRequest.getCheckPreInOrders(); if (StrUtil.isNotEmpty(orderIds)) { String[] orderIdArray = orderIds.split(","); @@ -524,8 +524,11 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "未选择预验收入库单，请先选择预验收入库单！"); } - } else { //按库存出库 - int preInCount = invPreinProductDetailService.findCountByCode(code); + } else if (bussinessTypeEntity.getBackPreinType() == 2) { //按货位出库 + if (StrUtil.isEmpty(addOrderRequest.getCheckPreInSpaceCode())) + return ResultVOUtils.error(500, "" + + "请选择预验收货位！"); + int preInCount = invPreinProductDetailService.findCountBySpaceCode(addOrderRequest.getCheckPreInSpaceCode(), code); InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(code); if (preInCount <= 0) { return ResultVOUtils.error(500, "预验收库存数量不足！"); @@ -552,6 +555,36 @@ public class IoCodeTempController extends BaseController { } } + /** + * else { //按库存出库 + * int preInCount = invPreinProductDetailService.findCountByCode(code); + * InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(code); + * if (preInCount <= 0) { + * return ResultVOUtils.error(500, "预验收库存数量不足！"); + * } else { + * if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(udiEntity.getBatchNo()) + * && !invPreinDetailEntity.getBatchNo().equals(udiEntity.getBatchNo())) { + * return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！"); + * } + * if (StrUtil.isNotEmpty(orderId)) {//非首次添加 + * if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品 + * //无序列号，则可能存在多个预验收入库单 + * IoCodeTempEntity codeTempEntity = codeTempService.findByUnique(orderId, code); + * if (codeTempEntity != null) { + * if (preInCount < (codeTempEntity.getMyCount() + 1)) { + * return ResultVOUtils.error(500, "超出预验收库存数量"); + * } + * } + * } else { + * if (preInCount < 1) { + * return ResultVOUtils.error(500, "预验收库存数量不足"); + * } + * } + * } + * } + * } + */ + } // 是否检验寄售库存 diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java index 78ab31c0b..fd859af6d 100644 --- a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java @@ -29,5 +29,7 @@ public class AddOrderRequest { private String remark; private String checkPreInOrders; + // 预验收货位 + private String checkPreInSpaceCode; private int fromVailPi; //是否需要校验三期；1：不需要，2：需要 } diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index b99350f71..4788472be 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -803,7 +803,6 @@ public class IoCheckInoutService { // ThreadUtil.execAsync(() -> { if (StrUtil.isNotEmpty(bussinessTypeEntity.getPreInBackAction())) { if (bussinessTypeEntity.getBackPreinType() == 1) { //按单退货 - String orderIds = orderEntity.getCheckPreInOrders(); if (StrUtil.isNotEmpty(orderIds)) { String[] orderIdArray = orderIds.split(","); @@ -861,7 +860,6 @@ public class IoCheckInoutService { codeEntity.setReCount(udiCalCountUtil.getActCount(codeEntity.getNameCode())); codeEntity.setWarehouseCode(orderEntity.getCheckPreInSpaceCode()); backCodeList.add(codeEntity); - } } genBackOrder(orderEntity, backCodeList); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java index 27f12a809..e1f3a27ce 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java @@ -190,7 +190,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe @Override public InvPreInProductDetailEntity findUseOneByCode(String code) { List invPreinDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper().eq("code", code) - .last("limit 1")); + .last("limit 1")); if (CollUtil.isNotEmpty(invPreinDetailEntities)) { return invPreinDetailEntities.get(0); } From 4687aeea24f8b232b453ea6cb101c9d45d80a279 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 11:52:50 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E6=8C=89?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/auth/InvBusUserDao.xml | 77 +++++++++---------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml index 078a8cd87..56e9d9414 100644 --- a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml @@ -2,7 +2,6 @@ - replace - INTO auth_user_bustype - (userId, `subInvCode`, scAction, remark,updateTime) - values ( - #{userId}, - #{subInvCode}, - #{scAction}, - #{remark},now() - ) + INTO auth_user_bustype + (userId, `subInvCode`, scAction, remark, updateTime) + values (#{userId}, + #{subInvCode}, + #{scAction}, + #{remark}, now()) @@ -103,28 +95,35 @@ DELETE FROM auth_user_bustype - - - AND subInvCode = #{subInvCode} - - - and scAction in - - #{item} - - - + + + AND subInvCode = #{subInvCode} + + + and scAction in + + #{item} + + + UPDATE auth_user_bustype + + userId=#{userId}, + + + subInvCode=#{subInvCode}, + + + scAction=#{scAction}, + + + remark=#{remark}, + updateTime=now() - userId=#{userId}, - subInvCode=#{subInvCode}, - scAction=#{scAction}, - remark=#{remark}, WHERE id = #{id} - From 8ca7d523df5f3e4514c5025628f22ddbc439f5cf Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 11:42:15 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E6=8C=89?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 39 +++++++++++++++++-- .../glxp/api/req/inout/AddOrderRequest.java | 2 + .../service/inout/IoCheckInoutService.java | 2 - .../InvPreInProductDetailServiceImpl.java | 2 +- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 52cf48da4..ef55450a6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -495,7 +495,7 @@ public class IoCodeTempController extends BaseController { //校验预验收库存是否已存在 if (bussinessTypeEntity.isScanPreIn()) { - if (bussinessTypeEntity.getBackPreinType() == 1 && bussinessTypeEntity.isPreInBack()) {//按单出库 + if (bussinessTypeEntity.getBackPreinType() == 1) {//按单出库&& bussinessTypeEntity.isPreInBack() String orderIds = addOrderRequest.getCheckPreInOrders(); if (StrUtil.isNotEmpty(orderIds)) { String[] orderIdArray = orderIds.split(","); @@ -524,8 +524,11 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "未选择预验收入库单，请先选择预验收入库单！"); } - } else { //按库存出库 - int preInCount = invPreinProductDetailService.findCountByCode(code); + } else if (bussinessTypeEntity.getBackPreinType() == 2) { //按货位出库 + if (StrUtil.isEmpty(addOrderRequest.getCheckPreInSpaceCode())) + return ResultVOUtils.error(500, "" + + "请选择预验收货位！"); + int preInCount = invPreinProductDetailService.findCountBySpaceCode(addOrderRequest.getCheckPreInSpaceCode(), code); InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(code); if (preInCount <= 0) { return ResultVOUtils.error(500, "预验收库存数量不足！"); @@ -552,6 +555,36 @@ public class IoCodeTempController extends BaseController { } } + /** + * else { //按库存出库 + * int preInCount = invPreinProductDetailService.findCountByCode(code); + * InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(code); + * if (preInCount <= 0) { + * return ResultVOUtils.error(500, "预验收库存数量不足！"); + * } else { + * if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(udiEntity.getBatchNo()) + * && !invPreinDetailEntity.getBatchNo().equals(udiEntity.getBatchNo())) { + * return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！"); + * } + * if (StrUtil.isNotEmpty(orderId)) {//非首次添加 + * if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品 + * //无序列号，则可能存在多个预验收入库单 + * IoCodeTempEntity codeTempEntity = codeTempService.findByUnique(orderId, code); + * if (codeTempEntity != null) { + * if (preInCount < (codeTempEntity.getMyCount() + 1)) { + * return ResultVOUtils.error(500, "超出预验收库存数量"); + * } + * } + * } else { + * if (preInCount < 1) { + * return ResultVOUtils.error(500, "预验收库存数量不足"); + * } + * } + * } + * } + * } + */ + } // 是否检验寄售库存 diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java index 78ab31c0b..fd859af6d 100644 --- a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java @@ -29,5 +29,7 @@ public class AddOrderRequest { private String remark; private String checkPreInOrders; + // 预验收货位 + private String checkPreInSpaceCode; private int fromVailPi; //是否需要校验三期；1：不需要，2：需要 } diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index b99350f71..4788472be 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -803,7 +803,6 @@ public class IoCheckInoutService { // ThreadUtil.execAsync(() -> { if (StrUtil.isNotEmpty(bussinessTypeEntity.getPreInBackAction())) { if (bussinessTypeEntity.getBackPreinType() == 1) { //按单退货 - String orderIds = orderEntity.getCheckPreInOrders(); if (StrUtil.isNotEmpty(orderIds)) { String[] orderIdArray = orderIds.split(","); @@ -861,7 +860,6 @@ public class IoCheckInoutService { codeEntity.setReCount(udiCalCountUtil.getActCount(codeEntity.getNameCode())); codeEntity.setWarehouseCode(orderEntity.getCheckPreInSpaceCode()); backCodeList.add(codeEntity); - } } genBackOrder(orderEntity, backCodeList); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java index 27f12a809..e1f3a27ce 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java @@ -190,7 +190,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe @Override public InvPreInProductDetailEntity findUseOneByCode(String code) { List invPreinDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper().eq("code", code) - .last("limit 1")); + .last("limit 1")); if (CollUtil.isNotEmpty(invPreinDetailEntities)) { return invPreinDetailEntities.get(0); } From 89aaac673f8d0d5da3787768e2476de9e1e698f4 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 11:52:50 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E6=8C=89?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/auth/InvBusUserDao.xml | 77 +++++++++---------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml index 078a8cd87..56e9d9414 100644 --- a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml @@ -2,7 +2,6 @@ - replace - INTO auth_user_bustype - (userId, `subInvCode`, scAction, remark,updateTime) - values ( - #{userId}, - #{subInvCode}, - #{scAction}, - #{remark},now() - ) + INTO auth_user_bustype + (userId, `subInvCode`, scAction, remark, updateTime) + values (#{userId}, + #{subInvCode}, + #{scAction}, + #{remark}, now()) @@ -103,28 +95,35 @@ DELETE FROM auth_user_bustype - - - AND subInvCode = #{subInvCode} - - - and scAction in - - #{item} - - - + + + AND subInvCode = #{subInvCode} + + + and scAction in + + #{item} + + + UPDATE auth_user_bustype + + userId=#{userId}, + + + subInvCode=#{subInvCode}, + + + scAction=#{scAction}, + + + remark=#{remark}, + updateTime=now() - userId=#{userId}, - subInvCode=#{subInvCode}, - scAction=#{scAction}, - remark=#{remark}, WHERE id = #{id} - From 5b970dc4c7dec27a4ec171ecb2b76b9572ebc73f Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 28 Apr 2023 11:56:11 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9id=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/auth/DeptController.java | 16 ++++++++-------- .../com/glxp/api/entity/auth/DeptEntity.java | 2 +- .../api/req/auth/FilterInvWarehouseRequest.java | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index 7676ac98c..c38f4dfc8 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -62,7 +62,7 @@ public class DeptController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterAll") public BaseResponse filterAllInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); filterInvWarehouseRequest.setStatus(1); List invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest); return ResultVOUtils.success(invWarehouseEntities); @@ -72,7 +72,7 @@ public class DeptController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterNext") public BaseResponse filterNext(FilterInvWarehouseRequest filterInvWarehouseRequest) { - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); filterInvWarehouseRequest.setStatus(1); List invWarehouseEntities = deptService.filterGroupInvWarehouse(filterInvWarehouseRequest); @@ -84,7 +84,7 @@ public class DeptController { @GetMapping("spms/inv/warehouse/filterByUser") public BaseResponse filterByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { AuthAdmin authAdmin = customerService.getUserBean(); - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); filterInvWarehouseRequest.setStatus(1); filterInvWarehouseRequest.setUserId(authAdmin.getId()); List mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); @@ -95,7 +95,7 @@ public class DeptController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterAllLocInv") public BaseResponse filterAllLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) { - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); filterInvWarehouseRequest.setStatus(1); List invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); @@ -124,12 +124,12 @@ public class DeptController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterUplLocInv") public BaseResponse filterUplLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) { - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); filterInvWarehouseRequest.setStatus(1); List invWarehouseEntities; AuthAdmin authAdmin = customerService.getUserBean(); filterInvWarehouseRequest.setUserId(authAdmin.getId()); - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); List mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); Map invWarehouseEntityMap = new HashMap<>(); if (mInvWarehouseEntities.size() > 0) { @@ -155,7 +155,7 @@ public class DeptController { List invWarehouseEntities; AuthAdmin authAdmin = customerService.getUserBean(); filterInvWarehouseRequest.setUserId(authAdmin.getId()); - filterInvWarehouseRequest.setPid(0); + filterInvWarehouseRequest.setPid(0L); invWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); return ResultVOUtils.success(invWarehouseEntities); @@ -181,7 +181,7 @@ public class DeptController { } //顶级部门 if (deptEntity.getPid() == null || deptEntity.getPid() == 0) { - deptEntity.setPid(0); // 默认设置 + deptEntity.setPid(0L); // 默认设置 FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); filterInvWarehouseRequest.setPid(deptEntity.getPid()); DeptEntity codeEntity = deptService.selectMaxCode(filterInvWarehouseRequest); diff --git a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java index f313bbe33..ef180b7ea 100644 --- a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java @@ -10,7 +10,7 @@ import java.util.Date; @TableName("auth_dept") public class DeptEntity { private Long id; - private Integer pid; + private Long pid; private String code; private String name; private Boolean advanceType; diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java index 9a4067020..e030b08d6 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java @@ -9,8 +9,8 @@ import java.util.List; @Data public class FilterInvWarehouseRequest extends ListPageRequest { - private Integer id; - private Integer pid; + private Long id; + private Long pid; private String code; private String name; private String deptCode; From a4838a4459e0dcbd42215e8852a38ef70c3efcc8 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 13:57:10 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=80=89=E5=85=A5?= =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E7=A7=BB=E9=99=A4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=B9=81=E5=BF=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 2 +- .../glxp/api/dao/auth/WarehouseUserDao.java | 7 ++--- .../api/req/auth/FilterInvUserRequest.java | 2 +- .../service/auth/WarehouseUserService.java | 8 ++++-- .../auth/impl/WarehouseUserServiceImpl.java | 10 ++++--- .../mybatis/mapper/auth/WarehouseUserDao.xml | 28 ++++--------------- src/main/resources/schemas/schema_v2.1.sql | 5 ++++ 7 files changed, 27 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 4d983b6cd..dad64d2ad 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -612,7 +612,7 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/delWarehouseUser") - public BaseResponse deleteWarehouseUser(Integer id) { + public BaseResponse deleteWarehouseUser(Long id) { if (null == id) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id); diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java index 43cefff33..109b703e8 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -10,8 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface WarehouseUserDao extends BaseMapperPlus { - int deleteByPrimaryKey(Integer id); +public interface WarehouseUserDao extends BaseMapperPlus { int deleteByCodeAndId(@Param("id") Long id, @Param("code") String code); @@ -35,13 +34,13 @@ public interface WarehouseUserDao extends BaseMapperPlus list); - int batchInsert(@Param("list") List list); List selectListByCode(@Param("code") String code); List selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest); - List selectNotSelectUserid(@Param("userIds")List userIds ); + List selectNotSelectUserid(@Param("userIds") List userIds); + List selectCodeByUser(@Param("userId") String userId); void deleteByCode(@Param("code") String code); diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java index d231ad607..6fcb8d963 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java @@ -6,7 +6,7 @@ import lombok.Data; @Data public class FilterInvUserRequest extends ListPageRequest { - private Integer id; + private Long id; private String code; private Long userid; private String username; diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java index 476f5a36b..248c6c2e2 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java @@ -18,7 +18,7 @@ public interface WarehouseUserService extends IService { * @return */ - WarehouseUserEntity selectById(Integer id); + WarehouseUserEntity selectById(Long id); List getListByCode(String code); @@ -48,7 +48,7 @@ public interface WarehouseUserService extends IService { * * @param id */ - void deleteWarehouseUser(Integer id); + void deleteWarehouseUser(Long id); void deleteByCodeAndId(Long id, String code); @@ -61,7 +61,8 @@ public interface WarehouseUserService extends IService { * @return */ List getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest); - List selectNotSelectUserid(@Param("userIds")List userIds ); + + List selectNotSelectUserid(@Param("userIds") List userIds); /** * 根据分仓编码，统计用户数量 @@ -70,5 +71,6 @@ public interface WarehouseUserService extends IService { * @return */ Integer countUserBySubInvCode(String subInvCode); + boolean insert(WarehouseUserEntity warehouseUserEntity); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index ab5966e5f..55ef0342e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.WarehouseUserDao; @@ -28,7 +29,7 @@ public class WarehouseUserServiceImpl extends ServiceImpl warehouseUserEntities = warehouseUserDao.filterList(filterInvUserRequest); @@ -75,9 +76,10 @@ public class WarehouseUserServiceImpl extends ServiceImpl - - - delete - from auth_warehouse_user - where id = #{id,jdbcType=INTEGER} - delete @@ -101,7 +95,7 @@ isDirector = #{isDirector} - where id = #{id,jdbcType=INTEGER} + where id = #{id,jdbcType=INTEGER} @@ -167,16 +161,6 @@ #{item.id,jdbcType=INTEGER} - - - insert into auth_warehouse_user - (code, userId, userName, isDirector) - values - - (#{item.code,jdbcType=VARCHAR}, #{item.userid,jdbcType=BIGINT}, #{item.username,jdbcType=VARCHAR}, - #{item.isDirector}) - - @@ -205,9 +189,9 @@ id = #{id,jdbcType=INTEGER}, - code = #{code,jdbcType=VARCHAR}, - userId = #{userid,jdbcType=BIGINT}, - userName = #{username,jdbcType=VARCHAR}, + code = #{code,jdbcType=VARCHAR}, + userId = #{userid,jdbcType=BIGINT}, + userName = #{username,jdbcType=VARCHAR}, select auth_warehouse_user.*, auth_user.employeeName from auth_warehouse_user - inner join auth_user on auth_user.id = auth_warehouse_user.userId + inner join auth_user on auth_user.id = auth_warehouse_user.userId where code = #{code} @@ -271,7 +255,7 @@ parameterType="com.glxp.api.req.auth.FilterInvLinkDataRequest"> select auth_warehouse_user.*, auth_user.employeeName from auth_warehouse_user - inner join auth_user on auth_user.id = auth_warehouse_user.userId + inner join auth_user on auth_user.id = auth_warehouse_user.userId AND code = #{code} diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 6e57cb659..c010b2601 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -382,3 +382,8 @@ CALL Pro_Temp_ColumnWork('thr_dept', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_products', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2); + + + +CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2); From 222c5f270888ea7db8fbfafbe573745c5a39f54b Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 13:57:10 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=80=89=E5=85=A5?= =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E7=A7=BB=E9=99=A4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=B9=81=E5=BF=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 2 +- .../glxp/api/dao/auth/WarehouseUserDao.java | 7 ++--- .../api/req/auth/FilterInvUserRequest.java | 2 +- .../service/auth/WarehouseUserService.java | 8 ++++-- .../auth/impl/WarehouseUserServiceImpl.java | 10 ++++--- .../mybatis/mapper/auth/WarehouseUserDao.xml | 28 ++++--------------- src/main/resources/schemas/schema_v2.1.sql | 5 ++++ 7 files changed, 27 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 4d983b6cd..dad64d2ad 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -612,7 +612,7 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/delWarehouseUser") - public BaseResponse deleteWarehouseUser(Integer id) { + public BaseResponse deleteWarehouseUser(Long id) { if (null == id) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id); diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java index 43cefff33..109b703e8 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -10,8 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface WarehouseUserDao extends BaseMapperPlus { - int deleteByPrimaryKey(Integer id); +public interface WarehouseUserDao extends BaseMapperPlus { int deleteByCodeAndId(@Param("id") Long id, @Param("code") String code); @@ -35,13 +34,13 @@ public interface WarehouseUserDao extends BaseMapperPlus list); - int batchInsert(@Param("list") List list); List selectListByCode(@Param("code") String code); List selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest); - List selectNotSelectUserid(@Param("userIds")List userIds ); + List selectNotSelectUserid(@Param("userIds") List userIds); + List selectCodeByUser(@Param("userId") String userId); void deleteByCode(@Param("code") String code); diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java index d231ad607..6fcb8d963 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java @@ -6,7 +6,7 @@ import lombok.Data; @Data public class FilterInvUserRequest extends ListPageRequest { - private Integer id; + private Long id; private String code; private Long userid; private String username; diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java index 476f5a36b..248c6c2e2 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java @@ -18,7 +18,7 @@ public interface WarehouseUserService extends IService { * @return */ - WarehouseUserEntity selectById(Integer id); + WarehouseUserEntity selectById(Long id); List getListByCode(String code); @@ -48,7 +48,7 @@ public interface WarehouseUserService extends IService { * * @param id */ - void deleteWarehouseUser(Integer id); + void deleteWarehouseUser(Long id); void deleteByCodeAndId(Long id, String code); @@ -61,7 +61,8 @@ public interface WarehouseUserService extends IService { * @return */ List getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest); - List selectNotSelectUserid(@Param("userIds")List userIds ); + + List selectNotSelectUserid(@Param("userIds") List userIds); /** * 根据分仓编码，统计用户数量 @@ -70,5 +71,6 @@ public interface WarehouseUserService extends IService { * @return */ Integer countUserBySubInvCode(String subInvCode); + boolean insert(WarehouseUserEntity warehouseUserEntity); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index ab5966e5f..55ef0342e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.WarehouseUserDao; @@ -28,7 +29,7 @@ public class WarehouseUserServiceImpl extends ServiceImpl warehouseUserEntities = warehouseUserDao.filterList(filterInvUserRequest); @@ -75,9 +76,10 @@ public class WarehouseUserServiceImpl extends ServiceImpl - - - delete - from auth_warehouse_user - where id = #{id,jdbcType=INTEGER} - delete @@ -101,7 +95,7 @@ isDirector = #{isDirector} - where id = #{id,jdbcType=INTEGER} + where id = #{id,jdbcType=INTEGER} @@ -167,16 +161,6 @@ #{item.id,jdbcType=INTEGER} - - - insert into auth_warehouse_user - (code, userId, userName, isDirector) - values - - (#{item.code,jdbcType=VARCHAR}, #{item.userid,jdbcType=BIGINT}, #{item.username,jdbcType=VARCHAR}, - #{item.isDirector}) - - @@ -205,9 +189,9 @@ id = #{id,jdbcType=INTEGER}, - code = #{code,jdbcType=VARCHAR}, - userId = #{userid,jdbcType=BIGINT}, - userName = #{username,jdbcType=VARCHAR}, + code = #{code,jdbcType=VARCHAR}, + userId = #{userid,jdbcType=BIGINT}, + userName = #{username,jdbcType=VARCHAR}, select auth_warehouse_user.*, auth_user.employeeName from auth_warehouse_user - inner join auth_user on auth_user.id = auth_warehouse_user.userId + inner join auth_user on auth_user.id = auth_warehouse_user.userId where code = #{code} @@ -271,7 +255,7 @@ parameterType="com.glxp.api.req.auth.FilterInvLinkDataRequest"> select auth_warehouse_user.*, auth_user.employeeName from auth_warehouse_user - inner join auth_user on auth_user.id = auth_warehouse_user.userId + inner join auth_user on auth_user.id = auth_warehouse_user.userId AND code = #{code} diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 6e57cb659..c010b2601 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -382,3 +382,8 @@ CALL Pro_Temp_ColumnWork('thr_dept', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_products', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2); + + + +CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2); +CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2); From eca01f3f4ae84b81799ba0ca7cf4cc18fb3accca Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 14:09:09 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=A7=BB=E9=99=A4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/auth/InvBusUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java index 676ac8c95..ae107aba6 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java @@ -128,8 +128,8 @@ public class InvBusUserController { @AuthRuleAnnotation("") @PostMapping("/spms/bus/user/warehouse/post") public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) { + invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) { - invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); relBusRequset.getSelectActions().forEach(action -> { InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); From ac199432c9c285ea6036aa71ea06f16c6dc982a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 28 Apr 2023 14:28:20 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E7=89=A9=E8=B5=84=E6=B7=BB=E5=8A=A0id?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/service/basic/UdiContrastService.java | 5 +++++ src/main/java/com/glxp/api/task/SyncHeartTask.java | 6 +++--- src/main/resources/mybatis/mapper/basic/UdiProductDao.xml | 5 +++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 3992a4bea..dcf5cb632 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.basic; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.basic.UdiRelevanceDao; @@ -16,6 +17,7 @@ import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; import com.glxp.api.util.GennerOrderUtils; + import com.glxp.api.util.udi.UdiInfoUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -206,6 +208,9 @@ public class UdiContrastService { if (CollUtil.isNotEmpty(udiInfoEntities)) { UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiInfoEntities.get(0).getUuid()); if (udiProductEntity == null) { + for (UdiProductEntity udiInfoEntity : udiInfoEntities) { + udiInfoEntity.setId(IdUtil.getSnowflakeNextId()); + } udiProductService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); } } diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index 932e4b435..9a91ea980 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -19,9 +19,9 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.Arrays; - -@Component -@EnableScheduling +// +//@Component +//@EnableScheduling public class SyncHeartTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class); diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 2a8e2ad76..8a2886cfb 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -229,7 +229,7 @@ replace INTO basic_products - (uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, + (id,uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, @@ -241,7 +241,8 @@ - (#{item.uuid}, + (#{item.id}, + #{item.uuid}, #{item.originUuid}, #{item.nameCode}, #{item.deviceRecordKey}, From e616ccd7ff980f453ee916fd71540221c25f35a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 28 Apr 2023 14:35:12 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9test=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=A8=A1=E6=9D=BF=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index dacca35b5..c5417849a 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -43,7 +43,7 @@ logging: level: com.glxp.api.dao: debug -file_path: /udi/udiwms/udiwmsfile/ +file_path: D:/udi/udiwms/udiwmsfile/ back_file_path: /share/udisps/back/ UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test From dbaa3cf85ea15db9756fa6d7ffd959c7f8df1ef2 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 28 Apr 2023 14:52:06 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E5=BE=80=E6=9D=A5id=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/basic/UdiRelevanceController.java | 2 +- .../java/com/glxp/api/entity/basic/UdiRlSupEntity.java | 2 +- .../java/com/glxp/api/res/basic/UdiRlSupResponse.java | 2 +- .../api/service/basic/CompanyProductsRelService.java | 9 +++------ src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml | 4 ++-- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index f91c78a85..dc559a097 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -675,7 +675,7 @@ public class UdiRelevanceController extends BaseController { UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity(); udiRlSupEntity.setUpdateTime(new Date()); udiRlSupEntity.setPrice(new BigDecimal(udiProductEntity.getPrice())); - udiRlSupEntity.setId(udiProductEntity.getRelSupId()); + udiRlSupEntity.setId(Long.valueOf(udiProductEntity.getRelSupId())); udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity); } if (falg) { diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java index 74874e17b..cbdb02e7f 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java @@ -11,7 +11,7 @@ import java.util.Date; @Data public class UdiRlSupEntity { - private Integer id; + private Long id; private String customerId; private String productId; private String enterpriseId; diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java index 9e8edf8a7..dcf95d039 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class UdiRlSupResponse { - private int id; + private Long id; private Integer rlId; private String thirdId; private String thirdName; diff --git a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java index 4feabb70c..7d270fc47 100644 --- a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java +++ b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java @@ -1,17 +1,13 @@ package com.glxp.api.service.basic; -import cn.hutool.core.util.StrUtil; -import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.entity.basic.UdiRlSupEntity; +import cn.hutool.core.util.IdUtil; import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.req.basic.UdiInfoExportRequest; -import com.glxp.api.req.basic.UdiInfoRequest; -import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -39,6 +35,7 @@ public class CompanyProductsRelService { udiRlSupEntity.setUnitFk(udiInfoExportRequest.getUnitFk()); udiRlSupEntity.setUdiRlIdFk(uuid); udiRlSupEntity.setCustomerId(udiInfoExportRequest.getUnitFk()); + udiRlSupEntity.setId(IdUtil.getSnowflakeNextId()); boolean b = udiRlSupService.insertCompanyProductRelevance(udiRlSupEntity); } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index 6ce578a88..5a6074221 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -285,10 +285,10 @@ replace - INTO company_product_relevance(customerId, productId, enterpriseId, registrationId, + INTO company_product_relevance(id,customerId, productId, enterpriseId, registrationId, createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk, price, createUser, updateUser) - values (#{customerId}, + values (#{id},#{customerId}, #{productId}, #{enterpriseId}, #{registrationId}, From eec7d4f87a55b1403a37bdffd92dca8c92ec22f2 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 15:11:53 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E5=B8=A6=E9=85=8D=E8=B4=A7=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/constant/ConstantStatus.java | 3 ++- .../glxp/api/controller/inout/IoCodeTempController.java | 8 ++++---- src/main/java/com/glxp/api/res/PageSimpleResponse.java | 7 ++++++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index e63753a92..cfd87c652 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -70,11 +70,12 @@ public class ConstantStatus { /** - * 单据创建类型 2.新增扫码单据，1、新增业务单据，3、正常单据处理 + * 单据创建类型 2.新增扫码单据，1、新增业务单据，3、正常单据处理,4:带配货页面 */ public static final Integer ORDER_TYPE_BIZ = 1; public static final Integer ORDER_TYPE_SCAN = 2; public static final Integer ORDER_TYPE_NORMAL = 3; + public static final Integer ORDER_TYPE_WAIT = 4; /** * 供应商自助平台单据类型 diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index ef55450a6..d4393b91e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -664,13 +664,13 @@ public class IoCodeTempController extends BaseController { } if (StringUtils.isBlank(exitLocalEntity.getSerialNo())) { - if (bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() == 1 && addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL) { + if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) { String errMsg = ioCheckInoutService.checkCode(genDetaiEntity); if (errMsg != null) { return ResultVOUtils.error(500, errMsg); } else codeTempService.updateById(exitLocalEntity); - } else if (bussinessTypeEntity.isCheckEnable() && (bussinessTypeEntity.getCheckWebNew() == 2 || (bussinessTypeEntity.getCheckWebNew() == 3 && addOrderRequest.getFromVailPi() == 1)) && addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL) { + } else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) { String errMsg = ioCheckInoutService.checkNoPiCode(genDetaiEntity); if (errMsg != null) { return ResultVOUtils.error(500, errMsg); @@ -821,13 +821,13 @@ public class IoCodeTempController extends BaseController { } //是否边扫边校验 - if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() == 1) { + if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) { String errMsg = ioCheckInoutService.checkCode(codeEnttity); if (errMsg != null) { return ResultVOUtils.error(500, errMsg); } else codeTempService.insert(codeEnttity); - } else if (bussinessTypeEntity.isCheckEnable() && (bussinessTypeEntity.getCheckWebNew() == 2 || (bussinessTypeEntity.getCheckWebNew() == 3 && addOrderRequest.getFromVailPi() == 1)) && addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL) { + } else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) { String errMsg = ioCheckInoutService.checkNoPiCode(codeEnttity); if (errMsg != null) { return ResultVOUtils.error(500, errMsg); diff --git a/src/main/java/com/glxp/api/res/PageSimpleResponse.java b/src/main/java/com/glxp/api/res/PageSimpleResponse.java index d198d989b..54fe61c5f 100644 --- a/src/main/java/com/glxp/api/res/PageSimpleResponse.java +++ b/src/main/java/com/glxp/api/res/PageSimpleResponse.java @@ -10,7 +10,12 @@ import java.util.List; @Data public class PageSimpleResponse { // 总数 - private Long total; + private Integer total; // 列表 private List list; + + public void setTotal(Long total) { + + this.total = total.intValue(); + } } From af379547eab9272d5b7d2df9954105ab739ca8d9 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Fri, 28 Apr 2023 15:36:08 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/task/SyncHeartTask.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index 9a91ea980..932e4b435 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -19,9 +19,9 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.Arrays; -// -//@Component -//@EnableScheduling + +@Component +@EnableScheduling public class SyncHeartTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class); From 0d51bce1a3e18009cff15a1193b69575021cd0ca Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 28 Apr 2023 15:56:30 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=A1=A5=E5=8D=95=20=E4=B8=9A=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=A1=A5=E5=8D=95=20=20=E4=BF=AE=E6=94=B9id?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/BasicBusTypeChangeController.java | 2 ++ src/main/resources/schemas/schema_v2.1.sql | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java index dcdd1952c..942b217fd 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; @@ -70,6 +71,7 @@ public class BasicBusTypeChangeController { return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加"); } basicBusTypeChangeEntity.setUpdateTime(new Date()); + basicBusTypeChangeEntity.setId(IdUtil.getSnowflakeNextId()); basicBusTypeChangeService.insert(basicBusTypeChangeEntity); return ResultVOUtils.success("更新成功"); } diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index c010b2601..ffa006a6c 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -387,3 +387,5 @@ CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2); CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2); +CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2); + From 0d878f1d646486caf8ea0ce6aed95557f8fec69f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 28 Apr 2023 16:22:09 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8Did=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/thrsys/ThrDeptController.java | 2 ++ .../glxp/api/controller/thrsys/ThrProductsController.java | 2 ++ .../java/com/glxp/api/res/thrsys/ThrProductsResponse.java | 2 +- .../api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java | 2 ++ .../resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml | 5 +++-- src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml | 3 ++- src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml | 3 ++- 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java index 9994c5cf9..fd558aa7b 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; @@ -78,6 +79,7 @@ public class ThrDeptController { thrDeptEntity.setPcode(pEntity.getPcode()); } thrDeptEntity.setUpdateTime(new Date()); + thrDeptEntity.setId(IdUtil.getSnowflakeNextId()); boolean b = thrDeptService.insertInvWarehouse(thrDeptEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index fedc2db8e..97310b3e4 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -3,6 +3,7 @@ package com.glxp.api.controller.thrsys; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -179,6 +180,7 @@ public class ThrProductsController { thrProductsEntity.setCreateUser(String.valueOf(customerService.getUserId())); thrProductsEntity.setUpdateTime(new Date()); thrProductsEntity.setCreateTime(new Date()); + thrProductsEntity.setId(IdUtil.getSnowflakeNextId()); thrProductsService.insertThrProducts(thrProductsEntity); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java index 0e9b1839a..e19f9df45 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java @@ -8,7 +8,7 @@ import java.util.Date; @Data public class ThrProductsResponse { - private Integer id; + private Long id; private String code; //产品编码 private String name; private String measname; //计量单位 diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java index 775ce7efd..3842bf90e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -68,6 +69,7 @@ public class ThrBusTypeOriginServiceImpl extends ServiceImpl replace into thr_bustype_origin - (`name`, `action`, thirdSys, `enable`, inoutType, updateTime, remark, createUser, updateUser, + (id,`name`, `action`, thirdSys, `enable`, inoutType, updateTime, remark, createUser, updateUser, createTime) - values (#{name}, + values (#{id}, + #{name}, #{action}, #{thirdSys}, #{enable}, diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml index 0681dd883..ef296c2e9 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrDeptDao.xml @@ -83,9 +83,10 @@ parameterType="com.glxp.api.entity.thrsys.ThrDeptEntity"> replace INTO thr_dept - (pid, code, name, advanceType, isDefault, + (id,pid, code, name, advanceType, isDefault, status, updateTime, remark, thirdSysFk) values ( + #{id}, #{pid}, #{code}, #{name}, diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index a231f6342..a82d5a01b 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -154,10 +154,11 @@ parameterType="com.glxp.api.entity.thrsys.ThrProductsEntity"> replace INTO thr_products - (code, `name`, measname, spec, registerNo, manufactory, + (id,code, `name`, measname, spec, registerNo, manufactory, cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3,price,createUser,createTime,updateUser) values ( + #{id}, #{code}, #{name}, #{measname}, From 6c44c6b690692b5abda9003edd296c577ba03551 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Fri, 28 Apr 2023 18:18:33 +0800 Subject: [PATCH 16/17] =?UTF-8?q?sql=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/mapper/sync/BasicExportDao.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml b/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml index 239a5cf31..f66d846f8 100644 --- a/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml +++ b/src/main/resources/mybatis/mapper/sync/BasicExportDao.xml @@ -33,7 +33,7 @@ replace - INTO basic_export_status(id,idDatas,status,type,updateTime,scheduleType,startTime,endTime,remark) + INTO basic_export_status(id,idDatas,status,type,updateTime,scheduleType,startTime,endTime,remark,cacheFilePath) values( #{id}, #{idDatas}, @@ -43,7 +43,8 @@ #{scheduleType}, #{startTime}, #{endTime}, - #{remark} + #{remark}, + #{cacheFilePath} ) From 872c4e516749cbcc4ee75071f8866560cfed9e52 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Fri, 28 Apr 2023 18:24:36 +0800 Subject: [PATCH 17/17] =?UTF-8?q?sql=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml b/src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml index 1f7779d71..a9af68fd1 100644 --- a/src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml +++ b/src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml @@ -34,7 +34,7 @@ parameterType="com.glxp.api.entity.sync.BasicDownloadStatusEntity"> replace INTO basic_download_status(id, taskId, idDatas, status, type, updateTime, scheduleType, startTime, - endTime, remark) + endTime, remark,cacheFilePath) values (#{id}, #{taskId}, #{idDatas}, @@ -44,7 +44,8 @@ #{scheduleType}, #{startTime}, #{endTime}, - #{remark}) + #{remark}, + #{cacheFilePath})