出入库作废功能修改

src/main/java/com/dk/mdm/service/ivt/inbound/InboundOtherService.java

@@ -452,9 +452,9 @@ public class InboundOtherService extends BaseService<Inbound> {
         List<InboundItemResponse> inboundItemResponseList = inboundItemMapper.selectByCond(new InboundItemQuery().setIntoId(inboundResponse.getIntoId()));
         //endregion
 
-        //region  自动办理参数为true  已入库编辑
-        //自动办理参数为true
-        if (Constant.FlgHandleSetting.TRUE.getValue().equals(inboundResponse.getFlgHandleSetting())) {
+        //region  已入库作废
+        if (Constant.IntoStatus.YIRUKU.getName().equals(inboundResponse.getIntoStatus())) {
+
             //region   todo  退账 当单据红的账款id不为空说明有账， 要先退账才能进行操作
             if (inboundResponse.getReceivableId() != null) {
 
@@ -502,9 +502,9 @@ public class InboundOtherService extends BaseService<Inbound> {
         }
         //endregion
 
-        //region 自动办理参数false  入库中编辑
-        //自动办理标识为false 并且 自动办理参数为false  入库中
-        if (!inboundResponse.getFlgAutoHandle() && Constant.FlgHandleSetting.FALSE.getValue().equals(inboundResponse.getFlgHandleSetting())) {
+        //region 入库中、待入库作废
+        if (Constant.IntoStatus.RUKUZHONG.getName().equals(inboundResponse.getIntoStatus()) ||
+                Constant.IntoStatus.DAIRUKU.getName().equals(inboundResponse.getIntoStatus())) {
             //region 修改明细
             for (InboundItemResponse inboundItemResponse : inboundItemResponseList) {
                 //赋值

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java

@@ -501,9 +501,9 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
         List<InboundItemResponse> inboundItemResponseList = inboundItemMapper.selectByCond(new InboundItemQuery().setIntoId(inboundResponse.getIntoId()));
         //endregion
 
-        //region  自动办理参数为true  已入库编辑
-        //自动办理参数为true
-        if (Constant.FlgHandleSetting.TRUE.getValue().equals(inboundResponse.getFlgHandleSetting())) {
+        //region  已入库作废
+        if (Constant.IntoStatus.YIRUKU.getName().equals(inboundResponse.getIntoStatus())) {
+
             //region 退账
             if (inboundResponse.getReceivableId() != null) {
                 accountService.reversePayable(inboundResponse.getIntoId(), Constant.InventoryDocCode.INTOBOUND.getTableName());
@@ -553,15 +553,15 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
             map.put("delIntoDetail", inboundItemResponseList);
             inventoryService.operatingInventoryInformation(map);
             //endregion
-        }
-        else{
+        } else {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_INTO.getMessage());
         }
         //endregion
 
-        //region 自动办理参数false  入库中编辑
-        //自动办理标识为false 并且 自动办理参数为false  入库中
-        if (!inboundResponse.getFlgAutoHandle() && Constant.FlgHandleSetting.FALSE.getValue().equals(inboundResponse.getFlgHandleSetting())) {
+        //region 入库中、待入库作废
+        if (Constant.IntoStatus.RUKUZHONG.getName().equals(inboundResponse.getIntoStatus()) ||
+                Constant.IntoStatus.DAIRUKU.getName().equals(inboundResponse.getIntoStatus())) {
+
             //region 修改明细
             for (InboundItemResponse inboundItemResponse : inboundItemResponseList) {
                 //赋值
@@ -590,8 +590,7 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
             );
             //endregion
 
-        }
-        else{
+        } else {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_INTO.getMessage());
         }
         //endregion

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseService.java

@@ -700,9 +700,8 @@ public class InboundPurchaseService extends BaseService<Inbound> {
         List<InboundItemResponse> inboundItemResponseList = inboundItemMapper.selectByCond(new InboundItemQuery().setIntoId(inboundResponse.getIntoId()));
         //endregion
 
-        //region  自动办理参数为true  已入库编辑
-        //自动办理参数为true
-        if (Constant.FlgHandleSetting.TRUE.getValue().equals(inboundResponse.getFlgHandleSetting())) {
+        //region  已入库作废
+        if (Constant.IntoStatus.YIRUKU.getName().equals(inboundResponse.getIntoStatus())) {
 
             //region 退账
             if (inboundResponse.getReceivableId() != null) {
@@ -795,16 +794,14 @@ public class InboundPurchaseService extends BaseService<Inbound> {
             map.put("delIntoDetail", inboundItemResponseList);
             inventoryService.operatingInventoryInformation(map);
             //endregion
-        }
-        else{
+        } else {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_INTO.getMessage());
         }
         //endregion
 
-        //region 自动办理参数false  入库中编辑
-        //自动办理标识为false 并且 自动办理参数为false  入库中
-        if (!inboundResponse.getFlgAutoHandle() && Constant.FlgHandleSetting.FALSE.getValue().equals(inboundResponse.getFlgHandleSetting())) {
-
+        //region 入库中、待入库作废
+        if (Constant.IntoStatus.RUKUZHONG.getName().equals(inboundResponse.getIntoStatus()) ||
+                Constant.IntoStatus.DAIRUKU.getName().equals(inboundResponse.getIntoStatus())) {
             //region 修改明细
             for (InboundItemResponse inboundItemResponse : inboundItemResponseList) {
                 //region 编辑明细 赋值
@@ -875,8 +872,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
             }
 
             //endregion
-        }
-        else{
+        } else {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_INTO.getMessage());
         }
         //endregion

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundOtherService.java

@@ -461,9 +461,8 @@ public class OutboundOtherService extends BaseService<Outbound> {
         List<OutboundItemResponse> outboundItemResponseList = outboundItemMapper.selectByCond(new OutboundItemQuery().setOutId(outboundResponse.getOutId()));
         //endregion
 
-        //region  自动办理参数为true  已出库编辑
-        //自动办理参数为true
-        if (Constant.FlgHandleSetting.TRUE.getValue().equals(outboundResponse.getFlgHandleSetting())) {
+        //region  已出库状态作废
+        if (Constant.OutStatus.YICHUKU.getName().equals(outboundResponse.getOutStatus())) {
 
             //region 修改明细
             for (OutboundItemResponse outboundItemResponse : outboundItemResponseList) {
@@ -501,15 +500,14 @@ public class OutboundOtherService extends BaseService<Outbound> {
             map.put("delOutDetail", outboundItemResponseList);
             inventoryService.operatingInventoryInformation(map);
             //endregion
-        }
-        else{
+        } else {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_OUT.getMessage());
         }
         //endregion
 
-        //region 自动办理参数false  出库中编辑
-        //自动办理标识为false 并且 自动办理参数为false  出库中
-        if (!outboundResponse.getFlgAutoHandle() && Constant.FlgHandleSetting.FALSE.getValue().equals(outboundResponse.getFlgHandleSetting())) {
+        //region 出库中、待出库状态作废
+        if (Constant.OutStatus.CHUKUZHONG.getName().equals(outboundResponse.getOutStatus()) ||
+                Constant.OutStatus.DAICHUKU.getName().equals(outboundResponse.getOutStatus())) {
             //region 修改明细
             for (OutboundItemResponse outboundItemResponse : outboundItemResponseList) {
                 //赋值
@@ -537,8 +535,7 @@ public class OutboundOtherService extends BaseService<Outbound> {
                     new UpdateWrapper<Outbound>().lambda().eq(Outbound::getOutId, UUID.fromString(outbound.getOutId()))
             );
             //endregion
-        }
-        else{
+        } else {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_OUT.getMessage());
         }
         //endregion

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -873,9 +873,8 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
 
         //endregion
 
-        //region  自动办理参数为true  已入库作废
-        //自动办理参数为true
-        if (Constant.FlgHandleSetting.TRUE.getValue().equals(outboundResponse.getFlgHandleSetting())) {
+        //region 已出库状态作废
+        if (Constant.OutStatus.YICHUKU.getName().equals(outboundResponse.getOutStatus())) {
             //region 应收反记账
             if (outboundResponse.getReceivableId() != null) {
                 accountService.reverseReceivable(outboundResponse.getOutId(), Constant.InventoryDocCode.OUTBOUND.getTableName());
@@ -979,9 +978,9 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
         }
         //endregion
 
-        //region 自动办理参数false  入库中作废
-        //自动办理标识为false 并且 自动办理参数为false  入库中
-        if (!outboundResponse.getFlgAutoHandle() && Constant.FlgHandleSetting.FALSE.getValue().equals(outboundResponse.getFlgHandleSetting())) {
+        //region 出库中、待出库状态作废
+        if (Constant.OutStatus.CHUKUZHONG.getName().equals(outboundResponse.getOutStatus()) ||
+                Constant.OutStatus.DAICHUKU.getName().equals(outboundResponse.getOutStatus())) {
             //region 修改明细
             for (OutboundItemResponse outboundItemResponse : outboundItemResponseList) {
                 //region 修改明细

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -713,9 +713,9 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
         List<OutboundItemResponse> outboundItemResponseList = outboundItemMapper.selectByCond(new OutboundItemQuery().setOutId(outboundResponse.getOutId()));
         //endregion
 
-        //region  自动办理参数为true  已出库编辑
+        //region   已出库状态作废
         //自动办理参数为true
-        if (Constant.FlgHandleSetting.TRUE.getValue().equals(outboundResponse.getFlgHandleSetting())) {
+        if (Constant.OutStatus.YICHUKU.getName().equals(outboundResponse.getOutStatus())) {
             //region 退账
             if (outboundResponse.getReceivableId() != null) {
                 accountService.reverseReceivable(outboundResponse.getOutId(), Constant.InventoryDocCode.OUTBOUND.getTableName());
@@ -770,10 +770,10 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
         }
         //endregion
 
-        //region 自动办理参数false  出库中编辑
+        //region  出库中、待出库状态作废
         //自动办理标识为false 并且 自动办理参数为false  出库中
-        if (!outboundResponse.getFlgAutoHandle() && Constant.FlgHandleSetting.FALSE.getValue().equals(outboundResponse.getFlgHandleSetting())) {
-
+        if (Constant.OutStatus.CHUKUZHONG.getName().equals(outboundResponse.getOutStatus()) ||
+                Constant.OutStatus.DAICHUKU.getName().equals(outboundResponse.getOutStatus()))  {
             //region  回滚原总单和明细信息（订单，出库单）
             List<OutboundItemVO> outboundItemVOList = outboundItemConvert.convertResListToVOList(outboundItemResponseList);
             this.rollBackTotalAndDetail(outboundItemVOList);