From 6a907db7df972927a127b375bd0c009fd7886b82 Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Mon, 21 Sep 2026 13:21:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E6=89=93?=
 =?UTF-8?q?=E6=A0=B7=E5=8D=95=E6=94=B6=E8=B4=A7=E5=8A=9F=E8=83=BD=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=AA=8C=E8=B4=A7=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在poOrder页面添加收货按钮，仅对打样单且已下达状态显示
- 新增收货确认弹窗，支持填写收货日期并提交到后端
- 添加receivePoDetail API接口用于处理打样单收货逻辑
- 实现收货后自动生成已排程验货申请的功能
- 在myInspectionList中增加状态校验，防止页面数据滞后导致的操作错误
- 为公共验货单添加开始验货时的提示信息
- 完善相关的工具函数和状态管理逻辑
---
 src/api/order/poOrder.js                      |   3 +
 .../modules/inspection/myInspectionList.vue   |   9 +-
 src/views/modules/order/poOrder.vue           | 123 ++++++++++++++++++
 .../modules/order/poOrderStatusOptions.js     |   5 +
 4 files changed, 139 insertions(+), 1 deletion(-)

diff --git a/src/api/order/poOrder.js b/src/api/order/poOrder.js
index ae2fcd7..ab2bd06 100644
--- a/src/api/order/poOrder.js
+++ b/src/api/order/poOrder.js
@@ -31,6 +31,9 @@ export const shipPoDetailPreview = (data) => createAPI(`/pODetail/shipPoDetailPr
 /** 提交发货（回写 qty/c_ship_qty，并按规则判定部分发货或已发货） */
 export const shipPoDetail = (data) => createAPI(`/pODetail/shipPoDetail`, 'post', data)
 
+/** 打样单收货（回写 c_po_actual_ready_date，同事务自动生成已排程验货申请） */
+export const receivePoDetail = (data) => createAPI(`/pODetail/receivePoDetail`, 'post', data)
+
 // 根据PO订单查询验货申请明细
 export const getInspectionByPODetail = (data) => createAPI(`/pODetail/getInspectionByPODetail`, 'post', data)
 
diff --git a/src/views/modules/inspection/myInspectionList.vue b/src/views/modules/inspection/myInspectionList.vue
index 471c44a..1c35f05 100644
--- a/src/views/modules/inspection/myInspectionList.vue
+++ b/src/views/modules/inspection/myInspectionList.vue
@@ -199,7 +199,14 @@ export default {
 
     // 开始验货
     startInspection (row) {
-      this.$confirm(`确认开始验货？\n申请单号：${row.requestNo}\n供应商：${row.supplierName}`, '提示', {
+      // 校验单子状态是否为已排程（防止页面数据滞后）
+      if (row.statusDb !== 'Scheduled') {
+        this.$message.warning('只有已排程状态的验货申请可以开始验货，请刷新列表后重试')
+        this.getList()
+        return
+      }
+      const publicOrderTip = row.qcOperator === '*' ? '\n该单为公共单（QC人员：*），开始验货后QC人员将改为您本人' : ''
+      this.$confirm(`确认开始验货？\n申请单号：${row.requestNo}\n供应商：${row.supplierName}${publicOrderTip}`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/src/views/modules/order/poOrder.vue b/src/views/modules/order/poOrder.vue
index 3ff23b9..c8f3337 100644
--- a/src/views/modules/order/poOrder.vue
+++ b/src/views/modules/order/poOrder.vue
@@ -77,6 +77,10 @@
               v-if="canShipPoOrder(scope.row.status)"
               type="primary"
               @click.stop="handleShipPoOrder(scope.row)">shipped</el-link>
+            <el-link
+              v-if="canReceivePoOrder(scope.row)"
+              type="primary"
+              @click.stop="handleReceivePoOrder(scope.row)">收货</el-link>
             <el-link
               v-if="canClosePoOrder(scope.row.status)"
               type="primary"
@@ -365,6 +369,35 @@
       </div>
     </el-dialog>
 
+    <!-- 打样单收货确认弹窗：填写收货日期，确定后回写 c_po_actual_ready_date 并自动生成已排程验货申请 -->
+    <el-dialog
+      title="收货确认"
+      v-drag
+      :visible.sync="receiveDialogVisible"
+      width="360px"
+      append-to-body
+      :close-on-click-modal="false"
+      @closed="resetReceiveDialog">
+      <el-form label-position="top">
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <el-form-item label="收货日期" required>
+              <el-date-picker
+                v-model="receiveDialogForm.receiveDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择收货日期"
+                style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer ship-dialog-footer">
+        <el-button type="primary" :loading="receiveDialogSaving" @click="submitReceiveDialog">确定</el-button>
+        <el-button @click="receiveDialogVisible = false">取消</el-button>
+      </div>
+    </el-dialog>
+
     <ChooselistEam ref="eamList" @getBaseData="getEamData" />
 
     <po-order-advanced-query
@@ -659,6 +692,7 @@ import {
   issuePoDetail,
   shipPoDetailPreview,
   shipPoDetail,
+  receivePoDetail,
   createPoOrder,
   getPoCustomerOptions,
   getPoBuyerOptions,
@@ -682,6 +716,7 @@ import {
   PO_ORDER_STATUS_OPTIONS,
   canIssuePoOrder,
   canShipPoOrder,
+  canReceivePoOrder,
   canClosePoOrder,
   canOpenPoOrder,
   canEditPoColumnByStatus,
@@ -923,6 +958,17 @@ export default {
         flexid: ''
       },
 
+      // ===== 打样单收货确认弹窗状态 =====
+      receiveDialogVisible: false,
+      receiveDialogSaving: false,
+      receiveDialogForm: {
+        id: null,
+        site: '',
+        orderNo: '',
+        itemNo: null,
+        receiveDate: ''
+      },
+
       // ===== 主表编辑与列渲染状态 =====
       currentRow: null,
       // 各列下拉：select 列通过 selectOptionsKey 指向此处；也可在列定义里写 selectOptions 数组 - rqrq
@@ -2108,6 +2154,7 @@ export default {
   methods: {
     canIssuePoOrder,
     canShipPoOrder,
+    canReceivePoOrder,
     canClosePoOrder,
     canOpenPoOrder,
     canEditPoColumnByStatus,
@@ -2735,6 +2782,82 @@ export default {
       })
     },
 
+    /**
+     * 当天日期字符串（yyyy-MM-dd），收货日期默认值用。
+     */
+    getTodayDateStr () {
+      const d = new Date()
+      const month = String(d.getMonth() + 1).padStart(2, '0')
+      const day = String(d.getDate()).padStart(2, '0')
+      return d.getFullYear() + '-' + month + '-' + day
+    },
+
+    /**
+     * 点击收货（仅打样单+已下达）：
+     * 1) 校验行标识后打开收货确认弹窗，收货日期默认当天；
+     * 2) 确认后由后端同事务回写 c_po_actual_ready_date、PO 转待验货并自动生成已排程验货申请。
+     */
+    handleReceivePoOrder (row) {
+      const params = buildPoDetailActionParams(row, this.$store.state.user.site)
+      if (!params.id && !(params.orderNo && params.site && params.itemNo != null)) {
+        this.$message.error('无法识别订单行，请刷新后重试')
+        return
+      }
+      this.receiveDialogForm = {
+        id: params.id != null ? params.id : null,
+        site: params.site,
+        orderNo: params.orderNo,
+        itemNo: params.itemNo,
+        receiveDate: this.getTodayDateStr()
+      }
+      this.receiveDialogVisible = true
+    },
+
+    /**
+     * 关闭收货弹窗时重置状态，避免上次缓存污染下一次操作。
+     */
+    resetReceiveDialog () {
+      this.receiveDialogSaving = false
+      this.receiveDialogForm = {
+        id: null,
+        site: '',
+        orderNo: '',
+        itemNo: null,
+        receiveDate: ''
+      }
+    },
+
+    /**
+     * 提交收货：仅校验收货日期必填；成功后提示并刷新列表（状态已联动为待验货）。
+     */
+    submitReceiveDialog () {
+      if (!this.receiveDialogForm.receiveDate) {
+        this.$message.error('请选择收货日期')
+        return
+      }
+      const payload = {
+        id: this.receiveDialogForm.id != null ? this.receiveDialogForm.id : undefined,
+        site: this.receiveDialogForm.site,
+        orderNo: this.receiveDialogForm.orderNo,
+        itemNo: this.receiveDialogForm.itemNo,
+        receiveDate: this.receiveDialogForm.receiveDate
+      }
+      this.receiveDialogSaving = true
+      receivePoDetail(payload).then(({ data }) => {
+        this.receiveDialogSaving = false
+        if (data && data.code === 0) {
+          this.$message.success('收货成功，已生成验货申请')
+          this.receiveDialogVisible = false
+          this.getDataList()
+        } else {
+          this.$message.error((data && data.msg) || '收货失败')
+        }
+      }).catch(err => {
+        this.receiveDialogSaving = false
+        this.$message.error((err && err.message) || '收货失败')
+      })
+    },
+
     handleOpenPoOrder (row) {
       const params = buildPoDetailActionParams(row, this.$store.state.user.site)
       if (!params.id && !(params.orderNo && params.site && params.itemNo != null)) {
diff --git a/src/views/modules/order/poOrderStatusOptions.js b/src/views/modules/order/poOrderStatusOptions.js
index 04e8281..3551658 100644
--- a/src/views/modules/order/poOrderStatusOptions.js
+++ b/src/views/modules/order/poOrderStatusOptions.js
@@ -57,6 +57,11 @@ export function canIssuePoOrder (status) {
   return status === '草稿'
 }
 
+/** 是否可「收货」：仅打样单（Sample）且状态为已下达（与后端 receivePoDetail 校验一致） */
+export function canReceivePoOrder (row) {
+  return !!row && row.orderType === 'Sample' && row.status === '已下达'
+}
+
 /**
  * 打开时根据验货数量推算恢复状态（与后端 PoDetailStatusSupport 规则一致）
  * 说明：