From f2176a83d99d3e10adf0a7d76db229f303634260 Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Wed, 24 Aug 2022 22:35:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E3=80=81=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmStorageLocationController.java | 10 ++++++++++ .../mes/wm/controller/WmWarehouseController.java | 16 ++++++++++++++++ .../ktg/mes/wm/mapper/WmStorageAreaMapper.java | 14 ++++++++++++++ .../mes/wm/mapper/WmStorageLocationMapper.java | 7 +++++++ .../com/ktg/mes/wm/mapper/WmWarehouseMapper.java | 1 + .../mes/wm/service/IWmStorageAreaService.java | 14 ++++++++++++++ .../wm/service/IWmStorageLocationService.java | 7 +++++++ .../service/impl/WmStorageAreaServiceImpl.java | 10 ++++++++++ .../impl/WmStorageLocationServiceImpl.java | 5 +++++ .../resources/mapper/wm/WmStorageAreaMapper.xml | 9 +++++++++ .../mapper/wm/WmStorageLocationMapper.xml | 4 ++++ 11 files changed, 97 insertions(+) diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageLocationController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageLocationController.java index b5af6bd..8cccc54 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageLocationController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageLocationController.java @@ -4,8 +4,10 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ktg.common.constant.UserConstants; +import com.ktg.mes.wm.service.IWmStorageAreaService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -36,6 +38,9 @@ public class WmStorageLocationController extends BaseController @Autowired private IWmStorageLocationService wmStorageLocationService; + @Autowired + private IWmStorageAreaService wmStorageAreaService; + /** * 查询库区设置列表 */ @@ -104,9 +109,14 @@ public class WmStorageLocationController extends BaseController */ @PreAuthorize("@ss.hasPermi('mes:wm:location:remove')") @Log(title = "库区设置", businessType = BusinessType.DELETE) + @Transactional @DeleteMapping("/{locationIds}") public AjaxResult remove(@PathVariable Long[] locationIds) { + for (Long locationId: locationIds + ) { + wmStorageAreaService.deleteByLocationId(locationId); + } return toAjax(wmStorageLocationService.deleteWmStorageLocationByLocationIds(locationIds)); } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java index 88a8f27..250f3d0 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java @@ -4,8 +4,11 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ktg.common.constant.UserConstants; +import com.ktg.mes.wm.service.IWmStorageAreaService; +import com.ktg.mes.wm.service.IWmStorageLocationService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -36,6 +39,12 @@ public class WmWarehouseController extends BaseController @Autowired private IWmWarehouseService wmWarehouseService; + @Autowired + private IWmStorageLocationService wmStorageLocationService; + + @Autowired + private IWmStorageAreaService wmStorageAreaService; + /** * 查询仓库设置列表 */ @@ -114,9 +123,16 @@ public class WmWarehouseController extends BaseController */ @PreAuthorize("@ss.hasPermi('mes:wm:warehouse:remove')") @Log(title = "仓库设置", businessType = BusinessType.DELETE) + @Transactional @DeleteMapping("/{warehouseIds}") public AjaxResult remove(@PathVariable Long[] warehouseIds) { + for (Long wahouseId: warehouseIds + ) { + wmStorageLocationService.deleteByWarehouseId(wahouseId); + wmStorageAreaService.deleteByWarehouseId(wahouseId); + } + return toAjax(wmWarehouseService.deleteWmWarehouseByWarehouseIds(warehouseIds)); } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java index 9ede938..743fa60 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java @@ -58,4 +58,18 @@ public interface WmStorageAreaMapper * @return 结果 */ public int deleteWmStorageAreaByAreaIds(Long[] areaIds); + + /** + * 根据仓库删除对应的库位 + * @param warehouseId + * @return + */ + public int deleteByWarehouseId(Long warehouseId); + + /** + * 根据库区删除对应的库位 + * @param locationId + * @return + */ + public int deleteByLocationId(Long locationId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageLocationMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageLocationMapper.java index 76d31f4..6488d72 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageLocationMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageLocationMapper.java @@ -64,4 +64,11 @@ public interface WmStorageLocationMapper * @return 结果 */ public int deleteWmStorageLocationByLocationIds(Long[] locationIds); + + /** + * 根据仓库删除对应的库区 + * @param warehouseId + * @return + */ + public int deleteByWarehouseId(Long warehouseId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java index c4d29f7..1cc1225 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java @@ -63,4 +63,5 @@ public interface WmWarehouseMapper * @return 结果 */ public int deleteWmWarehouseByWarehouseIds(Long[] warehouseIds); + } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java index 7dbf528..3a19c57 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java @@ -58,4 +58,18 @@ public interface IWmStorageAreaService * @return 结果 */ public int deleteWmStorageAreaByAreaId(Long areaId); + + /** + * 根据仓库删除对应的库位 + * @param warehouseId + * @return + */ + public int deleteByWarehouseId(Long warehouseId); + + /** + * 根据库区删除对应的库位 + * @param locationId + * @return + */ + public int deleteByLocationId(Long locationId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageLocationService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageLocationService.java index 7862487..e173c54 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageLocationService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageLocationService.java @@ -73,4 +73,11 @@ public interface IWmStorageLocationService * @return 结果 */ public int deleteWmStorageLocationByLocationId(Long locationId); + + /** + * 根据仓库删除对应的库区 + * @param warehouseId + * @return + */ + public int deleteByWarehouseId(Long warehouseId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java index 45c2b9d..d5b3e56 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java @@ -93,4 +93,14 @@ public class WmStorageAreaServiceImpl implements IWmStorageAreaService { return wmStorageAreaMapper.deleteWmStorageAreaByAreaId(areaId); } + + @Override + public int deleteByWarehouseId(Long warehouseId) { + return wmStorageAreaMapper.deleteByWarehouseId(warehouseId); + } + + @Override + public int deleteByLocationId(Long locationId) { + return wmStorageAreaMapper.deleteByLocationId(locationId); + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java index 9fc651b..14d81f1 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java @@ -117,4 +117,9 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService { return wmStorageLocationMapper.deleteWmStorageLocationByLocationId(locationId); } + + @Override + public int deleteByWarehouseId(Long warehouseId) { + return wmStorageLocationMapper.deleteByWarehouseId(warehouseId); + } } diff --git a/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml index 63aa11f..5328d22 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml @@ -129,4 +129,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{areaId} + + + delete from wm_storage_area where warehouse_id = #{warehouseId} + + + + delete form wm_storage_area where location_id = #{locationId} + + \ No newline at end of file diff --git a/ktg-mes/src/main/resources/mapper/wm/WmStorageLocationMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmStorageLocationMapper.xml index 803c0c9..3884435 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmStorageLocationMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmStorageLocationMapper.xml @@ -119,4 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{locationId} + + + delete from wm_storage_location where warehouse_id = #{warehouseId} + \ No newline at end of file