From a1ba606567db3b83827a6a9f0d4fae46217a2e7e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 07 一月 2025 21:39:18 +0800
Subject: [PATCH] 前端优化,枚举更新
---
代码管理/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue | 13 ++-
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue | 8 -
代码管理/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue | 21 +---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/CommonEnum/PrintStatusEnum.cs | 23 +++++
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs | 54 +++++++++++++
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/339ccc6a-95ea-4f78-8616-45299be9dd90.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/51bc4fd8-adae-43fe-aa0e-8971136a692a.vsidx | 0
/dev/null | 0
代码管理/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue | 17 ++--
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d25efbec-11d1-4ce7-a481-6187db1d5fbb.vsidx | 0
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 14 ++
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4b4ce8f6-d231-4356-8904-ece35b20d64d.vsidx | 0
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/palletCodeInfo.vue | 8 +-
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue | 39 +++------
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 10 ++
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue | 30 +++---
17 files changed, 156 insertions(+), 83 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
index 5b61bdc..b2f15b4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
@@ -27,7 +27,7 @@
sortName: "id",
});
const editFormFields = ref({
- areaId: "",
+ warehouseId: "",
materielCode: "",
materielName: "",
materielDes: "",
@@ -37,9 +37,9 @@
const editFormOptions = ref([
[
{
- title: "鍖哄煙",
+ title: "浠撳簱",
required: true,
- field: "areaId",
+ field: "warehouseId",
type: "string",
},
{
@@ -73,13 +73,11 @@
const searchFormFields = ref({
materielCode: "",
materielName: "",
- areaId: "",
});
const searchFormOptions = ref([
[
{ title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
{ title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
- { title: "璁惧鐘舵��", field: "deviceStatus" },
],
]);
const columns = ref([
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/palletCodeInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/palletCodeInfo.vue"
index 6a93589..991ad93 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/palletCodeInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/palletCodeInfo.vue"
@@ -68,20 +68,20 @@
type: "string",
width: 90,
align: "left",
- bind: { key: "warehouse", data: [] },
+ bind: { key: "warehouses", data: [] },
},
{
field: "palletType",
title: "鎵樼洏绫诲瀷",
type: "string",
- width: 150,
+ width: 100,
align: "left",
},
{
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "decimal",
- width: 90,
+ width: 200,
align: "left",
},
{
@@ -90,7 +90,7 @@
type: "string",
width: 90,
align: "left",
- bind: { key: "enableEnum", data: [] },
+ bind: { key: "printStatus", data: [] },
},
{
field: "size",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue"
index 444e3eb..5aa50c2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue"
@@ -51,7 +51,7 @@
{field:'name',title:'鍛樺伐鍚嶇О',type:'string',width:110,align:'left'},
{field:'state',title:'鐘舵��',type:'int',width:110,require:true,align:'left',bind: { key: "status", data: [] }},
{field:'invOrgId',title:'搴撳瓨缁勭粐',type:'string',width:110,align:'left'},
- {field:'type',title:'绫诲瀷',type:'int',width:110,require:true,align:'left'},
+ {field:'type',title:'绫诲瀷',type:'int',width:110,require:true,align:'left',hidden:true},
{field:'creater',title:'鍒涘缓鑰�',type:'string',width:110,require:true,align:'left'},
{field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
{field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
index cbefc41..41ee0fc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue"
@@ -31,7 +31,12 @@
});
const editFormFields = ref({});
const editFormOptions = ref([]);
- const searchFormFields = ref({});
+ const searchFormFields = ref({
+ checkOrderNo:"",
+ receiveOrderNo:"",
+ checkOrderStatus:"",
+ auditStatus:""
+ });
const searchFormOptions = ref([
[
{title:"妫�楠屽崟鍙�", field:"checkOrderNo",type:"like"},
@@ -45,9 +50,9 @@
{title:"妫�楠岀粨鏋�", field:"result",type:"like"},
]
]);
- const columns = ref([{field:'checkOrderId',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'checkOrderNo',title:'妫�楠屽崟鍙�',type:'string',width:110,require:true,align:'left',sort:true},
- {field:'receiveOrderNo',title:'鏀惰揣鍗曞彿',type:'string',width:110,require:true,align:'left'},
+ const columns = ref([{field:'checkOrderId',title:'涓婚敭',type:'int',width:150,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'checkOrderNo',title:'妫�楠屽崟鍙�',type:'string',width:160,require:true,align:'left',sort:true},
+ {field:'receiveOrderNo',title:'鏀惰揣鍗曞彿',type:'string',width:160,require:true,align:'left'},
{field:'checkOrderStatus',title:'璐ㄦ鍗曠姸鎬�',type:'int',width:110,require:true,align:'left'},
{field:'auditStatus',title:'瀹℃壒鐘舵��',type:'int',width:110,require:true,align:'left'},
{field:'receiveDetailRowNo',title:'鏀惰揣鍗曟槑缁嗚鍙�',type:'int',width:110,require:true,align:'left'},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index bdbba74..517719b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -126,6 +126,14 @@
align: "left",
},
{
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind:{key: "warehouses", data: []}
+ },
+ {
field: "orderType",
title: "鍗曟嵁绫诲瀷",
type: "string",
@@ -145,7 +153,7 @@
field: "createType",
title: "鍒涘缓鏂瑰紡",
type: "string",
- width: 90,
+ width: 120,
align: "left",
bind: { key: "createType", data: [] },
},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
index 9bbbdaf..ac92e4e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
@@ -60,44 +60,28 @@
// ],
]);
const searchFormFields = ref({
- inboundOrderNo: "",
- upperOrderNo: "",
- orderType: "",
- orderStatus: "",
- createType: "",
- creater: "",
- createDate: "",
+ purchaseOrderNo: "",
+ purchaseOrderType: "",
+ purchaseOrderStatus: "",
});
const searchFormOptions = ref([
[
- { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
- { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
+ { title: "閲囪喘鍗曞彿", field: "purchaseOrderNo", type: "like" },
{
title: "鍗曟嵁绫诲瀷",
- field: "orderType",
+ field: "purchaseOrderType",
type: "select",
dataKey: "purchaseType",
data: [],
},
{
title: "鍗曟嵁鐘舵��",
- field: "orderStatus",
+ field: "purchaseOrderStatus",
type: "select",
- dataKey: "inboundState",
+ dataKey: "purchaseOrderStatus",
data: [],
},
- ],
- [
- {
- title: "鍒涘缓鏂瑰紡",
- field: "createType",
- type: "select",
- dataKey: "createType",
- data: [],
- },
- { title: "鍒涘缓鑰�", field: "creater", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ],
+ ]
]);
const columns = ref([
{
@@ -114,7 +98,7 @@
field: "purchaseOrderNo",
title: "閲囪喘鍗曞彿",
type: "string",
- width: 120,
+ width: 150,
align: "left",
link: true,
},
@@ -130,7 +114,7 @@
field: "supplierCode",
title: "渚涘簲鍟嗙紪鍙�",
type: "string",
- width: 150,
+ width: 120,
align: "left",
},
{
@@ -146,12 +130,13 @@
type: "string",
width: 90,
align: "left",
+ bind: { key: "purchaseOrderStatus", data: [] },
},
{
field: "orderDate",
title: "涓嬪崟鏃ユ湡",
type: "string",
- width: 90,
+ width: 160,
align: "left",
},
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue"
index a52acca..6750ee2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue"
@@ -28,35 +28,32 @@
});
const searchFormFields = ref({
- orderNo: "",
- upperOrderNo: "",
- orderType: "",
- orderStatus: "",
- createType: "",
+ receiveOrderNo: "",
+ receiveOrderType: "",
+ receiveOrderStatus: "",
creater: "",
- createDate: "",
});
const searchFormOptions = ref([
[
- { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
+ { title: "鍗曟嵁缂栧彿", field: "receiveOrderNo", type: "like" },
{
title: "鍗曟嵁绫诲瀷",
- field: "orderType",
+ field: "receiveOrderType",
type: "select",
- dataKey: "inOrderType",
+ dataKey: "receiveOrderTypeEnum",
data: [],
},
{
title: "鍗曟嵁鐘舵��",
- field: "orderStatus",
+ field: "receiveOrderStatus",
type: "selectList",
dataKey: "receiveStatus",
data: [],
},
],
[
+ { title: "渚涘簲鍟�", field: "suppliersId", type: "select",dataKey:"suppliers",data:[]},
{ title: "鍒涘缓鑰�", field: "creater", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
@@ -139,7 +136,7 @@
field: "receiveOrderStatus",
title: "璁㈠崟鐘舵��",
type: "string",
- width: 150,
+ width: 120,
align: "left",
bind: { key: "receiveStatus", data: [] },
},
@@ -149,6 +146,7 @@
type: "string",
width: 90,
align: "left",
+ hidden:true
},
{
field: "suppliersId",
@@ -159,23 +157,24 @@
},
{
field: "warehouseId",
- title: "浠撳簱涓婚敭",
+ title: "浠撳簱",
type: "string",
width: 90,
align: "left",
+ bind:{key: "warehouses", data: []}
},
{
field: "receiveDate",
title: "鏀惰揣鏃ユ湡",
type: "string",
- width: 90,
+ width: 160,
align: "left",
},
{
field: "deliveryCode",
title: "閫佽揣鍗曞彿",
type: "string",
- width: 90,
+ width: 150,
align: "left",
},
{
@@ -184,6 +183,7 @@
type: "string",
width: 90,
align: "left",
+ bind:{key:"enable",data:[]}
},
{
field: "creater",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
index 7ec8bca..00422e9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
@@ -129,10 +129,18 @@
align: "left",
},
{
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind:{key: "warehouses", data: []}
+ },
+ {
field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
- width: 120,
+ width: 160,
align: "left",
link: true,
},
@@ -140,7 +148,7 @@
field: "upperOrderNo",
title: "涓婃父鍗曟嵁缂栧彿",
type: "string",
- width: 150,
+ width: 160,
align: "left",
},
{
@@ -163,7 +171,7 @@
field: "createType",
title: "鍒涘缓鏂瑰紡",
type: "string",
- width: 90,
+ width: 120,
align: "left",
bind: { key: "createType", data: [] },
},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
index 3c073eb..f8fed3d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
@@ -73,28 +73,28 @@
field: "taskNum",
title: "浠诲姟鍙�",
type: "int",
- width: 80,
+ width: 120,
align: "left",
},
{
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
- width: 150,
+ width: 160,
align: "left",
},
{
field: "roadway",
title: "宸烽亾鍙�",
type: "string",
- width: 90,
+ width: 120,
align: "left",
},
{
field: "taskType",
title: "浠诲姟绫诲瀷",
type: "int",
- width: 90,
+ width: 120,
align: "left",
bind: { key: "taskType", data: [] },
},
@@ -110,14 +110,14 @@
field: "sourceAddress",
title: "璧峰鍦板潃",
type: "int",
- width: 120,
+ width: 220,
align: "left",
},
{
field: "targetAddress",
title: "鐩爣鍦板潃",
type: "string",
- width: 120,
+ width: 220,
align: "left",
},
// {
@@ -140,7 +140,6 @@
type: "string",
width: 90,
align: "left",
- hidden: true,
},
{
field: "grade",
@@ -160,7 +159,7 @@
field: "dispatchertime",
title: "浠诲姟涓嬪彂鏃堕棿",
type: "datetime",
- width: 150,
+ width: 160,
align: "left",
hidden:true,
},
@@ -183,7 +182,7 @@
field: "createDate",
title: "鍒涘缓鏃堕棿",
type: "datetime",
- width: 150,
+ width: 160,
align: "left",
},
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
index 3b10f2e..c0ade98 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
@@ -73,28 +73,28 @@
field: "taskNum",
title: "浠诲姟鍙�",
type: "int",
- width: 80,
+ width: 120,
align: "left",
},
{
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
- width: 150,
+ width: 160,
align: "left",
},
{
field: "roadway",
title: "宸烽亾鍙�",
type: "string",
- width: 90,
+ width: 120,
align: "left",
},
{
field: "taskType",
title: "浠诲姟绫诲瀷",
type: "int",
- width: 90,
+ width: 120,
align: "left",
bind: { key: "taskType", data: [] },
},
@@ -110,14 +110,14 @@
field: "sourceAddress",
title: "璧峰鍦板潃",
type: "int",
- width: 120,
+ width: 220,
align: "left",
},
{
field: "targetAddress",
title: "鐩爣鍦板潃",
type: "string",
- width: 120,
+ width: 220,
align: "left",
},
// {
@@ -182,7 +182,7 @@
field: "createDate",
title: "鍒涘缓鏃堕棿",
type: "datetime",
- width: 150,
+ width: 160,
align: "left",
},
{
@@ -197,13 +197,6 @@
title: "淇敼鏃堕棿",
type: "datetime",
width: 160,
- align: "left",
- },
- {
- field: "operateType",
- title: "澶囨敞",
- type: "string",
- width: 100,
align: "left",
},
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/339ccc6a-95ea-4f78-8616-45299be9dd90.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/339ccc6a-95ea-4f78-8616-45299be9dd90.vsidx"
new file mode 100644
index 0000000..4a82009
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/339ccc6a-95ea-4f78-8616-45299be9dd90.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4b4ce8f6-d231-4356-8904-ece35b20d64d.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4b4ce8f6-d231-4356-8904-ece35b20d64d.vsidx"
new file mode 100644
index 0000000..03acc8a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4b4ce8f6-d231-4356-8904-ece35b20d64d.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/51bc4fd8-adae-43fe-aa0e-8971136a692a.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/51bc4fd8-adae-43fe-aa0e-8971136a692a.vsidx"
new file mode 100644
index 0000000..33cf4fa
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/51bc4fd8-adae-43fe-aa0e-8971136a692a.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c44d9433-e876-4faf-90e0-7b056781c3b4.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c44d9433-e876-4faf-90e0-7b056781c3b4.vsidx"
deleted file mode 100644
index bcfd329..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c44d9433-e876-4faf-90e0-7b056781c3b4.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d25efbec-11d1-4ce7-a481-6187db1d5fbb.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d25efbec-11d1-4ce7-a481-6187db1d5fbb.vsidx"
new file mode 100644
index 0000000..56a1289
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d25efbec-11d1-4ce7-a481-6187db1d5fbb.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/da85dbf7-c355-4843-a8fd-bdd296cc107b.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/da85dbf7-c355-4843-a8fd-bdd296cc107b.vsidx"
deleted file mode 100644
index 5d3f043..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/da85dbf7-c355-4843-a8fd-bdd296cc107b.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/CommonEnum/PrintStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/CommonEnum/PrintStatusEnum.cs"
new file mode 100644
index 0000000..5c4c3b3
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/CommonEnum/PrintStatusEnum.cs"
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.CommonEnum
+{
+ public enum PrintStatusEnum
+ {
+ /// <summary>
+ /// 宸叉墦鍗�
+ /// </summary>
+ [Description("宸叉墦鍗�")]
+ Printed = 0,
+ /// <summary>
+ /// 鏈墦鍗�
+ /// </summary>
+ [Description("鏈墦鍗�")]
+ UnPrinted =1
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
index 27fce3b..98744f1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
@@ -791,6 +791,33 @@
List<object> data = new List<object>();
{
+ Type type = typeof(PurchaseOrderTypeEnum);
+ List<string> enums = Enum.GetValues(typeof(PurchaseOrderTypeEnum)).Cast<string>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ //FieldInfo? fieldInfo = typeof(PurchaseOrderTypeEnum).GetField(((PurchaseOrderTypeEnum)item).ToString());
+ //DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ //if (description != null)
+ //{
+ // data.Add(new { key = item.ToString(), value = description.Description });
+ //}
+ //else
+ //{
+ // data.Add(new { key = item.ToString(), value = item.ToString() });
+ //}
+ //index++;
+ }
+ }
+
+ result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
+ }
+ break;
+ case "purchaseOrderStatus":
+ {
+ List<object> data = new List<object>();
+
+ {
Type type = typeof(PurchaseOrderStatusEnum);
List<int> enums = Enum.GetValues(typeof(PurchaseOrderStatusEnum)).Cast<int>().ToList();
int index = 0;
@@ -813,6 +840,33 @@
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
+ case "printStatus":
+ {
+ List<object> data = new List<object>();
+
+ {
+ Type type = typeof(PrintStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(PrintStatusEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(PrintStatusEnum).GetField(((PrintStatusEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+ }
+
+ result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
+ }
+ break;
}
return result;
}
--
Gitblit v1.9.3