From a23a4645dc9d8e670b52fc2d3d7940f3ad5686ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Wed, 11 Mar 2026 17:11:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E8=A7=A3=E6=9E=90=E9=97=AE=E9=A2=98=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复日期解析函数中的变量名冲突和空值处理问题，同时在新增和修改操作中添加日期格式化处理。新增钢卷待操作导出功能。
---
 apps/hand-factory/api/wms/pendingAction.js | 45 +++++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/apps/hand-factory/api/wms/pendingAction.js b/apps/hand-factory/api/wms/pendingAction.js
index 683886a..3f55787 100644
--- a/apps/hand-factory/api/wms/pendingAction.js
+++ b/apps/hand-factory/api/wms/pendingAction.js
@@ -1,5 +1,23 @@
 import request from '@/utils/request'
 
+function parseDate(date) {
+  // 修复1：参数名和内部变量名冲突，改用tempDate
+  // 修复2：如果传入的date为空/无效，默认使用当前时间
+  const tempDate = date ? new Date(date) : new Date();
+
+  // 获取年、月、日、时、分、秒（补零处理，确保是两位数）
+  const year = tempDate.getFullYear();
+  // 月份从0开始，所以要+1，不足两位补0
+  const month = String(tempDate.getMonth() + 1).padStart(2, '0');
+  const day = String(tempDate.getDate()).padStart(2, '0');
+  const hours = String(tempDate.getHours()).padStart(2, '0');
+  const minutes = String(tempDate.getMinutes()).padStart(2, '0');
+  const seconds = String(tempDate.getSeconds()).padStart(2, '0');
+
+  // 格式化为YYYY-mm-dd HH:mm:ss并返回
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+
 // 查询钢卷待操作列表
 export function listPendingAction(query) {
   return request({
@@ -19,19 +37,33 @@ export function getPendingAction(actionId) {
 
 // 新增钢卷待操作
 export function addPendingAction(data) {
+  const payload = { ...data }
+  if (payload.processTime) {
+    payload.processTime = parseDate(payload.processTime)
+  }
+  if (payload.completeTime) {
+    payload.completeTime = parseDate(payload.completeTime)
+  }
   return request({
     url: '/wms/coilPendingAction',
     method: 'post',
-    data: data
+    data: payload
   })
 }
 
 // 修改钢卷待操作
 export function updatePendingAction(data) {
+  const payload = { ...data }
+  if (payload.processTime) {
+    payload.processTime = parseDate(payload.processTime)
+  }
+  if (payload.completeTime) {
+    payload.completeTime = parseDate(payload.completeTime)
+  }
   return request({
     url: '/wms/coilPendingAction',
     method: 'put',
-    data: data
+    data: payload
   })
 }
 
@@ -75,3 +107,12 @@ export function cancelAction(actionId) {
   })
 }
 
+// 导出钢卷待操作
+export function exportPendingAction(query) {
+  return request({
+    url: '/wms/coilPendingAction/export',
+    method: 'post',
+    params: query
+  })
+}
+