From b27d90d423330ffcb28097c05fd6ce01d561acbe Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Mon, 18 Aug 2025 19:22:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E7=89=A9?= =?UTF-8?q?=E6=96=99=E9=AB=98=E4=BB=B7=E5=80=BC=E6=A0=87=E8=AF=86=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E5=BA=93=E5=AE=A1=E6=89=B9=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsOutstockDetail模型中添加 isHighValue 字段，用于标识高价值物料 - 在 WmsOutstockDetailServiceImpl 中实现高价值物料信息的查询和关联 --- .../org/dromara/wms/domain/WmsOutstockDetail.java | 6 ++++++ .../dromara/wms/domain/vo/WmsOutstockDetailVo.java | 4 ++++ .../service/impl/WmsInstockOrderServiceImpl.java | 14 ++++---------- .../service/impl/WmsOutstockDetailServiceImpl.java | 3 +++ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockDetail.java index 7f49b9f..c439424 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockDetail.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockDetail.java @@ -114,4 +114,10 @@ public class WmsOutstockDetail { @TableField(exist = false) private String materialCategoryName;//字段映射 + /** + * 是否高价值物料(0否,1是) + */ + @TableField(exist = false) + private String isHighValue;//字段映射 + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockDetailVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockDetailVo.java index 967393d..2545927 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockDetailVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockDetailVo.java @@ -114,4 +114,8 @@ public class WmsOutstockDetailVo implements Serializable { */ private String materialCategoryName;//字段映射 + /** + * 是否高价值物料(0否,1是) + */ + private String isHighValue;//字段映射 } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java index 2c8a4c0..8a706b9 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java @@ -450,9 +450,9 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService { @Override public Integer approveInstockOrder(WmsInstockOrderBo bo) { String username = LoginHelper.getUsername(); - if (!username.equals(bo.getAuditBy())){ - return 0; - } +// if (!username.equals(bo.getAuditBy())){ +// return 0; +// } WmsInstockOrder update = MapstructUtils.convert(bo, WmsInstockOrder.class); validEntityBeforeSave(update); update.setUpdateBy(username); @@ -480,13 +480,7 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService { int count = wmsInstockDetailService.deleteByInstockId(ids); return delete>0; } -/** - * 创建外协入库单 - * 1. 生成入库单号 - * 2. 转换并保存入库单主表信息 - * 3. 保存明细信息 - * 4. 若明细中有批次号，则生成打印记录 - */ + /** * 创建外协入库单 diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockDetailServiceImpl.java index 9eb9a0c..5576189 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockDetailServiceImpl.java @@ -87,6 +87,9 @@ public class WmsOutstockDetailServiceImpl implements IWmsOutstockDetailService { MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsOutstockDetail.class) .selectAll(WmsOutstockDetail.class) + .select(BaseMaterialInfo::getIsHighValue) + .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, WmsOutstockDetail::getMaterialId) + // 关联表查询物料大类名称 .select(BaseMaterialCategory::getMaterialCategoryName) .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockDetail::getMaterialCategoryId)