增加逻辑：删除仓库删除关联的商品的初始库存，删除仓库删除关联的商品的当前库存

jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java

@@ -19,4 +19,6 @@ public interface MaterialCurrentStockMapperEx {
             @Param("materialId") Long materialId);
 
     BigDecimal getCurrentUnitPriceByMId(@Param("materialId") Long materialId);
+
+    void batchDeleteByDepots(@Param("ids") String ids[]);
 }

jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialInitialStockMapperEx.java

@@ -13,4 +13,5 @@ public interface MaterialInitialStockMapperEx {
 
     List<MaterialInitialStock> getListExceptZero();
 
+    void batchDeleteByDepots(@Param("ids") String ids[]);
 }

jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java

@@ -5,10 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.constants.BusinessConstants;
 import com.jsh.erp.constants.ExceptionConstants;
 import com.jsh.erp.datasource.entities.*;
-import com.jsh.erp.datasource.mappers.DepotHeadMapperEx;
-import com.jsh.erp.datasource.mappers.DepotItemMapperEx;
-import com.jsh.erp.datasource.mappers.DepotMapper;
-import com.jsh.erp.datasource.mappers.DepotMapperEx;
+import com.jsh.erp.datasource.mappers.*;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.exception.JshException;
 import com.jsh.erp.service.log.LogService;
@@ -35,7 +32,6 @@ public class DepotService {
 
     @Resource
     private DepotMapper depotMapper;
-
     @Resource
     private DepotMapperEx depotMapperEx;
     @Resource
@@ -47,9 +43,11 @@ public class DepotService {
     @Resource
     private LogService logService;
     @Resource
-    private DepotHeadMapperEx depotHeadMapperEx;
-    @Resource
     private DepotItemMapperEx depotItemMapperEx;
+    @Resource
+    private MaterialInitialStockMapperEx materialInitialStockMapperEx;
+    @Resource
+    private MaterialCurrentStockMapperEx materialCurrentStockMapperEx;
 
     public Depot getDepot(long id)throws Exception {
         Depot result=null;
@@ -214,6 +212,11 @@ public class DepotService {
         User userInfo=userService.getCurrentUser();
         //校验通过执行删除操作
         try{
+            //删除仓库关联的商品的初始库存
+            materialInitialStockMapperEx.batchDeleteByDepots(idArray);
+            //删除仓库关联的商品的当前库存
+            materialCurrentStockMapperEx.batchDeleteByDepots(idArray);
+            //删除仓库
             result = depotMapperEx.batchDeleteDepotByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray);
         }catch(Exception e){
             JshException.writeFail(logger, e);

jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml

@@ -31,4 +31,15 @@
         select ifnull(mcs.current_unit_price,0) as current_unit_price from jsh_material_current_stock mcs where mcs.material_id=#{materialId} limit 1
     </select>
 
+    <update id="batchDeleteByDepots">
+        update jsh_material_current_stock
+        set delete_flag='1'
+        where 1=1
+        and depot_id in (
+        <foreach collection="ids" item="id" separator=",">
+            #{id}
+        </foreach>
+        )
+    </update>
+
 </mapper>

jshERP-boot/src/main/resources/mapper_xml/MaterialInitialStockMapperEx.xml

@@ -3,16 +3,27 @@
 <mapper namespace="com.jsh.erp.datasource.mappers.MaterialInitialStockMapperEx">
 
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into jsh_material_initial_stock (material_id, depot_id, number)
-    values
-    <foreach collection="list" item="item" separator=",">
-      (#{item.materialId,jdbcType=BIGINT}, #{item.depotId,jdbcType=BIGINT},#{item.number,jdbcType=DECIMAL})
-    </foreach >
+      insert into jsh_material_initial_stock (material_id, depot_id, number)
+      values
+      <foreach collection="list" item="item" separator=",">
+        (#{item.materialId,jdbcType=BIGINT}, #{item.depotId,jdbcType=BIGINT},#{item.number,jdbcType=DECIMAL})
+      </foreach >
   </insert>
 
   <select id="getListExceptZero" resultType="com.jsh.erp.datasource.entities.MaterialInitialStock">
-    select * from jsh_material_initial_stock where number!=0
-    and ifnull(delete_flag,'0') !='1'
+      select * from jsh_material_initial_stock where number!=0
+      and ifnull(delete_flag,'0') !='1'
   </select>
 
+  <update id="batchDeleteByDepots">
+      update jsh_material_initial_stock
+      set delete_flag='1'
+      where 1=1
+      and depot_id in (
+      <foreach collection="ids" item="id" separator=",">
+        #{id}
+      </foreach>
+      )
+  </update>
+
 </mapper>