diff --git a/klp-ui/src/api/wms/pendingAction.js b/klp-ui/src/api/wms/pendingAction.js
index 8b2d4eaf..3f55787a 100644
--- a/klp-ui/src/api/wms/pendingAction.js
+++ b/klp-ui/src/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
})
}
diff --git a/klp-ui/src/views/wms/coil/js/coilActions.js b/klp-ui/src/views/wms/coil/js/coilActions.js
index fb78f16a..810dd011 100644
--- a/klp-ui/src/views/wms/coil/js/coilActions.js
+++ b/klp-ui/src/views/wms/coil/js/coilActions.js
@@ -50,10 +50,16 @@ export const actionStrategies = {
handler: async (coil, action) => {
// 更新操作记录状态 actionStatus: 2
// 并行执行更新操作记录和更新钢卷状态
+ // 将日期格式化为yyyy-MM-dd HH:mm:ss
+ const completeTime = new Date()
+ function parseDate(date) {
+ return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds()
+ }
await Promise.all([
updatePendingAction({
...action,
actionStatus: 2,
+ completeTime: parseDate(completeTime),
}),
updateMaterialCoilSimple({
...coil,
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 9e947beb..302b9ee7 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -75,7 +75,8 @@
@click="handleBatchPrintLabel">批量打印标签
- 按实际库区排序
+ 按实际库区排序
@@ -412,6 +413,7 @@ import {
returnCoil,
} from "@/api/wms/coil";
import { listBoundCoil } from "@/api/wms/deliveryWaybillDetail";
+import { addPendingAction } from "@/api/wms/pendingAction";
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
import QRCode from "../../print/components/QRCode.vue";
import * as XLSX from 'xlsx'
@@ -1046,6 +1048,20 @@ export default {
handleExportCoil(row) {
exportCoil(row.coilId).then(response => {
this.$modal.msgSuccess("发货成功");
+ // 2. 插入一条已完成的待操作记录
+ addPendingAction({
+ coilId: row.coilId,
+ currentCoilNo: row.currentCoilNo,
+ actionType: 402, // 402=发货
+ actionStatus: 2, // 直接标记为完成状态
+ scanTime: new Date(),
+ // scanDevice: ,
+ priority: 0, // 0=普通
+ sourceType: 'scan',
+ warehouseId: row.warehouseId,
+ processTime: new Date(),
+ completeTime: new Date()
+ });
this.getList();
}).catch(error => {
this.$modal.msgError("发货失败");
diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index 2bcae066..a401b675 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -34,8 +34,8 @@
{{ localWaybill.principal }}