From 96b1afcbf80cd6b12c1108b61ba2cef1345b1398 Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期三, 12 二月 2025 17:33:20 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu
---
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue | 11 +++--
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue | 11 +++--
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs | 1
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue | 6 ++
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue | 5 ++
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue | 39 ++++++++++++-------
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 40 ++++++++++++-------
7 files changed, 74 insertions(+), 39 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
index a744063..65e0050 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
@@ -66,6 +66,7 @@
],
[
{ title: "宸烽亾鍙�", field: "roadway", type: "like" },
+ { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
{ title: "鍒涘缓浜�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
@@ -147,6 +148,13 @@
align: "left",
},
{
+ field: "productionLine",
+ title: "浜х嚎",
+ type: "string",
+ width: 70,
+ align: "left",
+ },
+ {
field: "exceptionMessage",
title: "寮傚父淇℃伅",
type: "string",
@@ -158,7 +166,7 @@
field: "grade",
title: "浼樺厛绾�",
type: "int",
- width: 80,
+ width: 60,
align: "left",
},
{
@@ -176,6 +184,22 @@
align: "left",
hidden: true,
},
+
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 150,
+ align: "left",
+ },
+
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
{
field: "creater",
title: "鍒涘缓浜�",
@@ -184,24 +208,10 @@
align: "left",
},
{
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 150,
- align: "left",
- },
- {
field: "modifier",
title: "淇敼浜�",
type: "string",
width: 90,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
align: "left",
},
{
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..5c271ef 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
@@ -66,6 +66,7 @@
],
[
{ title: "宸烽亾鍙�", field: "roadway", type: "like" },
+ { title: "鐢熶骇浜х嚎", field: "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
{ title: "鍒涘缓浜�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
@@ -147,6 +148,13 @@
align: "left",
},
{
+ field: "productionLine",
+ title: "浜х嚎",
+ type: "string",
+ width: 70,
+ align: "left",
+ },
+ {
field: "exceptionMessage",
title: "寮傚父淇℃伅",
type: "string",
@@ -158,7 +166,7 @@
field: "grade",
title: "浼樺厛绾�",
type: "int",
- width: 80,
+ width: 60,
align: "left",
},
{
@@ -176,13 +184,7 @@
align: "left",
hidden: true,
},
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
+
{
field: "createDate",
title: "鍒涘缓鏃堕棿",
@@ -191,13 +193,6 @@
align: "left",
},
{
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
field: "modifyDate",
title: "淇敼鏃堕棿",
type: "datetime",
@@ -205,6 +200,20 @@
align: "left",
},
{
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
field: "remark",
title: "澶囨敞",
type: "string",
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue
index 4cfc7f8..d70940b 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue
@@ -35,8 +35,12 @@
[
{ "title": "璐т綅缂栧彿", "field": "locationCode", type: "text" },
{ "title": "璐т綅鐘舵��", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
- // { "title": "瀵瑰簲鍫嗗灈鏈哄彿", "field": "sCNo", type: "text" },
{ "title": "宸烽亾缂栧彿", "field": "roadWayNO", type: "text" },
+ ],
+ [
+ { "title": "琛�", "field": "row", type: "text" },
+ { "title": "鍒�", "field": "column", "type": "text" },
+ { "title": "灞�", "field": "layer", type: "text" },
]
]);
const columns = ref([{ field: 'locationID', title: '璐т綅ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue
index ab853a1..7e83f2e 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue
@@ -36,6 +36,10 @@
{ "title": "鐗╂枡缂栧彿", "field": "materielCode", type: "text" },
{ "title": "搴撳瓨鐘舵��", "field": "status", type: "select", dataKey: "StockState", data: [] },
{ "title": "缁勭洏绫诲瀷", "field": "groupType", type: "select", dataKey: "GroupType", data: [] },
+ ],
+ [
+ { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
+
]
]);
const columns = ref([
@@ -45,6 +49,7 @@
{ field: 'isFull', title: '鏄惁婊＄洏', type: 'bool', width: 110, align: 'left' },
// { field: 'state', title: '搴撳瓨鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "StockState", data: [] } },
{ field: 'remark', title: '澶囨敞', type: 'string', width: 120, align: 'left' },
+ { field: 'productionLine', title: '浜х嚎', type: 'string', width: 70, align: 'left' },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'int', sort: true, width: 100, align: 'left' },
]);
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue
index f9446e1..b6742c8 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue
@@ -59,6 +59,7 @@
],
[
{ "title": "宸烽亾", "field": "roadway", type: "text" },
+ { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
{ "title": "鍒涘缓浜�", "field": "creater", type: "text" },
{ "title": "鍒涘缓鏃堕棿", "field": "createDate", type: "datetime" },
],
@@ -76,13 +77,15 @@
{ field: 'currentAddress', title: '褰撳墠浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'nextAddress', title: '涓嬩竴浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'targetAddress', title: '鐩爣浣嶇疆', type: 'string', width: 110, align: 'left' },
- { field: 'grade', title: '浼樺厛绾�', type: 'int', width: 110, align: 'left' },
+ { field: 'grade', title: '浼樺厛绾�', type: 'int', width: 60, align: 'left' },
+ { field: 'productionLine', title: '浜х嚎', type: 'string', width: 70, align: 'left' },
+ { field: 'processCode', title: '宸ュ簭', type: 'string', width: 90, align: 'left' },
{ field: 'dispatchertime', title: '浠诲姟涓嬪彂鏃堕棿', type: 'datetime', width: 150, align: 'left', sort: true },
- { field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left' },
- { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left',hidden: true, },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
- { field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
{ field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
{ field: 'locationCode', title: '璐т綅鍙�', type: 'string', width: 110, hidden: true, align: 'left' },
{ field: 'materialNo', title: '鐗╂枡缂栧彿', type: 'string', width: 110, hidden: true, align: 'left' },
{ field: 'targetAddress', title: '鐩爣鍦板潃', type: 'string', width: 110, hidden: true, align: 'left' },
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue
index 5fa2b49..50efeb5 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue
@@ -59,6 +59,7 @@
],
[
{ "title": "宸烽亾", "field": "roadway", type: "text" },
+ { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
{ "title": "鍒涘缓浜�", "field": "creater", type: "text" },
{ "title": "鍒涘缓鏃堕棿", "field": "createDate", type: "datetime" },
],
@@ -76,14 +77,16 @@
{ field: 'currentAddress', title: '褰撳墠浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'nextAddress', title: '涓嬩竴浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'targetAddress', title: '鐩爣浣嶇疆', type: 'string', width: 110, align: 'left' },
- { field: 'grade', title: '浼樺厛绾�', type: 'int', width: 110, align: 'left' },
+ { field: 'grade', title: '浼樺厛绾�', type: 'int', width: 60, align: 'left' },
+ { field: 'productionLine', title: '浜х嚎', type: 'string', width: 70, align: 'left' },
+ { field: 'processCode', title: '宸ュ簭', type: 'string', width: 90, align: 'left' },
{ field: 'dispatchertime', title: '浠诲姟涓嬪彂鏃堕棿', type: 'datetime', width: 150, align: 'left', sort: true },
{ field: 'operateType', title: '鎿嶄綔绫诲瀷', type: 'string', width: 110, align: 'left', bind: { key: "operateType", data: [] }},
- { field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left' },
- { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left',hidden: true, },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
- { field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
{ field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
{ field: 'locationCode', title: '璐т綅鍙�', type: 'string', width: 110, hidden: true, align: 'left' },
{ field: 'materialNo', title: '鐗╂枡缂栧彿', type: 'string', width: 110, hidden: true, align: 'left' },
{ field: 'targetAddress', title: '鐩爣鍦板潃', type: 'string', width: 110, hidden: true, align: 'left' },
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
index c89d0c7..a8bf1b1 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
@@ -3,6 +3,7 @@
using WIDESEA_Core.Const;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
+using WIDESEAWCS_Model.Models;
namespace WIDESEA_StorageTaskServices;
--
Gitblit v1.9.3