From 8ae1a147aefadbb255edde088e7c12535c5f02d4 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 08 十月 2025 20:35:51 +0800
Subject: [PATCH] 完善输送线和堆垛机任务处理逻辑在CommonConveyorLine_NewCW.cs`中添加版本注释和设备属性定义，增强设备连接状态检查与命令发送逻辑。 修改 CommonConveyorLine_GWJob.cs`的任务查询逻辑，确保在特定条件下不下发新任务。在CommonConveyorLine_NewCWJob.cs中实现请求入库和出库的处理逻辑，确保任务状态更新。在 RequestInbound.cs中添加出库任务和新任务的处理逻辑，增强异常处理。 在CommonStackerCrane_NewCWJob.cs中实现堆垛机任务完成事件的处理，确保状态更新和前端通知。新增设备型号修改相关常量和 DTO 类，更新服务接口和实现逻辑，确保设备型号修改请求的正确处理。修改 Dt_TaskService.cs中的任务处理逻辑，确保出库任务的库存判断和状态更新。
---
Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue
index 5359a18..287deaa 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_needBarcode.vue
@@ -24,43 +24,46 @@
sortName: "AreaCode"
});
const editFormFields = ref({
- // "toArea": "",
- // "fromArea": "",
- // "barcodeType": "",
+ "id":"",
+ "toArea": "",
+ "fromArea": "",
+ "barcodeType": "",
"productLine": "",
"inLineNum": "",
"cacheNum":""
});
const editFormOptions = ref([
- // [
- // { "title": "鐩爣搴撳尯", "field": "toArea", type: "text" },
- // { "title": "鏉ユ簮搴撳尯", "field": "fromArea", type: "text" },
- // { "title": "鎵樼洏绫诲瀷", "field": "barcodeType", type: "text" },
- // ],
[
- { "title": "鎵�灞炰骇绾�", "field": "productLine", type: "text" },
{ "title": "鍦ㄩ�旀暟閲�", "field": "inLineNum", type: "text" },
{ "title": "鍙紦瀛樻暟閲�", "field": "cacheNum", type: "text" },
]
]);
- const searchFormFields = ref({});
+ const searchFormFields = ref({
+ "iD":"",
+ "toArea": "",
+ "fromArea": "",
+ "barcodeType": "",
+ "productLine": "",
+ "inLineNum": "",
+ "cacheNum":""
+ });
const searchFormOptions = ref([
- // [
- // { "title": "鐩爣搴撳尯", "field": "toArea", type: "text" },
- // { "title": "鏉ユ簮搴撳尯", "field": "fromArea", type: "text" },
- // { "title": "鎵樼洏绫诲瀷", "field": "barcodeType", type: "text" },
- // ],
+ [
+ { "title": "鐩爣搴撳尯", "field": "toArea", type: "text" },
+ { "title": "鏉ユ簮搴撳尯", "field": "fromArea", type: "text" },
+ { "title": "鎵樼洏绫诲瀷", "field": "barcodeType", type: "text" },
+ ],
[
{ "title": "鎵�灞炰骇绾�", "field": "productLine", type: "text" },
{ "title": "鍦ㄩ�旀暟閲�", "field": "inLineNum", type: "text" },
{ "title": "鍙紦瀛樻暟閲�", "field": "cacheNum", type: "text" },
]
]);
- const columns = ref([{ field: 'ID', title: '涓婚敭', type: 'int', sort: true, hidden: true, width: 110, readonly: true, require: true, align: 'left' },
- //{ field: 'toArea', title: '鐩爣搴撳尯', type: 'string', sort: true, width: 110, require: true, align: 'left', sort: true },
- //{ field: 'fromArea', title: '鏉ユ簮搴撳尯', type: 'string', sort: true, width: 110, align: 'left' },
- //{ field: 'barcodeType', title: '鎵樼洏绫诲瀷', type: 'string', sort: true, width: 110, align: 'left' },
- { field: 'productLine', title: '鎵�灞炰骇绾�', type: 'string', sort: true, width: 110, align: 'left',},
+ const columns = ref([{ field: 'iD', title: '涓婚敭', type: 'int', sort: true, hidden: true, width: 110, readonly: true, require: true, align: 'left' },
+ { field: 'toArea', title: '鐩爣搴撳尯', type: 'string', sort: true, width: 110, require: true, align: 'left', sort: true },
+ { field: 'fromArea', title: '鏉ユ簮搴撳尯', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'barcodeType', title: '鎵樼洏绫诲瀷', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'productLine', title: '鎵�灞炰骇绾�', type: 'string', sort: true, width: 110, align: 'left',bind: { key: "ProductionLine", data: [] } },
{ field: 'inLineNum', title: '鍦ㄩ�旀暟閲�', type: 'int', sort: true, width: 110, align: 'left' },
{ field: 'cacheNum', title: '鍙紦瀛樻暟閲�', type: 'int', sort: true, width: 100, align: 'left' },
{ field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
--
Gitblit v1.9.3