1、修改销售出库相关问题

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemCostMapper.java

@@ -47,7 +47,7 @@ public interface OutboundItemCostMapper extends BaseMapper<OutboundItemCost>{
      * @date   : 2024/4/10 13:46
      * @author : 寇珊珊
      */
-    int deleteData(InOutRecord inOutRecord);
+    int deleteData(@Param("id") String id);
 
 
     /**

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

@@ -155,10 +155,10 @@
 
 
     <!--删除数据-->
-    <delete id="deleteData" parameterType="com.dk.mdm.model.pojo.ivt.OutboundItemCost">
+    <delete id="deleteData" >
         DELETE
         FROM dkic_b.t_psi_outbound_item_cost
-        where out_item_id = #{outItemId,typeHandler=UuidTypeHandler}
+        where out_item_id = #{id,typeHandler=UuidTypeHandler}
     </delete>
 
 

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

@@ -1174,10 +1174,10 @@ public class InventoryService extends BaseService<Inventory> {
                     !Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) ||
                     Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())
             ) {
-                OutboundItemCost outboundItemCost = new OutboundItemCost();
-                //出库明细Id
-                outboundItemCost.setOutItemId(inOutRecordVO.getBiznisItemId());
-                outboundItemCostMapper.deleteData(inOutRecord);
+//                OutboundItemCost outboundItemCost = new OutboundItemCost();
+//                //出库明细Id
+//                outboundItemCost.setOutItemId(inOutRecordVO.getBiznisItemId());
+                outboundItemCostMapper.deleteData(inOutRecordVO.getBiznisItemId());
             }
             //endregion
 
@@ -1205,7 +1205,7 @@ public class InventoryService extends BaseService<Inventory> {
         //endregion
 
         //region 库存数量重算   库存数量-删除数量
-        BigDecimal qty = 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());
@@ -1421,10 +1421,10 @@ public class InventoryService extends BaseService<Inventory> {
                 //endregion
 
                 //region   要把出库成本也删除
-                OutboundItemCost outboundItemCost = new OutboundItemCost();
-                //出库明细Id
-                outboundItemCost.setOutItemId(inOutRecordVO.getBiznisItemId());
-                outboundItemCostMapper.deleteData(inOutRecord);
+//                OutboundItemCost outboundItemCost = new OutboundItemCost();
+//                //出库明细Id
+//                outboundItemCost.setOutItemId(inOutRecordVO.getBiznisItemId());
+                outboundItemCostMapper.deleteData(inOutRecordVO.getBiznisItemId());
                 //endregion
 
                 //新建存货流水 一正一负
@@ -1489,10 +1489,10 @@ public class InventoryService extends BaseService<Inventory> {
 
 
             //region   要把出库成本也删除
-            OutboundItemCost outboundItemCost = new OutboundItemCost();
-            //出库明细Id
-            outboundItemCost.setOutItemId(inOutRecordVO.getBiznisItemId());
-            outboundItemCostMapper.deleteData(inOutRecord);
+//            OutboundItemCost outboundItemCost = new OutboundItemCost();
+//            //出库明细Id
+//            outboundItemCost.setOutItemId(inOutRecordVO.getBiznisItemId());
+            outboundItemCostMapper.deleteData(inOutRecordVO.getBiznisItemId());
             //endregion
         }
 

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

@@ -1097,7 +1097,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 outboundItemVO
                         .setOutQty(outboundItemVO.getOutingQty())
                         .setOutBox(outboundItemVO.getOutingBox()).setOutPiece(outboundItemVO.getOutingPiece())
-                        .setOutAmt(outboundItemVO.getOutAmt())
+                        .setOutAmt(outboundItemVO.getOutingAmt())
                         .setOutingQty(BigDecimal.ZERO).setOutingBox(0).setOutingPiece(0)
                         .setOutingAmt(BigDecimal.ZERO)
                         .setCostPrice(outboundItemVO.getPriceOut())