其他入库编辑的时候如果库存没有了 给库存制成false

销售订单转出库编辑  出库总单的金额和数量 以前台传的为准

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -1132,8 +1132,10 @@ public class InventoryService extends BaseService<Inventory> {
 
                     //region  出库成本 todo  2024年5月20日15:46:01  库存批次有几条出库成本就有几条
                     //除了销售退货出库  其他类型出库要新建出库成本  采购退货 出库成本 正数
-                    if (!Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode()) ||
-                            Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
+                    if ((Constant.InventoryType.OUTBOUND.getName().equals(inOutRecordVO.getInventoryType()) &&
+                            !Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) ||
+                            Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())
+                    ) {
                         //存货批次明细ID
                         inOutRecordVO.setBatchId(inventoryBatchResponse.getBatchId());
                         this.insertOutboundItemCost(inOutRecordVO,inOutRecordVO.getIntoQty().abs(),inOutRecordVO.getIntoQty().abs().multiply(inventoryBatchResponse.getCostPrice()));
@@ -1163,13 +1165,16 @@ public class InventoryService extends BaseService<Inventory> {
 
                         //region  出库成本 todo  2024年5月20日15:46:01  库存批次有几条出库成本就有几条
                         //除了销售退货出库  其他类型出库要新建出库成本  采购退货 出库成本 正数
-                        if (!Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode()) ||
-                                Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
+                        if ((Constant.InventoryType.OUTBOUND.getName().equals(inOutRecordVO.getInventoryType()) &&
+                                !Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) ||
+                                Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())
+                        ) {
                             //存货批次明细ID
                             inOutRecordVO.setBatchId(inventoryBatchResponse.getBatchId());
                             this.insertOutboundItemCost(inOutRecordVO,qty,qty.multiply(inventoryBatchResponse.getCostPrice()));
                         }
                         //endregion
+                        break;
                     }
                     //当前条库存批次明细不够出库
                     else {
@@ -1189,8 +1194,10 @@ public class InventoryService extends BaseService<Inventory> {
 
                         //region  出库成本 todo  2024年5月20日15:46:01  库存批次有几条出库成本就有几条
                         //除了销售退货出库  其他类型出库要新建出库成本  采购退货 出库成本 正数
-                        if (!Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode()) ||
-                                Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
+                        if ((Constant.InventoryType.OUTBOUND.getName().equals(inOutRecordVO.getInventoryType()) &&
+                                !Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) ||
+                                Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())
+                        ) {
                             //存货批次明细ID
                             inOutRecordVO.setBatchId(inventoryBatchResponse.getBatchId());
                             this.insertOutboundItemCost(inOutRecordVO,inventoryBatchResponse.getInvQty(),inventoryBatchResponse.getInvQty().multiply(inventoryBatchResponse.getCostPrice()));
@@ -1200,8 +1207,9 @@ public class InventoryService extends BaseService<Inventory> {
                 }
             }
             //region   反写本次办理出库的 出库成本金额和成本单价
-            if (!Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode()) ||
-                    Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
+            if ((Constant.InventoryType.OUTBOUND.getName().equals(inOutRecordVO.getInventoryType()) &&
+                    !Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode()))
+            ) {
                 OutboundItem outboundItem = new OutboundItem();
                 outboundItem.setItemId(inOutRecordVO.getBiznisItemId());
                 outboundItem.setCostAmt(notEnoughAmount.compareTo(BigDecimal.ZERO)>0 ? notEnoughAmount : inOutRecordVO.getIntoAmt());
@@ -1385,7 +1393,14 @@ public class InventoryService extends BaseService<Inventory> {
                 costAmt.divide(inventory.getInvQty(), BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
         inventoryMapper.updateAmtAndQty(inventory);
 
-        
+        //region 采购入库 并且 其他入库编辑传给库存标识 为true 查询库存修改完是否为0，如果为0 将库存制成无效
+        if(Constant.InventoryDocCode.OTHER_INBOUND.getValue().equals(inOutRecordVO.getInventoryDocCode()) && inOutRecordVO.getUpdateOtherIntoInvFlag()){
+            Inventory inventoryDel = inventoryMapper.selectById(inventory);
+            if(inventoryDel.getInvQty().compareTo(BigDecimal.ZERO)==0){
+                inventoryMapper.updateById(new Inventory().setInvId(inventory.getInvId()).setFlgValid(false));
+            }
+        }
+        //endregion
 
         //endregion
     }

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

@@ -140,7 +140,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                     .setNonStdCode(outboundItemVO.getNonStdCode()));
         }
         //库存不存在
-        if(inventoryResponse == null){
+        if (inventoryResponse == null) {
             //当前出库商品中在库存中不存在
             throw new BaseBusinessException(ErrorCodeEnum.SKU_IS_NOT_IN_INVENTORY.getCode(),
                     ErrorCodeEnum.SKU_IS_NOT_IN_INVENTORY.getMessage());
@@ -187,7 +187,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                     InventoryResponse inventoryResponse = this.checkInventoryExist(outboundItemVO);
                     if (inventoryResponse != null) {
                         //库存量小于本次出库数量
-                        if(inventoryResponse.getInvQty().compareTo(outboundItemVO.getOutingQty())<0){
+                        if (inventoryResponse.getInvQty().compareTo(outboundItemVO.getOutingQty()) < 0) {
                             throw new BaseBusinessException(ErrorCodeEnum.SKU_IS_NOT_IN_INVENTORY.getCode(),
                                     ErrorCodeEnum.SKU_IS_NOT_IN_INVENTORY.getMessage());
                         }
@@ -431,7 +431,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
         if (orderTransmitFlag) {
             sumIntoQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
             sumIntoPriceAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getFactAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
-      }
+        }
         //获取 id/单号
         Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.SALEORDER.getName(), false);
         outboundVO.setOutId(codeMap.get("outId").toString()).
@@ -475,7 +475,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
 
         //region 销售订单
         //新建销售出库修改销售订单信息
-        this.insertOrderMessageByEdit(outboundVO,outboundVO.getItemList());
+        this.insertOrderMessageByEdit(outboundVO, outboundVO.getItemList());
         //endregion
 
         BigDecimal factAmt = BigDecimal.ZERO; //总单的实际金额
@@ -494,7 +494,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
             outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
             outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.SALE_ORDER.getValue());
             outboundItemVO.setAddOrEditFlag(true);
-            if(outboundItemVO.getFromItemId() != null){
+            if (outboundItemVO.getFromItemId() != null) {
                 outboundItemVO.setInvOrderItemId(outboundItemVO.getFromItemId());
             }
             //endregion
@@ -614,12 +614,12 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
     }
 
     /**
-     * @desc   : 新建销售出库修改销售订单信息
-     * @date   : 2024/6/27 9:27
+     * @desc : 新建销售出库修改销售订单信息
+     * @date : 2024/6/27 9:27
      * @author : 寇珊珊
      */
     @Transactional(rollbackFor = {Exception.class})
-    public  void insertOrderMessageByEdit(OutboundVO outboundVO , List<OutboundItemVO> itemList){
+    public void insertOrderMessageByEdit(OutboundVO outboundVO, List<OutboundItemVO> itemList) {
         //出库明细汇总
         Map<String, List<OutboundItemVO>> orderOutItemVOListMap = itemList.stream().collect(Collectors.groupingBy(OutboundItemVO::getFromId));
         //出库明细汇总循环
@@ -706,6 +706,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
             OutboundResponse outboundResponse = outboundMapper.selectById(outboundVO.getOutId());
             //根据总单id查询
             List<OutboundItemResponse> outboundItemResponseList = outboundItemMapper.selectByCond(new OutboundItemQuery().setOutId(outboundResponse.getOutId()));
+            //编辑的数据金额汇总 todo 2024年7月11日13:16:38  以前台传过来的数据为主 因为原来明细数据是全给，现在只给改过的数据
             BigDecimal sumQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
             BigDecimal sumAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
             //endregion
@@ -744,7 +745,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         outboundItemVO.setOutQty(outboundItemVO.getOutingQty());
                         outboundItemVO.setOutAmt(outboundItemVO.getOutingAmt());
                         outboundItemVO.setAddOrEditFlag(false);
-                        if(outboundItemVO.getFromItemId() != null){
+                        if (outboundItemVO.getFromItemId() != null) {
                             outboundItemVO.setInvOrderItemId(outboundItemVO.getFromItemId());
                         }
                         //endregion
@@ -783,7 +784,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
                         outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.SALE_ORDER.getValue());
                         outboundItemVO.setAddOrEditFlag(true);
-                        if(outboundItemVO.getFromItemId() != null){
+                        if (outboundItemVO.getFromItemId() != null) {
                             outboundItemVO.setInvOrderItemId(outboundItemVO.getFromItemId());
                         }
                         //endregion
@@ -823,7 +824,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                             //region 将库存需要的参数赋值
                             outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
                             outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.SALE_ORDER.getValue());
-                            if(outboundItemVO.getFromItemId() != null){
+                            if (outboundItemVO.getFromItemId() != null) {
                                 outboundItemVO.setInvOrderItemId(outboundItemVO.getFromItemId());
                             }
                             //endregion
@@ -864,8 +865,8 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 //region  修改出库总单
                 Outbound outbound = new Outbound();
                 outbound.setOutId(outboundVO.getOutId());
-                outbound.setOutQty(sumQty);
-                outbound.setOutAmt(sumAmt);
+                outbound.setOutQty(outboundVO.getOutingQty());
+                outbound.setOutAmt(outboundVO.getOutAmt());
                 outbound.setAnnexPaths(outboundVO.getAnnexPaths());
                 outbound.setFactAmt(outboundVO.getFactAmt());
 
@@ -975,8 +976,8 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         OrderItemResponse orderItemResponse = orderItemMapper.selectById(outboundItemVO.getFromItemId());
                         OrderItem orderItem = new OrderItem();
                         orderItem.setItemId(outboundItemVO.getFromItemId());
-                        orderItem.setOutingQty(( outboundItemResponse != null ? outboundItemResponse.getOutingQty().negate() : BigDecimal.ZERO).add(outboundItemVO.getOutingQty()));
-                        orderItem.setOutingAmt(( outboundItemResponse != null ? outboundItemResponse.getOutingAmt().negate() : BigDecimal.ZERO).add(outboundItemVO.getOutingAmt()));
+                        orderItem.setOutingQty((outboundItemResponse != null ? outboundItemResponse.getOutingQty().negate() : BigDecimal.ZERO).add(outboundItemVO.getOutingQty()));
+                        orderItem.setOutingAmt((outboundItemResponse != null ? outboundItemResponse.getOutingAmt().negate() : BigDecimal.ZERO).add(outboundItemVO.getOutingAmt()));
                         orderItem.setUpdateOutingMessageFlag(true);
                         //出库状态
                         String outStatus = this.setOutStatus(orderItemResponse.getOutingQty().add(orderItem.getOutingQty()),
@@ -1030,8 +1031,8 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 //region  修改入库总单
                 Outbound outbound = new Outbound();
                 outbound.setOutId(outboundVO.getOutId());
-                outbound.setOutingQty(sumQty);
-                outbound.setOutingAmt(sumAmt);
+                outbound.setOutingQty(outboundVO.getOutingQty());
+                outbound.setOutingAmt(outboundVO.getOutingAmt());
                 outbound.setAnnexPaths(outboundVO.getAnnexPaths());
                 //修改
                 outboundMapper.update(outbound,
@@ -1065,7 +1066,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
         //出库明细汇总循环
         for (String fromId : orderOutItemVOListMap.keySet()) {
             //有需要删除的修改数据
-            if(delOrderOutItemVOListMap!=null  && delOrderOutItemVOListMap.keySet().size()>0){
+            if (delOrderOutItemVOListMap != null && delOrderOutItemVOListMap.keySet().size() > 0) {
                 //出库明细删除汇总循环
                 for (String delFromId : delOrderOutItemVOListMap.keySet()) {
                     //新建出库明细来源Id = 删除出库明细来源Id
@@ -1083,13 +1084,13 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         BigDecimal updateOrderOutingAmt = BigDecimal.ZERO;
                         //已出库
                         if (Constant.OutStatus.YICHUKU.getName().equals(outboundResponse.getOutStatus())) {
-                            updateOrderOutQty = orderOutItemVOListGroup.stream().filter(it->it.getUpdateOrderOutQty()!=null).map(OutboundItemVO::getUpdateOrderOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                            updateOrderOutAmt = orderOutItemVOListGroup.stream().filter(it->it.getUpdateOrderOutAmt()!=null).map(OutboundItemVO::getUpdateOrderOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                            updateOrderOutQty = orderOutItemVOListGroup.stream().filter(it -> it.getUpdateOrderOutQty() != null).map(OutboundItemVO::getUpdateOrderOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                            updateOrderOutAmt = orderOutItemVOListGroup.stream().filter(it -> it.getUpdateOrderOutAmt() != null).map(OutboundItemVO::getUpdateOrderOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
                         }
                         //出库中
                         else {
-                            updateOrderOutingQty = orderOutItemVOListGroup.stream().filter(it->it.getUpdateOrderOutingQty()!=null).map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                            updateOrderOutingAmt = orderOutItemVOListGroup.stream().filter(it->it.getUpdateOrderOutingAmt()!=null).map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                            updateOrderOutingQty = orderOutItemVOListGroup.stream().filter(it -> it.getUpdateOrderOutingQty() != null).map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                            updateOrderOutingAmt = orderOutItemVOListGroup.stream().filter(it -> it.getUpdateOrderOutingAmt() != null).map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
                         }
                         //endregion
 
@@ -1147,7 +1148,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 }
             }
             //没有需要删除的修改数据
-            else{
+            else {
 
                 //region  提取新建分组后的明细
                 List<OutboundItemVO> orderOutItemVOListGroup = orderOutItemVOListMap.get(fromId);
@@ -1161,13 +1162,13 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 BigDecimal updateOrderOutingAmt = BigDecimal.ZERO;
                 //已出库
                 if (Constant.OutStatus.YICHUKU.getName().equals(outboundResponse.getOutStatus())) {
-                    updateOrderOutQty = orderOutItemVOListGroup.stream().filter(it->it.getUpdateOrderOutQty()!=null).map(OutboundItemVO::getUpdateOrderOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                    updateOrderOutAmt = orderOutItemVOListGroup.stream().filter(it->it.getUpdateOrderOutAmt()!=null).map(OutboundItemVO::getUpdateOrderOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                    updateOrderOutQty = orderOutItemVOListGroup.stream().filter(it -> it.getUpdateOrderOutQty() != null).map(OutboundItemVO::getUpdateOrderOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                    updateOrderOutAmt = orderOutItemVOListGroup.stream().filter(it -> it.getUpdateOrderOutAmt() != null).map(OutboundItemVO::getUpdateOrderOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
                 }
                 //出库中
                 else {
-                    updateOrderOutingQty = orderOutItemVOListGroup.stream().filter(it->it.getUpdateOrderOutingQty()!=null).map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                    updateOrderOutingAmt = orderOutItemVOListGroup.stream().filter(it->it.getUpdateOrderOutingAmt()!=null).map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                    updateOrderOutingQty = orderOutItemVOListGroup.stream().filter(it -> it.getUpdateOrderOutingQty() != null).map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                    updateOrderOutingAmt = orderOutItemVOListGroup.stream().filter(it -> it.getUpdateOrderOutingAmt() != null).map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
                 }
                 //endregion
 
@@ -1237,7 +1238,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 outboundItemResponse.setInventoryDocCode(Constant.InventoryDocCode.SALE_ORDER.getValue());
                 outboundItemResponse.setOutQty(outboundItemResponse.getOutQty());
                 outboundItemResponse.setOutAmt(outboundItemResponse.getOutAmt());
-                if(outboundItemResponse.getFromItemId() != null){
+                if (outboundItemResponse.getFromItemId() != null) {
                     outboundItemResponse.setInvOrderItemId(outboundItemResponse.getFromItemId());
                 }
                 //endregion
@@ -1503,7 +1504,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                     outboundItemVO.setAmtBeforeUpdate(outboundItemResponse.getOutAmt());
                 }
                 outboundItemVO.setAddOrEditFlag(true);
-                if(outboundItemVO.getFromItemId() != null){
+                if (outboundItemVO.getFromItemId() != null) {
                     outboundItemVO.setInvOrderItemId(outboundItemVO.getFromItemId());
                 }
                 //endregion
@@ -1536,7 +1537,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
                 outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.SALE_ORDER.getValue());
                 outboundItemVO.setAddOrEditFlag(true);
-                if(outboundItemVO.getFromItemId() != null){
+                if (outboundItemVO.getFromItemId() != null) {
                     outboundItemVO.setInvOrderItemId(outboundItemVO.getFromItemId());
                 }
                 //endregion
@@ -1578,7 +1579,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                     //region 将库存需要的参数赋值
                     outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
                     outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.SALE_ORDER.getValue());
-                    if(outboundItemVO.getFromItemId() != null){
+                    if (outboundItemVO.getFromItemId() != null) {
                         outboundItemVO.setInvOrderItemId(outboundItemVO.getFromItemId());
                     }
                     //endregion
@@ -1701,8 +1702,8 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         BigDecimal orderSumQty = orderOutItemVOListGroup.stream().map(OutboundItemVO::getOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
                         BigDecimal orderSumAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
                         //分组后的明细 原出库数量和金额总和
-                        BigDecimal updateOrderOutingQty = orderOutItemVOListGroup.stream().filter(it->it.getUpdateOrderOutingQty()!=null).map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                        BigDecimal updateOrderOutingAmt = orderOutItemVOListGroup.stream().filter(it->it.getUpdateOrderOutingAmt()!=null).map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                        BigDecimal updateOrderOutingQty = orderOutItemVOListGroup.stream().filter(it -> it.getUpdateOrderOutingQty() != null).map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                        BigDecimal updateOrderOutingAmt = orderOutItemVOListGroup.stream().filter(it -> it.getUpdateOrderOutingAmt() != null).map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
                         //endregion
 
                         //region 提取删除分组后的明细
@@ -1745,8 +1746,8 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 BigDecimal orderSumQty = orderOutItemVOListGroup.stream().map(OutboundItemVO::getOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
                 BigDecimal orderSumAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
                 //分组后的明细 原出库数量和金额总和
-                BigDecimal updateOrderOutingQty = orderOutItemVOListGroup.stream().filter(it->it.getUpdateOrderOutingQty()!=null).map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                BigDecimal updateOrderOutingAmt = orderOutItemVOListGroup.stream().filter(it->it.getUpdateOrderOutingAmt()!=null).map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                BigDecimal updateOrderOutingQty = orderOutItemVOListGroup.stream().filter(it -> it.getUpdateOrderOutingQty() != null).map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                BigDecimal updateOrderOutingAmt = orderOutItemVOListGroup.stream().filter(it -> it.getUpdateOrderOutingAmt() != null).map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
                 //endregion
 
                 //region 反写订单数据
@@ -1849,7 +1850,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
             outboundItemResponse.setInventoryDocCode(Constant.InventoryDocCode.SALE_ORDER.getValue());
             outboundItemResponse.setOutQty(outboundItemResponse.getOutQty());
             outboundItemResponse.setOutQty(outboundItemResponse.getOutQty());
-            if(outboundItemResponse.getFromItemId() != null){
+            if (outboundItemResponse.getFromItemId() != null) {
                 outboundItemResponse.setInvOrderItemId(outboundItemResponse.getFromItemId());
             }
             //endregion
@@ -1938,8 +1939,8 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
     }
 
     /**
-     * @desc   : 销售出库一键作废
-     * @date   : 2024/7/1 13:29
+     * @desc : 销售出库一键作废
+     * @date : 2024/7/1 13:29
      * @author : 寇珊珊
      */
     @Transactional(rollbackFor = {Exception.class})
@@ -1971,7 +1972,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                         outboundItemResponse.setInventoryDocCode(Constant.InventoryDocCode.SALE_ORDER.getValue());
                         outboundItemResponse.setOutQty(outboundItemResponse.getOutQty());
                         outboundItemResponse.setOutAmt(outboundItemResponse.getOutAmt());
-                        if(outboundItemResponse.getFromItemId() != null){
+                        if (outboundItemResponse.getFromItemId() != null) {
                             outboundItemResponse.setInvOrderItemId(outboundItemResponse.getFromItemId());
                         }
                         //endregion
@@ -2143,7 +2144,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
         //出库状态
         String outStatus = null;
         //出库中小于等于总数，已出库小于总数，并且出库中+已出库大于0
-        if(intoingQty.compareTo(sumQty)<=0 && intoQty.compareTo(sumQty) < 0  && intoingQty.add(intoQty).compareTo(BigDecimal.ZERO) > 0 ){
+        if (intoingQty.compareTo(sumQty) <= 0 && intoQty.compareTo(sumQty) < 0 && intoingQty.add(intoQty).compareTo(BigDecimal.ZERO) > 0) {
             //出库中
             outStatus = Constant.OutStatus.CHUKUZHONG.getName();
         }