From e1451f8ba13cf7c00fde1137998057ac7d7d42ba Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Tue, 10 Mar 2026 13:08:07 +0800 Subject: [PATCH] =?UTF-8?q?feat(WmsInventoryDetailsVo):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8D=95=E4=BD=8DID=E5=AD=97=E6=AE=B5=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsInventoryDetailsVo中新增unitId字段 - 添加单位ID的注释说明 - 支持联查成品表获取单位信息功能 --- .../main/resources/合同审批单模板.docx | Bin 0 -> 15443 bytes .../wms/domain/vo/WmsInventoryDetailsVo.java | 10 +++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 ruoyi-modules/ruoyi-oa/src/main/resources/合同审批单模板.docx diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/合同审批单模板.docx b/ruoyi-modules/ruoyi-oa/src/main/resources/合同审批单模板.docx new file mode 100644 index 0000000000000000000000000000000000000000..a98d81e5f4e18d22c8f7c4c2262d244646ab0cc6 GIT binary patch literal 15443 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 VUjq^V0HoJHhga%ki0$p{{{h>pUiJV0 literal 0 HcmV?d00001 diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsInventoryDetailsVo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsInventoryDetailsVo.java index 2d6292d7..2fc8044a 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsInventoryDetailsVo.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsInventoryDetailsVo.java @@ -1,12 +1,10 @@ package org.dromara.wms.domain.vo; -import org.dromara.wms.domain.WmsInventoryDetails; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.wms.domain.WmsInventoryDetails; import java.io.Serial; import java.io.Serializable; @@ -138,6 +136,12 @@ public class WmsInventoryDetailsVo implements Serializable { * 成品描述 */ private String productSpe; + + /** + * 单位ID(联查成品表获取) + */ + private Long unitId; + /** * 物料单位 */