From 31eba6a8c6261adf5bfef4dafad4dc8efc1f66a2 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 18 二月 2025 18:57:54 +0800
Subject: [PATCH] 1
---
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue | 15 ++-------------
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 1 +
项目资料/通信协议/1_二楼9#交互偏移量地址20241027.xls | 0
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/DtBoxingInfo.vue | 4 ++--
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs | 2 +-
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 18 ++++++++++++++++--
6 files changed, 22 insertions(+), 18 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 03060f2..9a53652 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
@@ -26,8 +26,22 @@
url: "/Task/",
sortName: "CreateDate",
});
- const editFormFields = ref({});
- const editFormOptions = ref([]);
+ const editFormFields = ref({
+ taskNum:"",
+ palletCode: "",
+ roadway: "",
+ taskType:"",
+ taskState:"",
+ wMSId:"",
+ sourceAddress: "",
+ targetAddress: "",
+ currentAddress: "",
+ nextAddress: "",
+ creater: "",
+ createDate: "",
+ grade: "",
+ });
+ const editFormOptions = ref([[{ title: "浼樺厛绾�", field: "grade", type: "int" },]]);
const searchFormFields = ref({
taskNum: "",
palletCode: "",
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
index 0f78e15..bf61d3b 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
@@ -132,7 +132,7 @@
}
}
- if (childDeviceCode == "1670")
+ if (childDeviceCode == "1670"||childDeviceCode=="1666"||childDeviceCode=="1548"||childDeviceCode=="1448")
{
Platform platform = _platFormRepository.QueryFirst(x => x.PLCCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
if (platform != null)
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 7570ede..4e275f8 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
@@ -57,8 +57,8 @@
cnName: "缁勭洏鏄庣粏淇℃伅",
table: "DtBoxingInfoDetail",
columns: [
- { title: "鐢佃姱搴忓垪鍙�", field: "serialNumber", type: "text" },
- { title: "鐗╂枡缂栧彿", field: "materielCode", type: "text" },
+ { title: "鐢佃姱搴忓垪鍙�", field: "serialNumber", type: "text"},
+ { title: "鐗╂枡缂栧彿", field: "materielCode",type: "text" },
{ title: "鐗╂枡鍚嶇О", field: "materielName", type: "text" },
{ title: "搴撳瓨鐘舵��", field: "status", type: "text" },
{ title: "缁勭洏鏁伴噺", field: "stockQuantity", type: "text" },
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 700b7ac..c7af286 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
@@ -23,22 +23,11 @@
sortName: "TaskId"
});
const editFormFields = ref({
- "taskNum": "",
- "palletCode": ""
+ "grade": "",
});
const editFormOptions = ref([
[
- { "title": "浠诲姟鍙�", "field": "taskNum", "type": "text" },
- { "title": "鎵樼洏鍙�", "field": "palletCode", "type": "text" },
- { "title": "浠诲姟绫诲瀷", "field": "taskType", "type": "select", dataKey: "TaskType", data: [] },
- { "title": "浠诲姟鐘舵��", "field": "taskState", "type": "select", dataKey: "TaskStatus", data: [] },
-
- ],
- [
- { "title": "璧峰浣嶇疆", "field": "sourceAddress", type: "text" },
- { "title": "褰撳墠浣嶇疆", "field": "currentAddress", type: "text" },
- { "title": "涓嬩竴浣嶇疆", "field": "nextAddress", type: "text" },
- { "title": "鐩爣浣嶇疆", "field": "targetAddress", type: "text" },
+ { "title": "浼樺厛绾�", "field": "grade", type: "text" },
],
]);
const searchFormFields = ref({
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index 5e9b978..b1cda0a 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -1026,6 +1026,7 @@
var boxing = CreateBoxingInfo(result, input.PalletCode);
if (boxing == null) return content.Error("缁勭洏澶辫触");
+ input.ProductionLine = result.ProductionLine;
return await ProcessBasedOnProcessCode(boxing, area, input, result);
}
}
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/1_\344\272\214\346\245\2749\043\344\272\244\344\272\222\345\201\217\347\247\273\351\207\217\345\234\260\345\235\20020241027.xls" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/1_\344\272\214\346\245\2749\043\344\272\244\344\272\222\345\201\217\347\247\273\351\207\217\345\234\260\345\235\20020241027.xls"
new file mode 100644
index 0000000..89112bf
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\200\232\344\277\241\345\215\217\350\256\256/1_\344\272\214\346\245\2749\043\344\272\244\344\272\222\345\201\217\347\247\273\351\207\217\345\234\260\345\235\20020241027.xls"
Binary files differ
--
Gitblit v1.9.3