diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaRequirements.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaRequirements.java index e7c7cd9..9cd0277 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaRequirements.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaRequirements.java @@ -49,6 +49,14 @@ public class OaRequirements extends BaseEntity { * 关联物料 ID CSV -> sys_oa_warehouse.id,可选 */ private String materialIds; + /** + * 是否发往车间:1是,0否 + */ + private Integer shipToWorkshop; + /** + * 发货地址(是否发往车间=否时必填) + */ + private String shipAddress; /** * 需求描述 */ diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaRequirementsBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaRequirementsBo.java index 79771ba..e925776 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaRequirementsBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaRequirementsBo.java @@ -54,6 +54,16 @@ public class OaRequirementsBo extends BaseEntity { */ private String materialIds; + /** + * 是否发往车间:1是,0否 + */ + private Integer shipToWorkshop; + + /** + * 发货地址(是否发往车间=否时必填) + */ + private String shipAddress; + /** * 需求描述 */ diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaRequirementsVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaRequirementsVo.java index 96abc16..d7d483c 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaRequirementsVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaRequirementsVo.java @@ -91,6 +91,14 @@ public class OaRequirementsVo extends BaseEntity { /** 关联物料 ID CSV */ private String materialIds; + + /** 是否发往车间:1是,0否 */ + @ExcelProperty(value = "是否发往车间") + private Integer shipToWorkshop; + + /** 发货地址(是否发往车间=否时必填) */ + @ExcelProperty(value = "发货地址") + private String shipAddress; /** 关联物料明细(service 层 enrich,列表/详情都返回) */ private java.util.List materials; diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaRequirementsMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaRequirementsMapper.xml index 9247668..13c2566 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/OaRequirementsMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaRequirementsMapper.xml @@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + diff --git a/ruoyi-ui/src/views/oa/task/requirement/index.vue b/ruoyi-ui/src/views/oa/task/requirement/index.vue index 0d854e4..e8886ec 100644 --- a/ruoyi-ui/src/views/oa/task/requirement/index.vue +++ b/ruoyi-ui/src/views/oa/task/requirement/index.vue @@ -106,6 +106,15 @@ + + +