From 0c369f4d3dab390ab14332346b0fe6b86c999bd9 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 23 六月 2025 09:46:29 +0800
Subject: [PATCH] 修复消息处理逻辑并增加地址检查在 `RequestInbound.cs` 中，更新了对 `content.Message` 的条件判断，增加了对 "无法获取目标地址" 消息的处理逻辑，并确保错误信息始终被记录。在 `Dt_TaskService.cs` 中，增加了对 `ToAddress` 变量的空值检查，确保在创建新任务实例之前，地址是有效的。
---
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue | 52 +++++++++++++++++++++-------------------------------
1 files changed, 21 insertions(+), 31 deletions(-)
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 53091df..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
@@ -11,68 +11,58 @@
</view-grid>
</template>
<script>
-import extend from "@/extension/widesea_wms/basicinfo/Dt_LocationInfo.js";
+import extend from "@/extension/widesea_wms/basicinfo/Dt_LocationInfo.jsx";
import { ref, defineComponent } from "vue";
export default defineComponent({
setup() {
const table = ref({
- key: 'locationID',
+ key: 'id',
footer: "Foots",
cnName: '璐т綅淇℃伅',
name: 'basicinfo/Dt_LocationInfo',
url: "/LocationInfo/",
- sortName: "LocationID"
+ sortName: "id"
});
- const editFormFields = ref({ "status": "", "scNo": "", "roadWayNO": "", "locationCode": "", "wareAreaCode": "" });
+ const editFormFields = ref({ "locationStatus": "" });
const editFormOptions = ref([
[
- { "title": "璐т綅缂栧彿", "field": "locationCode", type: "text" },
- { "title": "璐т綅鐘舵��", "field": "status", "type": "select", dataKey: "LocationState", data: [] },
- { "title": "瀵瑰簲鍫嗗灈鏈哄彿", "field": "scNo", type: "text" },
- { "title": "宸烽亾缂栧彿", "field": "roadWayNO", type: "text" },
-
- ], [
- { "title": "搴撳尯缂栧彿", "field": "wareAreaCode", type: "text" },
+ { "title": "璐т綅鐘舵��", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
+ { "title": "鏄惁绂佺敤", "field": "enalbeStatus", "type": "select", dataKey: "EnalbeStatus", data: [] },
]
]);
- const searchFormFields = ref({ "LocationID": "" });
+ const searchFormFields = ref({ "LocationID": "",roadWayNO:"" });
const searchFormOptions = ref([
[
{ "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' },
{ field: 'locationCode', title: '璐т綅缂栧彿', type: 'string', width: 110, require: true, align: 'left' },
{ field: 'locationName', title: '璐т綅鍚嶇О', type: 'string', width: 120, align: 'left' },
- { field: 'roadWayNO', title: '宸烽亾鍙�', type: 'string', width: 110, require: true, align: 'left', sort: true },
+ { field: 'roadwayNo', title: '宸烽亾鍙�', type: 'string', width: 110, require: true, align: 'left', sort: true },
{ field: 'row', title: '琛�', type: 'string', width: 70, align: 'left' },
{ field: 'column', title: '鍒�', type: 'string', width: 70, align: 'left' },
{ field: 'layer', title: '灞�', type: 'string', width: 110, align: 'left' },
- { field: 'depth', title: '娣卞害', type: 'string', width: 110, align: 'left' },
- { field: 'scNo', title: '瀵瑰簲鍫嗗灈鏈哄彿', type: 'string', width: 110, align: 'left' },
- { field: 'locationType', title: '璐т綅绫诲瀷', type: 'int', width: 110, align: 'left' },
+ { field: 'depth', title: '娣卞害', type: 'string', width: 110, align: 'left', hidden: true },
+ { field: 'scNo', title: '瀵瑰簲鍫嗗灈鏈哄彿', type: 'string', width: 110, align: 'left', hidden: true },
+ { field: 'locationType', title: '璐т綅绫诲瀷', type: 'int', width: 110, align: 'left',bind: { key: "LocationType", data: [] } },
{ field: 'locationStatus', title: '璐т綅鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "LocationState", data: [] } },
- { field: 'isLocked', title: '鏄惁閿佸畾', type: 'bool', width: 110, align: 'left' , bind: { key: "IsLocked", data: [] } },
- { field: 'locationDesc', title: '璐т綅鎻忚堪', type: 'string', width: 110, align: 'left' },
- { field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left' },
- { field: 'wareAreaCode', title: '搴撳尯缂栧彿', type: 'string', width: 110, align: 'left', hidden: true },
- { field: 'roadway', title: '宸烽亾', type: 'string', width: 110, align: 'left', hidden: true },
- { field: 'sClocationID', title: '鍫嗗灈鏈哄搴旇揣浣嶇珯鍙板彿', type: 'string', width: 110, align: 'left', hidden: true },
- { field: 'isDelete', title: '鏄惁鍒犻櫎', type: 'bool', width: 110, align: 'left', hidden: true },
- { field: 'createID', title: '鍒涘缓ID', type: 'int', sort: true, width: 100, hidden: true, align: 'left' },
+ { field: 'enalbeStatus', title: '鏄惁绂佺敤', type: 'int', width: 75, align: 'left', bind: { key: "EnalbeStatus", data: [] }},
+ // { field: 'isLocked', title: '鏄惁閿佸畾', type: 'bool', width: 110, align: 'left', bind: { key: "IsLocked", data: [] } },
+ { field: 'locationDesc', title: '璐т綅鎻忚堪', type: 'string', width: 110, align: 'left', hidden: true },
+ { field: 'remark', title: '妫�娴嬫煖鍏佽', type: 'string', width: 110, align: 'left' ,bind: { key: "AllowStatus", data: [] }},
{ field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
- { field: 'modifyID', title: '淇敼浜篒D', type: 'int', sort: true, width: 100, hidden: true, align: 'left' },
{ 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: 'spare1', title: 'Spare1', type: 'string', sort: true, width: 110, hidden: true, align: 'left' },
- { field: 'spare2', title: 'Spare2', type: 'string', sort: true, width: 110, hidden: true, align: 'left' },
- { field: 'spare3', title: 'Spare3', type: 'string', sort: true, width: 110, hidden: true, align: 'left' },
- { field: 'spare4', title: 'Spare4', type: 'string', sort: true, width: 110, hidden: true, align: 'left' },
- { field: 'spare5', title: 'Spare5', type: 'string', sort: true, width: 110, hidden: true, align: 'left' }]);
+ ]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
--
Gitblit v1.9.3