From a8be8f9371b6fc03b66d212b2902d08f93b087dd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 02 七月 2025 13:55:55 +0800
Subject: [PATCH] 新增任务查询方法并优化逻辑在 `ITaskService.cs` 中添加了新的 `QueryExecutingConveyorLineTask` 方法，支持根据托盘号和下一地址查询任务，同时调整了原有方法的参数以保留旧功能。在 `TaskService.cs` 中新增重载方法，允许根据下一地址和条形码查询任务。在 `CommonConveyorLine_GWJob.cs` 中更新了 `ConveyorLineOutFinish` 方法，简化了任务查询逻辑并删除了多余的注释代码。同时，增加了对 `taskNext` 的处理逻辑，确保在任务未找到时的相应处理，并更新在途数据的逻辑，提升数据一致性和准确性。
---
Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js b/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js
index ca16186..54d708c 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js
@@ -1,29 +1,39 @@
-
-import gridBody from './extend/importDevicePro.vue'
+import gridBody from "./extend/importDevicePro.vue";
let extension = {
components: {
//鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
+ gridHeader: "",
gridBody: gridBody,
- gridFooter: '',
+ gridFooter: "",
//鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
+ modelHeader: "",
+ modelBody: "",
+ modelFooter: "",
},
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ tableAction: "", //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
methods: {
//涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
onInit() {
// console.log(this.detailOptions.buttons);
// console.log(this.$refs.detail)
- var detailImport = this.detailOptions.buttons.find(item=>item.value == 'import');
- if(detailImport){
+ var detailImport = this.detailOptions.buttons.find(
+ (item) => item.value == "import"
+ );
+ if (detailImport) {
detailImport.onClick = function () {
this.$refs.gridBody.open();
- }
+ };
}
+ // this.buttons.unshift({
+ // //涔熷彲浠ョ敤push鎴栬�卻plice鏂规硶鏉ヤ慨鏀筨uttons鏁扮粍
+ // name: "寮�鍚湇鍔�", //鎸夐挳鍚嶇О
+ // icon: "el-icon-document", //鎸夐挳鍥炬爣vue2鐗堟湰瑙乮view鏂囨。icon锛寁ue3鐗堟湰瑙乪lement ui鏂囨。icon(娉ㄦ剰涓嶆槸element puls鏂囨。)
+ // type: "primary", //鎸夐挳鏍峰紡vue2鐗堟湰瑙乮view鏂囨。button锛寁ue3鐗堟湰瑙乪lement ui鏂囨。button
+ // onClick: function () {
+ // this.$Message.success("寮�鍚湇鍔�");
+ // },
+ // });
},
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
@@ -64,15 +74,14 @@
//console.log(this.$refs)
this.$nextTick(() => {
if (this.$refs.upload_excel) {
- alert('鐐瑰嚮浜嗕笂浼犳寜閽�')
+ alert("鐐瑰嚮浜嗕笂浼犳寜閽�");
this.$refs.upload_excel.upload = function () {
- console.log('鐐瑰嚮浜嗕笂浼犳寜閽�')
- }
+ console.log("鐐瑰嚮浜嗕笂浼犳寜閽�");
+ };
}
// alert(1)
- })
-
- }
- }
+ });
+ },
+ },
};
export default extension;
--
Gitblit v1.9.3