From 6c5722c47cfb4f39775c9098ae948fba92ad1628 Mon Sep 17 00:00:00 2001
From: wangyu <823267011@qq.com>
Date: Thu, 2 Jul 2026 14:24:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=9C=80=E6=B1=82=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0"=E6=98=AF=E5=90=A6=E5=8F=91=E5=BE=80=E8=BD=A6?=
 =?UTF-8?q?=E9=97=B4"=E5=8F=8A=E5=8F=91=E8=B4=A7=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

表单新增单选，选"否"时需填写发货地址；列表新增对应列。已在生产库
oa_requirements 表执行 ADD COLUMN 迁移。

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 .../com/ruoyi/oa/domain/OaRequirements.java   |  8 ++++
 .../ruoyi/oa/domain/bo/OaRequirementsBo.java  | 10 +++++
 .../ruoyi/oa/domain/vo/OaRequirementsVo.java  |  8 ++++
 .../mapper/oa/OaRequirementsMapper.xml        |  2 +
 .../src/views/oa/task/requirement/index.vue   | 40 +++++++++++++++++++
 sql/requirement_add_ship_to_workshop.sql      |  4 ++
 6 files changed, 72 insertions(+)
 create mode 100644 sql/requirement_add_ship_to_workshop.sql

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<MaterialItem> 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"
         <result property="requesterId" column="requester_id"/>
         <result property="ownerId" column="owner_id"/>
         <result property="projectId" column="project_id"/>
+        <result property="shipToWorkshop" column="ship_to_workshop"/>
+        <result property="shipAddress" column="ship_address"/>
         <result property="description" column="description"/>
         <result property="deadline" column="deadline"/>
         <result property="status" column="status"/>
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 @@
           </el-tooltip>
         </template>
       </el-table-column>
+      <el-table-column label="是否发往车间" align="center" width="110">
+        <template slot-scope="{ row }">
+          <el-tag v-if="row.shipToWorkshop === 0" type="warning" size="mini">否</el-tag>
+          <el-tag v-else type="success" size="mini">是</el-tag>
+          <div v-if="row.shipToWorkshop === 0 && row.shipAddress" class="ship-address">
+            {{ row.shipAddress }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="采购物料" align="left" min-width="170">
         <template slot-scope="{ row }">
           <template v-if="row.materials && row.materials.length">
@@ -215,6 +224,15 @@
             </div>
           </div>
         </el-form-item>
+        <el-form-item label="是否发往车间" prop="shipToWorkshop">
+          <el-radio-group v-model="form.shipToWorkshop">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="form.shipToWorkshop === 0" label="发货地址" prop="shipAddress">
+          <el-input v-model="form.shipAddress" placeholder="请输入发货地址" />
+        </el-form-item>
         <el-form-item label="需求描述" prop="description">
           <el-input v-model="form.description" type="textarea" placeholder="请输入需求描述" />
         </el-form-item>
@@ -321,6 +339,8 @@
         <el-descriptions-item label="需求方">{{ detailRow.requesterNickName }}</el-descriptions-item>
         <el-descriptions-item label="负责人">{{ detailRow.ownerNickName }}</el-descriptions-item>
         <el-descriptions-item label="关联项目">{{ detailRow.projectName }}</el-descriptions-item>
+        <el-descriptions-item label="是否发往车间">{{ detailRow.shipToWorkshop === 0 ? '否' : '是' }}</el-descriptions-item>
+        <el-descriptions-item v-if="detailRow.shipToWorkshop === 0" label="发货地址">{{ detailRow.shipAddress }}</el-descriptions-item>
         <el-descriptions-item label="需求描述">{{ detailRow.description }}</el-descriptions-item>
         <el-descriptions-item label="截止日期">{{ detailRow.deadline }}</el-descriptions-item>
         <el-descriptions-item label="剩余时间">{{ getRemainText(detailRow.deadline) }}</el-descriptions-item>
@@ -445,6 +465,18 @@ export default {
         ],
         deadline: [
           { required: true, message: "请选择截止日期", trigger: "change" }
+        ],
+        shipAddress: [
+          {
+            validator: (rule, value, callback) => {
+              if (this.form.shipToWorkshop === 0 && !value) {
+                callback(new Error("请输入发货地址"));
+              } else {
+                callback();
+              }
+            },
+            trigger: "blur"
+          }
         ]
       },
       detailDialog: false,
@@ -688,6 +720,8 @@ export default {
         projectId: undefined,
         materialIds: undefined,
         materialIdArr: [],
+        shipToWorkshop: 1,
+        shipAddress: undefined,
         description: undefined,
         deadline: undefined,
         status: 0,
@@ -978,6 +1012,12 @@ export default {
   }
   .mat-stock-meta { color: #909399; }
 }
+.ship-address {
+  margin-top: 4px;
+  font-size: 11px;
+  color: #909399;
+  word-break: break-all;
+}
 .accessory-link {
   display: inline-block;
   max-width: 160px;
diff --git a/sql/requirement_add_ship_to_workshop.sql b/sql/requirement_add_ship_to_workshop.sql
new file mode 100644
index 0000000..c064e1f
--- /dev/null
+++ b/sql/requirement_add_ship_to_workshop.sql
@@ -0,0 +1,4 @@
+-- 采购需求增加"是否发往车间"及"发货地址"
+ALTER TABLE oa_requirements
+  ADD COLUMN ship_to_workshop TINYINT(1) DEFAULT 1 COMMENT '是否发往车间：1是，0否' AFTER material_ids,
+  ADD COLUMN ship_address VARCHAR(255) DEFAULT NULL COMMENT '发货地址（是否发往车间=否时必填）' AFTER ship_to_workshop;