Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -431,6 +431,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                t.remarks,
                t.inv_id,
                t.wh_id                                                                 as "whId",
+
                sys.f_remove_zero(tpi.inv_qty)                                                               as "invQty",
                sys.f_remove_zero(tpi.usable_qty)                                                            as "usableQty",
                tmw.wh_name                                                               as "whName",
@@ -628,7 +629,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                case when t.sku_id is null then t.sku_model  else  tmgs.sku_model end                 as "skuModel",
                case when t.sku_id is null then t.sku_name  else  tmgs.sku_name end                   as "skuName",
                sys.f_remove_zero(COALESCE(tpobi.out_qty, 0))                                                            as "outboundOutQty",
-               sys.f_remove_zero(t.out_qty - t.return_qty)                   as "canReturnQty",
+               sys.f_remove_zero(t.out_qty - t.outing_qty- t.return_qty)                   as "canReturnQty",
                t.inv_id,
                tpi.wh_id,
                sys.f_remove_zero(tpi.inv_qty)                                                                           as "invQty",

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -3089,6 +3089,7 @@
             left join dkic_b.t_psi_outbound tpo on tpo.out_id = tpoi.out_id
         </if>
         <include refid="getSaleProfitCond"/>
+        <include refid="getSaleProfitDateCond"/>
         <if test="orgIds!=null and orgIds.size()>0">
             and (
             tpo.org_id = any(#{orgIds, typeHandler=com.dk.common.infrastructure.handler.UuidListTypeHandler})
@@ -3110,7 +3111,7 @@
         </if>
         <include refid="getSaleProfitInOutBound"/>
         from dkic_b.t_psi_outbound_item tpoi
-        where tpoi.cp_id = #{cpId} and tpoi.out_status = '出库状态-已出库'
+        <include refid="getSaleProfitCond"/>
         AND tpoi.op_create_time >= now() - interval
         <if test="byDate==null or (byDate!=null and byDate=='false')">
             '1 year'
@@ -3141,6 +3142,7 @@
         from dkic_b.t_psi_outbound_item tpoi
         left join dkic_b.t_psi_outbound tpo on tpo.out_id = tpoi.out_id
         <include refid="getSaleProfitCond"/>
+        <include refid="getSaleProfitDateCond"/>
         group by tpo.org_id) t
         ) tt
         left join dkic_b.t_mst_org tmo on tmo.org_id = tt.org_id
@@ -3158,6 +3160,7 @@
         from dkic_b.t_psi_outbound_item tpoi
         left join dkic_b.t_psi_outbound tpo on tpo.out_id = tpoi.out_id
         <include refid="getSaleProfitCond"/>
+        <include refid="getSaleProfitDateCond"/>
         <if test="orgIds!=null and orgIds.size()>0">
             and (
             tpo.org_id = any(#{orgIds, typeHandler=com.dk.common.infrastructure.handler.UuidListTypeHandler})
@@ -3179,6 +3182,7 @@
         <include refid="getSaleProfitInOutBound"/>
         from dkic_b.t_psi_outbound_item tpoi
         <include refid="getSaleProfitCond"/>
+        <include refid="getSaleProfitDateCond"/>
         group by sku_id) t
         ) tt
         left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tt.sku_id
@@ -3191,7 +3195,10 @@
     </sql>
 
     <sql id="getSaleProfitCond">
-        where tpoi.cp_id = #{cpId} and tpoi.out_status = '出库状态-已出库'
+        where tpoi.cp_id = #{cpId} and tpoi.out_status = '出库状态-已出库' and tpoi.sku_id is not null
+    </sql>
+
+    <sql id="getSaleProfitDateCond">
         <if test="makeTimeStart != null and makeTimeEnd != null">
             AND tpoi.op_create_time &gt;= #{makeTimeStart}::timestamp with time zone
             AND tpoi.op_create_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -387,6 +387,7 @@
                t.non_std_code,
                t.remarks,
                t.wh_id,
+               t.sup_id,
                t.unit_id,
                t.sub_unit_id,
                tmw.wh_name,

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -333,6 +333,7 @@
     <!-- 通用条件列 -->
     <sql id="Condition">
         <where>
+
             <if test="orderNo != null and orderNo != ''">
                 AND t.order_no LIKE concat('%',my_ex.likequery(#{orderNo}),'%')
             </if>
@@ -471,6 +472,7 @@
             <if test="viewVoidedDocuments !=null and viewVoidedDocuments == false">
                 AND  t.flg_valid = true
             </if>
+
             <if test="searchText !=null">
                 AND (  t.order_no LIKE concat('%', my_ex.likequery(#{searchText}), '%')
                 OR   t.contact_phone LIKE concat('%', my_ex.likequery(#{searchText}), '%')
@@ -1080,6 +1082,9 @@
         WHERE T.RK = 1) as i
         on i.sku_id = toi.sku_id and i.non_std_code = toi.non_std_code and i.cp_id = toi.cp_id
         <include refid="Condition"/>
+        <if test="flgSource !=null and flgSource == true">
+            AND toi.item_qty - toi.outing_qty -toi.out_qty + toi.return_qty > 0
+        </if>
         order by t.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}

src/main/java/com/dk/mdm/model/query/sale/OrderQuery.java

@@ -395,6 +395,13 @@ public class OrderQuery extends PageInfo<OrderQuery> implements Serializable {
     private String searchText;
     @ApiModelProperty(value = "查询作废")
     private Boolean viewVoidedDocuments;
+
+    /**
+     * 销售出库是否过滤明细的 外协 明细订单量-出库中-已出库+退货数量
+     */
+    @ApiModelProperty(value = "销售出库是否过滤明细的")
+    private Boolean flgSource;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/vo/ivt/InboundVO.java

@@ -2,6 +2,7 @@ package com.dk.mdm.model.vo.ivt;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.vo.AnnexVO;
@@ -166,6 +167,7 @@ public class InboundVO {
      * 附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)
      */
     @ApiModelProperty(value = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @TableField(typeHandler = JsonTypeHandler.class)
     private List<AnnexVO> annexPaths;
 
 

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

@@ -18,9 +18,12 @@ import com.dk.mdm.infrastructure.convert.ivt.InOutRecordConvert;
 import com.dk.mdm.infrastructure.convert.ivt.InventoryConvert;
 import com.dk.mdm.mapper.common.CommonMapper;
 import com.dk.mdm.mapper.ivt.*;
+import com.dk.mdm.mapper.mst.GoodsSkuMapper;
 import com.dk.mdm.model.pojo.ivt.*;
 import com.dk.mdm.model.query.ivt.*;
+import com.dk.mdm.model.query.mst.GoodsSkuQuery;
 import com.dk.mdm.model.response.ivt.*;
+import com.dk.mdm.model.response.mst.GoodsSkuResponse;
 import com.dk.mdm.model.vo.ivt.InOutRecordVO;
 import com.dk.mdm.model.vo.ivt.InventoryBatchVO;
 import com.dk.mdm.model.vo.ivt.InventoryVO;
@@ -84,10 +87,14 @@ public class InventoryService extends BaseService<Inventory> {
     @Autowired
     private CommonMapper commonMapper;
 
+
+    @Autowired
+    private GoodsSkuMapper goodsSkuMapper;
+
     /**
-     * @desc   : 重写主键
+     * @desc : 重写主键
      * @author : 宋扬
-     * @date   : 2024/5/9 13:10
+     * @date : 2024/5/9 13:10
      */
     @Override
     public String getPrimaryKey() {
@@ -148,20 +155,20 @@ public class InventoryService extends BaseService<Inventory> {
         //region  查询当前公司的系统参数  自动办理信息  并赋值
         Map<String, Object> map = new HashMap<>();
         map.put("cpId", inOutRecordVOList.get(0).getCpId());
-        map.put("code",Constant.SystemConstant.IVT_002.getValue());
+        map.put("code", Constant.SystemConstant.IVT_002.getValue());
         //负数标识1
         String flgHandleSetting = commonMapper.getSettingValue(map);
         //endregion
         //赋值
         for (InOutRecordVO inOutRecordVO : inOutRecordVOList) {
             //如果可以为负数标识为空或者false 那就赋值系统参数的
-            if(inOutRecordVO.getCanNegativeFlag() == null || !inOutRecordVO.getCanNegativeFlag()){
+            if (inOutRecordVO.getCanNegativeFlag() == null || !inOutRecordVO.getCanNegativeFlag()) {
                 //负数标识1 可以
                 if (Constant.FlgAutoHandleStringType.ONE.getValue().equals(flgHandleSetting)) {
                     inOutRecordVO.setCanNegativeFlag(true);
                 }
                 //不可以
-                else{
+                else {
                     inOutRecordVO.setCanNegativeFlag(false);
                 }
             }
@@ -217,16 +224,16 @@ public class InventoryService extends BaseService<Inventory> {
         }
         for (InOutRecordVO inventoryBatchVO : inOutRecordVOList) {
             // 外协供应商ID 不进行判断商品Id和库存ID
-            if(inventoryBatchVO.getSupId() == null) {
+            if (inventoryBatchVO.getSupId() == null) {
                 //商品ID
                 if (inventoryBatchVO.getSkuId() == null || "".equals(inventoryBatchVO.getSkuId())) {
                     throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SKU_IS_NULL.getMessage());
                 }
-                //存货ID
-                if (Constant.InventoryType.OUTBOUND.equals(inventoryBatchVO.getInventoryType())
-                        && (inventoryBatchVO.getInvId() == null || "".equals(inventoryBatchVO.getInvId()))) {
-                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SKU_IS_NOT_IN_INVENTORY.getMessage());
-                }
+                //存货ID // 后面有判断
+//                if (Constant.InventoryType.OUTBOUND.equals(inventoryBatchVO.getInventoryType())
+//                        && (inventoryBatchVO.getInvId() == null || "".equals(inventoryBatchVO.getInvId()))) {
+//                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SKU_IS_NOT_IN_INVENTORY.getMessage());
+//                }
                 //仓库ID
                 if (!inventoryBatchVO.getCanNegativeFlag() && (inventoryBatchVO.getWhId() == null || "".equals(inventoryBatchVO.getWhId()))) {
                     throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.WAREHOUSE_IS_NULL.getMessage());
@@ -322,9 +329,9 @@ public class InventoryService extends BaseService<Inventory> {
             addOrEditFlag = obj.getBoolean("addOrEditFlag");
         }
         //入库删除
-        if (map.get("delIntoDetail") != null ) {
+        if (map.get("delIntoDetail") != null) {
             delIntoDetail = (JSONArray) JSON.toJSON(map.get("delIntoDetail"));
-            if(delIntoDetail.size()>0){
+            if (delIntoDetail.size() > 0) {
                 JSONObject obj = (JSONObject) delIntoDetail.get(0);
                 inventoryDocCode = obj.get("inventoryDocCode").toString();
             }
@@ -332,7 +339,7 @@ public class InventoryService extends BaseService<Inventory> {
         //出库
         if (map.get("outDetail") != null) {
             outDetail = (JSONArray) JSON.toJSON(map.get("outDetail"));
-            if(outDetail.size() > 0){
+            if (outDetail.size() > 0) {
                 JSONObject obj = (JSONObject) outDetail.get(0);
                 inventoryDocCode = obj.get("inventoryDocCode").toString();
                 addOrEditFlag = obj.getBoolean("addOrEditFlag");
@@ -341,7 +348,7 @@ public class InventoryService extends BaseService<Inventory> {
         //出库删除
         if (map.get("delOutDetail") != null) {
             delOutDetail = (JSONArray) JSON.toJSON(map.get("delOutDetail"));
-            if(delOutDetail.size()>0){
+            if (delOutDetail.size() > 0) {
                 JSONObject obj = (JSONObject) delOutDetail.get(0);
                 inventoryDocCode = obj.get("inventoryDocCode").toString();
             }
@@ -354,7 +361,7 @@ public class InventoryService extends BaseService<Inventory> {
             //region 新建
             if (addOrEditFlag) {
                 //先出
-                if (outDetail.size() > 0 ) {
+                if (outDetail.size() > 0) {
                     outList = outDetail.toJavaList(InOutRecordVO.class);
                     //赋值并校验库存流水数据
                     outList = this.setInOutRecordMessageByOut(outList);
@@ -362,7 +369,7 @@ public class InventoryService extends BaseService<Inventory> {
                     outList = this.warehouseAdjustmentOut(outList);
                     //反写出库单金额等信息
                     this.updateOutbound(outList);
-                } else if (outDetail.size() == 0 && intoDetail.size() == 0 ) {
+                } else if (outDetail.size() == 0 && intoDetail.size() == 0) {
                     throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.NO_DATA_MOVED_OUT.getMessage());
                 }
                 //后入
@@ -376,7 +383,7 @@ public class InventoryService extends BaseService<Inventory> {
                     intoList = this.warehouseAdjustmentInto(intoList);
                     //修改入库单单价、金额、成本等信息
                     this.updateIntobound(intoList);
-                } else if (outDetail.size() == 0 && intoDetail.size() == 0 ) {
+                } else if (outDetail.size() == 0 && intoDetail.size() == 0) {
                     throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.NO_DATA_MOVED_IN.getMessage());
                 }
             }
@@ -444,13 +451,13 @@ public class InventoryService extends BaseService<Inventory> {
                 //赋值并校验库存流水数据
                 intoList = this.setInOutRecordMessageByInto(intoList);
                 //入库新建
-                intoAddList = intoList.stream().filter(it->it.getAddOrEditFlag()).collect(Collectors.toList());
+                intoAddList = intoList.stream().filter(it -> it.getAddOrEditFlag()).collect(Collectors.toList());
                 //入库编辑
-                intoEditList = intoList.stream().filter(it->!it.getAddOrEditFlag()).collect(Collectors.toList());
+                intoEditList = intoList.stream().filter(it -> !it.getAddOrEditFlag()).collect(Collectors.toList());
                 //新建
                 if (intoAddList.size() > 0) {
                     //正常逻辑 新建库存
-                    intoAddList =  this.operatingInsertInventory(intoAddList);
+                    intoAddList = this.operatingInsertInventory(intoAddList);
                     //修改入库单单价、金额、成本等信息
                     this.updateIntobound(intoAddList);
                 }
@@ -468,15 +475,15 @@ public class InventoryService extends BaseService<Inventory> {
                 //赋值并校验库存流水数据
                 outList = this.setInOutRecordMessageByOut(outList);
                 //出库新建
-                outAddList = outList.stream().filter(it->it.getAddOrEditFlag() && !it.getCanNegativeFlag() ).collect(Collectors.toList());
+                outAddList = outList.stream().filter(it -> it.getAddOrEditFlag() && !it.getCanNegativeFlag()).collect(Collectors.toList());
                 //出库编辑
-                outEditList = outList.stream().filter(it->!it.getAddOrEditFlag() && !it.getCanNegativeFlag() ).collect(Collectors.toList());
+                outEditList = outList.stream().filter(it -> !it.getAddOrEditFlag() && !it.getCanNegativeFlag()).collect(Collectors.toList());
                 //负出库新建
-                outNegAddList = outList.stream().filter(it->it.getAddOrEditFlag() && it.getCanNegativeFlag() ).collect(Collectors.toList());
+                outNegAddList = outList.stream().filter(it -> it.getAddOrEditFlag() && it.getCanNegativeFlag()).collect(Collectors.toList());
                 //负出库编辑
-                outNegEditList = outList.stream().filter(it->!it.getAddOrEditFlag() && it.getCanNegativeFlag() ).collect(Collectors.toList());
+                outNegEditList = outList.stream().filter(it -> !it.getAddOrEditFlag() && it.getCanNegativeFlag()).collect(Collectors.toList());
                 //走负库存逻辑 -- 新建
-                if (outNegAddList.size()>0) {
+                if (outNegAddList.size() > 0) {
                     //新建入库单
                     outNegAddList = this.insertOrUpdateInbound(outNegAddList);
                     //操作负库存
@@ -490,7 +497,7 @@ public class InventoryService extends BaseService<Inventory> {
                     this.operatingNegativeInventory(outNegEditList);
                 }
                 //正常库存逻辑 -- 新建
-                if (outAddList.size()>0) {
+                if (outAddList.size() > 0) {
                     //正常逻辑 新建库存
                     this.operatingInsertInventory(outAddList);
                 }
@@ -519,8 +526,8 @@ public class InventoryService extends BaseService<Inventory> {
     public InventoryResponse checkInventoryNumber(InOutRecordVO inOutRecordVO) {
         //存在标识
         //根据sku，仓库，非标号查询
-        InventoryResponse inventoryResponse = null ;
-        if(inOutRecordVO.getSkuId() != null){
+        InventoryResponse inventoryResponse = null;
+        if (inOutRecordVO.getSkuId() != null) {
             inventoryResponse = inventoryMapper.selectByOther(new InventoryQuery()
                     .setSkuId(inOutRecordVO.getSkuId())
                     .setWhId(inOutRecordVO.getWhId())
@@ -537,7 +544,7 @@ public class InventoryService extends BaseService<Inventory> {
     @Transactional(
             rollbackFor = {Exception.class}
     )
-    public List<InOutRecordVO>  operatingInsertInventory(List<InOutRecordVO> inOutRecordVOList) {
+    public List<InOutRecordVO> operatingInsertInventory(List<InOutRecordVO> inOutRecordVOList) {
         for (InOutRecordVO inOutRecordVO : inOutRecordVOList) {
             //校验库存是否存在
             InventoryResponse inventoryResponse = this.checkInventoryNumber(inOutRecordVO);
@@ -620,7 +627,7 @@ public class InventoryService extends BaseService<Inventory> {
                     //endregion
 
                     //region 销售退货出库  (负向出库相当于入库)
-                    if(inOutRecordVO.getSkuId() != null) {
+                    if (inOutRecordVO.getSkuId() != null) {
                         if (Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
                             //region  新建库存
                             inOutRecordVO = this.insertInventory(inOutRecordVO);
@@ -719,7 +726,7 @@ public class InventoryService extends BaseService<Inventory> {
             this.updateIntobound(inOutRecordVOList);
         }
         //出库
-        else{
+        else {
             //修改源出库信息
             this.updateOutboundPri(inOutRecordVOList);
         }
@@ -820,8 +827,8 @@ public class InventoryService extends BaseService<Inventory> {
         //存货资产
         inventory.setCostAmt(costAmt);
         //存货单价
-        inventory.setCostPrice(costAmt.compareTo(BigDecimal.ZERO) > 0 &&  inventory.getInvQty().compareTo(BigDecimal.ZERO) > 0 ?
-               costAmt.divide(inventory.getInvQty(),BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
+        inventory.setCostPrice(costAmt.compareTo(BigDecimal.ZERO) > 0 && inventory.getInvQty().compareTo(BigDecimal.ZERO) > 0 ?
+                costAmt.divide(inventory.getInvQty(), BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
         inventoryMapper.updateAmtAndQty(inventory);
         //endregion
     }
@@ -862,7 +869,7 @@ public class InventoryService extends BaseService<Inventory> {
         else {
             //region 销售退货出库和入库（不是采退入库）  数量正数
             if (Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode()) ||
-                    ( !Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode()) &&
+                    (!Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode()) &&
                             Constant.InventoryType.INBOUND.getName().equals(inOutRecordVO.getInventoryType()))
             ) {
                 //入库价
@@ -876,7 +883,7 @@ public class InventoryService extends BaseService<Inventory> {
 
             //region 采退入库 和出库（不是销退出库） 数量负数
             if (Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode()) ||
-                    ( !Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode()) &&
+                    (!Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode()) &&
                             Constant.InventoryType.OUTBOUND.getName().equals(inOutRecordVO.getInventoryType()))
             ) {
                 //入库价
@@ -926,7 +933,7 @@ public class InventoryService extends BaseService<Inventory> {
                 //库存资产
                 inventory.setCostAmt(inOutRecordVO.getIntoAmt());
                 //库存单价   存货资产/存货数量
-                inventory.setCostPrice(inventory.getCostAmt().negate().divide(inventory.getInvQty().negate(),BigDecimal.ROUND_HALF_UP));
+                inventory.setCostPrice(inventory.getCostAmt().negate().divide(inventory.getInvQty().negate(), BigDecimal.ROUND_HALF_UP));
             } else {
                 //库存数量
                 inventory.setInvQty(inOutRecordVO.getIntoQty());
@@ -935,7 +942,7 @@ public class InventoryService extends BaseService<Inventory> {
                 //库存资产
                 inventory.setCostAmt(inOutRecordVO.getIntoAmt());
                 //库存单价   存货资产/存货数量
-                inventory.setCostPrice(inventory.getCostAmt().divide(inventory.getInvQty(),BigDecimal.ROUND_HALF_UP));
+                inventory.setCostPrice(inventory.getCostAmt().divide(inventory.getInvQty(), BigDecimal.ROUND_HALF_UP));
             }
         }
 
@@ -1119,7 +1126,7 @@ public class InventoryService extends BaseService<Inventory> {
                     OutboundItem outboundItem = new OutboundItem();
                     outboundItem.setItemId(inOutRecordVO.getBiznisItemId());
                     outboundItem.setCostAmt(inOutRecordVO.getIntoAmt());
-                    outboundItem.setCostPrice(inOutRecordVO.getIntoAmt().divide(inOutRecordVO.getIntoQty(),2,BigDecimal.ROUND_HALF_UP));
+                    outboundItem.setCostPrice(inOutRecordVO.getIntoAmt().divide(inOutRecordVO.getIntoQty(), 2, BigDecimal.ROUND_HALF_UP));
                     outboundItemMapper.update(outboundItem,
                             new UpdateWrapper<OutboundItem>().lambda()
                                     .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
@@ -1129,7 +1136,15 @@ public class InventoryService extends BaseService<Inventory> {
                 //endregion
             }
         } else {
-            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.CAN_OUTBOUND_QUANTITY_INSUFFICIENT.getMessage());
+            if (inOutRecordVO.getSkuId() != null) {
+                List<GoodsSkuResponse> goodsSkuResponses = goodsSkuMapper.selectByCond(new GoodsSkuQuery().setSkuId(inOutRecordVO.getSkuId()));
+                if (goodsSkuResponses != null && goodsSkuResponses.size() > 0) {
+                    //提示具体型号不足
+                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), goodsSkuResponses.get(0).getSkuModel() + ErrorCodeEnum.CAN_OUTBOUND_QUANTITY_INSUFFICIENT.getMessage());
+                }
+            } else {
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.CAN_OUTBOUND_QUANTITY_INSUFFICIENT.getMessage());
+            }
         }
         //endregion
         return inOutRecordVO;
@@ -1259,7 +1274,7 @@ public class InventoryService extends BaseService<Inventory> {
         //endregion
 
         //region 库存数量重算   库存数量-删除数量
-        BigDecimal qty = inOutRecordVO.getQtyBeforeUpdate()!=null && inOutRecordVO.getQtyBeforeUpdate().compareTo(BigDecimal.ZERO)>0 ?inOutRecordVO.getQtyBeforeUpdate():inOutRecordVO.getIntoQty();
+        BigDecimal qty = inOutRecordVO.getQtyBeforeUpdate() != null && inOutRecordVO.getQtyBeforeUpdate().compareTo(BigDecimal.ZERO) > 0 ? inOutRecordVO.getQtyBeforeUpdate() : inOutRecordVO.getIntoQty();
         Inventory inventory = new Inventory();
         //库存id
         inventory.setInvId(inventoryResponse.getInvId());
@@ -1279,7 +1294,7 @@ public class InventoryService extends BaseService<Inventory> {
         inventory.setCostAmt(costAmt);
         //存货单价
         inventory.setCostPrice(costAmt.compareTo(BigDecimal.ZERO) > 0 ?
-                costAmt.divide(inventory.getInvQty(),BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
+                costAmt.divide(inventory.getInvQty(), BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);
         inventoryMapper.updateAmtAndQty(inventory);
         //endregion
     }
@@ -1315,7 +1330,7 @@ public class InventoryService extends BaseService<Inventory> {
                 //修改
                 outboundItemMapper.update(outboundItem,
                         new UpdateWrapper<OutboundItem>().lambda()
-                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getSOutItemId()))
+                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
                 );
             }
             //修改总单
@@ -1756,7 +1771,7 @@ public class InventoryService extends BaseService<Inventory> {
     )
     public List<InOutRecordVO> selectOutbound(List<InOutRecordVO> inOutRecordVOList) {
         for (InOutRecordVO inOutRecordVO : inOutRecordVOList) {
-            OutboundItemResponse outboundItemResponse = outboundItemMapper.selectItemIndex(inOutRecordVO.getItemIndex(),inOutRecordVO.getOutId());
+            OutboundItemResponse outboundItemResponse = outboundItemMapper.selectItemIndex(inOutRecordVO.getItemIndex(), inOutRecordVO.getOutId());
             //单价
             inOutRecordVO.setPriceInto(outboundItemResponse.getPriceOut());
             //金额
@@ -2244,10 +2259,10 @@ public class InventoryService extends BaseService<Inventory> {
             int invQty = item.getInvQty().intValue();
             Long warningLowerLimit = item.getWarningLowerLimit();
             Long warningUpperLimit = item.getWarningUpperLimit();
-            if (warningUpperLimit != 0 && invQty > warningUpperLimit){
+            if (warningUpperLimit != 0 && invQty > warningUpperLimit) {
                 item.setWarningMsg("超出警戒上限" + "(" + warningUpperLimit + item.getUnitName() + ")");
             }
-            if (warningLowerLimit != 0 && invQty < warningLowerLimit){
+            if (warningLowerLimit != 0 && invQty < warningLowerLimit) {
                 item.setWarningMsg("低于警戒下限" + "(" + warningLowerLimit + item.getUnitName() + ")");
             }
         });

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

@@ -201,7 +201,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 //赋值箱片
                 for (OutboundItemVO outboundItemVO : outboundIngList) {
                     //箱
-                    outboundItemVO.setOutingBox(Integer.valueOf(outboundItemVO.getOutingQty().divide(outboundItemVO.getPackBox(),0,RoundingMode.DOWN).toString()) );
+                    outboundItemVO.setOutingBox(Integer.valueOf(outboundItemVO.getOutingQty().divide(outboundItemVO.getPackBox(), 0, RoundingMode.DOWN).toString()));
                     //片
                     outboundItemVO.setOutingPiece(outboundItemVO.getOutingQty().remainder(outboundItemVO.getPackBox()));
                 }
@@ -218,7 +218,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 for (OutboundItemVO outboundItemVO : itemList) {
                     if (outboundItemVO.getSkuId() != null) { //过滤外协品 外协品没有箱片
                         //箱
-                        outboundItemVO.setOutBox(Integer.valueOf(outboundItemVO.getOutingQty().divide(outboundItemVO.getPackBox(),0,RoundingMode.DOWN).toString()) );
+                        outboundItemVO.setOutBox(Integer.valueOf(outboundItemVO.getOutingQty().divide(outboundItemVO.getPackBox(), 0, RoundingMode.DOWN).toString()));
                         //片
                         outboundItemVO.setOutPiece(outboundItemVO.getOutingQty().remainder(outboundItemVO.getPackBox()));
                     }
@@ -990,82 +990,142 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
         Map<String, List<OutboundItemVO>> delOrderOutItemVOListMap = deleteItemList.stream().collect(Collectors.groupingBy(OutboundItemVO::getFromId));
         //出库明细汇总循环
         for (String fromId : orderOutItemVOListMap.keySet()) {
-            //出库明细删除汇总循环
-            for (String delFromId : delOrderOutItemVOListMap.keySet()) {
-                //新建出库明细来源Id = 删除出库明细来源Id
-                if (fromId.equals(delFromId)) {
-                    //region  提取新建分组后的明细
-                    List<OutboundItemVO> orderOutItemVOListGroup = orderOutItemVOListMap.get(fromId);
-                    //分组后的明细 出库数量和金额总和
-                    BigDecimal orderSumQty = orderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                    BigDecimal orderSumAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
-                    //分组后的明细 原出库数量和金额总和
-                    BigDecimal updateOrderOutQty = BigDecimal.ZERO;
-                    BigDecimal updateOrderOutAmt = BigDecimal.ZERO;
-                    BigDecimal updateOrderOutingQty = BigDecimal.ZERO;
-                    BigDecimal updateOrderOutingAmt = BigDecimal.ZERO;
-                    //已出库
-                    if (Constant.OutStatus.YICHUKU.getName().equals(outboundResponse.getOutStatus())) {
-                        updateOrderOutQty = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                        updateOrderOutAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
-                    }
-                    //出库中
-                    else {
-                        updateOrderOutingQty = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                        updateOrderOutingAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
-                    }
-                    //endregion
+            //有需要删除的修改数据
+            if(delOrderOutItemVOListMap!=null  && delOrderOutItemVOListMap.keySet().size()>0){
+                //出库明细删除汇总循环
+                for (String delFromId : delOrderOutItemVOListMap.keySet()) {
+                    //新建出库明细来源Id = 删除出库明细来源Id
+                    if (fromId.equals(delFromId)) {
+
+                        //region  提取新建分组后的明细
+                        List<OutboundItemVO> orderOutItemVOListGroup = orderOutItemVOListMap.get(fromId);
+                        //分组后的明细 出库数量和金额总和
+                        BigDecimal orderSumQty = orderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                        BigDecimal orderSumAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                        //分组后的明细 原出库数量和金额总和
+                        BigDecimal updateOrderOutQty = BigDecimal.ZERO;
+                        BigDecimal updateOrderOutAmt = BigDecimal.ZERO;
+                        BigDecimal updateOrderOutingQty = BigDecimal.ZERO;
+                        BigDecimal updateOrderOutingAmt = BigDecimal.ZERO;
+                        //已出库
+                        if (Constant.OutStatus.YICHUKU.getName().equals(outboundResponse.getOutStatus())) {
+                            updateOrderOutQty = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                            updateOrderOutAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                        }
+                        //出库中
+                        else {
+                            updateOrderOutingQty = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                            updateOrderOutingAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                        }
+                        //endregion
 
-                    //region 提取删除分组后的明细
-                    List<OutboundItemVO> delOrderOutItemVOListGroup = delOrderOutItemVOListMap.get(delFromId);
-                    BigDecimal orderDelOutQty = BigDecimal.ZERO;
-                    BigDecimal orderDelOutAmt = BigDecimal.ZERO;
-                    //已出库
-                    if (Constant.OutStatus.YICHUKU.getName().equals(outboundResponse.getOutStatus())) {
-                        orderDelOutQty = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                        orderDelOutAmt = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
-                    }
-                    //出库中
-                    else if (Constant.OutStatus.CHUKUZHONG.getName().equals(outboundResponse.getOutStatus())) {
-                        orderDelOutQty = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                        orderDelOutAmt = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
-                    }
-                    //endregion
+                        //region 提取删除分组后的明细
+                        List<OutboundItemVO> delOrderOutItemVOListGroup = delOrderOutItemVOListMap.get(delFromId);
+                        BigDecimal orderDelOutQty = BigDecimal.ZERO;
+                        BigDecimal orderDelOutAmt = BigDecimal.ZERO;
+                        //已出库
+                        if (Constant.OutStatus.YICHUKU.getName().equals(outboundResponse.getOutStatus())) {
+                            orderDelOutQty = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                            orderDelOutAmt = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                        }
+                        //出库中
+                        else if (Constant.OutStatus.CHUKUZHONG.getName().equals(outboundResponse.getOutStatus())) {
+                            orderDelOutQty = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                            orderDelOutAmt = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                        }
+                        //endregion
 
-                    //region  反写订单数据
-                    //根据id查询
-                    OrderResponse orderResponse = orderMapper.selectById(fromId);
-                    Order order = new Order();
-                    order.setOrderId(fromId);
-                    //已出库
-                    if (Constant.OutStatus.YICHUKU.getName().equals(outboundResponse.getOutStatus())) {
-                        order.setOutQty(updateOrderOutQty.negate().add(orderSumQty).subtract(orderDelOutQty));
-                        order.setOutAmt(updateOrderOutAmt.negate().add(orderSumAmt).subtract(orderDelOutAmt));
-                        order.setOutingQty(orderDelOutQty);
-                        order.setOutingAmt(orderDelOutAmt);
-                        //出库状态
-                        String outStatus = this.setOutStatus(orderResponse.getOutingQty().add(order.getOutingQty()),
-                                orderResponse.getOutQty().add(order.getOutQty()), orderResponse.getSumQuantity());
-                        order.setOutStatus(outStatus);
-                    }
-                    //出库中
-                    else if (Constant.OutStatus.CHUKUZHONG.getName().equals(outboundResponse.getOutStatus())) {
-                        order.setOutingQty(updateOrderOutingQty.negate().add(orderSumQty).subtract(orderDelOutQty));
-                        order.setOutingAmt(updateOrderOutingAmt.negate().add(orderSumQty).subtract(orderDelOutAmt));
-                        //出库状态
-                        String outStatus = this.setOutStatus(orderResponse.getOutingQty().add(order.getOutingQty()),
-                                orderResponse.getOutQty(), orderResponse.getSumQuantity());
-                        order.setOutStatus(outStatus);
-                    }
-                    //修改
-                    int countRow = orderMapper.updateById(order);
-                    //数量超出
-                    if (countRow == 0) {
-                        throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED_OUTBOUND.getMessage());
+                        //region  反写订单数据
+                        //根据id查询
+                        OrderResponse orderResponse = orderMapper.selectById(fromId);
+                        Order order = new Order();
+                        order.setOrderId(fromId);
+                        //已出库
+                        if (Constant.OutStatus.YICHUKU.getName().equals(outboundResponse.getOutStatus())) {
+                            order.setOutQty(updateOrderOutQty.negate().add(orderSumQty).subtract(orderDelOutQty));
+                            order.setOutAmt(updateOrderOutAmt.negate().add(orderSumAmt).subtract(orderDelOutAmt));
+                            order.setOutingQty(orderDelOutQty);
+                            order.setOutingAmt(orderDelOutAmt);
+                            //出库状态
+                            String outStatus = this.setOutStatus(orderResponse.getOutingQty().add(order.getOutingQty()),
+                                    orderResponse.getOutQty().add(order.getOutQty()), orderResponse.getSumQuantity());
+                            order.setOutStatus(outStatus);
+                        }
+                        //出库中
+                        else if (Constant.OutStatus.CHUKUZHONG.getName().equals(outboundResponse.getOutStatus())) {
+                            order.setOutingQty(updateOrderOutingQty.negate().add(orderSumQty).subtract(orderDelOutQty));
+                            order.setOutingAmt(updateOrderOutingAmt.negate().add(orderSumQty).subtract(orderDelOutAmt));
+                            //出库状态
+                            String outStatus = this.setOutStatus(orderResponse.getOutingQty().add(order.getOutingQty()),
+                                    orderResponse.getOutQty(), orderResponse.getSumQuantity());
+                            order.setOutStatus(outStatus);
+                        }
+                        //修改
+                        int countRow = orderMapper.updateById(order);
+                        //数量超出
+                        if (countRow == 0) {
+                            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED_OUTBOUND.getMessage());
+                        }
+                        //endregion
                     }
-                    //endregion
                 }
             }
+            //没有需要删除的修改数据
+            else{
+
+                //region  提取新建分组后的明细
+                List<OutboundItemVO> orderOutItemVOListGroup = orderOutItemVOListMap.get(fromId);
+                //分组后的明细 出库数量和金额总和
+                BigDecimal orderSumQty = orderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                BigDecimal orderSumAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                //分组后的明细 原出库数量和金额总和
+                BigDecimal updateOrderOutQty = BigDecimal.ZERO;
+                BigDecimal updateOrderOutAmt = BigDecimal.ZERO;
+                BigDecimal updateOrderOutingQty = BigDecimal.ZERO;
+                BigDecimal updateOrderOutingAmt = BigDecimal.ZERO;
+                //已出库
+                if (Constant.OutStatus.YICHUKU.getName().equals(outboundResponse.getOutStatus())) {
+                    updateOrderOutQty = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                    updateOrderOutAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                }
+                //出库中
+                else {
+                    updateOrderOutingQty = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                    updateOrderOutingAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                }
+                //endregion
+
+                //region  反写订单数据
+                //根据id查询
+                OrderResponse orderResponse = orderMapper.selectById(fromId);
+                Order order = new Order();
+                order.setOrderId(fromId);
+                //已出库
+                if (Constant.OutStatus.YICHUKU.getName().equals(outboundResponse.getOutStatus())) {
+                    order.setOutQty(updateOrderOutQty.negate().add(orderSumQty));
+                    order.setOutAmt(updateOrderOutAmt.negate().add(orderSumAmt));
+                    //出库状态
+                    String outStatus = this.setOutStatus(orderResponse.getOutingQty().add(order.getOutingQty()),
+                            orderResponse.getOutQty().add(order.getOutQty()), orderResponse.getSumQuantity());
+                    order.setOutStatus(outStatus);
+                }
+                //出库中
+                else if (Constant.OutStatus.CHUKUZHONG.getName().equals(outboundResponse.getOutStatus())) {
+                    order.setOutingQty(updateOrderOutingQty.negate().add(orderSumQty));
+                    order.setOutingAmt(updateOrderOutingAmt.negate().add(orderSumQty));
+                    //出库状态
+                    String outStatus = this.setOutStatus(orderResponse.getOutingQty().add(order.getOutingQty()),
+                            orderResponse.getOutQty(), orderResponse.getSumQuantity());
+                    order.setOutStatus(outStatus);
+                }
+                //修改
+                int countRow = orderMapper.updateById(order);
+                //数量超出
+                if (countRow == 0) {
+                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED_OUTBOUND.getMessage());
+                }
+                //endregion
+            }
         }
     }
 
@@ -1241,6 +1301,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
         Map<String, List<OutboundItemResponse>> orderOutItemListMap = itemList.stream().collect(Collectors.groupingBy(OutboundItemResponse::getFromId));
         //出库明细汇总循环
         for (String fromId : orderOutItemListMap.keySet()) {
+
             //region  提取新建分组后的明细
             //分组后的明细 原出库数量和金额总和
             List<OutboundItemResponse> orderOutItemListGroup = orderOutItemListMap.get(fromId);
@@ -1542,51 +1603,88 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
         Map<String, List<OutboundItemVO>> delOrderOutItemVOListMap = deleteItemList.stream().collect(Collectors.groupingBy(OutboundItemVO::getFromId));
         //出库明细汇总循环
         for (String fromId : orderOutItemVOListMap.keySet()) {
-            //出库明细删除汇总循环
-            for (String delFromId : delOrderOutItemVOListMap.keySet()) {
-                //新建出库明细来源Id = 删除出库明细来源Id
-                if (fromId.equals(delFromId)) {
-                    //region  提取新建分组后的明细
-                    List<OutboundItemVO> orderOutItemVOListGroup = orderOutItemVOListMap.get(fromId);
-                    //分组后的明细 出库数量和金额总和
-                    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().map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                    BigDecimal updateOrderOutingAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
-                    //endregion
+            //有需要删除的办理数据
+            if (delOrderOutItemVOListMap != null && delOrderOutItemVOListMap.keySet().size() > 0) {
+                //出库明细删除汇总循环
+                for (String delFromId : delOrderOutItemVOListMap.keySet()) {
+                    //新建出库明细来源Id = 删除出库明细来源Id
+                    if (fromId.equals(delFromId)) {
+                        //region  提取新建分组后的明细
+                        List<OutboundItemVO> orderOutItemVOListGroup = orderOutItemVOListMap.get(fromId);
+                        //分组后的明细 出库数量和金额总和
+                        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().map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                        BigDecimal updateOrderOutingAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                        //endregion
 
-                    //region 提取删除分组后的明细
-                    List<OutboundItemVO> delOrderOutItemVOListGroup = delOrderOutItemVOListMap.get(delFromId);
-                    BigDecimal orderDelOutingQty = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                    BigDecimal orderDelOutingAmt = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
-                    BigDecimal orderDelOutQty = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-                    BigDecimal orderDelOutAmt = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
-                    //endregion
+                        //region 提取删除分组后的明细
+                        List<OutboundItemVO> delOrderOutItemVOListGroup = delOrderOutItemVOListMap.get(delFromId);
+                        BigDecimal orderDelOutingQty = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                        BigDecimal orderDelOutingAmt = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                        BigDecimal orderDelOutQty = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                        BigDecimal orderDelOutAmt = delOrderOutItemVOListGroup.stream().map(OutboundItemVO::getOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                        //endregion
 
-                    //region 反写订单数据
-                    //根据id查询
-                    OrderResponse orderResponse = orderMapper.selectById(fromId);
-                    //赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
-                    Order order = new Order();
-                    order.setOrderId(fromId);
-                    order.setOutQty(orderSumQty.subtract(orderDelOutQty));
-                    order.setOutAmt(orderSumAmt.subtract(orderDelOutAmt));
-                    order.setOutingQty((updateOrderOutingQty.add(orderDelOutingQty)).negate());
-                    order.setOutingAmt((updateOrderOutingAmt.add(orderDelOutingAmt)).negate());
-                    //出库状态
-                    String orderOutStatus = this.setOutStatus(orderResponse.getOutingQty().subtract(orderSumQty).add(orderDelOutQty),
-                            orderResponse.getOutQty().add(order.getOutQty()), orderResponse.getSumQuantity());
-                    order.setOutStatus(orderOutStatus);
-                    //修改
-                    int countRow = orderMapper.updateById(order);
-                    //数量超出
-                    if (countRow == 0) {
-                        throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED_OUTBOUND.getMessage());
+                        //region 反写订单数据
+                        //根据id查询
+                        OrderResponse orderResponse = orderMapper.selectById(fromId);
+                        //赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+                        Order order = new Order();
+                        order.setOrderId(fromId);
+                        order.setOutQty(orderSumQty.subtract(orderDelOutQty));
+                        order.setOutAmt(orderSumAmt.subtract(orderDelOutAmt));
+                        order.setOutingQty((updateOrderOutingQty.add(orderDelOutingQty)).negate());
+                        order.setOutingAmt((updateOrderOutingAmt.add(orderDelOutingAmt)).negate());
+                        //出库状态
+                        String orderOutStatus = this.setOutStatus(orderResponse.getOutingQty().subtract(orderSumQty).add(orderDelOutQty),
+                                orderResponse.getOutQty().add(order.getOutQty()), orderResponse.getSumQuantity());
+                        order.setOutStatus(orderOutStatus);
+                        //修改
+                        int countRow = orderMapper.updateById(order);
+                        //数量超出
+                        if (countRow == 0) {
+                            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED_OUTBOUND.getMessage());
+                        }
+                        //endregion
                     }
-                    //endregion
                 }
             }
+            //没有需要删除的办理数据
+            else {
+                //region  提取新建分组后的明细
+                List<OutboundItemVO> orderOutItemVOListGroup = orderOutItemVOListMap.get(fromId);
+                //分组后的明细 出库数量和金额总和
+                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().map(OutboundItemVO::getUpdateOrderOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+                BigDecimal updateOrderOutingAmt = orderOutItemVOListGroup.stream().map(OutboundItemVO::getUpdateOrderOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+                //endregion
+
+                //region 反写订单数据
+                //根据id查询
+                OrderResponse orderResponse = orderMapper.selectById(fromId);
+                //赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+                Order order = new Order();
+                order.setOrderId(fromId);
+                order.setOutQty(orderSumQty);
+                order.setOutAmt(orderSumAmt);
+                order.setOutingQty(updateOrderOutingQty.negate());
+                order.setOutingAmt(updateOrderOutingAmt.negate());
+                //出库状态
+                String orderOutStatus = this.setOutStatus(orderResponse.getOutingQty().subtract(orderSumQty),
+                        orderResponse.getOutQty().add(order.getOutQty()), orderResponse.getSumQuantity());
+                order.setOutStatus(orderOutStatus);
+                //修改
+                int countRow = orderMapper.updateById(order);
+                //数量超出
+                if (countRow == 0) {
+                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED_OUTBOUND.getMessage());
+                }
+                //endregion
+            }
         }
     }
 
@@ -1787,7 +1885,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
         //出库状态
         String outStatus = null;
         //出库中+已出库 小于 总数   或者 出库中数量小于等于订单总数量
-        if (intoingQty.compareTo(sumQty) <= 0 && intoingQty.add(intoQty).compareTo(sumQty) <= 0   ) {
+        if (intoingQty.compareTo(sumQty) <= 0 && intoingQty.add(intoQty).compareTo(sumQty) <= 0 && intoQty.compareTo(sumQty) < 0) {
             //出库中
             outStatus = Constant.OutStatus.CHUKUZHONG.getName();
         }

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

@@ -349,7 +349,9 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
         //endregion
 
         //region 原入库单  原销售订单
-        this.updatePrimaryTotal(outboundVO, true);
+        if(outboundVO.getFromId() != null){
+            this.updatePrimaryTotal(outboundVO, true);
+        }
         //endregion
 
         //region  总单