From 5edc0b796602ba08547d9f6fa68916c791282a18 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Thu, 4 Sep 2025 10:32:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsInstockPrint、WmsInstockPrintBo 和 WmsInstockPrintVo 中添加质检状态字段 inspectionType - 在 WmsInventoryMapper.xml 中添加 storeId 的查询条件，优化库存查询功能 --- .../main/java/org/dromara/wms/domain/WmsInstockPrint.java | 6 ++++++ .../java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java | 4 ++++ .../java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java | 5 +++++ .../src/main/resources/mapper/wms/WmsInventoryMapper.xml | 1 + 4 files changed, 16 insertions(+) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java index bc8a02b0..994eb672 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java @@ -142,6 +142,11 @@ public class WmsInstockPrint{ */ private String inspectionRequest; + /** + * 质检状态(0未发起，1质检中，2合格，3不合格） + */ + private String inspectionType; + /** * 物料大类 */ @@ -150,4 +155,5 @@ public class WmsInstockPrint{ + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java index 11415caf..a6fb4de2 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java @@ -126,6 +126,10 @@ public class WmsInstockPrintBo extends BaseEntity { * 质检要求(0必检,1免检) */ private String inspectionRequest; + + /** + * 质检状态(0未发起，1质检中，2合格，3不合格） + */ private String inspectionType; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java index 94e0a0de..249f7b53 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java @@ -161,4 +161,9 @@ public class WmsInstockPrintVo implements Serializable { // PDA 操作标题 private String title; + /** + * 质检状态(0未发起，1质检中，2合格，3不合格） + */ + private String inspectionType; + } diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml index 66d70915..388aac58 100644 --- a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml @@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and x.location_code like concat('%',#{entity.locationCode},'%') and x.batch_code like concat('%',#{entity.batchCode},'%') and x.material_code like concat('%',#{entity.materialCode},'%') + and x.store_id = #{entity.storeId} group by x.warehouse_id , From a8ff530973824c16ff66481e8daeceace1b32b0f Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Thu, 4 Sep 2025 14:38:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(wms):=20=E4=BB=93=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=87=BA=E5=BA=93=E5=8D=95=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsOutstockOrder、WmsOutstockOrderBo 和 WmsOutstockOrderVo 中添加仓库名称字段 - 在查询出库单信息时，增加仓库名称的查询和显示 - 优化出库单新增逻辑，处理子表数据的保存 --- .../dromara/wms/domain/WmsOutstockOrder.java | 6 ++++++ .../wms/domain/bo/WmsOutstockOrderBo.java | 5 +++++ .../wms/domain/vo/WmsOutstockOrderVo.java | 5 +++++ .../impl/WmsOutstockOrderServiceImpl.java | 19 +++++++++++++++++-- 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java index 8c78744b..6b928e9e 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java @@ -113,4 +113,10 @@ public class WmsOutstockOrder { @TableField(exist = false) private String materialCategoryName;//字段映射 + /** + * 仓库名称 + */ + @TableField(exist = false) + private String warehouseName;//字段映射 + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java index 5df48d6d..8a36c18b 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java @@ -92,6 +92,11 @@ public class WmsOutstockOrderBo extends BaseEntity { */ private Long customerId; + /** + * 仓库名称 + */ + private String warehouseName; + private List detailList; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java index b5ec12f5..b05e42c3 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java @@ -129,4 +129,9 @@ public class WmsOutstockOrderVo implements Serializable { */ private String materialCategoryName;//字段映射 + /** + * 仓库名称 + */ + private String warehouseName; + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java index 84e550bb..94e26738 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java @@ -87,8 +87,9 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService { .select(BaseMaterialCategory::getMaterialCategoryName) .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockOrder::getMaterialCategoryId) - .select(WmsBaseWarehouse::getWarehouseCode) + .select(WmsBaseWarehouse::getWarehouseCode, WmsBaseWarehouse::getWarehouseName) .leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsOutstockOrder::getWarehouseId); + lqw.eq(bo.getOutstockId() != null, WmsOutstockOrder::getOutstockId, bo.getOutstockId()); lqw.eq(bo.getWarehouseId() != null, WmsOutstockOrder::getWarehouseId, bo.getWarehouseId()); lqw.eq(StringUtils.isNotBlank(bo.getOutstockCode()), WmsOutstockOrder::getOutstockCode, bo.getOutstockCode()); @@ -100,7 +101,7 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService { lqw.eq(bo.getAuditTime() != null, WmsOutstockOrder::getAuditTime, bo.getAuditTime()); lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), WmsOutstockOrder::getAuditStatus, bo.getAuditStatus()); lqw.eq(StringUtils.isNotBlank(bo.getAuditComments()), WmsOutstockOrder::getAuditComments, bo.getAuditComments()) - .orderByAsc(WmsOutstockOrder::getCreateTime); + .orderByDesc(WmsOutstockOrder::getCreateTime); return lqw; } /** @@ -209,6 +210,20 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService { if (flag) { bo.setOutstockId(add.getOutstockId()); } + + // 处理子表数据：设置outstockCode和outstockId + if (bo.getDetailList() != null && !bo.getDetailList().isEmpty()) { + bo.getDetailList().forEach(detail -> { + detail.setOutstockCode(outStockOrder); + detail.setOutstockId(add.getOutstockId()); + // 如果前端没有传递materialCategoryId，使用主表的 + if (detail.getMaterialCategoryId() == null) { + detail.setMaterialCategoryId(add.getMaterialCategoryId()); + } + }); + wmsOutstockDetailService.insertByBo(bo.getDetailList()); + } + // 根据出库单号查询最新出库单信息 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(WmsOutstockOrder::getOutstockCode, outStockOrder);