|
@@ -251,9 +251,8 @@ public class InboundOtherService extends BaseService<Inbound> {
|
|
|
BigDecimal sumAmt = inboundVO.getItemList().stream().map(InboundItemVO::getIntoingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
BigDecimal sumAmt = inboundVO.getItemList().stream().map(InboundItemVO::getIntoingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
//endregion
|
|
//endregion
|
|
|
|
|
|
|
|
- //region 自动办理参数为true 已入库编辑
|
|
|
|
|
- //自动办理参数为true
|
|
|
|
|
- if (Constant.FlgHandleSetting.TRUE.getValue().equals(inboundVO.getFlgHandleSetting())) {
|
|
|
|
|
|
|
+ //region 已入库编辑
|
|
|
|
|
+ if (Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())) {
|
|
|
|
|
|
|
|
//region 修改明细
|
|
//region 修改明细
|
|
|
List<InboundItemVO> itemList = inboundVO.getItemList();
|
|
List<InboundItemVO> itemList = inboundVO.getItemList();
|
|
@@ -356,14 +355,12 @@ public class InboundOtherService extends BaseService<Inbound> {
|
|
|
map.put("delIntoDetail", inboundVO.getDeleteItemList());
|
|
map.put("delIntoDetail", inboundVO.getDeleteItemList());
|
|
|
inventoryService.operatingInventoryInformation(map);
|
|
inventoryService.operatingInventoryInformation(map);
|
|
|
//endregion
|
|
//endregion
|
|
|
- } else {
|
|
|
|
|
- throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_INTO.getMessage());
|
|
|
|
|
}
|
|
}
|
|
|
//endregion
|
|
//endregion
|
|
|
|
|
|
|
|
- //region 自动办理参数false 入库中编辑
|
|
|
|
|
- //自动办理标识为false 并且 自动办理参数为false 入库中
|
|
|
|
|
- if (!inboundVO.getFlgAutoHandle() && Constant.FlgHandleSetting.FALSE.getValue().equals(inboundVO.getFlgHandleSetting())) {
|
|
|
|
|
|
|
+ //region 入库中编辑
|
|
|
|
|
+ if (Constant.IntoStatus.RUKUZHONG.getName().equals(inboundVO.getIntoStatus()) ||
|
|
|
|
|
+ Constant.IntoStatus.DAIRUKU.getName().equals(inboundVO.getIntoStatus())) {
|
|
|
//region 修改明细
|
|
//region 修改明细
|
|
|
List<InboundItemVO> itemList = inboundVO.getItemList();
|
|
List<InboundItemVO> itemList = inboundVO.getItemList();
|
|
|
for (InboundItemVO inboundItemVO : itemList) {
|
|
for (InboundItemVO inboundItemVO : itemList) {
|
|
@@ -428,8 +425,6 @@ public class InboundOtherService extends BaseService<Inbound> {
|
|
|
new UpdateWrapper<Inbound>().lambda().eq(Inbound::getIntoId, UUID.fromString(inbound.getIntoId()))
|
|
new UpdateWrapper<Inbound>().lambda().eq(Inbound::getIntoId, UUID.fromString(inbound.getIntoId()))
|
|
|
);
|
|
);
|
|
|
//endregion
|
|
//endregion
|
|
|
- } else {
|
|
|
|
|
- throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_INTO.getMessage());
|
|
|
|
|
}
|
|
}
|
|
|
//endregion
|
|
//endregion
|
|
|
|
|
|