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 00000000..a98d81e5 Binary files /dev/null and b/ruoyi-modules/ruoyi-oa/src/main/resources/合同审批单模板.docx differ 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; + /** * 物料单位 */