From b0c0c18f3d150d06a198f042d68698cf52ce24c8 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Thu, 29 Aug 2024 00:14:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=BB=E8=BE=91=EF=BC=9A?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=93=E5=BA=93=E5=88=A0=E9=99=A4=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=9A=84=E5=95=86=E5=93=81=E7=9A=84=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=BA=93=E5=AD=98=EF=BC=8C=E5=88=A0=E9=99=A4=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=B3=E8=81=94=E7=9A=84=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=9A=84=E5=BD=93=E5=89=8D=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mappers/MaterialCurrentStockMapperEx.java | 2 ++ .../mappers/MaterialInitialStockMapperEx.java | 1 + .../jsh/erp/service/depot/DepotService.java | 17 +++++++------ .../MaterialCurrentStockMapperEx.xml | 11 ++++++++ .../MaterialInitialStockMapperEx.xml | 25 +++++++++++++------ 5 files changed, 42 insertions(+), 14 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java index 2586782d..74a8d2dc 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java +++ b/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[]); } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialInitialStockMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialInitialStockMapperEx.java index 76ff7c90..9dbce84f 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialInitialStockMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialInitialStockMapperEx.java @@ -13,4 +13,5 @@ public interface MaterialInitialStockMapperEx { List getListExceptZero(); + void batchDeleteByDepots(@Param("ids") String ids[]); } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java index 7b6bbb6e..b1f551da 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java +++ b/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); diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml index 70373c61..dce71636 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml +++ b/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 + + update jsh_material_current_stock + set delete_flag='1' + where 1=1 + and depot_id in ( + + #{id} + + ) + + \ No newline at end of file diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialInitialStockMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialInitialStockMapperEx.xml index a552505a..f708accf 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialInitialStockMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialInitialStockMapperEx.xml @@ -3,16 +3,27 @@ - insert into jsh_material_initial_stock (material_id, depot_id, number) - values - - (#{item.materialId,jdbcType=BIGINT}, #{item.depotId,jdbcType=BIGINT},#{item.number,jdbcType=DECIMAL}) - + insert into jsh_material_initial_stock (material_id, depot_id, number) + values + + (#{item.materialId,jdbcType=BIGINT}, #{item.depotId,jdbcType=BIGINT},#{item.number,jdbcType=DECIMAL}) + + + update jsh_material_initial_stock + set delete_flag='1' + where 1=1 + and depot_id in ( + + #{id} + + ) + + \ No newline at end of file