From a95c4e748b01da8bea6ba0f8e6af9c281bc582d7 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 29 七月 2025 09:22:13 +0800
Subject: [PATCH] 优化日志格式并增强库存查询逻辑在 CommonConveyorLineJob.cs和CommonConveyorLine_GWJob.cs文件中，修改了日志输出格式，添加了时间戳以提高可读性和可追溯性。部分代码中的ToJsonString()方法被替换为 Serialize()方法，以统一序列化方式。与此同时，在 Dt_TaskService.cs文件中增加了库存信息查询逻辑，以确保出库时能够正确处理库存条件，增强系统的健壮性。
---
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue | 65 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue
index 67f0366..8048fa8 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue
@@ -21,7 +21,7 @@
const table = ref({
key: "taskId",
footer: "Foots",
- cnName: "浠诲姟淇℃伅",
+ cnName: "浠诲姟鍘嗗彶淇℃伅",
name: "task_Hty",
url: "/Task_Hty/",
sortName: "CreateDate",
@@ -42,7 +42,7 @@
const searchFormOptions = ref([
[
{ title: "浠诲姟鍙�", field: "taskNum", type: "int" },
- { title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
+ { title: "鎵樼洏缂栧彿", field: "palletCode", type: "text" },
{
title: "浠诲姟绫诲瀷",
field: "taskType",
@@ -59,15 +59,16 @@
},
],
[
- { title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
- { title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
- { title: "褰撳墠浣嶇疆", field: "currentAddress", type: "like" },
- { title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "like" },
+ { title: "璧峰鍦板潃", field: "sourceAddress", type: "text" },
+ { title: "鐩爣鍦板潃", field: "targetAddress", type: "text" },
+ { title: "褰撳墠浣嶇疆", field: "currentAddress", type: "text" },
+ { title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "text" },
],
[
- { title: "宸烽亾鍙�", field: "roadway", type: "like" },
- { title: "鍒涘缓浜�", field: "creater", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ { title: "宸烽亾鍙�", field: "roadway", type: "text" },
+ { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
+ { title: "鍒涘缓浜�", field: "creater", type: "text" },
+ { title: "瀹屾垚鏃堕棿", field: "createDate", type: "datetime" },
],
]);
const columns = ref([
@@ -147,18 +148,26 @@
align: "left",
},
{
+ field: "productionLine",
+ title: "浜х嚎",
+ type: "string",
+ width: 70,
+ align: "left",
+ bind: { key: "ProductionLine", data: [] }
+ },
+ {
field: "exceptionMessage",
title: "寮傚父淇℃伅",
type: "string",
width: 90,
align: "left",
- hidden: true,
+
},
{
field: "grade",
title: "浼樺厛绾�",
type: "int",
- width: 80,
+ width: 60,
align: "left",
},
{
@@ -167,6 +176,7 @@
type: "datetime",
width: 150,
align: "left",
+ hidden: true,
},
{
field: "wMSId",
@@ -176,25 +186,12 @@
align: "left",
hidden: true,
},
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
+
{
field: "createDate",
- title: "鍒涘缓鏃堕棿",
+ title: "瀹屾垚鏃堕棿",
type: "datetime",
width: 150,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
align: "left",
},
{
@@ -203,6 +200,22 @@
type: "datetime",
width: 160,
align: "left",
+ hidden: true,
+ },
+ {
+ field: "creater",
+ title: "瀹屾垚鑰�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ hidden: true,
},
{
field: "remark",
--
Gitblit v1.9.3