koushanshan 1 год назад
Родитель
Сommit
4b2a97416c

+ 5 - 10
src/main/java/com/dk/mdm/service/ivt/inbound/InboundOtherService.java

@@ -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);
             //endregion
 
-            //region  自动办理参数为true  已入库编辑
-            //自动办理参数为true
-            if (Constant.FlgHandleSetting.TRUE.getValue().equals(inboundVO.getFlgHandleSetting())) {
+            //region   已入库编辑
+            if (Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())) {
 
                 //region 修改明细
                 List<InboundItemVO> itemList = inboundVO.getItemList();
@@ -356,14 +355,12 @@ public class InboundOtherService extends BaseService<Inbound> {
                 map.put("delIntoDetail", inboundVO.getDeleteItemList());
                 inventoryService.operatingInventoryInformation(map);
                 //endregion
-            } else {
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_INTO.getMessage());
             }
             //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 修改明细
                 List<InboundItemVO> itemList = inboundVO.getItemList();
                 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()))
                 );
                 //endregion
-            } else {
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_INTO.getMessage());
             }
             //endregion
 

+ 4 - 11
src/main/java/com/dk/mdm/service/ivt/outbound/OutboundOtherService.java

@@ -251,9 +251,8 @@ public class OutboundOtherService extends BaseService<Outbound> {
             BigDecimal sumAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
             //endregion
 
-            //region  自动办理参数为true  已出库编辑
-            //自动办理参数为true
-            if (Constant.FlgHandleSetting.TRUE.getValue().equals(outboundVO.getFlgHandleSetting())) {
+            //region   已出库编辑
+            if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())) {
 
                 //region 修改明细
                 List<OutboundItemVO> itemList = outboundVO.getItemList();
@@ -363,14 +362,11 @@ public class OutboundOtherService extends BaseService<Outbound> {
                 }
                 //endregion
             }
-            else{
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_OUT.getMessage());
-            }
             //endregion
 
             //region 自动办理参数false  出库中编辑
-            //自动办理标识为false 并且 自动办理参数为false  出库中
-            if (!outboundVO.getFlgAutoHandle() && Constant.FlgHandleSetting.FALSE.getValue().equals(outboundVO.getFlgHandleSetting())) {
+            if (Constant.OutStatus.CHUKUZHONG.getName().equals(outboundVO.getOutStatus()) ||
+                    Constant.OutStatus.DAICHUKU.getName().equals(outboundVO.getOutStatus())) {
                 //region 修改明细
                 List<OutboundItemVO> itemList = outboundVO.getItemList();
                 for (OutboundItemVO outboundItemVO : itemList) {
@@ -438,9 +434,6 @@ public class OutboundOtherService extends BaseService<Outbound> {
                 );
                 //endregion
             }
-            else{
-                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_OUT.getMessage());
-            }
             //endregion
         }
         //endregion