mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(sip): 更新项目订单状态判断逻辑并优化库存权限控制 

- 在撤单操作中添加审批状态检查的待办注释- 修改库存权限验证逻辑，增加对部门ID 101的支持-为产品信息实体添加实时库存和累计发货字段注释
- 扩展项目信息编辑页面的状态判断条件，支持审批拒绝状态下的更新
dev_1.0.0
chenhao 2025-10-21 09:55:43 +08:00
parent 7eccaeaebc
commit f5c757655c
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectInfoController.java
View File

@ -135,7 +135,9 @@ public class ProjectInfoController extends BaseController
List<ProjectOrderInfo> orderInfoList = orderInfoService.selectProjectOrderInfoByProjectId(Collections.singletonList(id)); List<ProjectOrderInfo> orderInfoList = orderInfoService.selectProjectOrderInfoByProjectId(Collections.singletonList(id));
ProjectOrderInfo orderInfo = CollUtil.isNotEmpty(orderInfoList) ? orderInfoList.get(0) : null; ProjectOrderInfo orderInfo = CollUtil.isNotEmpty(orderInfoList) ? orderInfoList.get(0) : null;
mmap.put("orderInfo", orderInfo); 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"; return prefix + "/edit";
} }
@GetMapping("/view/{id}") @GetMapping("/view/{id}")

2
ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java
View File

@ -66,7 +66,9 @@ public class ProductInfo extends BaseEntity
private String vendorCode; private String vendorCode;
private List<String> vendorCodeList; private List<String> vendorCodeList;
private String vendorName; private String vendorName;
//实时库存
private Long availableCount; private Long availableCount;
// 累计发货
private Long cumulativeCount; private Long cumulativeCount;
private Long inventoryCount; private Long inventoryCount;
private Long warehouseId; private Long warehouseId;

1
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java
View File

@ -240,6 +240,7 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService {
updateOrder.setOuterStatus(ProjectOrderInfo.OuterStatusEnum.NOT_OUTER.getCode()); updateOrder.setOuterStatus(ProjectOrderInfo.OuterStatusEnum.NOT_OUTER.getCode());
updateOrder.setDeliveryStatus(ProjectOrderInfo.DeliveryStatusEnum.NOT_DELIVERY.getCode()); updateOrder.setDeliveryStatus(ProjectOrderInfo.DeliveryStatusEnum.NOT_DELIVERY.getCode());
updateOrder.setSignStatus(ProjectOrderInfo.SignStatusEnum.NOT_SIGN.getCode()); updateOrder.setSignStatus(ProjectOrderInfo.SignStatusEnum.NOT_SIGN.getCode());
//todo 撤单是否需要重新审批
updateOrder.setId(id); updateOrder.setId(id);
projectOrderInfoMapper.updateProjectOrderInfo(updateOrder); projectOrderInfoMapper.updateProjectOrderInfo(updateOrder);
//修改库存 //修改库存

2
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryAuthServiceImpl.java
View File

@ -59,7 +59,7 @@ public class InventoryAuthServiceImpl implements IInventoryAuthService {
if (dept == null) { if (dept == null) {
return false; 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;
} }