From 9762e04dbd93140e8babe5af0bc2f58da8298ede Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 2 Mar 2023 17:12:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=88=97=E8=A1=A8=E6=97=A0=E5=BE=80=E6=9D=A5=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/inout/impl/IoOrderServiceImpl.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 1d421037b..4e8290b4d 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -16,10 +16,12 @@ import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.auth.DeptDao; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.basic.BasicBussinessTypeDao; +import com.glxp.api.dao.basic.BasicCorpDao; import com.glxp.api.dao.inout.IoOrderDao; import com.glxp.api.dao.thrsys.ThrSystemBusApiDao; import com.glxp.api.dao.thrsys.ThrSystemDao; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; +import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inv.*; import com.glxp.api.entity.system.SyncDataBustypeEntity; @@ -91,6 +93,8 @@ public class IoOrderServiceImpl implements IoOrderService { private ThrSystemDao thrSystemDao; @Resource private HttpOkClient httpOkClient; + @Resource + private BasicCorpDao basicCorpDao; @Override public List selectAll() { @@ -540,15 +544,23 @@ public class IoOrderServiceImpl implements IoOrderService { //查询单据类型名称 String busTypeName = basicBussinessTypeDao.selectNameByAction(order.getAction()); response.setBillTypeName(busTypeName); - //查询往来单位名称 TODO 有bug -// BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp()); -// response.setFromName(corpEntity.getName()); + //查询部门名称 String deptName = deptDao.selectNameByCode(order.getDeptCode()); response.setDeptName(deptName); //查询仓库名称 String invName = invWarehouseDao.selectNameByCode(order.getInvCode()); response.setInvName(invName); + + //查询往来单位名称 + if (StrUtil.isNotBlank(order.getFromCorp())) { + BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp()); + response.setFromCorpName(corpEntity.getName()); + } else if (StrUtil.isNotBlank(order.getFromInvCode())) { + String fromInvName = invWarehouseDao.selectNameByCode(order.getFromInvCode()); + response.setFromCorpName(fromInvName); + } + responseList.add(response); } return responseList; From e4ab80708570921a8860fedd3d6810dad13cb2ae Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 2 Mar 2023 17:30:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E7=BB=91=E5=AE=9A=E7=9A=84=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=BC=96=E7=A0=81=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B4=A7=E4=BD=8D?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/InvWarehouseController.java | 14 ++++++++++++++ .../java/com/glxp/api/dao/auth/InvSpaceDao.java | 2 +- .../com/glxp/api/service/auth/InvSpaceService.java | 8 ++++++++ .../api/service/auth/impl/InvSpaceServiceImpl.java | 5 +++++ 4 files changed, 28 insertions(+), 1 deletion(-) 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 d22a1efb6..490709b12 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -263,12 +263,26 @@ public class InvWarehouseController extends BaseController { if (invWarehouseEntity.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } + + //更新仓库信息 boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity); + //更新部门信息 DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId()); pEntity.setUpdateTime(new Date()); deptService.updateInvWarehouse(pEntity); + //更新货位信息 + //查询此仓库绑定的所有货位 + List spaceList = invSpaceService.findBySubWarehouseCode(invWarehouseEntity.getCode()); + if (CollUtil.isNotEmpty(spaceList)) { + for (InvSpace invSpace : spaceList) { + invSpace.setInvStorageCode(invWarehouseEntity.getParentId()); + invSpace.setUpdateTime(new Date()); + } + invSpaceService.batchUpdate(spaceList); + } + if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } diff --git a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java index c73169770..a18eb6367 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java @@ -23,7 +23,7 @@ public interface InvSpaceDao { int updateByPrimaryKey(InvSpace record); - int updateBatch(List list); + boolean updateBatch(List list); int batchInsert(@Param("list") List list); diff --git a/src/main/java/com/glxp/api/service/auth/InvSpaceService.java b/src/main/java/com/glxp/api/service/auth/InvSpaceService.java index 965c21dca..52893e700 100644 --- a/src/main/java/com/glxp/api/service/auth/InvSpaceService.java +++ b/src/main/java/com/glxp/api/service/auth/InvSpaceService.java @@ -50,4 +50,12 @@ public interface InvSpaceService { * @return */ List findBySubWarehouseCode(String code); + + /** + * 批量更新货位信息 + * + * @param spaceList + * @return + */ + boolean batchUpdate(List spaceList); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java index aa3f3c277..c5c558f71 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java @@ -130,6 +130,11 @@ public class InvSpaceServiceImpl implements InvSpaceService { return invSpaceDao.selectByWarehouseCode(code); } + @Override + public boolean batchUpdate(List spaceList) { + return invSpaceDao.updateBatch(spaceList); + } + /** * 校验货位是否重复 * From 704e678df29ad702f97cbd49e351dccf23dc7e94 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 3 Mar 2023 11:55:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=9B=B4=E6=96=B0=E5=BA=93=E5=AD=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/impl/IoOrderServiceImpl.java | 72 +++++++++++-------- 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 4e8290b4d..d859b7b5b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -190,43 +190,52 @@ public class IoOrderServiceImpl implements IoOrderService { } else if (basicBussinessTypeEntity.isAdvanceType()) { //是否寄售，删除寄售库存 List invProductDetailEntities = invPreProductDetailService.selectByOrderIdFk(billNo); - for (InvPreProductDetailEntity invProductDetailEntity : invProductDetailEntities) { - //更新库存 - InvPreProductEntity invProductEntity = invPreProductService.selectByUnique(invProductDetailEntity.getRelId(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode()); - if (invProductEntity != null) { - if (ConstantType.TYPE_PUT.equals(invProductDetailEntity.getMainAction())) { - int count = invProductEntity.getInCount() - invProductDetailEntity.getReCount(); - invProductEntity.setInCount(count); - } else if (ConstantType.TYPE_OUT.equals(invProductDetailEntity.getMainAction())) { - int count = invProductEntity.getOutCount() - invProductDetailEntity.getReCount(); - invProductEntity.setOutCount(count); + if (CollUtil.isNotEmpty(invProductDetailEntities)) { + for (InvPreProductDetailEntity invProductDetailEntity : invProductDetailEntities) { + //更新库存 + InvPreProductEntity invProductEntity = invPreProductService.selectByUnique(invProductDetailEntity.getRelId(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode()); + if (invProductEntity != null) { + if (ConstantType.TYPE_PUT.equals(invProductDetailEntity.getMainAction())) { + int count = invProductEntity.getInCount() - invProductDetailEntity.getReCount(); + invProductEntity.setInCount(count); + } else if (ConstantType.TYPE_OUT.equals(invProductDetailEntity.getMainAction())) { + int count = invProductEntity.getOutCount() - invProductDetailEntity.getReCount(); + invProductEntity.setOutCount(count); + } + + //计算实际数量 + invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount()); + invPreProductService.update(invProductEntity); } + } - invPreProductService.update(invProductEntity); + //删除库存详情 + invPreProductDetailService.deleteByOrderId(billNo); } - //删除库存详情 - invPreProductDetailService.deleteByOrderId(billNo); - - } else { //删除普通库存 List invProductDetailEntities = invProductDetailService.selectByOrderIdFk(billNo); - for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) { - //更新库存 - InvProductEntity invProductEntity = invProductService.selectByUnique(invProductDetailEntity.getRelId(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode()); - if (invProductEntity != null) { - if (ConstantType.TYPE_PUT.equals(invProductDetailEntity.getMainAction())) { - int count = invProductEntity.getInCount() - invProductDetailEntity.getReCount(); - invProductEntity.setInCount(count); - } else if (ConstantType.TYPE_OUT.equals(invProductDetailEntity.getMainAction())) { - int count = invProductEntity.getOutCount() - invProductDetailEntity.getReCount(); - invProductEntity.setOutCount(count); + if (CollUtil.isNotEmpty(invProductDetailEntities)) { + for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) { + //更新库存 + InvProductEntity invProductEntity = invProductService.selectByUnique(invProductDetailEntity.getRelId(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode()); + if (invProductEntity != null) { + if (ConstantType.TYPE_PUT.equals(invProductDetailEntity.getMainAction())) { + int count = invProductEntity.getInCount() - invProductDetailEntity.getReCount(); + invProductEntity.setInCount(count); + } else if (ConstantType.TYPE_OUT.equals(invProductDetailEntity.getMainAction())) { + int count = invProductEntity.getOutCount() - invProductDetailEntity.getReCount(); + invProductEntity.setOutCount(count); + } + + //计算实际数量 + invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount()); + invProductService.update(invProductEntity); } } - invProductService.update(invProductEntity); + //删除库存详情 + invProductDetailService.deleteByOrderId(billNo); } - //删除库存详情 - invProductDetailService.deleteByOrderId(billNo); } } } @@ -498,7 +507,7 @@ public class IoOrderServiceImpl implements IoOrderService { filterOrderRequest.setOrderType(ConstantStatus.ORDER_TYPE_SCAN); break; case Constant.ORDER_STATUS_NEW_ORDER: - filterOrderRequest.setStatuses(Arrays.asList(1, 2, 4)); + filterOrderRequest.setStatuses(Arrays.asList(1, 2, 4)); filterOrderRequest.setDealStatuses(Arrays.asList(1, 2)); break; case Constant.ORDER_STATUS_UN_CHECK: @@ -680,11 +689,12 @@ public class IoOrderServiceImpl implements IoOrderService { } ArrayList orders = new ArrayList<>(); - if (CollUtil.isNotEmpty(orders)) { + if (CollUtil.isNotEmpty(billNos)) { List list = orderDao.selectList(new QueryWrapper().in("billNo", billNos).orderByDesc("id")); orders.addAll(list); } - orders.add(order); + //将查询入口单据放在第一位的顺序 + orders.add(0, order); return orders; } From 2e99d05ae9991a367b78d6b4addcb68b3b7f079e Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 3 Mar 2023 13:45:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=8F=90=E9=86=92=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../config/YudaoMybatisAutoConfiguration.java | 22 +++++ .../controller/inv/InvProductController.java | 10 +++ .../system/SysRemindMsgController.java | 35 ++++++++ .../system/SysRemindSetController.java | 31 +++++++ .../api/dao/system/SysRemindMsgMapper.java | 16 ++++ .../api/dao/system/SysRemindSetMapper.java | 17 ++++ .../api/entity/system/SysRemindMsgEntity.java | 86 +++++++++++++++++++ .../api/entity/system/SysRemindSetEntity.java | 41 +++++++++ .../req/system/FilterSysRemindMsgRequest.java | 10 +++ .../req/system/FilterSysRemindSetRequest.java | 11 +++ .../service/system/SysRemindMsgService.java | 12 +++ .../service/system/SysRemindSetService.java | 13 +++ .../system/impl/SysRemindMsgServiceImpl.java | 31 +++++++ .../system/impl/SysRemindSetServiceImpl.java | 27 ++++++ .../com/glxp/api/util/page/TableDataInfo.java | 2 +- .../mapper/system/SysRemindMsgMapper.xml | 15 ++++ .../mapper/system/SysRemindSetMapper.xml | 15 ++++ 18 files changed, 394 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/glxp/api/config/YudaoMybatisAutoConfiguration.java create mode 100644 src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java create mode 100644 src/main/java/com/glxp/api/controller/system/SysRemindSetController.java create mode 100644 src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java create mode 100644 src/main/java/com/glxp/api/dao/system/SysRemindSetMapper.java create mode 100644 src/main/java/com/glxp/api/entity/system/SysRemindMsgEntity.java create mode 100644 src/main/java/com/glxp/api/entity/system/SysRemindSetEntity.java create mode 100644 src/main/java/com/glxp/api/req/system/FilterSysRemindMsgRequest.java create mode 100644 src/main/java/com/glxp/api/req/system/FilterSysRemindSetRequest.java create mode 100644 src/main/java/com/glxp/api/service/system/SysRemindMsgService.java create mode 100644 src/main/java/com/glxp/api/service/system/SysRemindSetService.java create mode 100644 src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/system/SysRemindMsgMapper.xml create mode 100644 src/main/resources/mybatis/mapper/system/SysRemindSetMapper.xml diff --git a/pom.xml b/pom.xml index 16358c72a..db6211940 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ com.github.pagehelper pagehelper-spring-boot-starter - 1.3.0 + 1.4.2