feat(sip): 更新项目订单状态判断逻辑并优化库存权限控制
- 在撤单操作中添加审批状态检查的待办注释- 修改库存权限验证逻辑,增加对部门ID 101的支持-为产品信息实体添加实时库存和累计发货字段注释 - 扩展项目信息编辑页面的状态判断条件,支持审批拒绝状态下的更新dev_1.0.0
parent
7eccaeaebc
commit
f5c757655c
|
|
@ -135,7 +135,9 @@ public class ProjectInfoController extends BaseController
|
|||
List<ProjectOrderInfo> 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}")
|
||||
|
|
|
|||
|
|
@ -66,7 +66,9 @@ public class ProductInfo extends BaseEntity
|
|||
private String vendorCode;
|
||||
private List<String> vendorCodeList;
|
||||
private String vendorName;
|
||||
//实时库存
|
||||
private Long availableCount;
|
||||
// 累计发货
|
||||
private Long cumulativeCount;
|
||||
private Long inventoryCount;
|
||||
private Long warehouseId;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
//修改库存
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue