From 4b02b3f775628b670a2472af9ad58421b34ec24b Mon Sep 17 00:00:00 2001 From: "maxw@mesnac.com" Date: Fri, 14 Feb 2025 16:53:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BF=AE=E6=94=B9=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsAllocateOrderDetailController.java | 12 ++++++++++-- .../wms/service/impl/WmsInventoryServiceImpl.java | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsAllocateOrderDetailController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsAllocateOrderDetailController.java index 61ad9830..87d909eb 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsAllocateOrderDetailController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsAllocateOrderDetailController.java @@ -103,7 +103,11 @@ public class WmsAllocateOrderDetailController extends BaseController { @PathVariable Long[] aoDIds) { return toAjax(wmsAllocateOrderDetailService.deleteWithValidByIds(List.of(aoDIds), true)); } - + /** + * 根据主键删除调拨子 + * + * @param aoDId 主键串 + */ @SaCheckPermission("system:allocateOrderDetail:remove") @Log(title = "调拨子", businessType = BusinessType.DELETE) @DeleteMapping("removeDetail/{aoDId}") @@ -111,7 +115,11 @@ public class WmsAllocateOrderDetailController extends BaseController { @PathVariable Long aoDId) { return toAjax(wmsAllocateOrderDetailService.deleteById(aoDId)); } - + /** + * 根据调拨单主键查询调拨单明细 + * + * @param aoDId 主键串 + */ @GetMapping("selectAllocateDetails") public R> selectAllocateDetails(Long aoDId){ return R.ok(wmsAllocateOrderDetailService.selectAllocateDetails()); diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryServiceImpl.java index 4aae4cd2..6a6cdbb7 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryServiceImpl.java @@ -175,7 +175,8 @@ public class WmsInventoryServiceImpl implements IWmsInventoryService { MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); lqw.selectAll(WmsInventory.class).select(BaseMaterialInfo::getMaterialCode) .leftJoin(BaseMaterialInfo.class,BaseMaterialInfo::getMaterialId,WmsInventory::getMaterialId); - lqw.eq(WmsInventory::getLocationCode,bo.getLocationCode()); + lqw.eq(WmsInventory::getLocationCode,bo.getLocationCode()) + .eq(WmsInventory::getMaterialCategories,bo.getMaterialCategories()); return baseMapper.selectVoList(lqw); }