From f5c757655c432701e0ddaa4f228754cca3719073 Mon Sep 17 00:00:00 2001 From: chenhao Date: Tue, 21 Oct 2025 09:55:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(sip):=20=E6=9B=B4=E6=96=B0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=B9=B6=E4=BC=98=E5=8C=96=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在撤单操作中添加审批状态检查的待办注释- 修改库存权限验证逻辑，增加对部门ID 101的支持-为产品信息实体添加实时库存和累计发货字段注释 - 扩展项目信息编辑页面的状态判断条件，支持审批拒绝状态下的更新 --- .../java/com/ruoyi/sip/controller/ProjectInfoController.java | 4 +++- ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java | 2 ++ .../com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java | 1 + .../com/ruoyi/sip/service/impl/InventoryAuthServiceImpl.java | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectInfoController.java index 9ebc569f..9500abd9 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectInfoController.java @@ -135,7 +135,9 @@ public class ProjectInfoController extends BaseController List orderInfoList = orderInfoService.selectProjectOrderInfoByProjectId(Collections.singletonList(id)); ProjectOrderInfo orderInfo = CollUtil.isNotEmpty(orderInfoList) ? orderInfoList.get(0) : null; mmap.put("orderInfo", orderInfo); - mmap.put("canUpdate", orderInfo == null || orderInfo.getOrderStatus().equals(ProjectOrderInfo.OrderStatus.WAIT_COMMIT.getCode())); + mmap.put("canUpdate", orderInfo == null || + orderInfo.getOrderStatus().equals(ProjectOrderInfo.OrderStatus.WAIT_COMMIT.getCode()) + || orderInfo.getOrderStatus().equals(ProjectOrderInfo.OrderStatus.APPROVE_REJECT.getCode())); return prefix + "/edit"; } @GetMapping("/view/{id}") diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java index 446c5133..e855d6d0 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java @@ -66,7 +66,9 @@ public class ProductInfo extends BaseEntity private String vendorCode; private List vendorCodeList; private String vendorName; + //实时库存 private Long availableCount; +// 累计发货 private Long cumulativeCount; private Long inventoryCount; private Long warehouseId; diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java index a39b274f..a1e5ed08 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java @@ -240,6 +240,7 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService { updateOrder.setOuterStatus(ProjectOrderInfo.OuterStatusEnum.NOT_OUTER.getCode()); updateOrder.setDeliveryStatus(ProjectOrderInfo.DeliveryStatusEnum.NOT_DELIVERY.getCode()); updateOrder.setSignStatus(ProjectOrderInfo.SignStatusEnum.NOT_SIGN.getCode()); + //todo 撤单是否需要重新审批 updateOrder.setId(id); projectOrderInfoMapper.updateProjectOrderInfo(updateOrder); //修改库存 diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryAuthServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryAuthServiceImpl.java index 0a803f48..c42c5b66 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryAuthServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryAuthServiceImpl.java @@ -59,7 +59,7 @@ public class InventoryAuthServiceImpl implements IInventoryAuthService { if (dept == null) { return false; } - return sysUser.isAdmin() || dept.getAncestors().contains("0,100,") || sysUser.getDeptId() == 100; + return sysUser.isAdmin() || dept.getAncestors().contains("0,100,101") || sysUser.getDeptId() == 100 || sysUser.getDeptId() == 101; }