koushanshan пре 2 година
родитељ
комит
5d937b77a0
23 измењених фајлова са 1384 додато и 101 уклоњено
  1. 12 1
      src/main/java/com/dk/mdm/mapper/ivt/InOutRecordMapper.java
  2. 9 0
      src/main/java/com/dk/mdm/mapper/ivt/InOutRecordMapper.xml
  3. 7 2
      src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.xml
  4. 23 1
      src/main/java/com/dk/mdm/mapper/ivt/InventoryBatchMapper.java
  5. 28 1
      src/main/java/com/dk/mdm/mapper/ivt/InventoryBatchMapper.xml
  6. 17 0
      src/main/java/com/dk/mdm/mapper/ivt/InventoryMapper.java
  7. 31 0
      src/main/java/com/dk/mdm/mapper/ivt/InventoryMapper.xml
  8. 12 1
      src/main/java/com/dk/mdm/mapper/ivt/OutboundItemCostMapper.java
  9. 10 0
      src/main/java/com/dk/mdm/mapper/ivt/OutboundItemCostMapper.xml
  10. 4 0
      src/main/java/com/dk/mdm/model/pojo/ivt/Inbound.java
  11. 5 0
      src/main/java/com/dk/mdm/model/response/ivt/InboundResponse.java
  12. 2 0
      src/main/java/com/dk/mdm/model/response/ivt/InventoryResponse.java
  13. 28 0
      src/main/java/com/dk/mdm/model/vo/ivt/InOutRecordVO.java
  14. 3 0
      src/main/java/com/dk/mdm/model/vo/ivt/InboundVO.java
  15. 1 1
      src/main/java/com/dk/mdm/service/ivt/inbound/InboundCheckService.java
  16. 5 5
      src/main/java/com/dk/mdm/service/ivt/inbound/InboundOtherService.java
  17. 5 5
      src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java
  18. 5 5
      src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseService.java
  19. 1161 63
      src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java
  20. 1 1
      src/main/java/com/dk/mdm/service/ivt/outbound/OutboundCheckService.java
  21. 5 5
      src/main/java/com/dk/mdm/service/ivt/outbound/OutboundOtherService.java
  22. 5 5
      src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java
  23. 5 5
      src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

+ 12 - 1
src/main/java/com/dk/mdm/mapper/ivt/InOutRecordMapper.java

@@ -2,6 +2,7 @@ package com.dk.mdm.mapper.ivt;
 
 import com.dk.mdm.model.pojo.ivt.InOutRecord;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.pojo.ivt.InventoryBatch;
 import com.dk.mdm.model.query.ivt.InOutRecordQuery;
 import com.dk.mdm.model.query.ivt.InboundQuery;
 import com.dk.mdm.model.response.ivt.InOutRecordResponse;
@@ -36,6 +37,16 @@ public interface InOutRecordMapper extends BaseMapper<InOutRecord>{
      * @author : 寇珊珊
      */
     Long countByCond(InOutRecordQuery inOutRecordQuery);
-	
+
+
+    /**
+     * @desc   : 删除数据
+     * @date   : 2024/4/10 13:46
+     * @author : 寇珊珊
+     */
+    int deleteData(InOutRecord inOutRecord);
+
+
+
 }
 

+ 9 - 0
src/main/java/com/dk/mdm/mapper/ivt/InOutRecordMapper.xml

@@ -211,4 +211,13 @@
             )
         </foreach>
     </insert>
+
+
+    <!--删除数据-->
+    <delete id="deleteData" parameterType="com.dk.mdm.model.pojo.ivt.InOutRecord">
+        DELETE
+        FROM dkic_b.t_psi_in_out_record
+        where biznis_id = #{biznisId,typeHandler=UuidTypeHandler}
+          and biznis_item_id = #{biznisItemId,typeHandler=UuidTypeHandler}
+    </delete>
 </mapper>

+ 7 - 2
src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.xml

@@ -10,7 +10,7 @@
         return_amt, into_date, remarks, annex_paths, make_staff, make_time,
         receivable_id, payable_id, flg_valid, cp_id, op_create_time, op_create_user_id,
         op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,wh_id,
-        into_reason,flg_auto_handle,flg_handle_setting
+        into_reason,flg_auto_handle,flg_handle_setting,flg_neg_into
     </sql>
 
 
@@ -20,7 +20,7 @@
         tpi.cus_id, tpi.sup_id, tpi.into_status, tpi.intoing_qty, tpi.intoing_amt, tpi.into_qty,
         tpi.into_amt, tpi.return_qty, tpi.return_amt, tpi.into_date, tpi.remarks, tpi.annex_paths,
         tpi.make_staff, tpi.make_time, tpi.receivable_id, tpi.payable_id, tpi.flg_valid, tpi.cp_id,
-        tpi.wh_id,tpi.into_reason,flg_auto_handle,flg_handle_setting
+        tpi.wh_id,tpi.into_reason,tpi.flg_auto_handle,tpi.flg_handle_setting,tpi.flg_neg_into
     </sql>
 
 
@@ -62,6 +62,7 @@
         <result column="wh_id" property="whId"/>
         <result column="flg_auto_handle" property="flgAutoHandle"/>
         <result column="flg_handle_setting" property="flgHandleSetting"/>
+        <result column="flg_neg_into" property="flgNegInto"/>
     </resultMap>
 
     <!-- response查询映射结果 -->
@@ -111,6 +112,7 @@
         <result column="return_address" property="returnAddress" />
         <result column="flg_auto_handle" property="flgAutoHandle"/>
         <result column="flg_handle_setting" property="flgHandleSetting"/>
+        <result column="flg_neg_into" property="flgNegInto"/>
     </resultMap>
 
 
@@ -631,6 +633,9 @@
             <if test="intoStatus != null and intoStatus != ''">
                 AND tpi.into_status = #{intoStatus}
             </if>
+            <if test="fromId != null and fromId != ''">
+                AND tpi.from_id = #{fromId}::uuid
+            </if>
         </where>
     </select>
 

+ 23 - 1
src/main/java/com/dk/mdm/mapper/ivt/InventoryBatchMapper.java

@@ -55,7 +55,29 @@ public interface InventoryBatchMapper extends BaseMapper<InventoryBatch>{
      */
     int updateAmountAndQuantity(InventoryBatchVO inventoryBatchVO);
 
+    /**
+     * @desc   : 修改数量金额--直接赋值
+     * @date   : 2024/3/22 14:23
+     * @author : 寇珊珊
+     */
+    int updateAmtAndQty(InventoryBatch inventoryBatch);
+
+    /**
+     * @desc   : 删除数据
+     * @date   : 2024/4/10 13:46
+     * @author : 寇珊珊
+     */
+    int deleteData(InventoryBatch inventoryBatch);
+
+
+    /**
+     * @desc   : 根据来源信息查询
+     * @date   : 2024/4/11 10:44
+     * @author : 寇珊珊
+     */
+    InventoryBatchResponse  selectByFromCondition(InventoryBatchQuery inventoryBatchQuery);
+
+
 
-	
 }
 

+ 28 - 1
src/main/java/com/dk/mdm/mapper/ivt/InventoryBatchMapper.xml

@@ -223,7 +223,7 @@
         <include refid="Base_Column_List_Response"/>
         FROM dkic_b.t_psi_inventory_batch tpib
         <where>
-            tpib.inv_qty > 0
+            tpib.inv_qty > 0  and tpib.flg_valid
             <if test="invId != null and invId != ''">
                 AND tpib.inv_id = #{invId,typeHandler=UuidTypeHandler}
             </if>
@@ -248,4 +248,31 @@
         and inv_qty - #{invQty,jdbcType=NUMERIC}>=0
         and cost_amt - #{costAmt,jdbcType=NUMERIC}>=0
     </update>
+
+    <!--删除数据-->
+    <delete id="deleteData" parameterType="com.dk.mdm.model.vo.ivt.InventoryBatchVO">
+        DELETE
+        FROM dkic_b.t_psi_inventory_batch
+        where from_id = #{fromId,typeHandler=UuidTypeHandler}
+          and from_item_id = #{fromItemId,typeHandler=UuidTypeHandler}
+    </delete>
+
+    <!--根据来源信息查询-->
+    <select id="selectByFromCondition" resultMap="BaseResultMapResponse">
+        SELECT
+        <include refid="Base_Column_List_Response"/>
+        FROM dkic_b.t_psi_inventory_batch tpib
+        WHERE tpib.from_id = #{fromId}::uuid
+        and   tpib.from_item_id = #{fromItemId}::uuid
+    </select>
+
+    <!-- 修改数量金额直接赋值-->
+    <update id="updateAmtAndQty" parameterType="com.dk.mdm.model.pojo.ivt.InventoryBatch">
+        update dkic_b.t_psi_inventory_batch
+        set cost_amt = #{costAmt,jdbcType=NUMERIC},
+            inv_qty  = #{invQty,jdbcType=NUMERIC},
+            where batch_id = #{batchId,typeHandler=UuidTypeHandler}
+    </update>
+
+
 </mapper>

+ 17 - 0
src/main/java/com/dk/mdm/mapper/ivt/InventoryMapper.java

@@ -1,5 +1,6 @@
 package com.dk.mdm.mapper.ivt;
 
+import com.dk.mdm.model.pojo.ivt.InOutRecord;
 import com.dk.mdm.model.pojo.ivt.Inventory;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.ivt.InOutRecordQuery;
@@ -55,5 +56,21 @@ public interface InventoryMapper extends BaseMapper<Inventory>{
     */
    int updateAmountAndQuantity(InventoryVO inventoryVO);
 
+
+   /**
+    * @desc   : 修改库存数量金额----删除用
+    * @date   : 2024/3/22 9:53
+    * @author : 寇珊珊
+    */
+   int updateAmtAndQty(Inventory inventory);
+
+
+    /**
+     * @desc   : 删除数据
+     * @date   : 2024/4/10 13:46
+     * @author : 寇珊珊
+     */
+    int deleteData(Inventory inventory);
+
 }
 

+ 31 - 0
src/main/java/com/dk/mdm/mapper/ivt/InventoryMapper.xml

@@ -256,4 +256,35 @@
         and cost_amt + #{costAmt,jdbcType=NUMERIC}>=0
     </update>
 
+    <!--修改库存数量金额(删除用)-->
+    <update id="updateAmtAndQty" parameterType="com.dk.mdm.model.pojo.ivt.Inventory">
+        update dkic_b.t_psi_inventory
+        <set>
+            <if test="invQty != null">
+                inv_qty = #{invQty,jdbcType=NUMERIC},
+            </if>
+            <if test="usableQty != null">
+                usable_qty = #{usableQty,jdbcType=NUMERIC},
+            </if>
+            <if test="costPrice != null">
+                cost_price = #{costPrice,jdbcType=NUMERIC},
+            </if>
+            <if test="costAmt != null">
+                cost_amt = #{costAmt,jdbcType=NUMERIC},
+            </if>
+        </set>
+        where inv_id =#{invId,typeHandler=UuidTypeHandler}
+        and #{invQty,jdbcType=NUMERIC}>=0
+        and #{costAmt,jdbcType=NUMERIC}>=0
+    </update>
+
+
+    <!--删除数据-->
+    <delete id="deleteData" parameterType="com.dk.mdm.model.pojo.ivt.InOutRecord">
+        DELETE
+        FROM dkic_b.t_psi_inventory
+        where inv_id = #{invId,typeHandler=UuidTypeHandler}
+    </delete>
+
+
 </mapper>

+ 12 - 1
src/main/java/com/dk/mdm/mapper/ivt/OutboundItemCostMapper.java

@@ -1,5 +1,6 @@
 package com.dk.mdm.mapper.ivt;
 
+import com.dk.mdm.model.pojo.ivt.InOutRecord;
 import com.dk.mdm.model.pojo.ivt.OutboundItemCost;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.ivt.InventoryQuery;
@@ -38,6 +39,16 @@ public interface OutboundItemCostMapper extends BaseMapper<OutboundItemCost>{
      * @author : 寇珊珊
      */
     Long countByCond(OutboundItemCostQuery outboundItemCostQuery);
-	
+
+
+
+    /**
+     * @desc   : 删除数据
+     * @date   : 2024/4/10 13:46
+     * @author : 寇珊珊
+     */
+    int deleteData(InOutRecord inOutRecord);
+
+
 }
 

+ 10 - 0
src/main/java/com/dk/mdm/mapper/ivt/OutboundItemCostMapper.xml

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

+ 4 - 0
src/main/java/com/dk/mdm/model/pojo/ivt/Inbound.java

@@ -336,6 +336,10 @@ public class Inbound extends PageInfo<Inbound> implements Serializable {
     @ApiModelProperty(value = "自动办理参数")
     private Boolean flgHandleSetting;
 
+    @Excel(name = "无货出库自动入库标识")
+    @ApiModelProperty(value = "无货出库自动入库标识")
+    private Boolean flgNegInto;
+
 
     /*
      * 相关属性

+ 5 - 0
src/main/java/com/dk/mdm/model/response/ivt/InboundResponse.java

@@ -276,6 +276,11 @@ public class InboundResponse  {
     @ApiModelProperty(value = "自动办理参数")
     private Boolean flgHandleSetting;
 
+    @Excel(name = "无货出库自动入库标识")
+    @ApiModelProperty(value = "无货出库自动入库标识")
+    private Boolean flgNegInto;
+
+
 
     @Excel(name = "入库原因")
     @ApiModelProperty(value = "入库原因")

+ 2 - 0
src/main/java/com/dk/mdm/model/response/ivt/InventoryResponse.java

@@ -217,6 +217,8 @@ public class InventoryResponse {
 
 
 
+
+
     private static final long serialVersionUID = 1L;
 
 }

+ 28 - 0
src/main/java/com/dk/mdm/model/vo/ivt/InOutRecordVO.java

@@ -150,6 +150,10 @@ public class InOutRecordVO  {
     @ApiModelProperty(value = "入库单id")
     private String intoId;
 
+    @ApiModelProperty(value = "入库单明细id")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String intoItemId;
+
     @ApiModelProperty(value = "入库日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class, updateStrategy = FieldStrategy.IGNORED)
@@ -190,10 +194,34 @@ public class InOutRecordVO  {
     @ApiModelProperty(value = "金额编辑之前")
     private BigDecimal amtBeforeUpdate;
 
+
+    @ApiModelProperty(value = "新建编辑标识true:新建,false:编辑")
+    private Boolean addOrEditFlag;
+
+
     @ApiModelProperty(value = "可以输入负数出库标识")
     private Boolean canNegativeFlag;
 
 
+    @ApiModelProperty(value = "源出库单明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sOutItemId;
+
+    @ApiModelProperty(value = "源出库单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String sOutId;
+
+    @ApiModelProperty(value = "业务单单号")
+    private String biznisNo;
+
+
+
+
+
+
+
+
+
 
 
 

+ 3 - 0
src/main/java/com/dk/mdm/model/vo/ivt/InboundVO.java

@@ -1,5 +1,6 @@
 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.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
@@ -233,6 +234,8 @@ public class InboundVO {
     private Boolean flgHandleSetting;
 
 
+    @ApiModelProperty(value = "无货出库自动入库标识")
+    private Boolean flgNegInto;
 
     /*
      * 相关属性

+ 1 - 1
src/main/java/com/dk/mdm/service/ivt/inbound/InboundCheckService.java

@@ -150,7 +150,7 @@ public class InboundCheckService extends BaseService<Inbound> {
 		//region 修改库存
 //		Map<String, Object> invMap = new HashMap<>();
 //		invMap.put("intoDetail", inboundVO.getItemList());
-//		inventoryService.updateInventoryInformation(invMap);
+//		inventoryService.operatingInventoryInformation(invMap);
 		//endregion
 
 		return inboundVO;

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

@@ -209,7 +209,7 @@ public class InboundOtherService extends BaseService<Inbound> {
         if (Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())) {
             Map<String, Object> invMap = new HashMap<>();
             map.put("intoDetail", inboundVO.getItemList());
-            inventoryService.updateInventoryInformation(invMap);
+            inventoryService.operatingInventoryInformation(invMap);
         }
         //endregion
 
@@ -342,7 +342,7 @@ public class InboundOtherService extends BaseService<Inbound> {
                 //region  todo调用库存
                 Map<String, Object> map = new HashMap<>();
                 map.put("intoDetail", inboundVO.getItemList());
-                inventoryService.updateInventoryInformation(map);
+                inventoryService.operatingInventoryInformation(map);
                 //endregion
             }
             //endregion
@@ -478,7 +478,7 @@ public class InboundOtherService extends BaseService<Inbound> {
             //region
             Map<String, Object> map = new HashMap<>();
             map.put("intoDetail", inboundItemResponseList);
-            inventoryService.updateInventoryInformation(map);
+            inventoryService.operatingInventoryInformation(map);
             //endregion
         }
         //endregion
@@ -631,7 +631,7 @@ public class InboundOtherService extends BaseService<Inbound> {
         //region 修改库存
 //        Map<String, Object> map = new HashMap<>();
 //        map.put("intoDetail", inboundVO.getItemList());
-//        inventoryService.updateInventoryInformation(map);
+//        inventoryService.operatingInventoryInformation(map);
         //endregion
         return ResponseResultUtil.success(inboundVO);
     }
@@ -695,7 +695,7 @@ public class InboundOtherService extends BaseService<Inbound> {
         //region 修改库存
         Map<String, Object> map = new HashMap<>();
         map.put("intoDetail", inboundItemResponseList);
-        inventoryService.updateInventoryInformation(map);
+        inventoryService.operatingInventoryInformation(map);
         //endregion
 
         return ResponseResultUtil.success();

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

@@ -224,7 +224,7 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
 //        if(Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())){
 //            Map<String, Object> invMap = new HashMap<>();
 //            invMap.put("intoDetail",inboundVO.getItemList());
-//            inventoryService.updateInventoryInformation(map);
+//            inventoryService.operatingInventoryInformation(map);
 //        }
         //endregion
 
@@ -377,7 +377,7 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                 //region  todo 调用库存
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("intoDetail",inboundVO.getItemList());
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
                 //endregion
             }
             //endregion
@@ -511,7 +511,7 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
             //region  todo 调用库存
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("intoDetail",inboundItemResponseList);
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
             //endregion
         }
         //endregion
@@ -676,7 +676,7 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
         //region  todo 调用库存
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("intoDetail",inboundVO.getItemList());
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
         //endregion
 
         return ResponseResultUtil.success(inboundVO);
@@ -759,7 +759,7 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
         //region  todo 调用库存
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("intoDetail",inboundItemResponseList);
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
         //endregion
 
         return ResponseResultUtil.success();

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

@@ -287,7 +287,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 //        if(Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())){
 //            Map<String, Object> invMap = new HashMap<>();
 //            invMap.put("intoDetail",inboundVO.getItemList());
-//            inventoryService.updateInventoryInformation(map);
+//            inventoryService.operatingInventoryInformation(map);
 //        }
         //endregion
 
@@ -506,7 +506,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
                 //region  todo调用库存
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("intoDetail",inboundVO.getItemList());
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
                 //endregion
             }
             //endregion
@@ -771,7 +771,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
             //region  todo 调用库存
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("intoDetail",inboundItemResponseList);
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
             //endregion
         }
         //endregion
@@ -1059,7 +1059,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
         //region  todo 调用库存 这里后续把删除的明细也加上
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("intoDetail",inboundItemResponseList);
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
         //endregion
 
         //endregion
@@ -1187,7 +1187,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
         //region  todo 调用库存
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("intoDetail",inboundItemResponseList);
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
         //endregion
 
         return ResponseResultUtil.success();

Разлика између датотеке није приказан због своје велике величине
+ 1161 - 63
src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java


+ 1 - 1
src/main/java/com/dk/mdm/service/ivt/outbound/OutboundCheckService.java

@@ -147,7 +147,7 @@ public class OutboundCheckService extends BaseService<Outbound> {
         //region 修改库存
 //            Map<String, Object> invMap = new HashMap<>();
 //            invMap.put("outDetail",outboundVO.getItemList());
-//            inventoryService.updateInventoryInformation(invMap);
+//            inventoryService.operatingInventoryInformation(invMap);
         //endregion
 
         //1.入库需要的值 附上 掉用接口

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

@@ -208,7 +208,7 @@ public class OutboundOtherService extends BaseService<Outbound> {
         if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())) {
             Map<String, Object> invMap = new HashMap<>();
             invMap.put("outDetail", outboundVO.getItemList());
-            inventoryService.updateInventoryInformation(invMap);
+            inventoryService.operatingInventoryInformation(invMap);
         }
         //endregion
 
@@ -343,7 +343,7 @@ public class OutboundOtherService extends BaseService<Outbound> {
                 if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())) {
                     Map<String, Object> invMap = new HashMap<>();
                     invMap.put("outDetail", outboundVO.getItemList());
-                    inventoryService.updateInventoryInformation(invMap);
+                    inventoryService.operatingInventoryInformation(invMap);
                 }
                 //endregion
             }
@@ -479,7 +479,7 @@ public class OutboundOtherService extends BaseService<Outbound> {
             //region  修改库存
             Map<String, Object> map = new HashMap<>();
             map.put("outDetail", outboundItemResponseList);
-            inventoryService.updateInventoryInformation(map);
+            inventoryService.operatingInventoryInformation(map);
             //endregion
         }
         //endregion
@@ -635,7 +635,7 @@ public class OutboundOtherService extends BaseService<Outbound> {
         //region 修改库存
         Map<String, Object> map = new HashMap<>();
         map.put("outDetail", outboundVO.getItemList());
-        inventoryService.updateInventoryInformation(map);
+        inventoryService.operatingInventoryInformation(map);
         //endregion
 
         return ResponseResultUtil.success(outboundVO);
@@ -703,7 +703,7 @@ public class OutboundOtherService extends BaseService<Outbound> {
         //region 修改库存
         Map<String, Object> map = new HashMap<>();
         map.put("outDetail", outboundItemResponseList);
-        inventoryService.updateInventoryInformation(map);
+        inventoryService.operatingInventoryInformation(map);
         //endregion
 
         return ResponseResultUtil.success();

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

@@ -280,7 +280,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
 //        if(Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())){
 //            Map<String, Object> invMap = new HashMap<>();
 //            invMap.put("outDetail",outboundVO.getItemList());
-//            inventoryService.updateInventoryInformation(map);
+//            inventoryService.operatingInventoryInformation(map);
 //        }
         //endregion
 
@@ -502,7 +502,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 //region 修改库存
 //                Map<String, Object> invMap = new HashMap<>();
 //                invMap.put("outDetail", outboundVO.getItemList());
-//                inventoryService.updateInventoryInformation(invMap);
+//                inventoryService.operatingInventoryInformation(invMap);
                 //endregion
             }
             //endregion
@@ -764,7 +764,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
             //region  修改库存
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("outDetail",outboundItemResponseList);
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
             //endregion
         }
         //endregion
@@ -1058,7 +1058,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
         //region   调用库存
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("outDetail",outboundVO.getItemList());
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
         //endregion
         return ResponseResultUtil.success(outboundVO);
     }
@@ -1182,7 +1182,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
         //region   调用库存
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("outDetail",outboundItemResponseList);
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
         //endregion
 
         return ResponseResultUtil.success();

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

@@ -410,7 +410,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
         if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())) {
 //            Map<String, Object> invMap = new HashMap<>();
 //            invMap.put("outDetail",outboundVO.getItemList());
-//            inventoryService.updateInventoryInformation(invMap);
+//            inventoryService.operatingInventoryInformation(invMap);
         }
         //endregion
 
@@ -579,7 +579,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                 //region 修改库存
 //                Map<String, Object> invMap = new HashMap<>();
 //                invMap.put("outDetail", outboundVO.getItemList());
-//                inventoryService.updateInventoryInformation(invMap);
+//                inventoryService.operatingInventoryInformation(invMap);
                 //endregion
             }
             //endregion
@@ -753,7 +753,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             //region  修改库存
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("outDetail",outboundItemResponseList);
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
             //endregion
         }
         //endregion
@@ -953,7 +953,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
         //region   调用库存
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("outDetail",outboundVO.getItemList());
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
         //endregion
         return ResponseResultUtil.success(outboundVO);
     }
@@ -1032,7 +1032,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
         //region   调用库存
 //                Map<String, Object> map = new HashMap<>();
 //                map.put("outDetail",outboundItemResponseList);
-//                inventoryService.updateInventoryInformation(map);
+//                inventoryService.operatingInventoryInformation(map);
         //endregion
 
         return ResponseResultUtil.success();

Неке датотеке нису приказане због велике количине промена