From 0a4224dbd27287ee2c79f832149e5222914d7ad4 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 22 十二月 2024 13:35:06 +0800
Subject: [PATCH] 更新代码
---
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo_Hty.vue | 32
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/APIEnum/APIEnum.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 42 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs | 69 +++
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/MesResponseContent.cs | 7
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/supplierInfo.vue | 2
代码管理/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue | 42 +-
代码管理/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue | 4
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/72845575-fd42-4ccb-9a0b-52ec01d5a35a.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f7067496-52ad-4a4a-bf3f-ed83b0bf130d.vsidx | 0
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrderDetail_Hty.vue | 36
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockInfoDetail_Hty.vue | 42 +-
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrderDetail.vue | 28
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrderDetail.vue | 4
代码管理/WMS/WIDESEA_WMSClient/src/extension/basic/customerInfo.js | 75 +++
代码管理/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue | 2
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Menu.tsv | 201 ++++++---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs | 4
代码管理/WMS/WIDESEA_WMSClient/src/extension/basic/userInfo.js | 75 +++
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue | 67 +++
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue | 64 +++
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureReplyModel.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGV/AgvController.cs | 34 +
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/44ca8512-2c9c-4084-8306-4da22284d9a3.vsidx | 0
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder_Hty.vue | 30
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/659246e0-feaf-49b5-8c49-7456594f6dd5.vsidx | 0
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 2
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder_Hty.vue | 30
代码管理/WMS/WIDESEA_WMSClient/src/views/check/checkOrderResult.vue | 24
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureApplyModel.cs | 28 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs | 10
代码管理/WMS/WIDESEA_WMSClient/src/router/viewGird.js | 14
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/AGVService/InvokeAGVService.cs | 33 +
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock | 0
代码管理/WMS/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs | 13
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs | 12
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 10
/dev/null | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/IAGVService/IInvokeAGVService.cs | 7
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrderDetail_Hty.vue | 38
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/bfff5ce4-43fc-42d6-bbfb-5b2b395f1cc1.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvUpdateModel.cs | 111 +++++
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue | 2
49 files changed, 930 insertions(+), 278 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/865277cf-60e5-4f38-8da0-b4a4cb7af367.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/865277cf-60e5-4f38-8da0-b4a4cb7af367.vsidx"
deleted file mode 100644
index 7a578f6..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/865277cf-60e5-4f38-8da0-b4a4cb7af367.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f7067496-52ad-4a4a-bf3f-ed83b0bf130d.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f7067496-52ad-4a4a-bf3f-ed83b0bf130d.vsidx"
new file mode 100644
index 0000000..6101c24
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f7067496-52ad-4a4a-bf3f-ed83b0bf130d.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock"
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/customerInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/customerInfo.js"
new file mode 100644
index 0000000..8935403
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/customerInfo.js"
@@ -0,0 +1,75 @@
+/*****************************************************************************************
+** Author:jxx 2022
+** QQ:283591387
+**瀹屾暣鏂囨。瑙侊細http://v2.volcore.xyz/document/api 銆愪唬鐮佺敓鎴愰〉闈iewGrid銆�
+**甯哥敤绀轰緥瑙侊細http://v2.volcore.xyz/document/vueDev
+**鍚庡彴鎿嶄綔瑙侊細http://v2.volcore.xyz/document/netCoreDev
+*****************************************************************************************/
+//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
+
+let extension = {
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: '',
+ gridBody: '',
+ gridFooter: '',
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() { //妗嗘灦鍒濆鍖栭厤缃墠锛�
+ //绀轰緥锛氬湪鎸夐挳鐨勬渶鍓嶉潰娣诲姞涓�涓寜閽�
+ // 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('鐐瑰嚮浜嗘寜閽�');
+ // }
+ // });
+
+ //绀轰緥锛氳缃慨鏀规柊寤恒�佺紪杈戝脊鍑烘瀛楁鏍囩鐨勯暱搴�
+ // this.boxOptions.labelWidth = 150;
+ },
+ onInited() {
+ //妗嗘灦鍒濆鍖栭厤缃悗
+ //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
+ //this.detailOptions.columns.forEach(column=>{ });
+ },
+ searchBefore(param) {
+ //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
+ //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
+ return true;
+ },
+ searchAfter(result) {
+ //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
+ return true;
+ },
+ addBefore(formData) {
+ //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
+ return true;
+ },
+ updateBefore(formData) {
+ //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
+ return true;
+ },
+ rowClick({ row, column, event }) {
+ //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
+ // this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
+ },
+ modelOpenAfter(row) {
+ //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
+ //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
+ //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
+ //(3)this.editFormFields.瀛楁='xxx';
+ //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
+ //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
+ }
+ }
+};
+export default extension;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/userInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/userInfo.js"
new file mode 100644
index 0000000..8935403
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/userInfo.js"
@@ -0,0 +1,75 @@
+/*****************************************************************************************
+** Author:jxx 2022
+** QQ:283591387
+**瀹屾暣鏂囨。瑙侊細http://v2.volcore.xyz/document/api 銆愪唬鐮佺敓鎴愰〉闈iewGrid銆�
+**甯哥敤绀轰緥瑙侊細http://v2.volcore.xyz/document/vueDev
+**鍚庡彴鎿嶄綔瑙侊細http://v2.volcore.xyz/document/netCoreDev
+*****************************************************************************************/
+//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
+
+let extension = {
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: '',
+ gridBody: '',
+ gridFooter: '',
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() { //妗嗘灦鍒濆鍖栭厤缃墠锛�
+ //绀轰緥锛氬湪鎸夐挳鐨勬渶鍓嶉潰娣诲姞涓�涓寜閽�
+ // 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('鐐瑰嚮浜嗘寜閽�');
+ // }
+ // });
+
+ //绀轰緥锛氳缃慨鏀规柊寤恒�佺紪杈戝脊鍑烘瀛楁鏍囩鐨勯暱搴�
+ // this.boxOptions.labelWidth = 150;
+ },
+ onInited() {
+ //妗嗘灦鍒濆鍖栭厤缃悗
+ //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
+ //this.detailOptions.columns.forEach(column=>{ });
+ },
+ searchBefore(param) {
+ //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
+ //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
+ return true;
+ },
+ searchAfter(result) {
+ //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
+ return true;
+ },
+ addBefore(formData) {
+ //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
+ return true;
+ },
+ updateBefore(formData) {
+ //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
+ return true;
+ },
+ rowClick({ row, column, event }) {
+ //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
+ // this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
+ },
+ modelOpenAfter(row) {
+ //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
+ //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
+ //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
+ //(3)this.editFormFields.瀛楁='xxx';
+ //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
+ //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
+ }
+ }
+};
+export default extension;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/router/viewGird.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/router/viewGird.js"
index 849dca1..3b99c5c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/router/viewGird.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/router/viewGird.js"
@@ -106,8 +106,8 @@
name: 'stockView',
component: () => import('@/views/stock/stockView.vue')
},{
- path: '/StockQuantityChangeRecord',
- name: 'StockQuantityChangeRecord',
+ path: '/stockQuantityChangeRecord',
+ name: 'stockQuantityChangeRecord',
component: () => import('@/views/record/stockQuantityChangeRecord.vue')
},{
path: '/locationStatusChangeRecord',
@@ -177,6 +177,16 @@
name: 'stockInfoDetail_Hty',
component: () => import('@/views/stock/stockInfoDetail_Hty.vue')
}
+ ,{
+ path: '/customerInfo',
+ name: 'customerInfo',
+ component: () => import('@/views/basic/customerInfo.vue')
+ }
+ ,{
+ path: '/userInfo',
+ name: 'userInfo',
+ component: () => import('@/views/basic/userInfo.vue')
+ }
]
export default viewgird
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue"
new file mode 100644
index 0000000..4afd641
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue"
@@ -0,0 +1,64 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wcs/order/Dt_CustomerInfo.js姝ゅ缂栧啓
+ -->
+<template>
+ <view-grid ref="grid"
+ :columns="columns"
+ :detail="detail"
+ :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions"
+ :searchFormFields="searchFormFields"
+ :searchFormOptions="searchFormOptions"
+ :table="table"
+ :extend="extend">
+ </view-grid>
+</template>
+<script>
+ import extend from "@/extension/basic/customerInfo.js";
+ import { ref, defineComponent } from "vue";
+ export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'id',
+ footer: "Foots",
+ cnName: '瀹㈡埛淇℃伅',
+ name: 'customerInfo',
+ url: "/CustomerInfo/",
+ sortName: "id"
+ });
+ const editFormFields = ref({});
+ const editFormOptions = ref([]);
+ const searchFormFields = ref({});
+ const searchFormOptions = ref([]);
+ const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'code',title:'瀹㈡埛缂栫爜',type:'string',width:110,align:'left',sort:true},
+ {field:'name',title:'瀹㈡埛鍚嶇О',type:'string',width:110,align:'left'},
+ {field:'nickName',title:'瀹㈡埛鍏ㄧО',type:'string',width:120,align:'left'},
+ {field:'state',title:'鐘舵��',type:'bool',width:110,require:true,align:'left'},
+ {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'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+ });
+</script>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/supplierInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/supplierInfo.vue"
index 18343d8..80aec3d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/supplierInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/supplierInfo.vue"
@@ -22,7 +22,7 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'Id',
+ key: 'id',
footer: "Foots",
cnName: '渚涘簲鍟嗕俊鎭�',
name: 'supplierInfo',
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"
new file mode 100644
index 0000000..e402f39
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue"
@@ -0,0 +1,67 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wcs/order/Dt_UserInfo.js姝ゅ缂栧啓
+ -->
+<template>
+ <view-grid ref="grid"
+ :columns="columns"
+ :detail="detail"
+ :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions"
+ :searchFormFields="searchFormFields"
+ :searchFormOptions="searchFormOptions"
+ :table="table"
+ :extend="extend">
+ </view-grid>
+</template>
+<script>
+ import extend from "@/extension/basic/userInfo.js";
+ import { ref, defineComponent } from "vue";
+ export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'id',
+ footer: "Foots",
+ cnName: '鍛樺伐淇℃伅',
+ name: 'userInfo',
+ url: "/UserInfo/",
+ sortName: "id"
+ });
+ const editFormFields = ref({});
+ const editFormOptions = ref([]);
+ const searchFormFields = ref({});
+ const searchFormOptions = ref([]);
+ const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'code',title:'鍛樺伐鍙�',type:'string',width:110,align:'left',sort:true},
+ {field:'deptNo',title:'閮ㄩ棬缂栫爜',type:'string',width:110,align:'left'},
+ {field:'deptName',title:'閮ㄩ棬鍚嶇О',type:'string',width:110,align:'left'},
+ {field:'name',title:'鍛樺伐鍚嶇О',type:'string',width:110,align:'left'},
+ {field:'state',title:'鐘舵��',type:'int',width:110,require:true,align:'left'},
+ {field:'invOrgId',title:'搴撳瓨缁勭粐',type:'string',width:110,align:'left'},
+ {field:'type',title:'绫诲瀷',type:'int',width:110,require:true,align:'left'},
+ {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'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+ });
+</script>
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 be0928f..09f6687 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"
@@ -22,36 +22,36 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'CheckOrderId',
+ key: 'checkOrderId',
footer: "Foots",
cnName: '妫�楠屽崟',
name: 'checkOrder',
url: "/CheckOrder/",
- sortName: "CheckOrderId"
+ sortName: "checkOrderId"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
const searchFormOptions = ref([]);
- 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'},
- {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'},
- {field:'MaterielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
- {field:'QualifiedQuantity',title:'鍚堟牸鏁伴噺',type:'float',width:110,align:'left'},
- {field:'DefectedQuantity',title:'鐗归噰鏁伴噺',type:'float',width:110,align:'left'},
- {field:'ReturnQuantity',title:'閫�璐ф暟閲�',type:'float',width:110,align:'left'},
- {field:'ScrappedQuantity',title:'鎶ュ簾鏁伴噺',type:'float',width:110,align:'left'},
- {field:'ReceivedQuantity',title:'妫�楠屾�绘暟',type:'float',width:110,require:true,align:'left'},
- {field:'Result',title:'妫�楠岀粨鏋�',type:'string',width:110,align:'left'},
- {field:'DefectedNote',title:'鐗归噰璇存槑',type:'string',width:110,align:'left'},
- {field:'CheckUserName',title:'妫�楠屼汉',type:'string',width:110,align:'left'},
- {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'},
- {field:'ModifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
+ 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'},
+ {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'},
+ {field:'materielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
+ {field:'qualifiedQuantity',title:'鍚堟牸鏁伴噺',type:'float',width:110,align:'left'},
+ {field:'defectedQuantity',title:'鐗归噰鏁伴噺',type:'float',width:110,align:'left'},
+ {field:'returnQuantity',title:'閫�璐ф暟閲�',type:'float',width:110,align:'left'},
+ {field:'scrappedQuantity',title:'鎶ュ簾鏁伴噺',type:'float',width:110,align:'left'},
+ {field:'receivedQuantity',title:'妫�楠屾�绘暟',type:'float',width:110,require:true,align:'left'},
+ {field:'result',title:'妫�楠岀粨鏋�',type:'string',width:110,align:'left'},
+ {field:'defectedNote',title:'鐗归噰璇存槑',type:'string',width:110,align:'left'},
+ {field:'checkUserName',title:'妫�楠屼汉',type:'string',width:110,align:'left'},
+ {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'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrderResult.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrderResult.vue"
index 247d6f0..74b1d89 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrderResult.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/check/checkOrderResult.vue"
@@ -22,27 +22,27 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'Id',
+ key: 'id',
footer: "Foots",
cnName: '妫�楠岀粨鏋�',
name: 'checkOrderResult',
url: "/CheckOrderResult/",
- sortName: "Id"
+ sortName: "id"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
const searchFormOptions = ref([]);
- const columns = ref([{field:'Id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'CheckOrderId',title:'妫�楠屽崟涓婚敭',type:'int',width:110,require:true,align:'left',sort:true},
- {field:'DefectCode',title:'缂洪櫡浠ｇ爜',type:'string',width:110,require:true,align:'left'},
- {field:'Result',title:'妫�楠岀粨鏋�',type:'string',width:110,require:true,align:'left'},
- {field:'Quantity',title:'鏁伴噺',type:'float',width:110,require:true,align:'left'},
- {field:'Note',title:'澶囨敞',type:'string',width:220,align:'left'},
- {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'},
- {field:'ModifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
+ const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'checkOrderId',title:'妫�楠屽崟涓婚敭',type:'int',width:110,require:true,align:'left',sort:true},
+ {field:'defectCode',title:'缂洪櫡浠ｇ爜',type:'string',width:110,require:true,align:'left'},
+ {field:'result',title:'妫�楠岀粨鏋�',type:'string',width:110,require:true,align:'left'},
+ {field:'quantity',title:'鏁伴噺',type:'float',width:110,require:true,align:'left'},
+ {field:'note',title:'澶囨敞',type:'string',width:220,align:'left'},
+ {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'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
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 e84bd89..bdbba74 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"
@@ -24,7 +24,7 @@
cnName: "鍏ュ簱鍗�",
name: "inboundOrder",
url: "/InboundOrder/",
- sortName: "CreateDate",
+ sortName: "id",
});
const editFormFields = ref({
orderType: "",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrderDetail_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrderDetail_Hty.vue"
index 28491c9..fece3a0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrderDetail_Hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrderDetail_Hty.vue"
@@ -22,33 +22,33 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'Id',
+ key: 'id',
footer: "Foots",
cnName: '鍘嗗彶鍏ュ簱鍗曟槑缁嗗巻鍙�',
name: 'inboundOrderDetail_Hty',
- url: "/inboundOrderDetail_Hty/",
- sortName: "Id"
+ url: "/InboundOrderDetail_Hty/",
+ sortName: "id"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
const searchFormOptions = ref([]);
- const columns = ref([{field:'Id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'OrderId',title:'鍏ュ簱鍗曚富閿�',type:'int',width:110,require:true,align:'left',sort:true},
- {field:'MaterielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
- {field:'MaterielName',title:'鐗╂枡鍚嶇О',type:'string',width:180,require:true,align:'left'},
- {field:'BatchNo',title:'鎵规鍙�',type:'string',width:110,require:true,align:'left'},
- {field:'OrderQuantity',title:'鍗曟嵁鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'ReceiptQuantity',title:'缁勭洏鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'OverInQuantity',title:'涓婃灦鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'OrderDetailStatus',title:'璁㈠崟鏄庣粏鐘舵��',type:'int',width:110,require:true,align:'left'},
- {field:'Remark',title:'澶囨敞',type:'string',width:220,align:'left'},
- {field:'SourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
- {field:'OperateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
- {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'},
- {field:'ModifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
+ const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'orderId',title:'鍏ュ簱鍗曚富閿�',type:'int',width:110,require:true,align:'left',sort:true},
+ {field:'materielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
+ {field:'materielName',title:'鐗╂枡鍚嶇О',type:'string',width:180,require:true,align:'left'},
+ {field:'batchNo',title:'鎵规鍙�',type:'string',width:110,require:true,align:'left'},
+ {field:'orderQuantity',title:'鍗曟嵁鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'receiptQuantity',title:'缁勭洏鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'overInQuantity',title:'涓婃灦鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'orderDetailStatus',title:'璁㈠崟鏄庣粏鐘舵��',type:'int',width:110,require:true,align:'left'},
+ {field:'remark',title:'澶囨敞',type:'string',width:220,align:'left'},
+ {field:'sourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
+ {field:'operateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
+ {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'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder_Hty.vue"
index 42fec73..4336f9a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder_Hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder_Hty.vue"
@@ -22,30 +22,30 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'Id',
+ key: 'id',
footer: "Foots",
cnName: '鍘嗗彶鍏ュ簱鍗�',
name: 'inboundOrder_Hty',
url: "/InboundOrder_Hty/",
- sortName: "Id"
+ sortName: "id"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
const searchFormOptions = ref([]);
- const columns = ref([{field:'Id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'OrderNo',title:'鍗曟嵁缂栧彿',type:'string',width:110,require:true,align:'left',sort:true},
- {field:'UpperOrderNo',title:'涓婃父鍗曟嵁缂栧彿',type:'string',width:110,align:'left'},
- {field:'OrderType',title:'鍗曟嵁绫诲瀷',type:'int',width:110,require:true,align:'left'},
- {field:'OrderStatus',title:'鍗曟嵁鐘舵��',type:'int',width:110,require:true,align:'left'},
- {field:'CreateType',title:'鍒涘缓鏂瑰紡',type:'int',width:110,require:true,align:'left'},
- {field:'Remark',title:'澶囨敞',type:'string',width:180,align:'left'},
- {field:'SourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
- {field:'OperateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
- {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'},
- {field:'ModifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
+ const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'orderNo',title:'鍗曟嵁缂栧彿',type:'string',width:110,require:true,align:'left',sort:true},
+ {field:'upperOrderNo',title:'涓婃父鍗曟嵁缂栧彿',type:'string',width:110,align:'left'},
+ {field:'orderType',title:'鍗曟嵁绫诲瀷',type:'int',width:110,require:true,align:'left'},
+ {field:'orderStatus',title:'鍗曟嵁鐘舵��',type:'int',width:110,require:true,align:'left'},
+ {field:'createType',title:'鍒涘缓鏂瑰紡',type:'int',width:110,require:true,align:'left'},
+ {field:'remark',title:'澶囨敞',type:'string',width:180,align:'left'},
+ {field:'sourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
+ {field:'operateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
+ {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'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
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 a6eeafc..918ae60 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"
@@ -24,7 +24,7 @@
cnName: "鍏ュ簱鍗�",
name: "purchaseOrder",
url: "/PurchaseOrder/",
- sortName: "CreateDate",
+ sortName: "id",
});
const editFormFields = ref({
// orderType: "",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrderDetail.vue"
index 32a26f3..6161c3a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrderDetail.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrderDetail.vue"
@@ -22,29 +22,29 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'Id',
+ key: 'id',
footer: "Foots",
cnName: '閲囪喘鍗曟槑缁�',
name: 'purchaseOrderDetail',
url: "/PurchaseOrderDetail/",
- sortName: "Id"
+ sortName: "id"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
const searchFormOptions = ref([]);
- const columns = ref([{field:'Id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'PurchaseOrderId',title:'澶磋〃涓婚敭',type:'int',width:110,require:true,align:'left',sort:true},
- {field:'RowNo',title:'琛屽彿',type:'int',width:110,require:true,align:'left'},
- {field:'MaterielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
- {field:'PurchaseDetailStatus',title:'閲囪喘鍗曟槑缁嗙姸鎬�',type:'int',width:110,require:true,align:'left'},
- {field:'WarehouseId',title:'WarehouseId',type:'int',width:110,require:true,align:'left'},
- {field:'PurchaseDetailQuantity',title:'PurchaseDetailQuantity',type:'float',width:110,require:true,align:'left'},
- {field:'Unit',title:'Unit',type:'string',width:110,require:true,align:'left'},
- {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'},
- {field:'ModifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
+ const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'purchaseOrderId',title:'澶磋〃涓婚敭',type:'int',width:110,require:true,align:'left',sort:true},
+ {field:'rowNo',title:'琛屽彿',type:'int',width:110,require:true,align:'left'},
+ {field:'materielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
+ {field:'purchaseDetailStatus',title:'閲囪喘鍗曟槑缁嗙姸鎬�',type:'int',width:110,require:true,align:'left'},
+ {field:'warehouseId',title:'WarehouseId',type:'int',width:110,require:true,align:'left'},
+ {field:'purchaseDetailQuantity',title:'PurchaseDetailQuantity',type:'float',width:110,require:true,align:'left'},
+ {field:'unit',title:'Unit',type:'string',width:110,require:true,align:'left'},
+ {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:'codifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
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 bfcb977..63637e8 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"
@@ -24,7 +24,7 @@
cnName: "鏀惰揣鍗�",
name: "receiveOrder",
url: "/ReceiveOrder/",
- sortName: "CreateDate",
+ sortName: "receiveOrderId",
});
const searchFormFields = ref({
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrderDetail.vue"
index 907eda1..c27198a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrderDetail.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrderDetail.vue"
@@ -22,12 +22,12 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'Id',
+ key: 'id',
footer: "Foots",
cnName: '鏀惰揣鍗曟槑缁�',
name: 'order/Dt_ReceiveOrderDetail',
url: "/Dt_ReceiveOrderDetail/",
- sortName: "Id"
+ sortName: "id"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
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 0a1977b..539b152 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"
@@ -24,7 +24,7 @@
cnName: "鍑哄簱鍗�",
name: "outboundOrder",
url: "/OutboundOrder/",
- sortName: "CreateDate",
+ sortName: "id",
});
const editFormFields = ref({
orderType: "",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrderDetail_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrderDetail_Hty.vue"
index 66c3865..704e977 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrderDetail_Hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrderDetail_Hty.vue"
@@ -22,33 +22,33 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'Id',
+ key: 'id',
footer: "Foots",
cnName: '鍘嗗彶鍑哄簱鍗曟槑缁�',
name: 'outboundOrderDetail_Hty',
url: "/OutboundOrderDetail_Hty/",
- sortName: "Id"
+ sortName: "id"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
const searchFormOptions = ref([]);
- const columns = ref([{field:'Id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'OrderId',title:'鍑哄簱鍗曚富閿�',type:'int',width:110,require:true,align:'left',sort:true},
- {field:'MaterielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
- {field:'MaterielName',title:'鐗╂枡鍚嶇О',type:'string',width:180,align:'left'},
- {field:'BatchNo',title:'鎵规鍙�',type:'string',width:110,require:true,align:'left'},
- {field:'OrderQuantity',title:'鍗曟嵁鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'LockQuantity',title:'閿佸畾鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'OverOutQuantity',title:'宸插嚭鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'OrderDetailStatus',title:'璁㈠崟鏄庣粏鐘舵��',type:'int',width:110,require:true,align:'left'},
- {field:'Remark',title:'澶囨敞',type:'string',width:220,align:'left'},
- {field:'SourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
- {field:'OperateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
- {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'},
- {field:'ModifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
+ const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'orderId',title:'鍑哄簱鍗曚富閿�',type:'int',width:110,require:true,align:'left',sort:true},
+ {field:'materielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
+ {field:'materielName',title:'鐗╂枡鍚嶇О',type:'string',width:180,align:'left'},
+ {field:'batchNo',title:'鎵规鍙�',type:'string',width:110,require:true,align:'left'},
+ {field:'orderQuantity',title:'鍗曟嵁鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'lockQuantity',title:'閿佸畾鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'overOutQuantity',title:'宸插嚭鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'orderDetailStatus',title:'璁㈠崟鏄庣粏鐘舵��',type:'int',width:110,require:true,align:'left'},
+ {field:'remark',title:'澶囨敞',type:'string',width:220,align:'left'},
+ {field:'sourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
+ {field:'operateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
+ {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'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder_Hty.vue"
index 0745ade..d08c302 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder_Hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder_Hty.vue"
@@ -22,30 +22,30 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'Id',
+ key: 'id',
footer: "Foots",
cnName: '鍘嗗彶鍑哄簱鍗�',
name: 'outboundOrder_Hty',
url: "/OutboundOrder_Hty/",
- sortName: "Id"
+ sortName: "id"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
const searchFormOptions = ref([]);
- const columns = ref([{field:'Id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'OrderNo',title:'鍗曟嵁缂栧彿',type:'string',width:110,require:true,align:'left',sort:true},
- {field:'UpperOrderNo',title:'涓婃父鍗曟嵁缂栧彿',type:'string',width:110,align:'left'},
- {field:'OrderType',title:'鍗曟嵁绫诲瀷',type:'int',width:110,require:true,align:'left'},
- {field:'OrderStatus',title:'鍗曟嵁鐘舵��',type:'int',width:110,require:true,align:'left'},
- {field:'CreateType',title:'鍒涘缓鏂瑰紡',type:'int',width:110,require:true,align:'left'},
- {field:'Remark',title:'澶囨敞',type:'string',width:180,align:'left'},
- {field:'SourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
- {field:'OperateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
- {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'},
- {field:'ModifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
+ const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'orderNo',title:'鍗曟嵁缂栧彿',type:'string',width:110,require:true,align:'left',sort:true},
+ {field:'upperOrderNo',title:'涓婃父鍗曟嵁缂栧彿',type:'string',width:110,align:'left'},
+ {field:'orderType',title:'鍗曟嵁绫诲瀷',type:'int',width:110,require:true,align:'left'},
+ {field:'orderStatus',title:'鍗曟嵁鐘舵��',type:'int',width:110,require:true,align:'left'},
+ {field:'createType',title:'鍒涘缓鏂瑰紡',type:'int',width:110,require:true,align:'left'},
+ {field:'remark',title:'澶囨敞',type:'string',width:180,align:'left'},
+ {field:'sourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
+ {field:'operateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
+ {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'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue"
index 036d4f3..8eff3c6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue"
@@ -24,7 +24,7 @@
cnName: "璐т綅鐘舵�佸彉鍔ㄨ褰�",
name: "locationStatusChangeRecord",
url: "/LocationStatusChangeRecord/",
- sortName: "CreateDate",
+ sortName: "id",
});
const editFormFields = ref({
deviceCode: "",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
index ea40703..118f9bf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
@@ -24,7 +24,7 @@
cnName: "搴撳瓨鍙樺姩淇℃伅璁板綍",
name: "stockQuantityChangeRecord",
url: "/StockQuantityChangeRecord/",
- sortName: "CreateDate",
+ sortName: "id",
});
const editFormFields = ref({
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
index eed82b6..faf241b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
@@ -24,7 +24,7 @@
cnName: "搴撳瓨淇℃伅",
name: "stockInfo",
url: "/StockInfo/",
- sortName: "CreateDate",
+ sortName: "id",
});
const editFormFields = ref({
deviceCode: "",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfoDetail_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfoDetail_Hty.vue"
index f3ae3db..e97706c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfoDetail_Hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfoDetail_Hty.vue"
@@ -22,34 +22,34 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'Id',
+ key: 'id',
footer: "Foots",
cnName: '鍘嗗彶搴撳瓨淇℃伅鏄庣粏',
- name: 'order/Dt_StockInfoDetail_Hty',
- url: "/Dt_StockInfoDetail_Hty/",
- sortName: "Id"
+ name: 'stockInfoDetail_Hty',
+ url: "/StockInfoDetail_Hty/",
+ sortName: "id"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
const searchFormOptions = ref([]);
- const columns = ref([{field:'Id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'StockId',title:'搴撳瓨淇℃伅涓婚敭',type:'int',width:110,require:true,align:'left',sort:true},
- {field:'MaterielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
- {field:'MaterielName',title:'鐗╂枡鍚嶇О',type:'string',width:180,require:true,align:'left'},
- {field:'OrderNo',title:'鍗曟嵁缂栧彿',type:'string',width:110,require:true,align:'left'},
- {field:'BatchNo',title:'鎵规鍙�',type:'string',width:110,require:true,align:'left'},
- {field:'SerialNumber',title:'搴忓垪鍙�',type:'string',width:120,require:true,align:'left'},
- {field:'StockQuantity',title:'搴撳瓨鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'OutboundQuantity',title:'鍑哄簱鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'Status',title:'搴撳瓨鏄庣粏鐘舵��',type:'int',width:110,require:true,align:'left'},
- {field:'Remark',title:'澶囨敞',type:'string',width:220,align:'left'},
- {field:'SourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
- {field:'OperateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
- {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'},
- {field:'ModifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
+ const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'stockId',title:'搴撳瓨淇℃伅涓婚敭',type:'int',width:110,require:true,align:'left',sort:true},
+ {field:'materielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
+ {field:'materielName',title:'鐗╂枡鍚嶇О',type:'string',width:180,require:true,align:'left'},
+ {field:'orderNo',title:'鍗曟嵁缂栧彿',type:'string',width:110,require:true,align:'left'},
+ {field:'batchNo',title:'鎵规鍙�',type:'string',width:110,require:true,align:'left'},
+ {field:'serialNumber',title:'搴忓垪鍙�',type:'string',width:120,require:true,align:'left'},
+ {field:'stockQuantity',title:'搴撳瓨鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'outboundQuantity',title:'鍑哄簱鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'status',title:'搴撳瓨鏄庣粏鐘舵��',type:'int',width:110,require:true,align:'left'},
+ {field:'remark',title:'澶囨敞',type:'string',width:220,align:'left'},
+ {field:'sourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
+ {field:'operateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
+ {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'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo_Hty.vue"
index 547c9ae..e0a65ff 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo_Hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo_Hty.vue"
@@ -22,29 +22,29 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'Id',
+ key: 'id',
footer: "Foots",
cnName: '鍘嗗彶搴撳瓨淇℃伅',
- name: '鍘嗗彶搴撳瓨淇℃伅/Dt_StockInfo_Hty',
- url: "/Dt_StockInfo_Hty/",
- sortName: "Id"
+ name: 'stockInfo_Hty',
+ url: "/StockInfo_Hty/",
+ sortName: "id"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({});
const searchFormOptions = ref([]);
- const columns = ref([{field:'Id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'PalletCode',title:'鎵樼洏缂栧彿',type:'string',width:110,require:true,align:'left',sort:true},
- {field:'LocationCode',title:'璐т綅缂栧彿',type:'string',width:110,align:'left'},
- {field:'IsFull',title:'鏄惁婊＄洏',type:'bool',width:110,require:true,align:'left'},
- {field:'StockStatus',title:'搴撳瓨鐘舵��',type:'int',width:110,require:true,align:'left'},
- {field:'Remark',title:'澶囨敞',type:'string',width:220,align:'left'},
- {field:'SourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
- {field:'OperateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
- {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'},
- {field:'ModifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
+ const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'palletCode',title:'鎵樼洏缂栧彿',type:'string',width:110,require:true,align:'left',sort:true},
+ {field:'locationCode',title:'璐т綅缂栧彿',type:'string',width:110,align:'left'},
+ {field:'isFull',title:'鏄惁婊＄洏',type:'bool',width:110,require:true,align:'left'},
+ {field:'stockStatus',title:'搴撳瓨鐘舵��',type:'int',width:110,require:true,align:'left'},
+ {field:'remark',title:'澶囨敞',type:'string',width:220,align:'left'},
+ {field:'sourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
+ {field:'operateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
+ {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'},
+ {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
index eb1d413..7aae6b8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
@@ -24,7 +24,7 @@
cnName: "搴撳瓨瑙嗗浘",
name: "stockView",
url: "/stockView/",
- sortName: "CreateDate",
+ sortName: "stockId",
});
const editFormFields = ref({
palletCode: "",
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 d24a17b..ce74276 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"
@@ -22,9 +22,9 @@
key: "taskId",
footer: "Foots",
cnName: "浠诲姟鍘嗗彶淇℃伅",
- name: "task",
+ name: "task_hty",
url: "/Task_Hty/",
- sortName: "CreateDate",
+ sortName: "taskId",
});
const editFormFields = ref({});
const editFormOptions = ref([]);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/242b356b-f3ea-4921-9f54-18dbf58b0a98.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/242b356b-f3ea-4921-9f54-18dbf58b0a98.vsidx"
deleted file mode 100644
index 2fb15ca..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/242b356b-f3ea-4921-9f54-18dbf58b0a98.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/44ca8512-2c9c-4084-8306-4da22284d9a3.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/44ca8512-2c9c-4084-8306-4da22284d9a3.vsidx"
new file mode 100644
index 0000000..bf783c7
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/44ca8512-2c9c-4084-8306-4da22284d9a3.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/659246e0-feaf-49b5-8c49-7456594f6dd5.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/659246e0-feaf-49b5-8c49-7456594f6dd5.vsidx"
new file mode 100644
index 0000000..5604aac
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/659246e0-feaf-49b5-8c49-7456594f6dd5.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/72845575-fd42-4ccb-9a0b-52ec01d5a35a.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/72845575-fd42-4ccb-9a0b-52ec01d5a35a.vsidx"
new file mode 100644
index 0000000..5c6fded
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/72845575-fd42-4ccb-9a0b-52ec01d5a35a.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/b54b1d7f-8484-400a-be3b-be358bd12331.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b54b1d7f-8484-400a-be3b-be358bd12331.vsidx"
deleted file mode 100644
index 140b44b..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b54b1d7f-8484-400a-be3b-be358bd12331.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/bfff5ce4-43fc-42d6-bbfb-5b2b395f1cc1.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/bfff5ce4-43fc-42d6-bbfb-5b2b395f1cc1.vsidx"
new file mode 100644
index 0000000..1a2203f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/bfff5ce4-43fc-42d6-bbfb-5b2b395f1cc1.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/d00682bf-4fae-4c92-b69f-33edfead3a59.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d00682bf-4fae-4c92-b69f-33edfead3a59.vsidx"
deleted file mode 100644
index 70aef67..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d00682bf-4fae-4c92-b69f-33edfead3a59.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/read.lock" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock"
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/APIEnum/APIEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/APIEnum/APIEnum.cs"
index 347bd94..4100cb6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/APIEnum/APIEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/APIEnum/APIEnum.cs"
@@ -12,6 +12,6 @@
[Description("AGV鍙戦�佷换鍔℃帴鍙�")]
AgvSendTask,
[Description("AGV瀹夊叏淇″彿鍥炲")]
- AGVSecureReply
+ AgvSecureReply
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs"
index d70623a..95b3070 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs"
@@ -8,7 +8,16 @@
namespace WIDESEA_Common.StockEnum
{
/// <summary>
- /// 搴撳瓨鐘舵�侊細 1锛岀粍鐩樻殏瀛� 2锛岀粍鐩樻挙閿� 3锛屽叆搴撶‘璁� 4锛屽叆搴撴挙閿� 5锛屽凡鍏ュ簱 6锛屽凡鍑哄簱
+ /// 搴撳瓨鐘舵�侊細 <br/>
+ /// 1锛岀粍鐩樻殏瀛�<br/>
+ /// 2锛岀粍鐩樻挙閿�<br/>
+ /// 3锛屽叆搴撶‘璁�<br/>
+ /// 4锛屽叆搴撴挙閿�<br/>
+ /// 5锛屽凡鍏ュ簱<br/>
+ /// 6锛屽叆搴撳畬鎴�<br/>
+ /// 7锛屽嚭搴撻攣瀹�<br/>
+ /// 8锛屽嚭搴撳畬鎴�<br/>
+ /// 9锛岀Щ搴撻攣瀹�<br/>
/// </summary>
public enum StockStatusEmun
{
@@ -38,5 +47,7 @@
[Description("绉诲簱閿佸畾")]
绉诲簱閿佸畾 = 9,
+ [Description("鍏ュ簱瀹屾垚鏈缓鍑哄簱鍗�")]
+ 鍏ュ簱瀹屾垚鏈缓鍑哄簱鍗� = 10
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
index 9682426..937e251 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
@@ -28,7 +28,12 @@
/// 璐ㄦ鍏ュ簱
/// </summary>
[Description("璐ㄦ鍏ュ簱")]
- InQuality = 203
+ InQuality = 203,
+ /// <summary>
+ /// 娴嬭瘯鏋跺叆搴�
+ /// </summary>
+ [Description("娴嬭瘯鏋跺叆搴�")]
+ TestInbound = 204,
}
public enum TaskOutboundTypeEnum
@@ -53,6 +58,11 @@
/// </summary>
[Description("璐ㄦ鍑哄簱")]
OutQuality = 103,
+ /// <summary>
+ /// 娴嬭瘯鏋跺嚭搴�
+ /// </summary>
+ [Description("娴嬭瘯鏋跺嚭搴�")]
+ OutTestStand = 104,
}
public enum TaskRelocationTypeEnum
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/MesResponseContent.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/MesResponseContent.cs"
index b64c5e2..65e68ef 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/MesResponseContent.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/MesResponseContent.cs"
@@ -50,7 +50,10 @@
StrMsg = message == null ? "鎵ц澶辫触" : message;
return this;
}
- public Content Content { get; set; }
+ public ContentMes Content { get; set; }
}
-
+ public class ContentMes: Content
+ {
+ public string Contacts { get; set; }
+ }
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs"
index 1abf8d9..7ac656d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs"
@@ -14,9 +14,9 @@
public class TestToolOutModel
{
/// <summary>
- /// 娴嬫灦缂栫爜
+ /// 娴嬫灦鎵樼洏缂栫爜
/// </summary>
- [PropertyValidate("娴嬫灦缂栫爜", NotNullAndEmpty = true)]
+ [PropertyValidate("娴嬫灦鎵樼洏缂栫爜", NotNullAndEmpty = true)]
public string ToolCode { get; set; }
/// <summary>
/// 鐩爣鍦板潃鐮�
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/AGVService/InvokeAGVService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/AGVService/InvokeAGVService.cs"
index 979dd92..4ce1f59 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/AGVService/InvokeAGVService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/AGVService/InvokeAGVService.cs"
@@ -19,11 +19,11 @@
get { return App.GetService<IInvokeAGVService>(); }
}
/// <summary>
- /// 鍙戦�丄GV浠诲姟
+ /// 鍙戦�丄GV浠诲姟
/// </summary>
/// <param name="taskModel"></param>
/// <returns></returns>
- public WebResponseContent SendAgvTask(AgvTaskModel taskModel)
+ public WebResponseContent AgvSendTask(AgvTaskModel taskModel)
{
WebResponseContent content = new WebResponseContent();
try
@@ -46,13 +46,26 @@
}
return content;
}
- public WebResponseContent AGVSecureReply(AgvSecureModel secureModel)
+ /// <summary>
+ /// 瀹夊叏淇″彿鐢宠 AGV-WMS-WCS
+ /// </summary>
+ public AgvResponseContent AgvSecureApply(AgvSecureApplyModel secureApplyModel)
+ {
+
+ return new AgvResponseContent();
+ }
+ /// <summary>
+ /// 瀹夊叏淇″彿鍥炲 WMS-AGV
+ /// </summary>
+ /// <param name="secureModel"></param>
+ /// <returns></returns>
+ public WebResponseContent AgvSecureReply(AgvSecureReplyModel secureReplyModel)
{
WebResponseContent content = new WebResponseContent();
try
{
- string apiAddress = AppSettings.Get(APIEnum.AGVSecureReply.ToString());
- string response = HttpHelper.Post(apiAddress, secureModel.Serialize());
+ string apiAddress = AppSettings.Get(APIEnum.AgvSecureReply.ToString());
+ string response = HttpHelper.Post(apiAddress, secureReplyModel.Serialize());
AgvResponseContent agvContent = response.DeserializeObject<AgvResponseContent>();
if (agvContent.Code == "200")
{
@@ -69,5 +82,15 @@
}
return content;
}
+ /// <summary>
+ /// AGV浠诲姟鐘舵�佸埛鏂�
+ /// </summary>
+ /// <param name="agvUpdateModel"></param>
+ /// <returns></returns>
+ public AgvResponseContent AgvUpdateTask(AgvUpdateModel agvUpdateModel)
+ {
+
+ return new AgvResponseContent();
+ }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/IAGVService/IInvokeAGVService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/IAGVService/IInvokeAGVService.cs"
index 06401f2..db0ccfa 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/IAGVService/IInvokeAGVService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/IAGVService/IInvokeAGVService.cs"
@@ -4,6 +4,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core;
+using WIDESEA_DTO.AGV;
using WIDESEA_External.Model;
namespace WIDESEA_External.AGVService
@@ -15,11 +16,13 @@
/// </summary>
/// <param name="taskModel"></param>
/// <returns></returns>
- WebResponseContent SendAgvTask(AgvTaskModel taskModel);
+ WebResponseContent AgvSendTask(AgvTaskModel taskModel);
+ AgvResponseContent AgvSecureApply(AgvSecureApplyModel secureApplyModel);
/// <summary>
/// AGV瀹夊叏淇″彿鍥炲
/// </summary>
/// <returns></returns>
- WebResponseContent AGVSecureReply(AgvSecureModel secureModel);
+ WebResponseContent AgvSecureReply(AgvSecureReplyModel secureReplyModel);
+ AgvResponseContent AgvUpdateTask(AgvUpdateModel agvUpdateModel);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureApplyModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureApplyModel.cs"
new file mode 100644
index 0000000..ffa9a75
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureApplyModel.cs"
@@ -0,0 +1,28 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_External.Model
+{
+ public class AgvSecureApplyModel
+ {
+ /// <summary>
+ /// 璇锋眰缂栧彿 姣忎釜璇锋眰閮借涓�涓敮涓�缂栧彿,鍚屼竴涓姹傞噸澶嶆彁浜や娇鐢ㄥ悓涓�缂栧彿
+ /// </summary>
+ public string ReqCode { get; set; }
+ /// <summary>
+ /// 鐩爣浣�
+ /// </summary>
+ public string WbCode { get; set; }
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ public string TaskCode { get; set; }
+ /// <summary>
+ /// 鎵规
+ /// </summary>
+ public string MaterialLot { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureReplyModel.cs"
similarity index 97%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureModel.cs"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureReplyModel.cs"
index 315c7ff..d6c3112 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureModel.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvSecureReplyModel.cs"
@@ -6,7 +6,7 @@
namespace WIDESEA_External.Model
{
- public class AgvSecureModel
+ public class AgvSecureReplyModel
{
/// <summary>
/// 璇锋眰缂栧彿 姣忎釜璇锋眰閮借涓�涓敮涓�缂栧彿,鍚屼竴涓姹傞噸澶嶆彁浜�,浣跨敤鍚屼竴缂栧彿
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvUpdateModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvUpdateModel.cs"
new file mode 100644
index 0000000..e6f0e7d
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_External/Model/AgvUpdateModel.cs"
@@ -0,0 +1,111 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_External.Model
+{
+ public class AgvUpdateModel
+ {
+ /// <summary>
+ /// 璇锋眰缂栧彿 姣忎釜璇锋眰閮借涓�涓敮涓�缂栧彿,鍚屼竴涓姹傞噸澶嶆彁浜や娇鐢ㄥ悓涓�缂栧彿
+ /// </summary>
+ public string ReqCode { get; set; }
+ /// <summary>
+ /// 璇锋眰鏃堕棿 鏍煎紡:yyyy-MM-dd HH:mm:ss
+ /// </summary>
+ public string ReqTime { get; set; }
+ /// <summary>
+ /// 浣嶇疆X鍧愭爣 浠诲姟瀹屾垚鏃舵湁鍊�
+ /// </summary>
+ public int CooX { get; set; }
+ /// <summary>
+ /// 浣嶇疆Y鍧愭爣 浠诲姟瀹屾垚鏃舵湁鍊�
+ /// </summary>
+ public int CooY { get; set; }
+ /// <summary>
+ /// 褰撳墠浣嶇疆缂栧彿<br/>
+ /// 浠诲姟寮�濮嬶細璇ヤ綅缃负浠诲姟璧风偣<br/>
+ /// 璧板嚭鍌ㄤ綅锛氳浣嶇疆涓轰换鍔¤捣鐐�<br/>
+ /// 浠诲姟鍗曞彇娑堬細璇ヤ綅缃负宸ヤ綔浣嶇紪鍙�<br/>
+ /// 浠诲姟缁撴潫锛氳浣嶇疆涓轰换鍔＄粓鐐�<br/>
+ /// 鍙栨斁鐢宠锛氬彇鏀炬枡绠辩殑鐐�<br/>
+ /// </summary>
+ public string CurrentPositionCode { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�
+ /// </summary>
+ public string Data { get; set; }
+ /// <summary>
+ /// 鍦板浘缂栧彿
+ /// </summary>
+ public string MapCode { get; set; }
+ /// <summary>
+ /// 鍦扮爜缂栧彿 浠诲姟瀹屾垚鏃舵湁鍊�
+ /// </summary>
+ public string MapDataCode { get; set; }
+ /// <summary>
+ /// 浠撲綅缂栫爜 鍙夎溅涓嶤TU浠诲姟鏃舵湁鍊�
+ /// </summary>
+ public string StgBinCode { get; set; }
+ /// <summary>
+ /// 鏂规硶鍚�<br/>
+ /// start : 浠诲姟寮�濮�<br/>
+ /// outbin : 璧板嚭鍌ㄤ綅<br/>
+ /// end : 浠诲姟缁撴潫<br/>
+ /// cancel : 浠诲姟鍗曞彇娑�<br/>
+ /// apply锛欳TU鏂欑鍙栨斁鐢宠<br/>
+ /// </summary>
+ public string Method { get; set; }
+ /// <summary>
+ /// 杞藉叿缂栧彿
+ /// </summary>
+ public string PodCode { get; set; }
+ /// <summary>
+ /// 杞藉叿鏂瑰悜
+ /// </summary>
+ public string PodDir { get; set; }
+ /// <summary>
+ /// 鐗╂枡鎵规鍙�
+ /// </summary>
+ public string MaterialLot { get; set; }
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ /// </summary>
+ public string MaterialType { get; set; }
+ /// <summary>
+ /// AGV缂栧彿
+ /// </summary>
+ public string RobotCode { get; set; }
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ public string TaskCode { get; set; }
+ /// <summary>
+ /// 宸ヤ綔鍙扮紪鍙� 浠诲姟瀹屾垚鏃舵湁鍊�,涓庣敓鎴愪换鍔″崟鎺ュ彛涓殑wbCode涓�鑷�
+ /// </summary>
+ public string WbCode { get; set; }
+ /// <summary>
+ /// 瀹瑰櫒缂栧彿
+ /// </summary>
+ public string CtnrCode { get; set; }
+ /// <summary>
+ /// 瀹瑰櫒绫诲瀷
+ /// </summary>
+ public string CtnrType { get; set; }
+ /// <summary>
+ /// 宸烽亾缂栧彿
+ /// </summary>
+ public string RoadWayCode { get; set; }
+ /// <summary>
+ /// 宸烽亾鍐呴『搴忓彿<br/>
+ /// 宸烽亾灏炬槸0渚濇鍒板贩閬撳ご渚濇閫掑1
+ /// </summary>
+ public string Seq { get; set; }
+ /// <summary>
+ /// 璁惧缂栧彿
+ /// </summary>
+ public string EqpCode { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
index edff987..26ac858 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
@@ -8,7 +8,9 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.OrderEnum;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
+using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
@@ -19,6 +21,7 @@
using WIDESEA_IBasicService;
using WIDESEA_IOutboundRepository;
using WIDESEA_IOutboundService;
+using WIDESEA_IStockRepository;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
@@ -27,18 +30,22 @@
public class OutboundOrderService : ServiceBase<Dt_OutboundOrder, IOutboundOrderRepository>, IOutboundOrderService
{
private readonly IMapper _mapper;
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IBasicService _basicService;
private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;
private readonly IStockInfoService _stockInfoService;
-
+ private readonly IStockInfoRepository _stockInfoRepository;
public IOutboundOrderRepository Repository => BaseDal;
- public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper, IBasicService basicService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IStockInfoService stockInfoService) : base(BaseDal)
+ public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper,IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IStockInfoService stockInfoService,
+ IStockInfoRepository stockInfoRepository) : base(BaseDal)
{
_mapper = mapper;
+ _unitOfWorkManage=unitOfWorkManage;
_basicService = basicService;
_outboundOrderDetailRepository = outboundOrderDetailRepository;
_stockInfoService = stockInfoService;
+ _stockInfoRepository= stockInfoRepository;
}
public WebResponseContent ReceiveOutOrder(ErpOutOrderDTO model)
@@ -73,6 +80,7 @@
}
else
{
+ Dt_StockInfo? stockInfo = null;
Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail()
{
RowNo = Convert.ToInt32(model.RowNo),
@@ -83,8 +91,20 @@
OrderQuantity = model.Qty,
OrderId = oldOutboundOrder.Id
};
-
+ //ERP涓婁紶娴嬭瘯浠撻鏂欏崟鏇存柊瀵瑰簲搴撳瓨鐘舵��
+ if (warehouse.WarehouseId == 1)
+ {
+ //鑾峰彇鍑哄簱鍗曞簱瀛�
+ stockInfo = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).Where(x => x.Details.Any(x => x.MaterielCode == model.MCode && x.BatchNo == model.MLot && x.InboundOrderRowNo == Convert.ToInt32(model.RowNo))).First();
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ _unitOfWorkManage.BeginTran();
+ if (stockInfo != null)
+ {
+ _stockInfoRepository.UpdateData(stockInfo);
+ }
_outboundOrderDetailRepository.AddData(outboundOrderDetail);
+ _unitOfWorkManage.CommitTran();
}
}
else
@@ -108,8 +128,21 @@
WarehouseId = warehouse.WarehouseId,
Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
};
-
+ Dt_StockInfo? stockInfo = null;
+ //ERP涓婁紶娴嬭瘯浠撻鏂欏崟鏇存柊瀵瑰簲搴撳瓨鐘舵��
+ if (warehouse.WarehouseId==1)
+ {
+ //鑾峰彇鍑哄簱鍗曞簱瀛�
+ stockInfo = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).Where(x => x.Details.Any(x => x.MaterielCode == model.MCode && x.BatchNo == model.MLot && x.InboundOrderRowNo == Convert.ToInt32(model.RowNo))).First();
+ stockInfo.StockStatus=StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ _unitOfWorkManage.BeginTran();
+ if (stockInfo!=null)
+ {
+ _stockInfoRepository.UpdateData(stockInfo);
+ }
Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
}
}
else if (model.Way == 2)
@@ -151,6 +184,7 @@
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
index adf17dd..713e75d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
@@ -3,6 +3,11 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.OtherEnum;
+using WIDESEA_Common.StockEnum;
+using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO;
@@ -13,12 +18,8 @@
namespace WIDESEA_TaskInfoService
{
- public partial class TaskService : ServiceBase<Dt_Task, ITaskRepository>, ITaskService
+ public partial class TaskService
{
- public static ITaskService Instance
- {
- get { return App.GetService<ITaskService>(); }
- }
/// <summary>
/// 娴嬭瘯鏋跺嚭浠�
/// </summary>
@@ -26,7 +27,63 @@
/// <returns></returns>
public MesResponseContent TestToolOut(TestToolOutModel model)
{
- return new MesResponseContent();
+ MesResponseContent responseContent = new MesResponseContent();
+ try
+ {
+ //鑾峰彇搴撳瓨璁板綍 warehouseID鏆傚畾鍏堢敤鍥哄畾鍊� TEST
+ Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == 1 &&
+ x.PalletCode == model.ToolCode &&
+ x.StockStatus==(int)StockStatusEmun.鍏ュ簱瀹屾垚)
+ .Includes(x => x.Details).First();
+ if (stockInfo==null)
+ {
+ return responseContent.Error($"娴嬭瘯鏋舵墭鐩�:{model.ToolCode}鏃犲簱瀛樿褰�");
+ }
+ Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode &&
+ x.WarehouseId == stockInfo.WarehouseId &&
+ x.LocationStatus == (int)LocationStatusEnum.InStock &&
+ (x.EnableStatus == (int)EnableStatusEnum.Normal || x.EnableStatus == (int)EnableStatusEnum.OnlyOut));
+ if (locationInfo==null)
+ {
+ return responseContent.Error($"璐т綅:{stockInfo.LocationCode}鍑哄簱鏉′欢涓嶆弧瓒�");
+ }
+ //鐢熸垚娴嬭瘯鏋跺嚭搴撲换鍔� 閿佸畾搴撳瓨 鏇存敼璐т綅鐘舵��
+ Dt_Task taskOut = new()
+ {
+ CurrentAddress = stockInfo.LocationCode,
+ Grade = 0,
+ PalletCode = stockInfo.PalletCode,
+ NextAddress = "",
+ Roadway = locationInfo.RoadwayNo,
+ SourceAddress = stockInfo.LocationCode,
+ TargetAddress = "",
+ TaskStatus = (int)TaskOutStatusEnum.OutNew,
+ TaskType = (int)TaskOutboundTypeEnum.OutTestStand,
+ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
+ PalletType = stockInfo.PalletType,
+ WarehouseId = stockInfo.WarehouseId,
+ };
+ stockInfo.StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾;
+ LocationStatusEnum locationStatus = (LocationStatusEnum)locationInfo.LocationStatus;
+ locationInfo.LocationStatus = (int)LocationStatusEnum.Lock;
+ _unitOfWorkManage.BeginTran();
+ //鏇存柊搴撳瓨鐘舵��
+ _stockRepository.StockInfoRepository.UpdateData(stockInfo);
+ //鏇存柊璐т綅鐘舵��
+ _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, (PalletTypeEnum)stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
+ //鏂板缓浠诲姟
+ BaseDal.AddData(taskOut);
+ //鍔犲叆璐т綅鍙樺姩璁板綍
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, locationStatus, LocationChangeType.OutboundAssignLocation, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", taskOut.TaskNum);
+ _unitOfWorkManage.CommitTran();
+ responseContent.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ responseContent.Error(ex.Message);
+ }
+ return responseContent;
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 017776e..311d139 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -260,7 +260,15 @@
LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;
locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ //娴嬭瘯鏋跺叆搴撳簱瀛樼姸鎬�
+ if (task.TaskType == TaskInboundTypeEnum.TestInbound.ObjToInt())
+ {
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚鏈缓鍑哄簱鍗�.ObjToInt();
+ }
+ else
+ {
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
stockInfo.LocationCode = locationInfo.LocationCode;
_unitOfWorkManage.BeginTran();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGV/AgvController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGV/AgvController.cs"
index fdbc47f..4f5a47d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGV/AgvController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGV/AgvController.cs"
@@ -9,6 +9,7 @@
using WIDESEA_Core.Attributes;
using WIDESEA_Core.Helper;
using WIDESEA_DTO;
+using WIDESEA_DTO.AGV;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_External.AGVService;
@@ -24,22 +25,43 @@
namespace WIDESEA_WMSServer.Controllers.ERP
{
+ /// <summary>
+ /// 鐗瑰垱AGV鎺ュ彛
+ /// </summary>
[Route("api/Agv")]
[ApiController]
public class AgvController : ControllerBase
{
- public AgvController()
- {
- }
/// <summary>
/// 鍙戦�丄GV浠诲姟
/// </summary>
/// <param name="taskModel"></param>
/// <returns></returns>
- [HttpPost,Route("SendAgvTask"),AllowAnonymous]
- public WebResponseContent SendAgvTask([FromBody] AgvTaskModel taskModel)
+ [HttpPost,Route("AgvSendTask"),AllowAnonymous]
+ public WebResponseContent AgvSendTask([FromBody] AgvTaskModel taskModel)
{
- return InvokeAGVService.Intance.SendAgvTask(taskModel);
+ return InvokeAGVService.Intance.AgvSendTask(taskModel);
}
+ /// <summary>
+ /// AGV瀹夊叏淇″彿鐢宠
+ /// </summary>
+ /// <param name="secureApplyModel"></param>
+ /// <returns></returns>
+ [HttpPost,Route("AgvSecureApply"),AllowAnonymous]
+ public AgvResponseContent AgvSecureApply(AgvSecureApplyModel secureApplyModel)
+ {
+ return InvokeAGVService.Intance.AgvSecureApply(secureApplyModel);
+ }
+ /// <summary>
+ /// AGV浠诲姟鐘舵�佸埛鏂�
+ /// </summary>
+ /// <param name="agvUpdateModel"></param>
+ /// <returns></returns>
+ [HttpPost, Route("AgvUpdateTask"), AllowAnonymous]
+ public AgvResponseContent AgvUpdateTask(AgvUpdateModel agvUpdateModel)
+ {
+ return InvokeAGVService.Intance.AgvUpdateTask(agvUpdateModel);
+ }
+
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
index 7c91fd8..dc9e78e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
@@ -39,10 +39,10 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- //[HttpPost, Route("TestToolOut"), AllowAnonymous, MethodParamsValidate]
- //public MesResponseContent TestToolOut([FromBody] Root<TestToolOutModel> model)
- //{
- // return _taskService.TestToolOut(model.Content);
- //}
+ [HttpPost, Route("TestToolOut"), AllowAnonymous, MethodParamsValidate]
+ public MesResponseContent TestToolOut([FromBody] Root<TestToolOutModel> model)
+ {
+ return _taskService.TestToolOut(model.Content);
+ }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Menu.tsv" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Menu.tsv"
index 42ac275..f71d836 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Menu.tsv"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/wwwroot/WIDESEA_DB.DBSeed.Json/Sys_Menu.tsv"
@@ -12,7 +12,7 @@
"OrderNo": 4000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-05-09T15:50:07.567"
},
@@ -29,7 +29,7 @@
"OrderNo": 2000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-05-09T15:50:14.03"
},
@@ -46,7 +46,7 @@
"OrderNo": 1000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-05-09T15:50:20.727"
},
@@ -63,7 +63,7 @@
"OrderNo": 900,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-05-09T15:50:23.177"
},
@@ -80,7 +80,7 @@
"OrderNo": 0,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-05-09T15:50:38.703"
},
@@ -97,7 +97,7 @@
"OrderNo": 10,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-05-09T15:50:42.007"
},
@@ -114,7 +114,7 @@
"OrderNo": 10,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": null,
"ModifyDate": "2024-09-04T11:06:31.127"
},
@@ -131,7 +131,7 @@
"OrderNo": 500,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-05-09T15:50:30.557"
},
@@ -148,7 +148,7 @@
"OrderNo": 0,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-05-09T15:50:34.273"
},
@@ -165,7 +165,7 @@
"OrderNo": 9000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-09-04T10:44:31.457"
},
@@ -182,7 +182,7 @@
"OrderNo": 500,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-09-20T09:15:35.93"
},
@@ -199,7 +199,7 @@
"OrderNo": 10000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-09-04T10:44:15.293"
},
@@ -216,7 +216,7 @@
"OrderNo": 8000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-09-04T10:50:35.37"
},
@@ -233,7 +233,7 @@
"OrderNo": 7000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-09-04T10:53:10.417"
},
@@ -250,26 +250,9 @@
"OrderNo": 10000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-09-24T14:36:38.443"
- },
- {
- "MenuId": 22,
- "MenuName": "鍖哄煙淇℃伅",
- "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"},{\"text\":\"鏂板缓\",\"value\":\"Add\"},{\"text\":\"鍒犻櫎\",\"value\":\"Delete\"},{\"text\":\"缂栬緫\",\"value\":\"Update\"},{\"text\":\"瀵煎叆\",\"value\":\"Import\"},{\"text\":\"瀵煎嚭\",\"value\":\"Export\"},{\"text\":\"鍚敤\",\"value\":\"Enable\"},{\"text\":\"绂佺敤\",\"value\":\"Disable\"}]",
- "Icon": "",
- "Description": null,
- "Enable": 1,
- "TableName": "Dt_AreaInfo",
- "ParentId": 17,
- "Url": "areaInfo",
- "OrderNo": 9000,
- "MenuType": 0,
- "Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
- "Modifier": "admin",
- "ModifyDate": "2024-09-24T14:36:41.967"
},
{
"MenuId": 23,
@@ -284,7 +267,7 @@
"OrderNo": 8000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-09-24T14:36:47.427"
},
@@ -301,7 +284,7 @@
"OrderNo": 7000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": null,
"ModifyDate": "2024-09-04T11:06:31.127"
},
@@ -318,7 +301,7 @@
"OrderNo": 10000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-09-04T10:50:25.91"
},
@@ -335,7 +318,7 @@
"OrderNo": 9000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-09-24T11:12:44.15"
},
@@ -352,7 +335,7 @@
"OrderNo": 8000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": null,
"ModifyDate": "2024-09-04T11:06:31.127"
},
@@ -369,7 +352,7 @@
"OrderNo": 7000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-09-24T11:12:46.923"
},
@@ -386,7 +369,7 @@
"OrderNo": 10000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": null,
"ModifyDate": "2024-09-04T11:06:31.127"
},
@@ -399,30 +382,13 @@
"Enable": 1,
"TableName": "Dt_StockInfoDetail",
"ParentId": 20,
- "Url": "stockInfoDetail",
+ "Url": "/stockInfoDetail",
"OrderNo": 9000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": null,
"ModifyDate": "2024-09-04T11:06:31.127"
- },
- {
- "MenuId": 31,
- "MenuName": "宸烽亾淇℃伅",
- "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"},{\"text\":\"缂栬緫\",\"value\":\"Update\"},{\"text\":\"瀵煎嚭\",\"value\":\"Export\"},{\"text\":\"鍚敤\",\"value\":\"Enable\"},{\"text\":\"绂佺敤\",\"value\":\"Disable\"}]",
- "Icon": "",
- "Description": null,
- "Enable": 1,
- "TableName": "Dt_RoadwayInfo",
- "ParentId": 17,
- "Url": "/roadwayInfo",
- "OrderNo": 8500,
- "MenuType": 0,
- "Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
- "Modifier": "admin",
- "ModifyDate": "2024-09-24T14:36:44.583"
},
{
"MenuId": 32,
@@ -437,7 +403,7 @@
"OrderNo": 9000,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": null,
"ModifyDate": null
},
@@ -450,11 +416,11 @@
"Enable": 1,
"TableName": "/",
"ParentId": 0,
- "Url": "/pages/materielGroup/inboundOrder",
+ "Url": "/inboundOrder",
"OrderNo": 0,
"MenuType": 1,
"Creater": "admin",
- "CreateDate": "2024-12-16T21:46:23.463",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-09-30T16:34:47.333"
},
@@ -471,7 +437,7 @@
"OrderNo": 0,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-16T22:24:16.24",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": null,
"ModifyDate": null
},
@@ -485,12 +451,12 @@
"TableName": "/",
"ParentId": 0,
"Url": "",
- "OrderNo": 0,
+ "OrderNo": 9700,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-17T09:22:42.127",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
- "ModifyDate": "2024-12-17T09:23:02.71"
+ "ModifyDate": "2024-12-18T18:46:55.123"
},
{
"MenuId": 44,
@@ -505,7 +471,7 @@
"OrderNo": 0,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-17T09:24:29.307",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": null,
"ModifyDate": null
},
@@ -522,7 +488,7 @@
"OrderNo": 6500,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-17T14:35:51.493",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-12-17T14:45:19.42"
},
@@ -539,7 +505,7 @@
"OrderNo": 6400,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-17T14:39:08.17",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-12-17T14:45:26.113"
},
@@ -556,7 +522,7 @@
"OrderNo": 6300,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-17T14:39:58.107",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-12-17T14:45:31.007"
},
@@ -573,7 +539,7 @@
"OrderNo": 6200,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-17T14:43:45.92",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-12-17T14:45:35.687"
},
@@ -590,7 +556,7 @@
"OrderNo": 9900,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-17T15:30:27.37",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-12-17T15:34:23.89"
},
@@ -607,7 +573,7 @@
"OrderNo": 0,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-17T15:35:22.713",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": "admin",
"ModifyDate": "2024-12-17T16:31:57.193"
},
@@ -624,7 +590,7 @@
"OrderNo": 9800,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-17T15:42:19.543",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": null,
"ModifyDate": null
},
@@ -641,7 +607,7 @@
"OrderNo": 0,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-17T16:30:07.67",
+ "CreateDate": "2024-12-18T17:25:49.06",
"Modifier": null,
"ModifyDate": null
},
@@ -658,7 +624,92 @@
"OrderNo": 2,
"MenuType": 0,
"Creater": "admin",
- "CreateDate": "2024-12-17T16:32:25.123",
+ "CreateDate": "2024-12-18T17:25:49.06",
+ "Modifier": null,
+ "ModifyDate": null
+ },
+ {
+ "MenuId": 54,
+ "MenuName": "瀹㈡埛淇℃伅",
+ "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"},{\"text\":\"鏂板缓\",\"value\":\"Add\"},{\"text\":\"鍒犻櫎\",\"value\":\"Delete\"},{\"text\":\"缂栬緫\",\"value\":\"Update\"},{\"text\":\"瀵煎叆\",\"value\":\"Import\"},{\"text\":\"瀵煎嚭\",\"value\":\"Export\"}]",
+ "Icon": "",
+ "Description": null,
+ "Enable": 1,
+ "TableName": "Dt_CustomerInfo",
+ "ParentId": 17,
+ "Url": "/customerInfo",
+ "OrderNo": 0,
+ "MenuType": 0,
+ "Creater": "admin",
+ "CreateDate": "2024-12-18T17:56:51.487",
+ "Modifier": null,
+ "ModifyDate": null
+ },
+ {
+ "MenuId": 55,
+ "MenuName": "鍛樺伐淇℃伅",
+ "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"},{\"text\":\"鏂板缓\",\"value\":\"Add\"},{\"text\":\"鍒犻櫎\",\"value\":\"Delete\"},{\"text\":\"缂栬緫\",\"value\":\"Update\"},{\"text\":\"瀵煎叆\",\"value\":\"Import\"},{\"text\":\"瀵煎嚭\",\"value\":\"Export\"}]",
+ "Icon": "",
+ "Description": null,
+ "Enable": 1,
+ "TableName": "Dt_UserInfo",
+ "ParentId": 17,
+ "Url": "/userInfo",
+ "OrderNo": 0,
+ "MenuType": 0,
+ "Creater": "admin",
+ "CreateDate": "2024-12-18T18:19:34.37",
+ "Modifier": null,
+ "ModifyDate": null
+ },
+ {
+ "MenuId": 56,
+ "MenuName": "鍘嗗彶浠诲姟淇℃伅",
+ "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"},{\"text\":\"瀵煎嚭\",\"value\":\"Export\"}]",
+ "Icon": "",
+ "Description": null,
+ "Enable": 1,
+ "TableName": "Dt_Task_Hty",
+ "ParentId": 12,
+ "Url": "/task_hty",
+ "OrderNo": 0,
+ "MenuType": 0,
+ "Creater": "admin",
+ "CreateDate": "2024-12-18T18:35:41.773",
+ "Modifier": null,
+ "ModifyDate": null
+ },
+ {
+ "MenuId": 57,
+ "MenuName": "璐т綅鍙樺姩璁板綍",
+ "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"},{\"text\":\"瀵煎嚭\",\"value\":\"Export\"}]",
+ "Icon": "",
+ "Description": null,
+ "Enable": 1,
+ "TableName": "Dt_LocationStatusChangeRecord",
+ "ParentId": 8,
+ "Url": "/locationStatusChangeRecord",
+ "OrderNo": 0,
+ "MenuType": 0,
+ "Creater": "admin",
+ "CreateDate": "2024-12-18T18:38:41.89",
+ "Modifier": null,
+ "ModifyDate": null
+ },
+ {
+ "MenuId": 58,
+ "MenuName": "搴撳瓨鍙樺姩璁板綍",
+ "Auth": "[{\"text\":\"鏌ヨ\",\"value\":\"Search\"},{\"text\":\"瀵煎嚭\",\"value\":\"Export\"}]",
+ "Icon": "",
+ "Description": null,
+ "Enable": 1,
+ "TableName": "Dt_StockQuantityChangeRecord",
+ "ParentId": 8,
+ "Url": "/stockQuantityChangeRecord",
+ "OrderNo": 0,
+ "MenuType": 0,
+ "Creater": "admin",
+ "CreateDate": "2024-12-18T18:46:22.51",
"Modifier": null,
"ModifyDate": null
}
--
Gitblit v1.9.3