From 92b129a783ff748a4e5365803aa862888fa4470e Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 16 一月 2024 14:27:10 +0800
Subject: [PATCH] WMS
---
代码管理/WMS/WMS_Client/src/views/widesea_wms/system/dt_materielinfo.vue | 95 +
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_inventoryService.cs | 13
代码管理/WMS/WMS_Client/src/extension/widesea_wms/system/dt_areainfo.js | 75
代码管理/WMS/WMS_Client/src/extension/widesea_wms/boxing/dt_boxing_hty.js | 75
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Partial/Idt_boxing_htyService.cs | 13
代码管理/WMS/WMS_Server/WIDESEA_WMS/IRepositories/Boxing/Idt_boxing_htyRepository.cs | 18
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_System/Dt_InterfacerecordController.cs | 22
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV任务20231219152911.xlsx | 0
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_inventoryService.cs | 12
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV任务20231219174230.xlsx | 0
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_boxingController.cs | 21
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_boxing_htyController.cs | 21
代码管理/WMS/WMS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs | 20
代码管理/WMS/WMS_Server/WIDESEA_Comm/WIDESEA_Comm.csproj | 1
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_areainfoService.cs | 13
代码管理/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs | 147 +
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Mes/HCJManage.cs | 19
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/partial/dt_boxing.cs | 21
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_inventoryController.cs | 21
代码管理/WMS/WMS_Server/WIDESEA_Comm/EquipmentEnum/StationEnum.cs | 30
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_boxingController.cs | 33
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_inventoryService.cs | 41
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_materielinfoService.cs | 27
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_inventoryController.cs | 33
代码管理/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_areainfoRepository.cs | 18
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Idt_boxingService.cs | 12
代码管理/WMS/WMS_Server/WIDESEA_Comm/TaskEnum/AGVTaskStateEnum.cs | 74
代码管理/WMS/WMS_Client/src/extension/widesea_wms/system/dt_inventory.js | 75
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV任务20231219151413.xlsx | 0
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV任务20231219151717.xlsx | 0
代码管理/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue | 5
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_inventory.cs | 21
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask.cs | 368 ++--
代码管理/WMS/WMS_Server/WIDESEA_System/Repositories/System/Dt_InterfacerecordRepository.cs | 24
代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/Task.cs | 58
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Idt_boxing_htyService.cs | 12
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_areainfoService.cs | 12
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/ToMes/ToWMSController.cs | 25
代码管理/WMS/WMS_Server/WIDESEA_Comm/TaskNo/IdenxManager.cs | 48
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV任务20231219170232.xlsx | 0
代码管理/WMS/WMS_Client/src/extension/widesea_system/system/Dt_Interfacerecord.js | 54
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV任务20231219152415.xlsx | 0
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_inventoryService.cs | 27
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_areainfoController.cs | 21
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_inventory.cs | 117 +
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_areainfoService.cs | 41
代码管理/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_inventoryRepository.cs | 24
代码管理/WMS/WMS_Client/src/views/widesea_system/system/tracklogDetial.vue | 65
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_areainfo.cs | 21
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV任务20231219171630.xlsx | 0
代码管理/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_inventoryRepository.cs | 18
代码管理/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_areainfoRepository.cs | 24
代码管理/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask.vue | 18
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/partial/dt_boxing_hty.cs | 21
代码管理/WMS/WMS_Server/WIDESEA_System/IRepositories/System/IDt_InterfacerecordRepository.cs | 18
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/Partial/dt_boxingService.cs | 41
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/dt_boxing.cs | 93 +
代码管理/WMS/WMS_Server/WIDESEA_Comm/LogInfo/WriteWMSLog.cs | 52
代码管理/WMS/WMS_Server/WIDESEA_Entity/ToAGV/UpdateTasteInfo.cs | 20
代码管理/WMS/WMS_Client/src/extension/widesea_wms/boxing/dt_boxing.js | 75
代码管理/WMS/WMS_Client/src/views/widesea_wms/system/dt_stationinfo.vue | 27
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/Dt_Interfacerecord.cs | 111 +
代码管理/WMS/WMS_Server/WIDESEA_WMS/Repositories/Boxing/dt_boxing_htyRepository.cs | 24
代码管理/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_materielinfoMapConfig.cs | 16
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_materielinfoService.cs | 41
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/Taskinfo/Partial/dt_agvtaskService.cs | 64
代码管理/WMS/WMS_Server/WIDESEA_WMS/ToMes/ToMesServer.cs | 19
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/ToAGV/ToAGVController.cs | 32
代码管理/WMS/WMS_Server/WIDESEA_Entity/ToAGV/RequestTask.cs | 32
代码管理/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_materielinfoRepository.cs | 24
代码管理/WMS/WMS_Client/src/views/dialog/addTask.vue | 93 +
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_areainfoService.cs | 27
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_materielinfo.cs | 21
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Mes/CBJPDA.cs | 19
代码管理/WMS/WMS_Server/WIDESEA_WMS/ToMes/AddToFloat3.cs | 77
代码管理/WMS/WMS_Server/WIDESEA_Comm/OperateTypesEnum/OperateTypes.cs | 24
代码管理/WMS/WMS_Client/src/extension/widesea_wms/system/dt_stationinfo.js | 18
代码管理/WMS/WMS_Server/WIDESEA_Comm/TaskEnum/AGVJobEnum.cs | 34
代码管理/WMS/WMS_Server/WIDESEA_Comm/TaskEnum/AGVTaskTypeEnum.cs | 39
代码管理/WMS/WMS_Server/WIDESEA_WMS/IRepositories/Boxing/Idt_boxingRepository.cs | 18
代码管理/WMS/WMS_Server/WIDESEA_Core/Infrastructure/DictionaryHandler.cs | 43
代码管理/WMS/WMS_Server/WIDESEA_System/IServices/System/Partial/ISys_DictionaryService.cs | 3
代码管理/WMS/WMS_Client/src/router/viewGird.js | 26
代码管理/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Sys_DictionaryService.cs | 49
代码管理/WMS/WMS_Server/WIDESEA_System/Services/System/Dt_InterfacerecordService.cs | 27
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_materielinfoController.cs | 21
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_System/Partial/Dt_InterfacerecordController.cs | 28
代码管理/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_materielinfoRepository.cs | 18
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_materielinfo.cs | 328 +++
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_materielinfoService.cs | 13
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs | 7
代码管理/WMS/WMS_Server/WIDESEA_System/WIDESEA_System.csproj | 1
代码管理/WMS/WMS_Client/src/views/Index.vue | 2
代码管理/WMS/WMS_Client/src/views/system/Sys_User.vue | 2
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/dt_boxing_hty.cs | 101 +
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Mes/MesRequest.cs | 42
代码管理/WMS/WMS_Server/WIDESEA_WMS/Repositories/Boxing/dt_boxingRepository.cs | 24
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_materielinfoController.cs | 33
代码管理/WMS/WMS_Client/src/views/widesea_wms/system/dt_areainfo.vue | 66
代码管理/WMS/WMS_Client/src/views/widesea_wms/system/dt_inventory.vue | 66
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_areainfo.cs | 108 +
代码管理/WMS/WMS_Client/src/views/widesea_wms/system/base_routing_table.vue | 4
代码管理/WMS/WMS_Client/src/views/widesea_wms/boxing/dt_boxing.vue | 63
代码管理/WMS/WMS_Server/WIDESEA_Comm/EquipmentEnum/EquipmentState.cs | 21
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_areainfoController.cs | 33
代码管理/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Dt_InterfacerecordService.cs | 27
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs | 91
代码管理/WMS/WMS_Client/src/views/widesea_wms/boxing/dt_boxing_hty.vue | 64
代码管理/WMS/WMS_Client/src/views/widesea_system/system/Dt_Interfacerecord.vue | 89
代码管理/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_areainfoMapConfig.cs | 16
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV任务20231219150515.xlsx | 0
代码管理/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/Boxing/dt_boxingMapConfig.cs | 16
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask_hty.cs | 425 ++--
代码管理/WMS/WMS_Server/WIDESEA_Entity/ToAGV/AGVRespone.cs | 20
代码管理/WMS/WMS_Server/WIDESEA_System/IServices/System/Partial/IDt_InterfacerecordService.cs | 13
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/dt_boxing_htyService.cs | 27
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/dt_boxingService.cs | 27
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/Partial/dt_boxing_htyService.cs | 41
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV任务20231219152111.xlsx | 0
代码管理/WMS/WMS_Client/src/extension/widesea_wms/system/dt_materielinfo.js | 75
代码管理/WMS/WMS_Client/src/extension/widesea_wms/taskinfo/dt_agvtask_hty.js | 75
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_materielinfoService.cs | 12
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Partial/Idt_boxingService.cs | 13
/dev/null | 0
代码管理/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/Boxing/dt_boxing_htyMapConfig.cs | 16
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_boxing_htyController.cs | 33
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/System/Partial/Sys_DictionaryController.cs | 14
代码管理/WMS/WMS_Client/src/views/widesea_wms/taskinfo/dt_agvtask_hty.vue | 81
代码管理/WMS/WMS_Client/src/views/extension/widesea_wms/taskinfo/dt_agvtask.js | 9
代码管理/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_inventoryMapConfig.cs | 16
代码管理/WMS/WMS_Server/WIDESEA_System/IServices/System/IDt_InterfacerecordService.cs | 12
代码管理/WMS/WMS_Server/WIDESEA_WMS/WIDESEA_WMS.csproj | 1
132 files changed, 4,886 insertions(+), 489 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_system/system/Dt_Interfacerecord.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_system/system/Dt_Interfacerecord.js"
new file mode 100644
index 0000000..9f120fd
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_system/system/Dt_Interfacerecord.js"
@@ -0,0 +1,54 @@
+import tracklogDetial from "@/views/widesea_system/system/tracklogDetial.vue"
+
+let extension = {
+ components: {//鍔ㄦ�佹墿鍏呯粍浠舵垨缁勪欢璺緞
+ //琛ㄥ崟header銆乧ontent銆乫ooter瀵瑰簲浣嶇疆鎵╁厖鐨勭粍浠�
+ gridHeader: tracklogDetial,//{ template: "<div>鎵╁睍缁剎x浠�</div>" },
+ gridBody: '',
+ gridFooter: '',
+ //寮瑰嚭妗�(淇敼銆佺紪杈戙�佹煡鐪�)header銆乧ontent銆乫ooter瀵瑰簲浣嶇疆鎵╁厖鐨勭粍浠�
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ //buttons: [],//鎵╁睍鐨勬寜閽�
+ buttons: {
+ view: [],
+ box: [],
+ detail: []
+ },
+ methods: {//浜嬩欢鎵╁睍
+ onInit() {
+ this.columns.forEach(x => {
+ if (x.field == "interface_type") {
+ x.getColor = (row, column) => {
+ if (row != null) {
+ if (row.interface_type == "鎴愬姛") {
+ return "success";
+ } else if (row.interface_type == "澶辫触") {
+ return "error";
+ }
+ }
+ }
+ }
+ })
+
+ let options = {
+ field: 'oper',
+ title: '鏁版嵁璇︽儏',
+ type: 'text',
+ width: 60,
+ //杩斿洖涓�涓爣绛�
+ formatter: (row) => {
+ return '<a href="javascript:void(0)">璇︽儏</a>'
+ },
+ //瑙﹀彂浜嬩欢,鍙互鍦ㄦ浜嬩欢鍐嶆墦寮�涓�涓脊鍑烘绛夋搷浣�
+ click: (row, column, event) => {
+ this.$refs.gridHeader.openDialog(row)
+ }
+ };
+ this.columns.push(options)
+ }
+ }
+};
+export default extension;
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/boxing/dt_boxing.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/boxing/dt_boxing.js"
new file mode 100644
index 0000000..8935403
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/boxing/dt_boxing.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/WMS_Client/src/extension/widesea_wms/boxing/dt_boxing_hty.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/boxing/dt_boxing_hty.js"
new file mode 100644
index 0000000..8935403
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/boxing/dt_boxing_hty.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/WMS_Client/src/extension/widesea_wms/system/dt_areainfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/system/dt_areainfo.js"
new file mode 100644
index 0000000..8935403
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/system/dt_areainfo.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/WMS_Client/src/extension/widesea_wms/system/dt_inventory.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/system/dt_inventory.js"
new file mode 100644
index 0000000..8935403
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/system/dt_inventory.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/WMS_Client/src/extension/widesea_wms/system/dt_materielinfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/system/dt_materielinfo.js"
new file mode 100644
index 0000000..8935403
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/system/dt_materielinfo.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/WMS_Client/src/extension/widesea_wms/system/dt_stationinfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/system/dt_stationinfo.js"
index 8935403..9fd079b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/system/dt_stationinfo.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/system/dt_stationinfo.js"
@@ -6,11 +6,11 @@
**鍚庡彴鎿嶄綔瑙侊細http://v2.volcore.xyz/document/netCoreDev
*****************************************************************************************/
//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
+import addTask from "@/views/dialog/addTask.vue"
let extension = {
components: {
//鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
+ gridHeader: addTask,
gridBody: '',
gridFooter: '',
//鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
@@ -32,9 +32,23 @@
// this.$Message.success('鐐瑰嚮浜嗘寜閽�');
// }
// });
+ // this.buttons.forEach(x => {
+ // if(x.value=='Add'){
+ // x.name='绉诲簱'
+ // x.icon='el-icon-document'
+ // }
+ // });
//绀轰緥锛氳缃慨鏀规柊寤恒�佺紪杈戝脊鍑烘瀛楁鏍囩鐨勯暱搴�
// this.boxOptions.labelWidth = 150;
+ this.buttons.splice(1, 0, {
+ name: "绉诲簱",
+ icon: 'el-icon-document',
+ type: 'danger',
+ onClick: function () {
+ this.$refs.gridHeader.detialBox = true;
+ }
+ })
},
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/taskinfo/dt_agvtask_hty.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/taskinfo/dt_agvtask_hty.js"
new file mode 100644
index 0000000..8935403
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/extension/widesea_wms/taskinfo/dt_agvtask_hty.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/WMS_Client/src/router/viewGird.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/router/viewGird.js"
index 1a8d124..d6f5735 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/router/viewGird.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/router/viewGird.js"
@@ -149,6 +149,30 @@
path: '/dt_stationinfo',
name: 'dt_stationinfo',
component: () => import('@/views/widesea_wms/system/dt_stationinfo.vue')
- }]
+ } ,{
+ path: '/dt_inventory',
+ name: 'dt_inventory',
+ component: () => import('@/views/widesea_wms/system/dt_inventory.vue')
+ } ,{
+ path: '/dt_boxing',
+ name: 'dt_boxing',
+ component: () => import('@/views/widesea_wms/boxing/dt_boxing.vue')
+ } ,{
+ path: '/dt_boxing_hty',
+ name: 'dt_boxing_hty',
+ component: () => import('@/views/widesea_wms/boxing/dt_boxing_hty.vue')
+ } ,{
+ path: '/dt_materielinfo',
+ name: 'dt_materielinfo',
+ component: () => import('@/views/widesea_wms/system/dt_materielinfo.vue')
+ } ,{
+ path: '/dt_areainfo',
+ name: 'dt_areainfo',
+ component: () => import('@/views/widesea_wms/system/dt_areainfo.vue')
+ } ,{
+ path: '/Dt_Interfacerecord',
+ name: 'Dt_Interfacerecord',
+ component: () => import('@/views/widesea_system/system/Dt_Interfacerecord.vue')
+ }]
export default viewgird
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Index.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Index.vue"
index d30ac20..78df0a2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Index.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Index.vue"
@@ -14,7 +14,7 @@
</div>
<div class="vol-container" :style="{ left: menuWidth - 1 + 'px' }">
<div class="vol-header">
- <div class="project-name">WMS_鏍囧噯鐗�</div>
+ <div class="project-name">WMS_澶噸杞ㄩ亾</div>
<div class="header-text">
<!-- <div class="h-link">
<a
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask.vue"
index 6670242..f495eaa 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask.vue"
@@ -29,10 +29,13 @@
url: "/dt_agvtask/",
sortName: "ID"
});
- const editFormFields = ref({"agv_fromaddress":"","agv_toaddress":"","agv_code":""});
- const editFormOptions = ref([[{"title":"璧风偣鍦板潃","field":"agv_fromaddress","type":"text"}],
- [{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"text"}],
- [{"dataKey":"agv_code","data":[],"title":"AGV缂栧彿","required":true,"field":"agv_code","type":"select"}]]);
+ const editFormFields = ref({"agv_fromaddress":"","agv_toaddress":"","agv_tasktype":"","agv_grades":"","agv_code":""});
+ const editFormOptions = ref([[{"title":"璧风偣鍦板潃","field":"agv_fromaddress","type":"text","required":true}],
+ [{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"text","required":true}],
+ [{"dataKey":"task_grade","data":[],"title":"浠诲姟绛夌骇","required":true,"field":"agv_grade","type":"select"}],
+ [{"dataKey":"agv_tasktypes","data":[],"title":"浠诲姟绫诲瀷","required":true,"field":"agv_tasktype","type":"select"}]
+ // [{"dataKey":"agv_code","data":[],"title":"AGV缂栧彿","required":true,"field":"agv_code","type":"select"}]
+ ]);
const searchFormFields = ref({"agv_tasknum":"","agv_fromaddress":"","agv_toaddress":"","agv_code":[],"agv_taskstate":[],"agv_materielid":"","agv_createtime":"","agv_barcode":"","agv_materbarcode":""});
const searchFormOptions = ref([[{"title":"浠诲姟缂栧彿","field":"agv_tasknum","type":"like"},{"title":"璧风偣鍦板潃","field":"agv_fromaddress","type":"like"},{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"like"}],[{"dataKey":"agv_code","data":[],"title":"AGV缂栧彿","field":"agv_code","type":"selectList"},{"dataKey":"Taskstates","data":[],"title":"浠诲姟鐘舵��","field":"agv_taskstate","type":"selectList"},{"title":"鐗╂枡绫诲瀷","field":"agv_materielid","type":"like"}],[{"title":"鍒涘缓鏃堕棿","field":"agv_createtime","type":"datetime"},{"title":"鎵樼洏鐮�","field":"agv_barcode","type":"like"},{"title":"鐗╂枡鐮�","field":"agv_materbarcode","type":"like"}]]);
const columns = ref([{field:'agv_id',title:'浠诲姟Id',type:'guid',width:110,hidden:true,readonly:true,require:true,align:'left'},
@@ -43,13 +46,14 @@
{field:'agv_taskstate',title:'浠诲姟鐘舵��',type:'string',bind:{ key:'Taskstates',data:[]},width:110,require:true,align:'left'},
{field:'agv_worktype',title:'AGV宸ヤ綔绫诲瀷',type:'int',width:110,align:'left'},
{field:'agv_materielid',title:'鐗╂枡绫诲瀷',type:'string',width:110,require:true,align:'left'},
- {field:'agv_qty',title:'鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'bindSN',title:'杞﹁疆SN鍙�',type:'string',width:110,align:'left'},
+ {field:'agv_qty',title:'鏁伴噺',type:'int',width:110,require:true,align:'left'},
{field:'agv_createtime',title:'鍒涘缓鏃堕棿',type:'datetime',sort:true,width:150,require:true,align:'left',sort:true},
{field:'agv_realesstime',title:'鎵ц鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
{field:'agv_finishedtime',title:'瀹屾垚鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
- {field:'agv_tasktype',title:'浠诲姟绫诲瀷',type:'string',width:110,require:true,align:'left'},
+ {field:'agv_tasktype',title:'浠诲姟绫诲瀷',type:'string',bind:{ key:'agv_tasktypes',data:[]},width:110,require:true,align:'left'},
{field:'agv_remark',title:'澶囨敞',type:'string',width:120,align:'left'},
- {field:'agv_grade',title:'浠诲姟绛夌骇',type:'int',sort:true,width:110,align:'left'},
+ {field:'agv_grade',title:'浠诲姟绛夌骇',type:'int',bind:{ key:'task_grade',data:[]},sort:true,width:110,align:'left'},
{field:'agv_userid',title:'鍒涘缓鑰�',type:'string',width:110,align:'left'},
{field:'agv_barcode',title:'鎵樼洏鐮�',type:'string',width:110,require:true,align:'left'},
{field:'agv_materbarcode',title:'鐗╂枡鐮�',type:'string',width:110,align:'left'},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue"
index bb30c47..e846064 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/Task/widesea_wms/taskinfo/dt_agvtask_hty.vue"
@@ -32,12 +32,13 @@
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({"agv_tasknum":"","agv_materielid":"","agv_createtime":"","agv_taskstate":"","agv_fromaddress":"","agv_toaddress":"","agv_operatetype":"","agv_barcode":"","agv_materbarcode":""});
- const searchFormOptions = ref([[{"title":"浠诲姟缂栧彿","field":"agv_tasknum","type":"like"},{"title":"鐗╂枡绫诲瀷","field":"agv_materielid","type":"like"},{"dataKey":"Taskstates","data":[],"title":"浠诲姟鐘舵��","field":"agv_taskstate","type":"select"}],[{"title":"璧风偣鍦板潃","field":"agv_fromaddress","type":"like"},{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"like"},{"dataKey":"Taskstates","data":[],"title":"鎿嶄綔绫诲瀷","field":"agv_operatetype","type":"select"}],[{"title":"鎵樼洏鐮�","field":"agv_barcode","type":"like"},{"title":"鐗╂枡鐮�","field":"agv_materbarcode","type":"like"},{"title":"鍒涘缓鏃堕棿","field":"agv_createtime","type":"datetime"}]]);
+ const searchFormOptions = ref([[{"title":"浠诲姟缂栧彿","field":"agv_tasknum","type":"like"},{"title":"鐗╂枡绫诲瀷","field":"agv_materielid","type":"like"},{"dataKey":"Taskstates","data":[],"title":"浠诲姟鐘舵��","field":"agv_taskstate","type":"select"}],[{"title":"璧风偣鍦板潃","field":"agv_fromaddress","type":"like"},{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"like"},{"dataKey":"operatetypes","data":[],"title":"鎿嶄綔绫诲瀷","field":"agv_operatetype","type":"select"}],[{"title":"鎵樼洏鐮�","field":"agv_barcode","type":"like"},{"title":"鐗╂枡鐮�","field":"agv_materbarcode","type":"like"},{"title":"鍒涘缓鏃堕棿","field":"agv_createtime","type":"datetime"}]]);
const columns = ref([{field:'hty_pkid',title:'鍘嗗彶浠诲姟ID',type:'guid',width:110,hidden:true,readonly:true,require:true,align:'left'},
{field:'agv_id',title:'浠诲姟ID',type:'guid',width:110,hidden:true,require:true,align:'left'},
{field:'agv_tasknum',title:'浠诲姟缂栧彿',type:'string',sort:true,width:110,require:true,align:'left',sort:true},
{field:'agv_materielid',title:'鐗╂枡绫诲瀷',type:'string',width:110,require:true,align:'left'},
- {field:'agv_qty',title:'鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
+ {field:'bindSN',title:'杞﹁疆SN鍙�',type:'string',width:110,align:'left'},
+ {field:'agv_qty',title:'鏁伴噺',type:'int',width:110,require:true,align:'left'},
{field:'agv_createtime',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
{field:'agv_realesstime',title:'鎵ц鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
{field:'agv_finishedtime',title:'瀹屾垚鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/dialog/addTask.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/dialog/addTask.vue"
new file mode 100644
index 0000000..69a2208
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/dialog/addTask.vue"
@@ -0,0 +1,93 @@
+<template>
+ <div>
+ <vol-box :lazy="true" v-model="detialBox" title="鎵嬪姩绉诲簱" :height="350" :width="400" :padding="15">
+ <div>
+ <el-form :model="formdata" label-width="120px" :rules="rules" size="mini" ref="ruleFormRef">
+ <!-- <el-form-item label="绫诲瀷">
+ <el-radio-group v-model="inType" class="ml-4">
+ <el-radio label="handle">鎵嬪姩鍑烘枡</el-radio>
+ <el-radio label="auto" disabled>鑷姩鍑烘枡</el-radio>
+ </el-radio-group>
+ </el-form-item> -->
+
+ <el-form-item v-if="inType == 'handle'" label="璧峰鍦板潃" prop="from_address">
+ <el-select v-model="formdata.from_address" clearable filterable placeholder="璇烽�夋嫨璧峰鍦板潃">
+ <el-option v-for="item in formAddressList" :label="item.key" :value="item.key" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐩殑鍦板潃" prop="to_address">
+ <el-select v-model="formdata.to_address" clearable filterable placeholder="璇烽�夋嫨鐩殑鍦板潃">
+ <el-option v-for="item in toAddressList" :label="item.key" :value="item.key" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="">
+ <el-button type="primary" @click="onSubmit()" size="mini"> 纭绉诲簱</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ </vol-box>
+ </div>
+</template>
+
+
+<script >
+import VolBox1Vue from '@/components/basic/VolBox.vue';
+export default {
+ components: { "vol-box": VolBox1Vue },
+ methods: {},
+ created() {
+ this.http.post("/api/Sys_Dictionary/GetVueDictionary", ["route_began", "route_end"]).then(x => {
+ x.forEach(item => {
+ if (item.dicNo == 'route_end') {
+ this.toAddressList = item.data;
+ } else if (item.dicNo == 'route_began') {
+ this.formAddressList = item.data;
+ }
+ })
+ })
+ },
+ data() {
+ return {
+ detialBox: false,
+ inType: "handle",
+ rules: {
+ from_address: [{ required: true, message: '璇烽�夋嫨璧峰鍦板潃', trigger: 'blur' }],
+ to_address: [{ required: true, message: '璇烽�夋嫨鐩殑鍦板潃', trigger: 'blur' }]
+ },
+ formdata: {
+ from_address: "",
+ to_address: ""
+ },
+ formAddressList: [],
+ toAddressList: []
+ };
+ },
+ methods: {
+ onSubmit() {
+ var _this = this;
+ this.$refs.ruleFormRef.validate((valid) => {
+ if (valid) {
+ _this.http.post("/api/ToMes/AddToFloat3", _this.formdata, "姝ｅ湪绉诲簱....").then(x => {
+ if (!x.status) return _this.$Message.error(x.message);
+ _this.$Message.success("绉诲簱鎴愬姛!");
+ _this.refresh();
+ });
+ }
+ })
+ }
+ },
+};
+</script>
+
+
+<style>
+.formContainer {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+</style>
+
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/extension/widesea_wms/taskinfo/dt_agvtask.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/extension/widesea_wms/taskinfo/dt_agvtask.js"
index 8935403..804e87f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/extension/widesea_wms/taskinfo/dt_agvtask.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/extension/widesea_wms/taskinfo/dt_agvtask.js"
@@ -32,7 +32,16 @@
// this.$Message.success('鐐瑰嚮浜嗘寜閽�');
// }
// });
+ // this.buttons.splice(1,0,function(){
+ // name:"娣诲姞浠诲姟"
+ // })
+ this.buttons.forEach(x => {
+ if(x.value == 'Add')
+ {
+ x.name = '娣诲姞浠诲姟'
+ }
+ });
//绀轰緥锛氳缃慨鏀规柊寤恒�佺紪杈戝脊鍑烘瀛楁鏍囩鐨勯暱搴�
// this.boxOptions.labelWidth = 150;
},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/system/Sys_User.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/system/Sys_User.vue"
index 7f37877..83eab67 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/system/Sys_User.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/system/Sys_User.vue"
@@ -27,7 +27,7 @@
const editFormOptions = ref([[{ "title": "甯愬彿", "required": true, "field": "UserName", "disabled": true }],
[{ "title": "濮撳悕", "required": true, "field": "UserTrueName", "type": "text" }],
[{ "dataKey": "tree_roles", "data": [], "title": "瑙掕壊", "required": true, "field": "Role_Id", "type": "cascader" }],
- [{ "dataKey": "缁勭粐鏈烘瀯", "data": [], "title": "缁勭粐鏋勬灦", "field": "DeptIds", "colSize": 12, "type": "treeSelect" }],
+ // [{ "dataKey": "缁勭粐鏈烘瀯", "data": [], "title": "缁勭粐鏋勬灦", "field": "DeptIds", "colSize": 12, "type": "treeSelect" }],
[{ "dataKey": "enable", "data": [], "title": "鏄惁鍙敤", "required": true, "field": "Enable", "type": "select" }],
[{ "dataKey": "gender", "data": [], "title": "鎬у埆", "field": "Gender", "type": "select" }],
[{ "title": "澶囨敞", "field": "Remark", "colSize": 12, "type": "textarea" }],
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_system/system/Dt_Interfacerecord.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_system/system/Dt_Interfacerecord.vue"
new file mode 100644
index 0000000..8894e71
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_system/system/Dt_Interfacerecord.vue"
@@ -0,0 +1,89 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/system/system/Sys_User.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/widesea_system/system/Dt_Interfacerecord.js";
+ import { ref, defineComponent } from "vue";
+ export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'User_Id',
+ footer: "Foots",
+ cnName: '鎺ュ彛鏃ュ織',
+ name: 'Dt_Interfacerecord',
+ url: "/Dt_Interfacerecord/",
+ sortName: "interface_createtime"
+ });
+ const editFormFields = ref();
+ const editFormOptions = ref([]);
+ const searchFormFields = ref({"interface_remark":"",});
+ const searchFormOptions = ref([[{"title":"璇锋眰鏁版嵁","field":"interface_paradata","type":"like"},{"title":"鎻忚堪","field":"interface_remark","type":"like"}],
+ [{"title":"杩斿洖鏁版嵁","field":"interface_returndata","type":"like"},{"title":"鍒涘缓鏃堕棿","field":"interface_createtime","type":"datetime"}]
+ ]);
+ const columns = ref([
+ {field:'interface_id',title:'涓婚敭',type:'guid',width:60,hidden:true,readonly:true,require:true,align:'left'},
+ {
+
+ field:'interface_call',
+ type:'string',
+ title:"璇锋眰鑰�",
+ width:60,
+ sort:true,
+ align:'left'
+ },
+ {
+ field:'interface_type',
+ title:'绫诲瀷',
+ type:'string',
+ width:60,
+ require:true,
+ align:'left',
+ bind:{data:[]},
+ //sortable:true
+ },
+ // {field:'interface_call',title:'璇锋眰鑰�',type:'string',width:60,require:true,align:'left'},
+ {field:'interface_provide',title:'鎺ュ彈鑰�',type:'string',width:60,require:true,align:'left'},
+ {field:'interface_paradata',title:'璇锋眰鏁版嵁',type:'string',width:120,align:'left'},
+ {field:'interface_returndata',title:'杩斿洖鏁版嵁',type:'string',width:120,align:'left'},
+ {field:'interface_createtime',title:'鍒涘缓鏃堕棿',type:'datetime',width:120,require:true,align:'left',sortable:true},
+ {field:'interface_remark',title:'鎻忚堪',type:'string',width:120,align:'left'},
+ {field:'interface_operator',title:'鎿嶄綔鑰�',type:'string',width:60,require:true,align:'left'},
+ {field:'interface_name',title:'鎿嶄綔鍚嶇О',type:'string',width:60,require:true,align:'left'},
+ {field:'interface_message',title:'閿欒淇℃伅',type:'string',width:120,require:true,align:'left'},
+ ]);
+ 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/WMS_Client/src/views/widesea_system/system/tracklogDetial.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_system/system/tracklogDetial.vue"
new file mode 100644
index 0000000..99164ab
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_system/system/tracklogDetial.vue"
@@ -0,0 +1,65 @@
+<template>
+ <div>
+ <!-- 璇︽儏寮圭獥 -->
+ <vol-box :height="450" v-model="detialBox" :padding="15" title="鏃ュ織璇︽儏">
+ <div>
+ id锛歿{ rowData.interface_id }}
+ <hr />
+ <b>鏃堕棿锛�</b>
+ {{ rowData.interface_createtime }}
+ <br />
+ <b>鎿嶄綔鍚嶇О锛�</b>
+ {{ rowData.interface_name }}
+ <br />
+ <b>鎻忚堪锛�</b>
+ {{ rowData.interface_remark }}
+ <br />
+ <b>閿欒淇℃伅锛�</b>
+ <br />
+ {{ rowData.interface_message }}
+ <br />
+ <br />
+ <b>璇锋眰鏁版嵁锛�</b>
+ <br />
+ <pre> {{ rowData.interface_paradata==""?rowData.interface_paradata:JSON.parse(rowData.interface_paradata) }}</pre>
+ <br />
+ <b>杩斿洖鏁版嵁锛�</b>
+ <pre>{{rowData.interface_returndata==""?rowData.interface_returndata:JSON.parse(rowData.interface_returndata)}}</pre>
+ </div>
+ </vol-box>
+ </div>
+</template>
+
+<script defer = "true">
+import VolBox from "@/components/basic/VolBox.vue";
+
+export default {
+ components: { "vol-box": VolBox },
+ methods: {},
+ data() {
+ return {
+ detialBox: false,
+ rowData: "",
+ };
+ },
+ methods: {
+ openDialog(row) {
+ this.detialBox = true;
+ this.rowData = row;
+ }
+ },
+};
+</script>
+
+
+<style>
+.formContainer {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+</style>
+
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/boxing/dt_boxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/boxing/dt_boxing.vue"
new file mode 100644
index 0000000..db5e6ec
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/boxing/dt_boxing.vue"
@@ -0,0 +1,63 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/boxing/dt_boxing.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/widesea_wms/boxing/dt_boxing.js";
+ import { ref, defineComponent } from "vue";
+ export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'ID',
+ footer: "Foots",
+ cnName: '缁勭洏淇℃伅',
+ name: 'boxing/dt_boxing',
+ url: "/dt_boxing/",
+ sortName: "ID"
+ });
+ const editFormFields = ref({});
+ const editFormOptions = ref([]);
+ const searchFormFields = ref({});
+ const searchFormOptions = ref([]);
+ const columns = ref([{field:'ID',title:'ID',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'boxhead_creator',title:'缁勭洏鑰�',type:'string',width:110,require:true,align:'left',sort:true},
+ {field:'boxhead_createtime',title:'缁勭洏鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
+ {field:'boxdtl_state',title:'缁勭洏鐘舵��',type:'string',width:110,require:true,align:'left'},
+ {field:'boxhead_address',title:'缁勭洏鍦板潃',type:'string',width:180,require:true,align:'left'},
+ {field:'boxhead_wheelSN',title:'SN鍙�',type:'string',width:180,require:true,align:'left'},
+ {field:'boxhead_wheeltype',title:'绫诲瀷',type:'string',width:120,align:'left'},
+ {field:'boxdtl_name',title:'鍚嶇О',type:'guid',width:110,align:'left'}]);
+ 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/WMS_Client/src/views/widesea_wms/boxing/dt_boxing_hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/boxing/dt_boxing_hty.vue"
new file mode 100644
index 0000000..ef3f0b2
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/boxing/dt_boxing_hty.vue"
@@ -0,0 +1,64 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/boxing/dt_boxing_hty.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/widesea_wms/boxing/dt_boxing_hty.js";
+ import { ref, defineComponent } from "vue";
+ export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'ID',
+ footer: "Foots",
+ cnName: '缁勭洏鍘嗗彶淇℃伅',
+ name: 'boxing/dt_boxing_hty',
+ url: "/dt_boxing_hty/",
+ sortName: "ID"
+ });
+ const editFormFields = ref({});
+ const editFormOptions = ref([]);
+ const searchFormFields = ref({});
+ const searchFormOptions = ref([]);
+ const columns = ref([{field:'ID',title:'ID',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'boxhead_creator',title:'缁勭洏鑰�',type:'string',width:110,require:true,align:'left',sort:true},
+ {field:'boxhead_createtime',title:'缁勭洏鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
+ {field:'boxdtl_state',title:'缁勭洏鐘舵��',type:'string',width:110,require:true,align:'left'},
+ {field:'boxhead_lastdatetime',title:'缁勭洏瀹屾垚鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
+ {field:'boxhead_address',title:'缁勭洏鍦板潃',type:'string',width:180,require:true,align:'left'},
+ {field:'boxhead_wheelSN',title:'SN鍙�',type:'string',width:180,require:true,align:'left'},
+ {field:'boxhead_wheeltype',title:'绫诲瀷',type:'string',width:120,align:'left'},
+ {field:'boxdtl_name',title:'鍚嶇О',type:'guid',width:110,align:'left'}]);
+ 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/WMS_Client/src/views/widesea_wms/system/base_routing_table.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/system/base_routing_table.vue"
index 0b0b8a1..13c9e53 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/system/base_routing_table.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/system/base_routing_table.vue"
@@ -38,13 +38,13 @@
{field:'route_end',title:'缁堢偣鍦板潃',type:'string',width:110,require:true,align:'left'},
{field:'route_area',title:'鍖哄煙',type:'string',width:110,align:'left'},
{field:'route_creator',title:'鍒涘缓鑰�',type:'string',width:110,require:true,align:'left'},
- {field:'route_createtime',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
+ {field:'route_createtime',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true,hidden:true},
{field:'Remark1',title:'Remark1',type:'string',width:110,hidden:true,align:'left'},
{field:'Remark2',title:'Remark2',type:'string',width:110,hidden:true,align:'left'},
{field:'Remark3',title:'Remark3',type:'string',width:110,hidden:true,align:'left'},
{field:'Remark4',title:'Remark4',type:'string',width:110,hidden:true,align:'left'},
{field:'Remark5',title:'Remark5',type:'string',width:110,hidden:true,align:'left'},
- {field:'ID',title:'ID',type:'int',width:80,require:true,align:'left'}]);
+ {field:'ID',title:'ID',type:'int',width:80,require:true,align:'left',hidden:true}]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/system/dt_areainfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/system/dt_areainfo.vue"
new file mode 100644
index 0000000..2fb0ff7
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/system/dt_areainfo.vue"
@@ -0,0 +1,66 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/system/dt_areainfo.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/widesea_wms/system/dt_areainfo.js";
+ import { ref, defineComponent } from "vue";
+ export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'area_code',
+ footer: "Foots",
+ cnName: '搴撳尯淇℃伅',
+ name: 'system/dt_areainfo',
+ url: "/dt_areainfo/",
+ sortName: "area_code"
+ });
+ const editFormFields = ref({"area_name":"","area_des":""});
+ const editFormOptions = ref([[{"title":"鍚嶇О","required":true,"field":"area_name","type":"text"}],
+ [{"title":"鎻忚堪","field":"area_des","type":"text"}]]);
+ const searchFormFields = ref({"area_name":""});
+ const searchFormOptions = ref([[{"title":"鍚嶇О","field":"area_name","type":"like"}]]);
+ const columns = ref([{field:'area_code',title:'搴撳尯ID',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'area_name',title:'鍚嶇О',type:'string',width:110,require:true,align:'left',sort:true},
+ {field:'area_des',title:'鎻忚堪',type:'string',width:220,align:'left'},
+ {field:'area_creator',title:'鍒涘缓鑰�',type:'string',width:110,require:true,align:'left'},
+ {field:'area_datetime',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
+ {field:'area_bindType',title:'缁戝畾绫诲瀷',type:'string',width:110,require:true,align:'left'},
+ {field:'area_max',title:'鏈�澶ф暟閲�',type:'int',width:80,align:'left'},
+ {field:'area_minimum',title:'鏈�灏忔暟閲�',type:'int',width:80,align:'left'},
+ {field:'area_spare1',title:'澶囩敤鍖�1',type:'string',width:120,align:'left'},
+ {field:'area_spare2',title:'澶囩敤鍖�2',type:'string',width:120,align:'left'}]);
+ 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/WMS_Client/src/views/widesea_wms/system/dt_inventory.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/system/dt_inventory.vue"
new file mode 100644
index 0000000..17d002c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/system/dt_inventory.vue"
@@ -0,0 +1,66 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/system/dt_inventory.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/widesea_wms/system/dt_inventory.js";
+ import { ref, defineComponent } from "vue";
+ export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'ID',
+ footer: "Foots",
+ cnName: '搴撳瓨鏌ヨ',
+ name: 'system/dt_inventory',
+ url: "/dt_inventory/",
+ sortName: "ID"
+ });
+ const editFormFields = ref({});
+ const editFormOptions = ref([]);
+ const searchFormFields = ref({"SN":"","Name":"","HearthNumber":"","HeatNumber":"","BilletNumber":"","remark":""});
+ const searchFormOptions = ref([[{"title":"杞﹁疆SN鍙�","field":"SN","type":"like"},{"title":"浜у搧鍚嶇О","field":"Name","type":"like"},{"title":"鎻忚堪","field":"remark","type":"like"}],[{"title":"鐔旂偧鐐夊彿","field":"HearthNumber","type":"like"},{"title":"鐐変唬鍙�","field":"HeatNumber","type":"like"},{"title":"閽㈠澂鍙�","field":"BilletNumber","type":"like"}]]);
+ const columns = ref([{field:'SN',title:'杞﹁疆SN鍙�',type:'string',width:220,align:'left',sort:true},
+ {field:'Name',title:'浜у搧鍚嶇О',type:'string',width:220,align:'left'},
+ {field:'FigureNumber',title:'浜у搧鍥惧彿',type:'string',width:220,align:'left'},
+ {field:'HearthNumber',title:'鐔旂偧鐐夊彿',type:'string',width:220,align:'left'},
+ {field:'HeatNumber',title:'鐐変唬鍙�',type:'string',width:110,align:'left'},
+ {field:'BilletNumber',title:'閽㈠澂鍙�',type:'int',width:110,align:'left'},
+ {field:'OnlineTime',title:'鍏ュ簱鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
+ {field:'Operator',title:'鎿嶄綔浜哄憳',type:'string',width:110,align:'left'},
+ {field:'remark',title:'鎻忚堪',type:'string',width:110,align:'left'},
+ {field:'ID',title:'ID',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'stationCode',title:'璐т綅缂栧彿',type:'string',width:110,align:'left'}]);
+ 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/WMS_Client/src/views/widesea_wms/system/dt_materielinfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/system/dt_materielinfo.vue"
new file mode 100644
index 0000000..325fab4
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/system/dt_materielinfo.vue"
@@ -0,0 +1,95 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/system/dt_materielinfo.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/widesea_wms/system/dt_materielinfo.js";
+ import { ref, defineComponent } from "vue";
+ export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'ID',
+ footer: "Foots",
+ cnName: '鐗╂枡淇℃伅',
+ name: 'system/dt_materielinfo',
+ url: "/dt_materielinfo/",
+ sortName: "ID"
+ });
+ const editFormFields = ref({"materiel_id":"","materiel_name":"","materiel_areaid":"","materiel_long":"","materiel_width":"","materiel_height":"","materiel_desc":""});
+ const editFormOptions = ref([[{"title":"鐗╂枡id","required":true,"field":"materiel_id","type":"text"}],
+ [{"title":"鐗╂枡鍚嶇О","required":true,"field":"materiel_name","type":"text"}],
+ [{"dataKey":"area_name","data":[],"title":"鎵�灞炲簱鍖�","required":true,"field":"materiel_areaid","type":"select"}],
+ [{"title":"鐗╂枡闀�","field":"materiel_long","type":"decimal"}],
+ [{"title":"鐗╂枡瀹�","field":"materiel_width","type":"decimal"}],
+ [{"title":"鐗╂枡楂�","field":"materiel_height","type":"decimal"}],
+ [{"title":"鐗╂枡淇℃伅鎻忚堪","field":"materiel_desc"}]]);
+ const searchFormFields = ref({"materiel_id":"","materiel_areaid":"","materiel_name":"","materiel_desc":""});
+ const searchFormOptions = ref([[{"title":"鐗╂枡鍚嶇О","field":"materiel_name","type":"like"},{"dataKey":"area_name","data":[],"title":"鎵�灞炲簱鍖�","field":"materiel_areaid","type":"select"}],[{"title":"鐗╂枡id","field":"materiel_id","type":"like"},{"title":"鐗╂枡淇℃伅鎻忚堪","field":"materiel_desc"}]]);
+ const columns = ref([{field:'materiel_pkid',title:'涓婚敭',type:'guid',width:110,hidden:true,require:true,align:'left'},
+ {field:'materiel_id',title:'鐗╂枡id',type:'string',width:120,require:true,align:'left',sort:true},
+ {field:'materiel_areaid',title:'鎵�灞炲簱鍖�',type:'int',bind:{ key:'area_name',data:[]},width:110,require:true,align:'left'},
+ {field:'materiel_name',title:'鐗╂枡鍚嶇О',type:'string',width:180,require:true,align:'left'},
+ {field:'materiel_desc',title:'鐗╂枡淇℃伅鎻忚堪',type:'string',width:180,align:'left'},
+ {field:'materiel_packspes',title:'鍖呰瑙勬牸',type:'string',width:110,align:'left'},
+ {field:'materiel_state',title:'褰撳墠鐘舵��',type:'string',width:110,align:'left'},
+ {field:'materiel_type',title:'鐗╂枡绫诲瀷',type:'string',width:110,align:'left'},
+ {field:'materiel_unit',title:'璁￠噺鍗曚綅',type:'string',width:110,align:'left'},
+ {field:'materiel_minpack_qty',title:'鏈�灏忓寘瑁�',type:'decimal',width:110,align:'left'},
+ {field:'materiel_mfacturer',title:'鐢熶骇鍟�',type:'string',width:110,align:'left'},
+ {field:'materiel_supplier',title:'渚涘簲鍟�',type:'string',width:110,align:'left'},
+ {field:'materiel_netweight',title:'鍑�閲�',type:'decimal',width:110,align:'left'},
+ {field:'materiel_grossweight',title:'姣涢噸',type:'decimal',width:110,align:'left'},
+ {field:'materiel_validity',title:'鏈夋晥鏈�',type:'int',width:110,align:'left'},
+ {field:'materiel_safety',title:'瀹夊叏搴撳瓨',type:'decimal',width:110,align:'left'},
+ {field:'materiel_creator',title:'鍒涘缓鑰�',type:'string',width:110,align:'left'},
+ {field:'materiel_createtime',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
+ {field:'materiel_remark',title:'澶囨敞',type:'string',width:120,align:'left'},
+ {field:'materiel_purchaseType',title:'閲囪喘绫诲瀷',type:'string',width:110,align:'left'},
+ {field:'materiel_englishdesc',title:'鑻辨枃鎻忚堪',type:'string',width:180,align:'left'},
+ {field:'materiel_materielGroup',title:'鐗╂枡缁�',type:'string',width:110,align:'left'},
+ {field:'materiel_productGroup',title:'浜у搧缁�',type:'string',width:110,align:'left'},
+ {field:'materiel_size',title:'澶у皬/閲忕翰',type:'string',width:110,align:'left'},
+ {field:'materiel_mrpType',title:'MRP绫诲瀷',type:'string',width:110,align:'left'},
+ {field:'materiel_traceabilityCode',title:'杩芥函鏍囪瘑',type:'string',width:110,align:'left'},
+ {field:'materiel_long',title:'鐗╂枡闀�',type:'decimal',width:110,align:'left'},
+ {field:'materiel_width',title:'鐗╂枡瀹�',type:'decimal',width:110,align:'left'},
+ {field:'materiel_height',title:'鐗╂枡楂�',type:'decimal',width:110,align:'left'},
+ {field:'materiel_palletlong',title:'鎵樼洏闀�',type:'decimal',width:110,align:'left'},
+ {field:'materiel_palletwidth',title:'鎵樼洏瀹�',type:'decimal',width:110,align:'left'},
+ {field:'materiel_palletheight',title:'鎵樼洏楂�',type:'decimal',width:110,align:'left'},
+ {field:'materiel_location',title:'搴撳瓨鍦扮偣',type:'string',width:110,align:'left'},
+ {field:'ID',title:'ID',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'}]);
+ 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/WMS_Client/src/views/widesea_wms/system/dt_stationinfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/system/dt_stationinfo.vue"
index ff9f880..dc7a77d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/system/dt_stationinfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/system/dt_stationinfo.vue"
@@ -24,28 +24,31 @@
const table = ref({
key: 'zj',
footer: "Foots",
- cnName: '绔欑偣鏌ヨ',
+ cnName: '搴撲綅淇℃伅',
name: 'system/dt_stationinfo',
url: "/dt_stationinfo/",
sortName: "zj"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([]);
+ const searchFormFields = ref({"stationCode":"","stationType":"","area":"","enable":"","location_state":[],"bindSN":""});
+ const searchFormOptions = ref([[{"title":"缂撳瓨鏋剁紪鍙�","field":"stationCode","type":"like"},{"title":"杞﹁疆SN鍙�","field":"bindSN","type":"like"},{"dataKey":"materielinfos","data":[],"title":"鐗╂枡绫诲瀷","field":"stationType","type":"select"}],[{"dataKey":"area_name","data":[],"title":"鍖哄煙","field":"area","type":"select"},{"dataKey":"location_states","data":[],"title":"璐т綅鐘舵��","field":"location_state","type":"selectList"},{"dataKey":"status","data":[],"title":"鏄惁鍚敤","field":"enable","type":"select"}]]);
const columns = ref([{field:'id',title:'id',type:'guid',width:110,hidden:true,readonly:true,require:true,align:'left'},
{field:'stationCode',title:'缂撳瓨鏋剁紪鍙�',type:'string',width:110,align:'left',sort:true},
- {field:'stationType',title:'鐗╂枡绫诲瀷',type:'string',width:110,align:'left'},
- {field:'area',title:'鍖哄煙',type:'string',width:110,align:'left'},
- {field:'enable',title:'鏄惁鍚敤',type:'bool',width:110,align:'left'},
- {field:'location_state',title:'璐т綅鐘舵��',type:'string',width:220,align:'left'},
+ {field:'stationType',title:'鐗╂枡绫诲瀷',type:'string',bind:{ key:'materielinfos',data:[]},width:110,align:'left'},
+ {field:'area',title:'鍖哄煙',type:'string',bind:{ key:'area_name',data:[]},width:110,require:true,align:'left'},
+ {field:'enable',title:'鏄惁鍚敤',type:'bool',bind:{ key:'status',data:[]},width:110,require:true,align:'left'},
+ {field:'location_state',title:'璐т綅鐘舵��',type:'string',bind:{ key:'location_states',data:[]},width:220,align:'left'},
{field:'lastUpdateTime',title:'鏈�鍚庣姸鎬佹敼鍙樻椂闂�',type:'datetime',width:150,align:'left',sort:true},
+ {field:'quantity',title:'杞﹁疆鏁伴噺',type:'int',width:80,align:'left'},
+ {field:'bindSN',title:'杞﹁疆SN鍙�',type:'string',width:220,align:'left'},
+ {field:'tray_status',title:'鎵樼洏鐘舵��',type:'string',bind:{ key:'tray_status',data:[]},width:110,align:'left'},
+ {field:'line',title:'琛�',type:'int',width:80,align:'left'},
+ {field:'column',title:'鍒�',type:'int',width:80,align:'left'},
{field:'remark',title:'澶囨敞',type:'string',width:120,align:'left'},
- {field:'getStatus',title:'winfrom鏇存柊鐨勭姸鎬�',type:'int',width:110,align:'left'},
- {field:'getLastTime',title:'winfrom鏈�鍚庢洿鏂扮殑鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
- {field:'sort',title:'鎺掑簭',type:'int',width:110,align:'left'},
- {field:'bindType',title:'缁戝畾鍙瓨鏀剧墿鏂欑被鍨�',type:'string',width:220,align:'left'},
- {field:'zj',title:'涓婚敭',type:'int',width:80,require:true,align:'left'}]);
+ {field:'zj',title:'涓婚敭',type:'int',width:80,hidden:true,require:true,align:'left'},
+ {field:'Number',title:'宸ュ崟缂栧彿',type:'string',width:220,align:'left'},
+ {field:'heatNumber',title:'鐐夊彿',type:'int',width:80,align:'left'}]);
const detail = ref({
cnName: "#detailCnName",
table: "#detailTable",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/taskinfo/dt_agvtask_hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/taskinfo/dt_agvtask_hty.vue"
new file mode 100644
index 0000000..02b8e40
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wms/taskinfo/dt_agvtask_hty.vue"
@@ -0,0 +1,81 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/taskinfo/dt_agvtask_hty.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/widesea_wms/taskinfo/dt_agvtask_hty.js";
+ import { ref, defineComponent } from "vue";
+ export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'agv_qty',
+ footer: "Foots",
+ cnName: 'AGV鍘嗗彶浠诲姟',
+ name: 'taskinfo/dt_agvtask_hty',
+ url: "/dt_agvtask_hty/",
+ sortName: "agv_qty"
+ });
+ const editFormFields = ref({});
+ const editFormOptions = ref([]);
+ const searchFormFields = ref({"agv_tasknum":"","agv_materielid":"","agv_createtime":"","agv_taskstate":"","agv_fromaddress":"","agv_toaddress":"","agv_operatetype":"","agv_barcode":"","agv_materbarcode":""});
+ const searchFormOptions = ref([[{"title":"浠诲姟缂栧彿","field":"agv_tasknum","type":"like"},{"title":"鐗╂枡绫诲瀷","field":"agv_materielid","type":"like"},{"dataKey":"Taskstates","data":[],"title":"浠诲姟鐘舵��","field":"agv_taskstate","type":"select"}],[{"title":"璧风偣鍦板潃","field":"agv_fromaddress","type":"like"},{"title":"缁堢偣鍦板潃","field":"agv_toaddress","type":"like"},{"dataKey":"Taskstates","data":[],"title":"鎿嶄綔绫诲瀷","field":"agv_operatetype","type":"select"}],[{"title":"鎵樼洏鐮�","field":"agv_barcode","type":"like"},{"title":"鐗╂枡鐮�","field":"agv_materbarcode","type":"like"},{"title":"鍒涘缓鏃堕棿","field":"agv_createtime","type":"datetime"}]]);
+ const columns = ref([{field:'hty_pkid',title:'鍘嗗彶浠诲姟ID',type:'guid',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'agv_id',title:'浠诲姟ID',type:'guid',width:110,hidden:true,require:true,align:'left'},
+ {field:'agv_tasknum',title:'浠诲姟缂栧彿',type:'string',sort:true,width:110,require:true,align:'left',sort:true},
+ {field:'agv_materielid',title:'鐗╂枡绫诲瀷',type:'string',width:110,require:true,align:'left'},
+ {field:'agv_qty',title:'鏁伴噺',type:'int',width:110,require:true,align:'left'},
+ {field:'agv_createtime',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
+ {field:'agv_realesstime',title:'鎵ц鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
+ {field:'agv_finishedtime',title:'瀹屾垚鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
+ {field:'agv_taskstate',title:'浠诲姟鐘舵��',type:'string',bind:{ key:'Taskstates',data:[]},width:110,require:true,align:'left'},
+ {field:'agv_tasktype',title:'浠诲姟绫诲瀷',type:'string',width:110,require:true,align:'left'},
+ {field:'agv_fromaddress',title:'璧风偣鍦板潃',type:'string',width:110,align:'left'},
+ {field:'agv_toaddress',title:'缁堢偣鍦板潃',type:'string',width:110,align:'left'},
+ {field:'agv_operatetype',title:'鎿嶄綔绫诲瀷',type:'string',bind:{ key:'Taskstates',data:[]},width:110,require:true,align:'left'},
+ {field:'agv_compeletor',title:'鎿嶄綔鑰�',type:'string',width:110,require:true,align:'left'},
+ {field:'agv_completedate',title:'鎿嶄綔鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
+ {field:'agv_grade',title:'浠诲姟绛夌骇',type:'int',width:110,align:'left'},
+ {field:'agv_userid',title:'鍒涘缓鑰�',type:'string',width:110,align:'left'},
+ {field:'agv_barcode',title:'鎵樼洏鐮�',type:'string',width:110,require:true,align:'left'},
+ {field:'agv_code',title:'AGV缂栧彿',type:'string',width:110,require:true,align:'left'},
+ {field:'agv_worktype',title:'AGV宸ヤ綔绫诲瀷',type:'int',width:110,require:true,align:'left'},
+ {field:'agv_materbarcode',title:'鐗╂枡鐮�',type:'string',width:110,align:'left'},
+ {field:'agv_executingBeginTime',title:'璧峰鐐规墽琛屼腑',type:'datetime',width:150,align:'left',sort:true},
+ {field:'agv_executingEndTime',title:'璧峰鐐瑰畬鎴�',type:'datetime',width:150,align:'left',sort:true},
+ {field:'agv_completeBeginTime',title:'鐩殑鐐规墽琛屼腑',type:'datetime',width:150,align:'left',sort:true},
+ {field:'agv_remark',title:'澶囨敞',type:'string',width:220,align:'left'},
+ {field:'bindSN',title:'杞﹁疆SN鍙�',type:'string',width:220,align:'left'}]);
+ 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/WMS_Server/WIDESEA_Comm/EquipmentEnum/EquipmentState.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/EquipmentEnum/EquipmentState.cs"
new file mode 100644
index 0000000..a5953e8
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/EquipmentEnum/EquipmentState.cs"
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WIDESEA_Common
+{
+ /// <summary>
+ /// 璁惧鐘舵��
+ /// </summary>
+ public enum EquipmentState
+ {
+ /// <summary>
+ /// 鍚敤
+ /// </summary>
+ Enable,
+ /// <summary>
+ /// 绂佺敤
+ /// </summary>
+ Disenable
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/EquipmentEnum/StationEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/EquipmentEnum/StationEnum.cs"
new file mode 100644
index 0000000..9a399bf
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/EquipmentEnum/StationEnum.cs"
@@ -0,0 +1,30 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WIDESEA_Common.EquipmentEnum
+{
+ public enum StationEnum
+ {
+ /// <summary>
+ /// 鏈繛鎺�
+ /// </summary>
+ Disconnect = -1,
+ /// <summary>
+ /// 鏃犳枡
+ /// </summary>
+ Empty,
+ /// <summary>
+ /// 鏈夋枡
+ /// </summary>
+ Stroge,
+ /// <summary>
+ /// 鍏佽
+ /// </summary>
+ Allow,
+ /// <summary>
+ /// 涓嶅厑璁�
+ /// </summary>
+ NotAllow
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/LogInfo/WriteWMSLog.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/LogInfo/WriteWMSLog.cs"
new file mode 100644
index 0000000..ada51ed
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/LogInfo/WriteWMSLog.cs"
@@ -0,0 +1,52 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Services.IRepositories;
+using WIDESEA_Services.Repositories;
+
+namespace WIDESEA_Comm.LogInfo
+{
+ public class WriteWMSLog
+ {
+ /// <summary>
+ /// 鎺ュ彛鏁版嵁璁板綍
+ /// </summary>
+ /// <param name="id">浠诲姟ID</param>
+ /// <param name="code">鎴愬姛/澶辫触</param>
+ /// <param name="provide">鎺ュ彈鑰�</param>
+ /// <param name="call">璇锋眰鑰�</param>
+ /// <param name="paradata">璇锋眰鏁版嵁</param>
+ /// <param name="returndata">杩斿洖鏁版嵁</param>
+ /// <param name="remark">澶囨敞/鎻忚堪</param>
+ /// <param name="name">鎿嶄綔鍚嶇О(鏂规硶鍚�)</param>
+ /// <param name="message">閿欒淇℃伅</param>
+ public static void LogAdd(string id, string code, string provide, string call, string paradata, string returndata, string remark, string name, string message)
+ {
+ VOLContext context = new VOLContext();
+ IDt_InterfacerecordRepository interfacerecordRepository = new Dt_InterfacerecordRepository(context);
+ Dt_Interfacerecord interfacerecord = new Dt_Interfacerecord()
+ {
+ interface_id = Guid.NewGuid(),
+ interface_type = code,
+ interface_provide = provide,
+ interface_call = call,
+ interface_paradata = paradata,
+ interface_returndata = returndata,
+ interface_createtime = DateTime.Now,
+ interface_remark = remark,
+ interface_operator = "admin",//UserContext.Current.UserName == null ? "admin" : UserContext.Current.UserName,
+ interface_name = name,
+ interface_message = message,
+ };
+ Dt_Interfacerecord data = null;
+ if (interfacerecord.interface_message != "")
+ data = interfacerecordRepository.FindFirst(x => x.interface_message == interfacerecord.interface_message && x.interface_remark == interfacerecord.interface_remark && x.interface_createtime.Day == DateTime.Now.Day && x.interface_paradata.Contains(id));
+ if (data == null)
+ interfacerecordRepository.Add(interfacerecord, true);
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/OperateTypesEnum/OperateTypes.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/OperateTypesEnum/OperateTypes.cs"
new file mode 100644
index 0000000..dcde224
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/OperateTypesEnum/OperateTypes.cs"
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Comm
+{
+ public enum OperateTypes
+ {
+ /// <summary>
+ /// 鑷姩瀹屾垚
+ /// </summary>
+ Complete,
+ /// <summary>
+ /// 鎵嬪姩鍙栨秷
+ /// </summary>
+ ManualCancellation,
+ /// <summary>
+ /// 鎵嬪姩瀹屾垚
+ /// </summary>
+ ManualCompletion,
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs"
new file mode 100644
index 0000000..f43a0e4
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs"
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Comm
+{
+ public enum LocationStateEnum
+ {
+ /// <summary>
+ /// 鏈夎揣
+ /// </summary>
+ Stroge,
+ /// <summary>
+ /// 绌鸿揣浣�
+ /// </summary>
+ Empty
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/TaskEnum/AGVJobEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/TaskEnum/AGVJobEnum.cs"
new file mode 100644
index 0000000..bd42efd
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/TaskEnum/AGVJobEnum.cs"
@@ -0,0 +1,34 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WIDESEA_Common
+{
+ public enum AGVJobEnum
+ {
+ /// <summary>
+ /// 鏂颁换鍔�
+ /// </summary>
+ newTaskEnum = 1,
+ /// <summary>
+ /// 鍙栨秷浠诲姟
+ /// </summary>
+ cancelTaskEnum = 2,
+ /// <summary>
+ /// 鍙樻洿浠诲姟
+ /// </summary>
+ changeTaskEnum = 3,
+ /// <summary>
+ /// 涓嬪彂浠诲姟寮傚父
+ /// </summary>
+ newTaskExp = 11,
+ /// <summary>
+ /// 鍙栨秷浠诲姟寮傚父
+ /// </summary>
+ cancelTaskExp = 12,
+ /// <summary>
+ /// 鍙樻洿浠诲姟寮傚父
+ /// </summary>
+ changeTaskExp = 13,
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/TaskEnum/AGVTaskStateEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/TaskEnum/AGVTaskStateEnum.cs"
new file mode 100644
index 0000000..c0b3374
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/TaskEnum/AGVTaskStateEnum.cs"
@@ -0,0 +1,74 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WIDESEA_Common
+{
+ public enum AGVTaskStateEnum
+ {
+ /// <summary>
+ /// 宸蹭笅鍙戝緟鍥炲
+ /// </summary>
+ Wait,
+ /// <summary>
+ /// 璧风偣鎵ц涓�
+ /// </summary>
+ Executing = 1,
+ /// <summary>
+ /// 璧风偣宸插畬鎴�
+ /// </summary>
+ Complete = 2,
+ /// <summary>
+ /// 缁堢偣鎵ц涓�
+ /// </summary>
+ Executing1 = 3,
+ /// <summary>
+ /// 缁堢偣宸插畬鎴�
+ /// </summary>
+ Complete1 = 4,
+ /// <summary>
+ /// 宸蹭笅鍙�
+ /// </summary>
+ SendOut,
+ /// <summary>
+ /// 宸插垱寤烘湭鎵ц
+ /// </summary>
+ Create,
+ /// <summary>
+ /// 寮傚父
+ /// </summary>
+ Abnormal,
+ /// <summary>
+ /// 缂栬緫涓�
+ /// </summary>
+ Editing,
+ /// <summary>
+ /// 鏇存敼浠诲姟绛夌骇寮傚父锛圧CS鏀跺埌鐨勭幇鏈変换鍔℃洿鏀规寚浠ゆ棤娉曟墽琛岋級
+ /// </summary>
+ EditAbnormal,
+ /// <summary>
+ /// 鎵ц寮傚父锛圧CS宸叉敹鍒版柊涓嬪彂鐨勪换鍔′絾鏃犳硶鎵ц锛�
+ /// </summary>
+ ExecutAbnormal,
+ /// <summary>
+ /// 鍙栨秷
+ /// </summary>
+ Cancel,
+ /// <summary>
+ /// 寰呭彇娑�
+ /// </summary>
+ WaitCancel,
+ /// <summary>
+ /// 鍙栨秷寮傚父锛圧CS鏀跺埌鐨勭幇鏈変换鍔″彇娑堟寚浠ゆ棤娉曟墽琛岋級
+ /// </summary>
+ CancelAbnormal,
+ /// <summary>
+ /// 鍙栨秷寰呭洖澶�
+ /// </summary>
+ WaitReply,
+ /// <summary>
+ /// 闃熷垪涓�
+ /// </summary>
+ Queue,
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/TaskEnum/AGVTaskTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/TaskEnum/AGVTaskTypeEnum.cs"
new file mode 100644
index 0000000..f232c6f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/TaskEnum/AGVTaskTypeEnum.cs"
@@ -0,0 +1,39 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace WIDESEA_Common
+{
+ public enum AGVTaskTypeEnum
+ {
+ /// <summary>
+ /// 閫佹弧鏂欐灦
+ /// </summary>
+ SendFull = 1,
+ /// <summary>
+ /// 鍙栫┖鏂欐灦
+ /// </summary>
+ TakeEmpty = 2,
+ /// <summary>
+ /// 缁勭洏鍏ュ簱
+ /// </summary>
+ [Description("缁勭洏鍏ュ簱")]
+ TaskType_Inbound = 3,
+ /// <summary>
+ /// 鎼繍
+ /// </summary>
+ [Description("鎼繍")]
+ TaskType_Outbound = 4,
+ /// <summary>
+ /// 璋冩嫧鍏ュ簱
+ /// </summary>
+ [Description("璋冩嫧鍏ュ簱")]
+ TaskType_AllotInbound = 5,
+ /// <summary>
+ /// 璋冩嫧鍑哄簱
+ /// </summary>
+ [Description("璋冩嫧鍑哄簱")]
+ TaskType_AllotOutbound = 6,
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/TaskNo/IdenxManager.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/TaskNo/IdenxManager.cs"
new file mode 100644
index 0000000..78793ac
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/TaskNo/IdenxManager.cs"
@@ -0,0 +1,48 @@
+锘縰sing FreeSql;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.FreeDB;
+
+namespace WIDESEA_Comm.TaskNo
+{
+ public class IdenxManager
+ {
+ static FreeDB freeDB = new FreeDB();
+ private static object lock_obj = new object();
+
+ /// <summary>
+ /// 鑾峰彇浠诲姟缂栧彿
+ /// </summary>
+ /// <param name="first">鏍囪澶村湴鍧�</param>
+ /// <param name="numType">缂栧彿绫诲瀷</param>
+ /// <returns></returns>
+ public static string GetTaskNo(string first = "", string numType = "WMS")
+ {
+ lock (lock_obj)
+ {
+ var taskno = freeDB.DataBase.Ado.QuerySingle<int>("select taskno from dt_task_num where numtype=@numtype", new { numType });
+
+ //鍫嗗灈鏈轰换鍔″彿澶勭悊
+ if (numType == "WMS")
+ {
+ //闄愬埗鏈�灏忓拰鏈�澶у��
+ if (taskno < 1000 || taskno >= 100000)
+ {
+ taskno = 1000;
+ }
+ else
+ {
+ taskno++;
+ }
+ }
+
+ freeDB.DataBase.Ado.ExecuteNonQuery("update dt_task_num set taskno=@taskno where numtype=@numtype", new { numType, taskno });
+ return first + taskno;
+ }
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/WIDESEA_Comm.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/WIDESEA_Comm.csproj"
index ec43002..e75e3fc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/WIDESEA_Comm.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Comm/WIDESEA_Comm.csproj"
@@ -12,6 +12,7 @@
<ItemGroup>
<ProjectReference Include="..\WIDESEA_Core\WIDESEA_Core.csproj" />
+ <ProjectReference Include="..\WIDESEA_System\WIDESEA_System.csproj" />
</ItemGroup>
</Project>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Core/Infrastructure/DictionaryHandler.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Core/Infrastructure/DictionaryHandler.cs"
index fa5dc69..b4c97f2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Core/Infrastructure/DictionaryHandler.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Core/Infrastructure/DictionaryHandler.cs"
@@ -24,19 +24,36 @@
switch (dicNo)
{
case "roles":
+ originalSql = GetRolesSql(originalSql);
+ break;
//2020.05.24澧炲姞缁戝畾table琛ㄦ椂锛岃幏鍙栨墍鏈夌殑瑙掕壊鍒楄〃
//娉ㄦ剰锛屽鏋滄槸2020.05.24涔嬪墠鑾峰彇鐨勬暟鎹簱鑴氭湰
//璇峰湪鑿滃崟銆愪笅鎷夋缁戝畾璁剧疆銆戞坊鍔犱竴涓瓧鍏哥紪鍙枫�恡_roles銆�,闄や簡瀛楀吀缂栧彿锛屽叾浠栧唴瀹归殢渚垮～鍐�
case "t_roles":
+ originalSql = GetRolesSql();
+ break;
case "tree_roles":
- originalSql = GetRolesSql(originalSql);
break;
default:
break;
}
return originalSql;
}
-
+ /// <summary>
+ /// 2020.05.24澧炲姞缁戝畾table琛ㄦ椂锛岃幏鍙栨墍鏈夌殑瑙掕壊鍒楄〃
+ /// </summary>
+ /// <param name="context"></param>
+ /// <param name="originalSql"></param>
+ /// <returns></returns>
+ public static string GetRolesSql()
+ {
+ if (DBType.Name == DbCurrentType.PgSql.ToString())
+ {
+ return "SELECT \"Role_Id\" as key,\"RoleName\" as value from Sys_Role";
+ }
+ return $@"SELECT Role_Id as 'key',RoleName as 'value' FROM Sys_Role
+ WHERE Enable=1 ";
+ }
/// <summary>
/// 鑾峰彇瑙ｅ喅鐨勬暟鎹簮锛屽彧鑳界湅鍒拌嚜宸变笌涓嬬骇鎵�鏈夎鑹�
/// </summary>
@@ -45,7 +62,7 @@
/// <returns></returns>
public static string GetRolesSql(string originalSql)
{
-
+
if (UserContext.Current.IsSuperAdmin)
{
return originalSql;
@@ -54,15 +71,17 @@
int currnetRoleId = UserContext.Current.RoleId;
List<int> roleIds = RoleContext.GetAllChildrenIds(currnetRoleId);
roleIds.Add(currnetRoleId);
- if (DBType.Name == DbCurrentType.PgSql.ToString())
- {
- originalSql = $"SELECT \"Role_Id\" as key,\"Role_Id\" as id,\"RoleName\" as value,\"ParentId\" AS parentId from Sys_Role"
- +$" where \"Role_Id\" in ({string.Join(',', roleIds)})";
- }
- else {
- originalSql= $@"SELECT Role_Id as 'key',Role_Id AS id,ParentId AS parentId,RoleName as 'value' FROM Sys_Role
- WHERE Enable=1 and Role_Id in ({string.Join(',', roleIds)})";
- }
+ //if (DBType.Name == DbCurrentType.PgSql.ToString())
+ //{
+ // originalSql = $"SELECT \"Role_Id\" as key,\"Role_Id\" as id,\"RoleName\" as value,\"ParentId\" AS parentId from Sys_Role"
+ // +$" where \"Role_Id\" in ({string.Join(',', roleIds)})";
+ //}
+ //else {
+ // originalSql= $@"SELECT Role_Id as 'key',Role_Id AS id,ParentId AS parentId,RoleName as 'value' FROM Sys_Role
+ // WHERE Enable=1 and Role_Id in ({string.Join(',', roleIds)})";
+ //}
+ originalSql = $@"SELECT Role_Id as 'key',RoleName as 'value' FROM Sys_Role
+ WHERE Enable=1 and Role_Id in ({string.Join(',', roleIds)})";
return originalSql;
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/dt_boxing.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/dt_boxing.cs"
new file mode 100644
index 0000000..2198f6b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/dt_boxing.cs"
@@ -0,0 +1,93 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉鏁版嵁搴撳瓧娈靛彂鐢熷彉鍖栵紝璇峰湪浠ｇ爜鐢熷櫒閲嶆柊鐢熸垚姝odel
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Entity.SystemModels;
+
+namespace WIDESEA_Entity.DomainModels
+{
+ [Entity(TableCnName = "缁勭洏淇℃伅",TableName = "dt_boxing")]
+ public partial class dt_boxing:BaseEntity
+ {
+ /// <summary>
+ ///ID
+ /// </summary>
+ [Key]
+ [Display(Name ="ID")]
+ [Column(TypeName="int")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public int ID { get; set; }
+
+ /// <summary>
+ ///缁勭洏鑰�
+ /// </summary>
+ [Display(Name ="缁勭洏鑰�")]
+ [MaxLength(40)]
+ [Column(TypeName="nvarchar(40)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public string boxhead_creator { get; set; }
+
+ /// <summary>
+ ///缁勭洏鏃堕棿
+ /// </summary>
+ [Display(Name ="缁勭洏鏃堕棿")]
+ [Column(TypeName="datetime")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public DateTime boxhead_createtime { get; set; }
+
+ /// <summary>
+ ///缁勭洏鐘舵��
+ /// </summary>
+ [Display(Name ="缁勭洏鐘舵��")]
+ [MaxLength(40)]
+ [Column(TypeName="nvarchar(40)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public string boxdtl_state { get; set; }
+
+ /// <summary>
+ ///缁勭洏鍦板潃
+ /// </summary>
+ [Display(Name ="缁勭洏鍦板潃")]
+ [MaxLength(80)]
+ [Column(TypeName="nvarchar(80)")]
+ [Required(AllowEmptyStrings=false)]
+ public string boxhead_address { get; set; }
+
+ /// <summary>
+ ///SN鍙�
+ /// </summary>
+ [Display(Name ="SN鍙�")]
+ [MaxLength(80)]
+ [Column(TypeName="nvarchar(80)")]
+ [Required(AllowEmptyStrings=false)]
+ public string boxhead_wheelSN { get; set; }
+
+ /// <summary>
+ ///绫诲瀷
+ /// </summary>
+ [Display(Name ="绫诲瀷")]
+ [MaxLength(40)]
+ [Column(TypeName="nvarchar(40)")]
+ public string boxhead_wheeltype { get; set; }
+
+ /// <summary>
+ ///鍚嶇О
+ /// </summary>
+ [Display(Name ="鍚嶇О")]
+ [Column(TypeName="uniqueidentifier")]
+ public Guid? boxdtl_name { get; set; }
+
+
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/dt_boxing_hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/dt_boxing_hty.cs"
new file mode 100644
index 0000000..feb2539
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/dt_boxing_hty.cs"
@@ -0,0 +1,101 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉鏁版嵁搴撳瓧娈靛彂鐢熷彉鍖栵紝璇峰湪浠ｇ爜鐢熷櫒閲嶆柊鐢熸垚姝odel
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Entity.SystemModels;
+
+namespace WIDESEA_Entity.DomainModels
+{
+ [Entity(TableCnName = "缁勭洏鍘嗗彶淇℃伅",TableName = "dt_boxing_hty")]
+ public partial class dt_boxing_hty:BaseEntity
+ {
+ /// <summary>
+ ///ID
+ /// </summary>
+ [Key]
+ [Display(Name ="ID")]
+ [Column(TypeName="int")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public int ID { get; set; }
+
+ /// <summary>
+ ///缁勭洏鑰�
+ /// </summary>
+ [Display(Name ="缁勭洏鑰�")]
+ [MaxLength(40)]
+ [Column(TypeName="nvarchar(40)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public string boxhead_creator { get; set; }
+
+ /// <summary>
+ ///缁勭洏鏃堕棿
+ /// </summary>
+ [Display(Name ="缁勭洏鏃堕棿")]
+ [Column(TypeName="datetime")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public DateTime boxhead_createtime { get; set; }
+
+ /// <summary>
+ ///缁勭洏鐘舵��
+ /// </summary>
+ [Display(Name ="缁勭洏鐘舵��")]
+ [MaxLength(40)]
+ [Column(TypeName="nvarchar(40)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public string boxdtl_state { get; set; }
+
+ /// <summary>
+ ///缁勭洏瀹屾垚鏃堕棿
+ /// </summary>
+ [Display(Name ="缁勭洏瀹屾垚鏃堕棿")]
+ [Column(TypeName="datetime")]
+ [Editable(true)]
+ public DateTime? boxhead_lastdatetime { get; set; }
+
+ /// <summary>
+ ///缁勭洏鍦板潃
+ /// </summary>
+ [Display(Name ="缁勭洏鍦板潃")]
+ [MaxLength(80)]
+ [Column(TypeName="nvarchar(80)")]
+ [Required(AllowEmptyStrings=false)]
+ public string boxhead_address { get; set; }
+
+ /// <summary>
+ ///SN鍙�
+ /// </summary>
+ [Display(Name ="SN鍙�")]
+ [MaxLength(80)]
+ [Column(TypeName="nvarchar(80)")]
+ [Required(AllowEmptyStrings=false)]
+ public string boxhead_wheelSN { get; set; }
+
+ /// <summary>
+ ///绫诲瀷
+ /// </summary>
+ [Display(Name ="绫诲瀷")]
+ [MaxLength(40)]
+ [Column(TypeName="nvarchar(40)")]
+ public string boxhead_wheeltype { get; set; }
+
+ /// <summary>
+ ///鍚嶇О
+ /// </summary>
+ [Display(Name ="鍚嶇О")]
+ [Column(TypeName="uniqueidentifier")]
+ public Guid? boxdtl_name { get; set; }
+
+
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/partial/dt_boxing.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/partial/dt_boxing.cs"
new file mode 100644
index 0000000..95e1d51
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/partial/dt_boxing.cs"
@@ -0,0 +1,21 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉鏁版嵁搴撳瓧娈靛彂鐢熷彉鍖栵紝璇峰湪浠ｇ爜鐢熷櫒閲嶆柊鐢熸垚姝odel
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Entity.SystemModels;
+
+namespace WIDESEA_Entity.DomainModels
+{
+
+ public partial class dt_boxing
+ {
+ //姝ゅ閰嶇疆瀛楁(瀛楁閰嶇疆瑙佹model鐨勫彟涓�涓猵artial),濡傛灉琛ㄤ腑娌℃湁姝ゅ瓧娈佃鍔犱笂 [NotMapped]灞炴�э紝鍚﹀垯浼氬紓甯�
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/partial/dt_boxing_hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/partial/dt_boxing_hty.cs"
new file mode 100644
index 0000000..2c442be
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Boxing/partial/dt_boxing_hty.cs"
@@ -0,0 +1,21 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉鏁版嵁搴撳瓧娈靛彂鐢熷彉鍖栵紝璇峰湪浠ｇ爜鐢熷櫒閲嶆柊鐢熸垚姝odel
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Entity.SystemModels;
+
+namespace WIDESEA_Entity.DomainModels
+{
+
+ public partial class dt_boxing_hty
+ {
+ //姝ゅ閰嶇疆瀛楁(瀛楁閰嶇疆瑙佹model鐨勫彟涓�涓猵artial),濡傛灉琛ㄤ腑娌℃湁姝ゅ瓧娈佃鍔犱笂 [NotMapped]灞炴�э紝鍚﹀垯浼氬紓甯�
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Mes/CBJPDA.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Mes/CBJPDA.cs"
new file mode 100644
index 0000000..a82812a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Mes/CBJPDA.cs"
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WIDESEA_Entity.DomainModels.Mes
+{
+ public class PADRequest
+ {
+ /// <summary>
+ /// 杈婇亾绾跨紪鍙�
+ /// </summary>
+ public string code { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏绫诲瀷
+ /// </summary>
+ public string palletCode { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Mes/HCJManage.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Mes/HCJManage.cs"
new file mode 100644
index 0000000..1d92834
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Mes/HCJManage.cs"
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WIDESEA_Entity.DomainModels.Mes
+{
+ public class HCJManage
+ {
+ /// <summary>
+ /// 缂撳瓨鏋剁紪鍙�
+ /// </summary>
+ public string code { get; set; }
+
+ /// <summary>
+ /// 璇锋眰绫诲瀷 in鍏ユ枡,out鍑烘枡
+ /// </summary>
+ public string requestType { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Mes/MesRequest.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Mes/MesRequest.cs"
new file mode 100644
index 0000000..af59d2d
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Mes/MesRequest.cs"
@@ -0,0 +1,42 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WIDESEA_Entity.DomainModels.Mes
+{
+ public class MesRequest
+ {
+ /// <summary>
+ /// Mes瀵瑰簲鐨勮澶囩紪鍙�
+ /// </summary>
+ public string EqMesCode { get; set; }
+
+ /// <summary>
+ /// 涓婃枡銆恑n銆戜笅鏂欍�恛ut銆�
+ /// </summary>
+ public string RequestType { get; set; }
+ }
+
+ public class MesRequestTemp
+ {
+ /// <summary>
+ /// 鐗╂枡绫诲瀷 閾濈當銆侀摐绠�
+ /// </summary>
+ public string Type { get; set; }
+
+ /// <summary>
+ /// 鎻愬崌鏈哄尯鍩� 姝ｆ瀬銆佽礋鏋�
+ /// </summary>
+ public string TiArea { get; set; }
+
+ /// <summary>
+ /// 璧峰鍦板潃
+ /// </summary>
+ public string from_address { get; set; }
+
+ /// <summary>
+ /// 鐩殑鍦板潃
+ /// </summary>
+ public string to_address { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/Dt_Interfacerecord.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/Dt_Interfacerecord.cs"
new file mode 100644
index 0000000..9e25d60
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/Dt_Interfacerecord.cs"
@@ -0,0 +1,111 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉鏁版嵁搴撳瓧娈靛彂鐢熷彉鍖栵紝璇峰湪浠ｇ爜鐢熷櫒閲嶆柊鐢熸垚姝odel
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Entity;
+using WIDESEA_Entity.SystemModels;
+
+namespace WIDESEA_Entity.DomainModels
+{
+ [Entity(TableCnName = "鎺ュ彛鏁版嵁璁板綍琛�", TableName = "Dt_Interfacerecord")]
+ public class Dt_Interfacerecord : BaseEntity
+ {
+ /// <summary>
+ ///涓婚敭
+ /// </summary>
+ [Key]
+ [Display(Name = "涓婚敭")]
+ [Column(TypeName = "uniqueidentifier")]
+ [Required(AllowEmptyStrings = false)]
+ public Guid interface_id { get; set; }
+
+ /// <summary>
+ ///鎴愬姛:澶辫触
+ /// </summary>
+ [Display(Name = "鎴愬姛:澶辫触")]
+ [MaxLength(40)]
+ [Column(TypeName = "nvarchar(40)")]
+ [Required(AllowEmptyStrings = false)]
+ public string interface_type { get; set; }
+
+ /// <summary>
+ ///鎺ュ彈鑰�
+ /// </summary>
+ [Display(Name = "鎺ュ彈鑰�")]
+ [MaxLength(40)]
+ [Column(TypeName = "nvarchar(40)")]
+ [Required(AllowEmptyStrings = false)]
+ public string interface_provide { get; set; }
+
+ /// <summary>
+ ///璇锋眰鑰�
+ /// </summary>
+ [Display(Name = "璇锋眰鑰�")]
+ [MaxLength(40)]
+ [Column(TypeName = "nvarchar(40)")]
+ [Required(AllowEmptyStrings = false)]
+ public string interface_call { get; set; }
+
+ /// <summary>
+ ///璇锋眰鏁版嵁
+ /// </summary>
+ [Display(Name = "璇锋眰鏁版嵁")]
+ [Column(TypeName = "nvarchar(max)")]
+ public string interface_paradata { get; set; }
+
+ /// <summary>
+ ///杩斿洖鏁版嵁
+ /// </summary>
+ [Display(Name = "杩斿洖鏁版嵁")]
+ [Column(TypeName = "nvarchar(max)")]
+ public string interface_returndata { get; set; }
+
+ /// <summary>
+ ///鍒涘缓鏃堕棿
+ /// </summary>
+ [Display(Name = "鍒涘缓鏃堕棿")]
+ [Column(TypeName = "datetime")]
+ [Required(AllowEmptyStrings = false)]
+ public DateTime interface_createtime { get; set; }
+
+ /// <summary>
+ ///鎻忚堪
+ /// </summary>
+ [Display(Name = "鎻忚堪")]
+ [MaxLength(200)]
+ [Column(TypeName = "nvarchar(200)")]
+ public string interface_remark { get; set; }
+
+ /// <summary>
+ ///鎿嶄綔鑰�
+ /// </summary>
+ [Display(Name = "鎿嶄綔鑰�")]
+ [MaxLength(100)]
+ [Column(TypeName = "nvarchar(100)")]
+ [Required(AllowEmptyStrings = false)]
+ public string interface_operator { get; set; }
+
+ /// <summary>
+ ///鎿嶄綔鍚嶇О
+ /// </summary>
+ [Display(Name = "鎿嶄綔鍚嶇О")]
+ [MaxLength(100)]
+ [Column(TypeName = "nvarchar(100)")]
+ [Required(AllowEmptyStrings = false)]
+ public string interface_name { get; set; }
+
+ /// <summary>
+ ///閿欒淇℃伅
+ /// </summary>
+ [Display(Name = "閿欒淇℃伅")]
+ [Column(TypeName = "nvarchar(max)")]
+ public string interface_message { get; set; }
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_areainfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_areainfo.cs"
new file mode 100644
index 0000000..46b36a0
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_areainfo.cs"
@@ -0,0 +1,108 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉鏁版嵁搴撳瓧娈靛彂鐢熷彉鍖栵紝璇峰湪浠ｇ爜鐢熷櫒閲嶆柊鐢熸垚姝odel
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Entity.SystemModels;
+
+namespace WIDESEA_Entity.DomainModels
+{
+ [Entity(TableCnName = "搴撳尯淇℃伅",TableName = "dt_areainfo")]
+ public partial class dt_areainfo:BaseEntity
+ {
+ /// <summary>
+ ///搴撳尯ID
+ /// </summary>
+ [Key]
+ [Display(Name ="搴撳尯ID")]
+ [Column(TypeName="int")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public int area_code { get; set; }
+
+ /// <summary>
+ ///鍚嶇О
+ /// </summary>
+ [Display(Name ="鍚嶇О")]
+ [MaxLength(50)]
+ [Column(TypeName="nvarchar(50)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public string area_name { get; set; }
+
+ /// <summary>
+ ///鎻忚堪
+ /// </summary>
+ [Display(Name ="鎻忚堪")]
+ [MaxLength(250)]
+ [Column(TypeName="nvarchar(250)")]
+ [Editable(true)]
+ public string area_des { get; set; }
+
+ /// <summary>
+ ///鍒涘缓鑰�
+ /// </summary>
+ [Display(Name ="鍒涘缓鑰�")]
+ [MaxLength(20)]
+ [Column(TypeName="nvarchar(20)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public string area_creator { get; set; }
+
+ /// <summary>
+ ///鍒涘缓鏃堕棿
+ /// </summary>
+ [Display(Name ="鍒涘缓鏃堕棿")]
+ [Column(TypeName="datetime")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public DateTime area_datetime { get; set; }
+
+ /// <summary>
+ ///缁戝畾绫诲瀷
+ /// </summary>
+ [Display(Name ="缁戝畾绫诲瀷")]
+ [MaxLength(100)]
+ [Column(TypeName="nvarchar(100)")]
+ [Required(AllowEmptyStrings=false)]
+ public string area_bindType { get; set; }
+
+ /// <summary>
+ ///鏈�澶ф暟閲�
+ /// </summary>
+ [Display(Name ="鏈�澶ф暟閲�")]
+ [Column(TypeName="int")]
+ public int? area_max { get; set; }
+
+ /// <summary>
+ ///鏈�灏忔暟閲�
+ /// </summary>
+ [Display(Name ="鏈�灏忔暟閲�")]
+ [Column(TypeName="int")]
+ public int? area_minimum { get; set; }
+
+ /// <summary>
+ ///澶囩敤鍖�1
+ /// </summary>
+ [Display(Name ="澶囩敤鍖�1")]
+ [MaxLength(50)]
+ [Column(TypeName="nvarchar(50)")]
+ public string area_spare1 { get; set; }
+
+ /// <summary>
+ ///澶囩敤鍖�2
+ /// </summary>
+ [Display(Name ="澶囩敤鍖�2")]
+ [MaxLength(50)]
+ [Column(TypeName="nvarchar(50)")]
+ public string area_spare2 { get; set; }
+
+
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_inventory.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_inventory.cs"
new file mode 100644
index 0000000..39d05f2
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_inventory.cs"
@@ -0,0 +1,117 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉鏁版嵁搴撳瓧娈靛彂鐢熷彉鍖栵紝璇峰湪浠ｇ爜鐢熷櫒閲嶆柊鐢熸垚姝odel
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Entity.SystemModels;
+
+namespace WIDESEA_Entity.DomainModels
+{
+ [Entity(TableCnName = "搴撳瓨鏌ヨ",TableName = "dt_inventory")]
+ public partial class dt_inventory:BaseEntity
+ {
+ /// <summary>
+ ///杞﹁疆SN鍙�
+ /// </summary>
+ [Display(Name ="杞﹁疆SN鍙�")]
+ [MaxLength(255)]
+ [Column(TypeName="nvarchar(255)")]
+ [Editable(true)]
+ public string SN { get; set; }
+
+ /// <summary>
+ ///浜у搧鍚嶇О
+ /// </summary>
+ [Display(Name ="浜у搧鍚嶇О")]
+ [MaxLength(255)]
+ [Column(TypeName="nvarchar(255)")]
+ [Editable(true)]
+ public string Name { get; set; }
+
+ /// <summary>
+ ///浜у搧鍥惧彿
+ /// </summary>
+ [Display(Name ="浜у搧鍥惧彿")]
+ [MaxLength(255)]
+ [Column(TypeName="nvarchar(255)")]
+ [Editable(true)]
+ public string FigureNumber { get; set; }
+
+ /// <summary>
+ ///鐔旂偧鐐夊彿
+ /// </summary>
+ [Display(Name ="鐔旂偧鐐夊彿")]
+ [MaxLength(255)]
+ [Column(TypeName="varchar(255)")]
+ [Editable(true)]
+ public string HearthNumber { get; set; }
+
+ /// <summary>
+ ///鐐変唬鍙�
+ /// </summary>
+ [Display(Name ="鐐変唬鍙�")]
+ [MaxLength(50)]
+ [Column(TypeName="nvarchar(50)")]
+ [Editable(true)]
+ public string HeatNumber { get; set; }
+
+ /// <summary>
+ ///閽㈠澂鍙�
+ /// </summary>
+ [Display(Name ="閽㈠澂鍙�")]
+ [Column(TypeName="int")]
+ [Editable(true)]
+ public int? BilletNumber { get; set; }
+
+ /// <summary>
+ ///鍏ュ簱鏃堕棿
+ /// </summary>
+ [Display(Name ="鍏ュ簱鏃堕棿")]
+ [Column(TypeName="datetime")]
+ [Editable(true)]
+ public DateTime? OnlineTime { get; set; }
+
+ /// <summary>
+ ///鎿嶄綔浜哄憳
+ /// </summary>
+ [Display(Name ="鎿嶄綔浜哄憳")]
+ [MaxLength(50)]
+ [Column(TypeName="nvarchar(50)")]
+ [Editable(true)]
+ public string Operator { get; set; }
+
+ /// <summary>
+ ///鎻忚堪
+ /// </summary>
+ [Display(Name ="鎻忚堪")]
+ [Column(TypeName="nvarchar(max)")]
+ [Editable(true)]
+ public string remark { get; set; }
+
+ /// <summary>
+ ///ID
+ /// </summary>
+ [Key]
+ [Display(Name ="ID")]
+ [Column(TypeName="int")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public int ID { get; set; }
+
+ /// <summary>
+ ///璐т綅缂栧彿
+ /// </summary>
+ [Display(Name ="璐т綅缂栧彿")]
+ [MaxLength(30)]
+ [Column(TypeName="nvarchar(30)")]
+ public string stationCode { get; set; }
+
+
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_materielinfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_materielinfo.cs"
new file mode 100644
index 0000000..43ab686
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_materielinfo.cs"
@@ -0,0 +1,328 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉鏁版嵁搴撳瓧娈靛彂鐢熷彉鍖栵紝璇峰湪浠ｇ爜鐢熷櫒閲嶆柊鐢熸垚姝odel
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Entity.SystemModels;
+
+namespace WIDESEA_Entity.DomainModels
+{
+ [Entity(TableCnName = "鐗╂枡淇℃伅",TableName = "dt_materielinfo")]
+ public partial class dt_materielinfo:BaseEntity
+ {
+ /// <summary>
+ ///涓婚敭
+ /// </summary>
+ [Display(Name ="涓婚敭")]
+ [Column(TypeName="uniqueidentifier")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public Guid materiel_pkid { get; set; }
+
+ /// <summary>
+ ///鐗╂枡id
+ /// </summary>
+ [Display(Name ="鐗╂枡id")]
+ [MaxLength(100)]
+ [Column(TypeName="nvarchar(100)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public string materiel_id { get; set; }
+
+ /// <summary>
+ ///鎵�灞炲簱鍖�
+ /// </summary>
+ [Display(Name ="鎵�灞炲簱鍖�")]
+ [Column(TypeName="int")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public int materiel_areaid { get; set; }
+
+ /// <summary>
+ ///鐗╂枡鍚嶇О
+ /// </summary>
+ [Display(Name ="鐗╂枡鍚嶇О")]
+ [MaxLength(200)]
+ [Column(TypeName="nvarchar(200)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public string materiel_name { get; set; }
+
+ /// <summary>
+ ///鐗╂枡淇℃伅鎻忚堪
+ /// </summary>
+ [Display(Name ="鐗╂枡淇℃伅鎻忚堪")]
+ [MaxLength(200)]
+ [Column(TypeName="nvarchar(200)")]
+ [Editable(true)]
+ public string materiel_desc { get; set; }
+
+ /// <summary>
+ ///鍖呰瑙勬牸
+ /// </summary>
+ [Display(Name ="鍖呰瑙勬牸")]
+ [MaxLength(20)]
+ [Column(TypeName="nvarchar(20)")]
+ [Editable(true)]
+ public string materiel_packspes { get; set; }
+
+ /// <summary>
+ ///褰撳墠鐘舵��
+ /// </summary>
+ [Display(Name ="褰撳墠鐘舵��")]
+ [MaxLength(20)]
+ [Column(TypeName="nvarchar(20)")]
+ [Editable(true)]
+ public string materiel_state { get; set; }
+
+ /// <summary>
+ ///鐗╂枡绫诲瀷
+ /// </summary>
+ [Display(Name ="鐗╂枡绫诲瀷")]
+ [MaxLength(20)]
+ [Column(TypeName="nvarchar(20)")]
+ [Editable(true)]
+ public string materiel_type { get; set; }
+
+ /// <summary>
+ ///璁￠噺鍗曚綅
+ /// </summary>
+ [Display(Name ="璁￠噺鍗曚綅")]
+ [MaxLength(10)]
+ [Column(TypeName="nvarchar(10)")]
+ [Editable(true)]
+ public string materiel_unit { get; set; }
+
+ /// <summary>
+ ///鏈�灏忓寘瑁�
+ /// </summary>
+ [Display(Name ="鏈�灏忓寘瑁�")]
+ [DisplayFormat(DataFormatString="18,2")]
+ [Column(TypeName="decimal")]
+ [Editable(true)]
+ public decimal? materiel_minpack_qty { get; set; }
+
+ /// <summary>
+ ///鐢熶骇鍟�
+ /// </summary>
+ [Display(Name ="鐢熶骇鍟�")]
+ [MaxLength(40)]
+ [Column(TypeName="nvarchar(40)")]
+ [Editable(true)]
+ public string materiel_mfacturer { get; set; }
+
+ /// <summary>
+ ///渚涘簲鍟�
+ /// </summary>
+ [Display(Name ="渚涘簲鍟�")]
+ [MaxLength(40)]
+ [Column(TypeName="nvarchar(40)")]
+ [Editable(true)]
+ public string materiel_supplier { get; set; }
+
+ /// <summary>
+ ///鍑�閲�
+ /// </summary>
+ [Display(Name ="鍑�閲�")]
+ [DisplayFormat(DataFormatString="18,2")]
+ [Column(TypeName="decimal")]
+ [Editable(true)]
+ public decimal? materiel_netweight { get; set; }
+
+ /// <summary>
+ ///姣涢噸
+ /// </summary>
+ [Display(Name ="姣涢噸")]
+ [DisplayFormat(DataFormatString="18,2")]
+ [Column(TypeName="decimal")]
+ [Editable(true)]
+ public decimal? materiel_grossweight { get; set; }
+
+ /// <summary>
+ ///鏈夋晥鏈�
+ /// </summary>
+ [Display(Name ="鏈夋晥鏈�")]
+ [Column(TypeName="int")]
+ [Editable(true)]
+ public int? materiel_validity { get; set; }
+
+ /// <summary>
+ ///瀹夊叏搴撳瓨
+ /// </summary>
+ [Display(Name ="瀹夊叏搴撳瓨")]
+ [DisplayFormat(DataFormatString="18,2")]
+ [Column(TypeName="decimal")]
+ [Editable(true)]
+ public decimal? materiel_safety { get; set; }
+
+ /// <summary>
+ ///鍒涘缓鑰�
+ /// </summary>
+ [Display(Name ="鍒涘缓鑰�")]
+ [MaxLength(20)]
+ [Column(TypeName="nvarchar(20)")]
+ [Editable(true)]
+ public string materiel_creator { get; set; }
+
+ /// <summary>
+ ///鍒涘缓鏃堕棿
+ /// </summary>
+ [Display(Name ="鍒涘缓鏃堕棿")]
+ [Column(TypeName="datetime")]
+ [Editable(true)]
+ public DateTime? materiel_createtime { get; set; }
+
+ /// <summary>
+ ///澶囨敞
+ /// </summary>
+ [Display(Name ="澶囨敞")]
+ [MaxLength(100)]
+ [Column(TypeName="nvarchar(100)")]
+ [Editable(true)]
+ public string materiel_remark { get; set; }
+
+ /// <summary>
+ ///閲囪喘绫诲瀷
+ /// </summary>
+ [Display(Name ="閲囪喘绫诲瀷")]
+ [MaxLength(20)]
+ [Column(TypeName="nvarchar(20)")]
+ [Editable(true)]
+ public string materiel_purchaseType { get; set; }
+
+ /// <summary>
+ ///鑻辨枃鎻忚堪
+ /// </summary>
+ [Display(Name ="鑻辨枃鎻忚堪")]
+ [MaxLength(200)]
+ [Column(TypeName="nvarchar(200)")]
+ [Editable(true)]
+ public string materiel_englishdesc { get; set; }
+
+ /// <summary>
+ ///鐗╂枡缁�
+ /// </summary>
+ [Display(Name ="鐗╂枡缁�")]
+ [MaxLength(20)]
+ [Column(TypeName="varchar(20)")]
+ [Editable(true)]
+ public string materiel_materielGroup { get; set; }
+
+ /// <summary>
+ ///浜у搧缁�
+ /// </summary>
+ [Display(Name ="浜у搧缁�")]
+ [MaxLength(20)]
+ [Column(TypeName="varchar(20)")]
+ [Editable(true)]
+ public string materiel_productGroup { get; set; }
+
+ /// <summary>
+ ///澶у皬/閲忕翰
+ /// </summary>
+ [Display(Name ="澶у皬/閲忕翰")]
+ [MaxLength(20)]
+ [Column(TypeName="nvarchar(20)")]
+ [Editable(true)]
+ public string materiel_size { get; set; }
+
+ /// <summary>
+ ///MRP绫诲瀷
+ /// </summary>
+ [Display(Name ="MRP绫诲瀷")]
+ [MaxLength(20)]
+ [Column(TypeName="nvarchar(20)")]
+ [Editable(true)]
+ public string materiel_mrpType { get; set; }
+
+ /// <summary>
+ ///杩芥函鏍囪瘑
+ /// </summary>
+ [Display(Name ="杩芥函鏍囪瘑")]
+ [MaxLength(20)]
+ [Column(TypeName="varchar(20)")]
+ [Editable(true)]
+ public string materiel_traceabilityCode { get; set; }
+
+ /// <summary>
+ ///鐗╂枡闀�
+ /// </summary>
+ [Display(Name ="鐗╂枡闀�")]
+ [DisplayFormat(DataFormatString="18,2")]
+ [Column(TypeName="decimal")]
+ [Editable(true)]
+ public decimal? materiel_long { get; set; }
+
+ /// <summary>
+ ///鐗╂枡瀹�
+ /// </summary>
+ [Display(Name ="鐗╂枡瀹�")]
+ [DisplayFormat(DataFormatString="18,2")]
+ [Column(TypeName="decimal")]
+ [Editable(true)]
+ public decimal? materiel_width { get; set; }
+
+ /// <summary>
+ ///鐗╂枡楂�
+ /// </summary>
+ [Display(Name ="鐗╂枡楂�")]
+ [DisplayFormat(DataFormatString="18,2")]
+ [Column(TypeName="decimal")]
+ [Editable(true)]
+ public decimal? materiel_height { get; set; }
+
+ /// <summary>
+ ///鎵樼洏闀�
+ /// </summary>
+ [Display(Name ="鎵樼洏闀�")]
+ [DisplayFormat(DataFormatString="18,2")]
+ [Column(TypeName="decimal")]
+ [Editable(true)]
+ public decimal? materiel_palletlong { get; set; }
+
+ /// <summary>
+ ///鎵樼洏瀹�
+ /// </summary>
+ [Display(Name ="鎵樼洏瀹�")]
+ [DisplayFormat(DataFormatString="18,2")]
+ [Column(TypeName="decimal")]
+ [Editable(true)]
+ public decimal? materiel_palletwidth { get; set; }
+
+ /// <summary>
+ ///鎵樼洏楂�
+ /// </summary>
+ [Display(Name ="鎵樼洏楂�")]
+ [DisplayFormat(DataFormatString="18,2")]
+ [Column(TypeName="decimal")]
+ [Editable(true)]
+ public decimal? materiel_palletheight { get; set; }
+
+ /// <summary>
+ ///搴撳瓨鍦扮偣
+ /// </summary>
+ [Display(Name ="搴撳瓨鍦扮偣")]
+ [MaxLength(20)]
+ [Column(TypeName="nvarchar(20)")]
+ [Editable(true)]
+ public string materiel_location { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ [Key]
+ [Display(Name ="ID")]
+ [Column(TypeName="int")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public int ID { get; set; }
+
+
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs"
index 4009dc4..96fd1b7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/dt_stationinfo.cs"
@@ -13,7 +13,7 @@
namespace WIDESEA_Entity.DomainModels
{
- [Entity(TableCnName = "绔欑偣鏌ヨ",TableName = "dt_stationinfo")]
+ [Entity(TableCnName = "搴撲綅淇℃伅",TableName = "dt_stationinfo")]
public partial class dt_stationinfo:BaseEntity
{
/// <summary>
@@ -50,6 +50,7 @@
[MaxLength(15)]
[Column(TypeName="nvarchar(15)")]
[Editable(true)]
+ [Required(AllowEmptyStrings=false)]
public string area { get; set; }
/// <summary>
@@ -58,7 +59,8 @@
[Display(Name ="鏄惁鍚敤")]
[Column(TypeName="bit")]
[Editable(true)]
- public bool? enable { get; set; }
+ [Required(AllowEmptyStrings=false)]
+ public bool enable { get; set; }
/// <summary>
///璐т綅鐘舵��
@@ -78,6 +80,43 @@
public DateTime? lastUpdateTime { get; set; }
/// <summary>
+ ///杞﹁疆鏁伴噺
+ /// </summary>
+ [Display(Name ="杞﹁疆鏁伴噺")]
+ [Column(TypeName="int")]
+ public int? quantity { get; set; }
+
+ /// <summary>
+ ///杞﹁疆SN鍙�
+ /// </summary>
+ [Display(Name ="杞﹁疆SN鍙�")]
+ [MaxLength(500)]
+ [Column(TypeName="nvarchar(500)")]
+ public string bindSN { get; set; }
+
+ /// <summary>
+ ///鎵樼洏鐘舵��
+ /// </summary>
+ [Display(Name ="鎵樼洏鐘舵��")]
+ [MaxLength(100)]
+ [Column(TypeName="nvarchar(100)")]
+ public string tray_status { get; set; }
+
+ /// <summary>
+ ///琛�
+ /// </summary>
+ [Display(Name ="琛�")]
+ [Column(TypeName="int")]
+ public int? line { get; set; }
+
+ /// <summary>
+ ///鍒�
+ /// </summary>
+ [Display(Name ="鍒�")]
+ [Column(TypeName="int")]
+ public int? column { get; set; }
+
+ /// <summary>
///澶囨敞
/// </summary>
[Display(Name ="澶囨敞")]
@@ -87,39 +126,6 @@
public string remark { get; set; }
/// <summary>
- ///winfrom鏇存柊鐨勭姸鎬�
- /// </summary>
- [Display(Name ="winfrom鏇存柊鐨勭姸鎬�")]
- [Column(TypeName="int")]
- [Editable(true)]
- public int? getStatus { get; set; }
-
- /// <summary>
- ///winfrom鏈�鍚庢洿鏂扮殑鏃堕棿
- /// </summary>
- [Display(Name ="winfrom鏈�鍚庢洿鏂扮殑鏃堕棿")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- public DateTime? getLastTime { get; set; }
-
- /// <summary>
- ///鎺掑簭
- /// </summary>
- [Display(Name ="鎺掑簭")]
- [Column(TypeName="int")]
- [Editable(true)]
- public int? sort { get; set; }
-
- /// <summary>
- ///缁戝畾鍙瓨鏀剧墿鏂欑被鍨�
- /// </summary>
- [Display(Name ="缁戝畾鍙瓨鏀剧墿鏂欑被鍨�")]
- [MaxLength(500)]
- [Column(TypeName="nvarchar(500)")]
- [Editable(true)]
- public string bindType { get; set; }
-
- /// <summary>
///涓婚敭
/// </summary>
[Key]
@@ -128,6 +134,21 @@
[Required(AllowEmptyStrings=false)]
public int zj { get; set; }
+ /// <summary>
+ ///宸ュ崟缂栧彿
+ /// </summary>
+ [Display(Name ="宸ュ崟缂栧彿")]
+ [MaxLength(255)]
+ [Column(TypeName="nvarchar(255)")]
+ public string Number { get; set; }
+
+ /// <summary>
+ ///鐐夊彿
+ /// </summary>
+ [Display(Name ="鐐夊彿")]
+ [Column(TypeName="int")]
+ public int? heatNumber { get; set; }
+
}
}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_areainfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_areainfo.cs"
new file mode 100644
index 0000000..c4017d1
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_areainfo.cs"
@@ -0,0 +1,21 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉鏁版嵁搴撳瓧娈靛彂鐢熷彉鍖栵紝璇峰湪浠ｇ爜鐢熷櫒閲嶆柊鐢熸垚姝odel
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Entity.SystemModels;
+
+namespace WIDESEA_Entity.DomainModels
+{
+
+ public partial class dt_areainfo
+ {
+ //姝ゅ閰嶇疆瀛楁(瀛楁閰嶇疆瑙佹model鐨勫彟涓�涓猵artial),濡傛灉琛ㄤ腑娌℃湁姝ゅ瓧娈佃鍔犱笂 [NotMapped]灞炴�э紝鍚﹀垯浼氬紓甯�
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_inventory.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_inventory.cs"
new file mode 100644
index 0000000..3e9d13f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_inventory.cs"
@@ -0,0 +1,21 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉鏁版嵁搴撳瓧娈靛彂鐢熷彉鍖栵紝璇峰湪浠ｇ爜鐢熷櫒閲嶆柊鐢熸垚姝odel
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Entity.SystemModels;
+
+namespace WIDESEA_Entity.DomainModels
+{
+
+ public partial class dt_inventory
+ {
+ //姝ゅ閰嶇疆瀛楁(瀛楁閰嶇疆瑙佹model鐨勫彟涓�涓猵artial),濡傛灉琛ㄤ腑娌℃湁姝ゅ瓧娈佃鍔犱笂 [NotMapped]灞炴�э紝鍚﹀垯浼氬紓甯�
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_materielinfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_materielinfo.cs"
new file mode 100644
index 0000000..fd6ffab
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/System/partial/dt_materielinfo.cs"
@@ -0,0 +1,21 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉鏁版嵁搴撳瓧娈靛彂鐢熷彉鍖栵紝璇峰湪浠ｇ爜鐢熷櫒閲嶆柊鐢熸垚姝odel
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Entity.SystemModels;
+
+namespace WIDESEA_Entity.DomainModels
+{
+
+ public partial class dt_materielinfo
+ {
+ //姝ゅ閰嶇疆瀛楁(瀛楁閰嶇疆瑙佹model鐨勫彟涓�涓猵artial),濡傛灉琛ㄤ腑娌℃湁姝ゅ瓧娈佃鍔犱笂 [NotMapped]灞炴�э紝鍚﹀垯浼氬紓甯�
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask.cs"
index a9ed19b..3000592 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask.cs"
@@ -13,215 +13,213 @@
namespace WIDESEA_Entity.DomainModels
{
- [Entity(TableCnName = "AGV浠诲姟",TableName = "dt_agvtask")]
- public partial class dt_agvtask:BaseEntity
+ [Entity(TableCnName = "AGV浠诲姟", TableName = "dt_agvtask")]
+ public partial class dt_agvtask : BaseEntity
{
/// <summary>
- ///浠诲姟Id
- /// </summary>
- [Display(Name ="浠诲姟Id")]
- [Column(TypeName="uniqueidentifier")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public Guid agv_id { get; set; }
+ ///浠诲姟Id
+ /// </summary>
+ [Key]
+ [Display(Name = "浠诲姟Id")]
+ [Column(TypeName = "uniqueidentifier")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public Guid agv_id { get; set; }
- /// <summary>
- ///浠诲姟缂栧彿
- /// </summary>
- [Display(Name ="浠诲姟缂栧彿")]
- [MaxLength(50)]
- [Column(TypeName="nvarchar(50)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_tasknum { get; set; }
+ /// <summary>
+ ///浠诲姟缂栧彿
+ /// </summary>
+ [Display(Name = "浠诲姟缂栧彿")]
+ [MaxLength(50)]
+ [Column(TypeName = "nvarchar(50)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public string agv_tasknum { get; set; }
- /// <summary>
- ///璧风偣鍦板潃
- /// </summary>
- [Display(Name ="璧风偣鍦板潃")]
- [MaxLength(50)]
- [Column(TypeName="nvarchar(50)")]
- [Editable(true)]
- public string agv_fromaddress { get; set; }
+ /// <summary>
+ ///璧风偣鍦板潃
+ /// </summary>
+ [Display(Name = "璧风偣鍦板潃")]
+ [MaxLength(50)]
+ [Column(TypeName = "nvarchar(50)")]
+ [Editable(true)]
+ public string agv_fromaddress { get; set; }
- /// <summary>
- ///缁堢偣鍦板潃
- /// </summary>
- [Display(Name ="缁堢偣鍦板潃")]
- [MaxLength(50)]
- [Column(TypeName="nvarchar(50)")]
- [Editable(true)]
- public string agv_toaddress { get; set; }
+ /// <summary>
+ ///缁堢偣鍦板潃
+ /// </summary>
+ [Display(Name = "缁堢偣鍦板潃")]
+ [MaxLength(50)]
+ [Column(TypeName = "nvarchar(50)")]
+ [Editable(true)]
+ public string agv_toaddress { get; set; }
- /// <summary>
- ///AGV缂栧彿
- /// </summary>
- [Display(Name ="AGV缂栧彿")]
- [MaxLength(50)]
- [Column(TypeName="nvarchar(50)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_code { get; set; }
+ /// <summary>
+ ///AGV缂栧彿
+ /// </summary>
+ [Display(Name = "AGV缂栧彿")]
+ [MaxLength(50)]
+ [Column(TypeName = "nvarchar(50)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public string agv_code { get; set; }
- /// <summary>
- ///浠诲姟鐘舵��
- /// </summary>
- [Display(Name ="浠诲姟鐘舵��")]
- [MaxLength(20)]
- [Column(TypeName="nvarchar(20)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_taskstate { get; set; }
+ /// <summary>
+ ///浠诲姟鐘舵��
+ /// </summary>
+ [Display(Name = "浠诲姟鐘舵��")]
+ [MaxLength(20)]
+ [Column(TypeName = "nvarchar(20)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public string agv_taskstate { get; set; }
- /// <summary>
- ///AGV宸ヤ綔绫诲瀷
- /// </summary>
- [Display(Name ="AGV宸ヤ綔绫诲瀷")]
- [Column(TypeName="int")]
- [Editable(true)]
- public int? agv_worktype { get; set; }
+ /// <summary>
+ ///AGV宸ヤ綔绫诲瀷
+ /// </summary>
+ [Display(Name = "AGV宸ヤ綔绫诲瀷")]
+ [Column(TypeName = "int")]
+ [Editable(true)]
+ public int? agv_worktype { get; set; }
- /// <summary>
- ///鐗╂枡绫诲瀷
- /// </summary>
- [Display(Name ="鐗╂枡绫诲瀷")]
- [MaxLength(50)]
- [Column(TypeName="nvarchar(50)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_materielid { get; set; }
+ /// <summary>
+ ///鐗╂枡绫诲瀷
+ /// </summary>
+ [Display(Name = "鐗╂枡绫诲瀷")]
+ [MaxLength(50)]
+ [Column(TypeName = "nvarchar(50)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public string agv_materielid { get; set; }
- /// <summary>
- ///鏁伴噺
- /// </summary>
- [Display(Name ="鏁伴噺")]
- [DisplayFormat(DataFormatString="18,2")]
- [Column(TypeName="decimal")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public decimal agv_qty { get; set; }
+ /// <summary>
+ ///鏁伴噺
+ /// </summary>
+ [Display(Name = "鏁伴噺")]
+ [Column(TypeName = "int")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public int? agv_qty { get; set; }
- /// <summary>
- ///鍒涘缓鏃堕棿
- /// </summary>
- [Display(Name ="鍒涘缓鏃堕棿")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public DateTime agv_createtime { get; set; }
+ /// <summary>
+ ///鍒涘缓鏃堕棿
+ /// </summary>
+ [Display(Name = "鍒涘缓鏃堕棿")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public DateTime agv_createtime { get; set; }
- /// <summary>
- ///鎵ц鏃堕棿
- /// </summary>
- [Display(Name ="鎵ц鏃堕棿")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- public DateTime? agv_realesstime { get; set; }
+ /// <summary>
+ ///鎵ц鏃堕棿
+ /// </summary>
+ [Display(Name = "鎵ц鏃堕棿")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ public DateTime? agv_realesstime { get; set; }
- /// <summary>
- ///瀹屾垚鏃堕棿
- /// </summary>
- [Display(Name ="瀹屾垚鏃堕棿")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- public DateTime? agv_finishedtime { get; set; }
+ /// <summary>
+ ///瀹屾垚鏃堕棿
+ /// </summary>
+ [Display(Name = "瀹屾垚鏃堕棿")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ public DateTime? agv_finishedtime { get; set; }
- /// <summary>
- ///浠诲姟绫诲瀷
- /// </summary>
- [Display(Name ="浠诲姟绫诲瀷")]
- [MaxLength(20)]
- [Column(TypeName="nvarchar(20)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_tasktype { get; set; }
+ /// <summary>
+ ///浠诲姟绫诲瀷
+ /// </summary>
+ [Display(Name = "浠诲姟绫诲瀷")]
+ [MaxLength(20)]
+ [Column(TypeName = "nvarchar(20)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public string agv_tasktype { get; set; }
- /// <summary>
- ///澶囨敞
- /// </summary>
- [Display(Name ="澶囨敞")]
- [MaxLength(100)]
- [Column(TypeName="nvarchar(100)")]
- [Editable(true)]
- public string agv_remark { get; set; }
+ /// <summary>
+ ///澶囨敞
+ /// </summary>
+ [Display(Name = "澶囨敞")]
+ [MaxLength(100)]
+ [Column(TypeName = "nvarchar(100)")]
+ [Editable(true)]
+ public string agv_remark { get; set; }
- /// <summary>
- ///浠诲姟绛夌骇
- /// </summary>
- [Display(Name ="浠诲姟绛夌骇")]
- [Column(TypeName="int")]
- [Editable(true)]
- public int? agv_grade { get; set; }
+ /// <summary>
+ ///浠诲姟绛夌骇
+ /// </summary>
+ [Display(Name = "浠诲姟绛夌骇")]
+ [Column(TypeName = "int")]
+ [Editable(true)]
+ public int? agv_grade { get; set; }
- /// <summary>
- ///鍒涘缓鑰�
- /// </summary>
- [Display(Name ="鍒涘缓鑰�")]
- [MaxLength(20)]
- [Column(TypeName="nvarchar(20)")]
- [Editable(true)]
- public string agv_userid { get; set; }
+ /// <summary>
+ ///鍒涘缓鑰�
+ /// </summary>
+ [Display(Name = "鍒涘缓鑰�")]
+ [MaxLength(20)]
+ [Column(TypeName = "nvarchar(20)")]
+ [Editable(true)]
+ public string agv_userid { get; set; }
- /// <summary>
- ///鎵樼洏鐮�
- /// </summary>
- [Display(Name ="鎵樼洏鐮�")]
- [MaxLength(30)]
- [Column(TypeName="nvarchar(30)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_barcode { get; set; }
+ /// <summary>
+ ///鎵樼洏鐮�
+ /// </summary>
+ [Display(Name = "鎵樼洏鐮�")]
+ [MaxLength(30)]
+ [Column(TypeName = "nvarchar(30)")]
+ [Editable(true)]
+ //[Required(AllowEmptyStrings = false)]//涓嶈兘涓虹┖
+ public string agv_barcode { get; set; }
- /// <summary>
- ///鐗╂枡鐮�
- /// </summary>
- [Display(Name ="鐗╂枡鐮�")]
- [MaxLength(50)]
- [Column(TypeName="nvarchar(50)")]
- [Editable(true)]
- public string agv_materbarcode { get; set; }
+ /// <summary>
+ ///鐗╂枡鐮�
+ /// </summary>
+ [Display(Name = "鐗╂枡鐮�")]
+ [MaxLength(50)]
+ [Column(TypeName = "nvarchar(50)")]
+ [Editable(true)]
+ public string agv_materbarcode { get; set; }
- /// <summary>
- ///璧峰鐐规墽琛屼腑
- /// </summary>
- [Display(Name ="璧峰鐐规墽琛屼腑")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- public DateTime? agv_executingBeginTime { get; set; }
+ /// <summary>
+ ///璧峰鐐规墽琛屼腑
+ /// </summary>
+ [Display(Name = "璧峰鐐规墽琛屼腑")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ public DateTime? agv_executingBeginTime { get; set; }
- /// <summary>
- ///璧峰鐐瑰畬鎴�
- /// </summary>
- [Display(Name ="璧峰鐐瑰畬鎴�")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- public DateTime? agv_executingEndTime { get; set; }
+ /// <summary>
+ ///璧峰鐐瑰畬鎴�
+ /// </summary>
+ [Display(Name = "璧峰鐐瑰畬鎴�")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ public DateTime? agv_executingEndTime { get; set; }
- /// <summary>
- ///鐩殑鐐规墽琛屼腑
- /// </summary>
- [Display(Name ="鐩殑鐐规墽琛屼腑")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- public DateTime? agv_completeBeginTime { get; set; }
+ /// <summary>
+ ///鐩殑鐐规墽琛屼腑
+ /// </summary>
+ [Display(Name = "鐩殑鐐规墽琛屼腑")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ public DateTime? agv_completeBeginTime { get; set; }
- /// <summary>
- ///
- /// </summary>
- [Display(Name ="unitag")]
- [Column(TypeName="uniqueidentifier")]
- [Editable(true)]
- public Guid? unitag { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ [Display(Name = "unitag")]
+ [Column(TypeName = "uniqueidentifier")]
+ [Editable(true)]
+ public Guid? unitag { get; set; }
- /// <summary>
- ///涓婚敭
- /// </summary>
- [Key]
- [Display(Name ="涓婚敭")]
- [Column(TypeName="int")]
- [Required(AllowEmptyStrings=false)]
- public int ID { get; set; }
+ /// <summary>
+ ///杞﹁疆SN鍙�
+ /// </summary>
+ [Display(Name = "杞﹁疆SN鍙�")]
+ [MaxLength(500)]
+ [Column(TypeName = "nvarchar(500)")]
+ public string bindSN { get; set; }
-
}
}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask_hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask_hty.cs"
index 2007f2a..7d395a2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask_hty.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/Taskinfo/dt_agvtask_hty.cs"
@@ -13,246 +13,245 @@
namespace WIDESEA_Entity.DomainModels
{
- [Entity(TableCnName = "AGV鍘嗗彶浠诲姟",TableName = "dt_agvtask_hty")]
- public partial class dt_agvtask_hty:BaseEntity
+ [Entity(TableCnName = "AGV鍘嗗彶浠诲姟", TableName = "dt_agvtask_hty")]
+ public partial class dt_agvtask_hty : BaseEntity
{
/// <summary>
- ///鍘嗗彶浠诲姟ID
- /// </summary>
- [Display(Name ="鍘嗗彶浠诲姟ID")]
- [Column(TypeName="uniqueidentifier")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public Guid hty_pkid { get; set; }
+ ///鍘嗗彶浠诲姟ID
+ /// </summary>
+ [Key]
+ [Display(Name = "鍘嗗彶浠诲姟ID")]
+ [Column(TypeName = "uniqueidentifier")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public Guid hty_pkid { get; set; }
- /// <summary>
- ///浠诲姟ID
- /// </summary>
- [Display(Name ="浠诲姟ID")]
- [Column(TypeName="uniqueidentifier")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public Guid agv_id { get; set; }
+ /// <summary>
+ ///浠诲姟ID
+ /// </summary>
+ [Display(Name = "浠诲姟ID")]
+ [Column(TypeName = "uniqueidentifier")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public Guid agv_id { get; set; }
- /// <summary>
- ///浠诲姟缂栧彿
- /// </summary>
- [Display(Name ="浠诲姟缂栧彿")]
- [MaxLength(50)]
- [Column(TypeName="nvarchar(50)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_tasknum { get; set; }
+ /// <summary>
+ ///浠诲姟缂栧彿
+ /// </summary>
+ [Display(Name = "浠诲姟缂栧彿")]
+ [MaxLength(50)]
+ [Column(TypeName = "nvarchar(50)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public string agv_tasknum { get; set; }
- /// <summary>
- ///鐗╂枡绫诲瀷
- /// </summary>
- [Display(Name ="鐗╂枡绫诲瀷")]
- [MaxLength(50)]
- [Column(TypeName="nvarchar(50)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_materielid { get; set; }
+ /// <summary>
+ ///鐗╂枡绫诲瀷
+ /// </summary>
+ [Display(Name = "鐗╂枡绫诲瀷")]
+ [MaxLength(50)]
+ [Column(TypeName = "nvarchar(50)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public string agv_materielid { get; set; }
- /// <summary>
- ///鏁伴噺
- /// </summary>
- [Display(Name ="鏁伴噺")]
- [DisplayFormat(DataFormatString="18,2")]
- [Column(TypeName="decimal")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public decimal agv_qty { get; set; }
+ /// <summary>
+ ///鏁伴噺
+ /// </summary>
+ [Display(Name = "鏁伴噺")]
+ [Column(TypeName = "int")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public int? agv_qty { get; set; }
- /// <summary>
- ///鍒涘缓鏃堕棿
- /// </summary>
- [Display(Name ="鍒涘缓鏃堕棿")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public DateTime agv_createtime { get; set; }
+ /// <summary>
+ ///鍒涘缓鏃堕棿
+ /// </summary>
+ [Display(Name = "鍒涘缓鏃堕棿")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public DateTime agv_createtime { get; set; }
- /// <summary>
- ///鎵ц鏃堕棿
- /// </summary>
- [Display(Name ="鎵ц鏃堕棿")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- public DateTime? agv_realesstime { get; set; }
+ /// <summary>
+ ///鎵ц鏃堕棿
+ /// </summary>
+ [Display(Name = "鎵ц鏃堕棿")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ public DateTime? agv_realesstime { get; set; }
- /// <summary>
- ///瀹屾垚鏃堕棿
- /// </summary>
- [Display(Name ="瀹屾垚鏃堕棿")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- public DateTime? agv_finishedtime { get; set; }
+ /// <summary>
+ ///瀹屾垚鏃堕棿
+ /// </summary>
+ [Display(Name = "瀹屾垚鏃堕棿")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ public DateTime? agv_finishedtime { get; set; }
- /// <summary>
- ///浠诲姟鐘舵��
- /// </summary>
- [Display(Name ="浠诲姟鐘舵��")]
- [MaxLength(20)]
- [Column(TypeName="nvarchar(20)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_taskstate { get; set; }
+ /// <summary>
+ ///浠诲姟鐘舵��
+ /// </summary>
+ [Display(Name = "浠诲姟鐘舵��")]
+ [MaxLength(20)]
+ [Column(TypeName = "nvarchar(20)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public string agv_taskstate { get; set; }
- /// <summary>
- ///浠诲姟绫诲瀷
- /// </summary>
- [Display(Name ="浠诲姟绫诲瀷")]
- [MaxLength(20)]
- [Column(TypeName="nvarchar(20)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_tasktype { get; set; }
+ /// <summary>
+ ///浠诲姟绫诲瀷
+ /// </summary>
+ [Display(Name = "浠诲姟绫诲瀷")]
+ [MaxLength(20)]
+ [Column(TypeName = "nvarchar(20)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public string agv_tasktype { get; set; }
- /// <summary>
- ///璧风偣鍦板潃
- /// </summary>
- [Display(Name ="璧风偣鍦板潃")]
- [MaxLength(50)]
- [Column(TypeName="nvarchar(50)")]
- [Editable(true)]
- public string agv_fromaddress { get; set; }
+ /// <summary>
+ ///璧风偣鍦板潃
+ /// </summary>
+ [Display(Name = "璧风偣鍦板潃")]
+ [MaxLength(50)]
+ [Column(TypeName = "nvarchar(50)")]
+ [Editable(true)]
+ public string agv_fromaddress { get; set; }
- /// <summary>
- ///缁堢偣鍦板潃
- /// </summary>
- [Display(Name ="缁堢偣鍦板潃")]
- [MaxLength(50)]
- [Column(TypeName="nvarchar(50)")]
- [Editable(true)]
- public string agv_toaddress { get; set; }
+ /// <summary>
+ ///缁堢偣鍦板潃
+ /// </summary>
+ [Display(Name = "缁堢偣鍦板潃")]
+ [MaxLength(50)]
+ [Column(TypeName = "nvarchar(50)")]
+ [Editable(true)]
+ public string agv_toaddress { get; set; }
- /// <summary>
- ///鎿嶄綔绫诲瀷
- /// </summary>
- [Display(Name ="鎿嶄綔绫诲瀷")]
- [MaxLength(10)]
- [Column(TypeName="nvarchar(10)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_operatetype { get; set; }
+ /// <summary>
+ ///鎿嶄綔绫诲瀷
+ /// </summary>
+ [Display(Name = "鎿嶄綔绫诲瀷")]
+ [MaxLength(10)]
+ [Column(TypeName = "nvarchar(10)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public string agv_operatetype { get; set; }
- /// <summary>
- ///鎿嶄綔鑰�
- /// </summary>
- [Display(Name ="鎿嶄綔鑰�")]
- [MaxLength(20)]
- [Column(TypeName="nvarchar(20)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_compeletor { get; set; }
+ /// <summary>
+ ///鎿嶄綔鑰�
+ /// </summary>
+ [Display(Name = "鎿嶄綔鑰�")]
+ [MaxLength(20)]
+ [Column(TypeName = "nvarchar(20)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public string agv_compeletor { get; set; }
- /// <summary>
- ///鎿嶄綔鏃堕棿
- /// </summary>
- [Display(Name ="鎿嶄綔鏃堕棿")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public DateTime agv_completedate { get; set; }
+ /// <summary>
+ ///鎿嶄綔鏃堕棿
+ /// </summary>
+ [Display(Name = "鎿嶄綔鏃堕棿")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public DateTime agv_completedate { get; set; }
- /// <summary>
- ///浠诲姟绛夌骇
- /// </summary>
- [Display(Name ="浠诲姟绛夌骇")]
- [Column(TypeName="int")]
- [Editable(true)]
- public int? agv_grade { get; set; }
+ /// <summary>
+ ///浠诲姟绛夌骇
+ /// </summary>
+ [Display(Name = "浠诲姟绛夌骇")]
+ [Column(TypeName = "int")]
+ [Editable(true)]
+ public int? agv_grade { get; set; }
- /// <summary>
- ///鍒涘缓鑰�
- /// </summary>
- [Display(Name ="鍒涘缓鑰�")]
- [MaxLength(20)]
- [Column(TypeName="nvarchar(20)")]
- [Editable(true)]
- public string agv_userid { get; set; }
+ /// <summary>
+ ///鍒涘缓鑰�
+ /// </summary>
+ [Display(Name = "鍒涘缓鑰�")]
+ [MaxLength(20)]
+ [Column(TypeName = "nvarchar(20)")]
+ [Editable(true)]
+ public string agv_userid { get; set; }
- /// <summary>
- ///鎵樼洏鐮�
- /// </summary>
- [Display(Name ="鎵樼洏鐮�")]
- [MaxLength(30)]
- [Column(TypeName="nvarchar(30)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_barcode { get; set; }
+ /// <summary>
+ ///鎵樼洏鐮�
+ /// </summary>
+ [Display(Name = "鎵樼洏鐮�")]
+ [MaxLength(30)]
+ [Column(TypeName = "nvarchar(30)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public string agv_barcode { get; set; }
- /// <summary>
- ///AGV缂栧彿
- /// </summary>
- [Display(Name ="AGV缂栧彿")]
- [MaxLength(50)]
- [Column(TypeName="nvarchar(50)")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public string agv_code { get; set; }
+ /// <summary>
+ ///AGV缂栧彿
+ /// </summary>
+ [Display(Name = "AGV缂栧彿")]
+ [MaxLength(50)]
+ [Column(TypeName = "nvarchar(50)")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public string agv_code { get; set; }
- /// <summary>
- ///AGV宸ヤ綔绫诲瀷
- /// </summary>
- [Display(Name ="AGV宸ヤ綔绫诲瀷")]
- [Column(TypeName="int")]
- [Editable(true)]
- [Required(AllowEmptyStrings=false)]
- public int agv_worktype { get; set; }
+ /// <summary>
+ ///AGV宸ヤ綔绫诲瀷
+ /// </summary>
+ [Display(Name = "AGV宸ヤ綔绫诲瀷")]
+ [Column(TypeName = "int")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings = false)]
+ public int? agv_worktype { get; set; }
- /// <summary>
- ///鐗╂枡鐮�
- /// </summary>
- [Display(Name ="鐗╂枡鐮�")]
- [MaxLength(50)]
- [Column(TypeName="nvarchar(50)")]
- [Editable(true)]
- public string agv_materbarcode { get; set; }
+ /// <summary>
+ ///鐗╂枡鐮�
+ /// </summary>
+ [Display(Name = "鐗╂枡鐮�")]
+ [MaxLength(50)]
+ [Column(TypeName = "nvarchar(50)")]
+ [Editable(true)]
+ public string agv_materbarcode { get; set; }
- /// <summary>
- ///璧峰鐐规墽琛屼腑
- /// </summary>
- [Display(Name ="璧峰鐐规墽琛屼腑")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- public DateTime? agv_executingBeginTime { get; set; }
+ /// <summary>
+ ///璧峰鐐规墽琛屼腑
+ /// </summary>
+ [Display(Name = "璧峰鐐规墽琛屼腑")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ public DateTime? agv_executingBeginTime { get; set; }
- /// <summary>
- ///璧峰鐐瑰畬鎴�
- /// </summary>
- [Display(Name ="璧峰鐐瑰畬鎴�")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- public DateTime? agv_executingEndTime { get; set; }
+ /// <summary>
+ ///璧峰鐐瑰畬鎴�
+ /// </summary>
+ [Display(Name = "璧峰鐐瑰畬鎴�")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ public DateTime? agv_executingEndTime { get; set; }
- /// <summary>
- ///鐩殑鐐规墽琛屼腑
- /// </summary>
- [Display(Name ="鐩殑鐐规墽琛屼腑")]
- [Column(TypeName="datetime")]
- [Editable(true)]
- public DateTime? agv_completeBeginTime { get; set; }
+ /// <summary>
+ ///鐩殑鐐规墽琛屼腑
+ /// </summary>
+ [Display(Name = "鐩殑鐐规墽琛屼腑")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ public DateTime? agv_completeBeginTime { get; set; }
- /// <summary>
- ///澶囨敞
- /// </summary>
- [Display(Name ="澶囨敞")]
- [MaxLength(255)]
- [Column(TypeName="varchar(255)")]
- [Editable(true)]
- public string agv_remark { get; set; }
+ /// <summary>
+ ///澶囨敞
+ /// </summary>
+ [Display(Name = "澶囨敞")]
+ [MaxLength(100)]
+ [Column(TypeName = "nvarchar(100)")]
+ [Editable(true)]
+ public string agv_remark { get; set; }
- /// <summary>
- ///涓婚敭
- /// </summary>
- [Key]
- [Display(Name ="涓婚敭")]
- [Column(TypeName="int")]
- [Required(AllowEmptyStrings=false)]
- public int ID { get; set; }
+ /// <summary>
+ ///杞﹁疆SN鍙�
+ /// </summary>
+ [Display(Name = "杞﹁疆SN鍙�")]
+ [MaxLength(500)]
+ [Column(TypeName = "nvarchar(500)")]
+ public string bindSN { get; set; }
-
+
}
}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/Boxing/dt_boxingMapConfig.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/Boxing/dt_boxingMapConfig.cs"
new file mode 100644
index 0000000..eeadeb8
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/Boxing/dt_boxingMapConfig.cs"
@@ -0,0 +1,16 @@
+using WIDESEA_Entity.MappingConfiguration;
+using WIDESEA_Entity.DomainModels;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace WIDESEA_Entity.MappingConfiguration
+{
+ public class dt_boxingMapConfig : EntityMappingConfiguration<dt_boxing>
+ {
+ public override void Map(EntityTypeBuilder<dt_boxing>
+ builderTable)
+ {
+ //b.Property(x => x.StorageName).HasMaxLength(45);
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/Boxing/dt_boxing_htyMapConfig.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/Boxing/dt_boxing_htyMapConfig.cs"
new file mode 100644
index 0000000..5a258c1
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/Boxing/dt_boxing_htyMapConfig.cs"
@@ -0,0 +1,16 @@
+using WIDESEA_Entity.MappingConfiguration;
+using WIDESEA_Entity.DomainModels;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace WIDESEA_Entity.MappingConfiguration
+{
+ public class dt_boxing_htyMapConfig : EntityMappingConfiguration<dt_boxing_hty>
+ {
+ public override void Map(EntityTypeBuilder<dt_boxing_hty>
+ builderTable)
+ {
+ //b.Property(x => x.StorageName).HasMaxLength(45);
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_areainfoMapConfig.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_areainfoMapConfig.cs"
new file mode 100644
index 0000000..5fc4aa3
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_areainfoMapConfig.cs"
@@ -0,0 +1,16 @@
+using WIDESEA_Entity.MappingConfiguration;
+using WIDESEA_Entity.DomainModels;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace WIDESEA_Entity.MappingConfiguration
+{
+ public class dt_areainfoMapConfig : EntityMappingConfiguration<dt_areainfo>
+ {
+ public override void Map(EntityTypeBuilder<dt_areainfo>
+ builderTable)
+ {
+ //b.Property(x => x.StorageName).HasMaxLength(45);
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_inventoryMapConfig.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_inventoryMapConfig.cs"
new file mode 100644
index 0000000..85017c3
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_inventoryMapConfig.cs"
@@ -0,0 +1,16 @@
+using WIDESEA_Entity.MappingConfiguration;
+using WIDESEA_Entity.DomainModels;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace WIDESEA_Entity.MappingConfiguration
+{
+ public class dt_inventoryMapConfig : EntityMappingConfiguration<dt_inventory>
+ {
+ public override void Map(EntityTypeBuilder<dt_inventory>
+ builderTable)
+ {
+ //b.Property(x => x.StorageName).HasMaxLength(45);
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_materielinfoMapConfig.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_materielinfoMapConfig.cs"
new file mode 100644
index 0000000..308437a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/System/dt_materielinfoMapConfig.cs"
@@ -0,0 +1,16 @@
+using WIDESEA_Entity.MappingConfiguration;
+using WIDESEA_Entity.DomainModels;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace WIDESEA_Entity.MappingConfiguration
+{
+ public class dt_materielinfoMapConfig : EntityMappingConfiguration<dt_materielinfo>
+ {
+ public override void Map(EntityTypeBuilder<dt_materielinfo>
+ builderTable)
+ {
+ //b.Property(x => x.StorageName).HasMaxLength(45);
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/ToAGV/AGVRespone.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/ToAGV/AGVRespone.cs"
new file mode 100644
index 0000000..b2cc9e8
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/ToAGV/AGVRespone.cs"
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Entity.ToAGV
+{
+ public class AGVRespone
+ {
+ /// <summary>
+ /// 1鎴愬姛
+ /// </summary>
+ public int success { get; set; } = 1;
+ /// <summary>
+ /// 澶辫触锛岃繑鍥炲け璐ヤ俊鎭�
+ /// </summary>
+ public string Message { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/ToAGV/RequestTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/ToAGV/RequestTask.cs"
new file mode 100644
index 0000000..5e05756
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/ToAGV/RequestTask.cs"
@@ -0,0 +1,32 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Entity.ToAGV
+{
+ public class RequestTask
+ {
+ /// <summary>
+ /// 浣滀笟浠诲姟鍙�
+ /// </summary>
+ public string TASK_NO { get; set; }
+ /// <summary>
+ /// 璧风偣
+ /// </summary>
+ public string FROM_POSITION { get; set; }
+ /// <summary>
+ /// 缁堢偣
+ /// </summary>
+ public string TO_POSITION { get; set; }
+ /// <summary>
+ /// 鐗╂枡淇℃伅
+ /// </summary>
+ public string Material { get; set; }
+ /// <summary>
+ /// 浠诲姟绛夌骇
+ /// </summary>
+ public int? Priority { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/ToAGV/UpdateTasteInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/ToAGV/UpdateTasteInfo.cs"
new file mode 100644
index 0000000..dbd3f1a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/ToAGV/UpdateTasteInfo.cs"
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Entity.ToAGV
+{
+ public class UpdateTasteInfo
+ {
+ /// <summary>
+ /// 浣滀笟浠诲姟鍙�
+ /// </summary>
+ public string TASK_NO { get; set; }
+ /// <summary>
+ /// 浠诲姟鐘舵��
+ /// </summary>
+ public int TASK_State { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/IRepositories/System/IDt_InterfacerecordRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/IRepositories/System/IDt_InterfacerecordRepository.cs"
new file mode 100644
index 0000000..dc2b19a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/IRepositories/System/IDt_InterfacerecordRepository.cs"
@@ -0,0 +1,18 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶笽Dt_InterfacerecordRepository缂栧啓鎺ュ彛
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Extensions.AutofacManager;
+namespace WIDESEA_Services.IRepositories
+{
+ public partial interface IDt_InterfacerecordRepository : IDependency,IRepository<Dt_Interfacerecord>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/IServices/System/IDt_InterfacerecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/IServices/System/IDt_InterfacerecordService.cs"
new file mode 100644
index 0000000..a53a0e0
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/IServices/System/IDt_InterfacerecordService.cs"
@@ -0,0 +1,12 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ */
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_Services.IServices
+{
+ public partial interface IDt_InterfacerecordService : IService<Dt_Interfacerecord>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/IServices/System/Partial/IDt_InterfacerecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/IServices/System/Partial/IDt_InterfacerecordService.cs"
new file mode 100644
index 0000000..039f208
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/IServices/System/Partial/IDt_InterfacerecordService.cs"
@@ -0,0 +1,13 @@
+/*
+*鎵�鏈夊叧浜嶥t_Interfacerecord绫荤殑涓氬姟浠ｇ爜鎺ュ彛搴斿湪姝ゅ缂栧啓
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+namespace WIDESEA_Services.IServices
+{
+ public partial interface IDt_InterfacerecordService
+ {
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/IServices/System/Partial/ISys_DictionaryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/IServices/System/Partial/ISys_DictionaryService.cs"
index 6278d08..38b2e98 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/IServices/System/Partial/ISys_DictionaryService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/IServices/System/Partial/ISys_DictionaryService.cs"
@@ -12,7 +12,8 @@
/// </summary>
/// <returns></returns>
Task<List<string>> GetBuilderDictionary();
- object GetVueDictionary(string[] dicNos);
+ Task<object> GetVueDictionary(string[] dicNos);
+ //object GetVueDictionary(string[] dicNos);
object GetTableDictionary(Dictionary<string, object[]> keyData);
object GetSearchDictionary(string dicNo, string value);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Repositories/System/Dt_InterfacerecordRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Repositories/System/Dt_InterfacerecordRepository.cs"
new file mode 100644
index 0000000..e739a59
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Repositories/System/Dt_InterfacerecordRepository.cs"
@@ -0,0 +1,24 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶笵t_InterfacerecordRepository缂栧啓浠ｇ爜
+ */
+using WIDESEA_Services.IRepositories;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_Services.Repositories
+{
+ public partial class Dt_InterfacerecordRepository : RepositoryBase<Dt_Interfacerecord> , IDt_InterfacerecordRepository
+ {
+ public Dt_InterfacerecordRepository(VOLContext dbContext)
+ : base(dbContext)
+ {
+
+ }
+ public static IDt_InterfacerecordRepository Instance
+ {
+ get { return AutofacContainerModule.GetService<IDt_InterfacerecordRepository>(); } }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Dt_InterfacerecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Dt_InterfacerecordService.cs"
new file mode 100644
index 0000000..1174350
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Dt_InterfacerecordService.cs"
@@ -0,0 +1,27 @@
+/*
+ *Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,姝ゅ浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *鎵�鏈変笟鍔＄紪鍐欏叏閮ㄥ簲鍦≒artial鏂囦欢澶逛笅Dt_InterfacerecordService涓嶪Dt_InterfacerecordService涓紪鍐�
+ */
+using WIDESEA_Services.IRepositories;
+using WIDESEA_Services.IServices;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_Services.Services
+{
+ public partial class Dt_InterfacerecordService : ServiceBase<Dt_Interfacerecord, IDt_InterfacerecordRepository>, IDt_InterfacerecordService, IDependency
+ {
+ public Dt_InterfacerecordService(IDt_InterfacerecordRepository repository)
+ : base(repository)
+ {
+ Init(repository);
+ }
+ public static IDt_InterfacerecordService Instance
+ {
+ get { return AutofacContainerModule.GetService<IDt_InterfacerecordService>(); }
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Dt_InterfacerecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Dt_InterfacerecordService.cs"
new file mode 100644
index 0000000..2d52e75
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Dt_InterfacerecordService.cs"
@@ -0,0 +1,27 @@
+/*
+ *鎵�鏈夊叧浜嶥t_Interfacerecord绫荤殑涓氬姟浠ｇ爜搴斿湪姝ゅ缂栧啓
+*鍙娇鐢╮epository.璋冪敤甯哥敤鏂规硶锛岃幏鍙朎F/Dapper绛変俊鎭�
+*濡傛灉闇�瑕佷簨鍔¤浣跨敤repository.DbContextBeginTransaction
+*涔熷彲浣跨敤DBServerProvider.鎵嬪姩鑾峰彇鏁版嵁搴撶浉鍏充俊鎭�
+*鐢ㄦ埛淇℃伅銆佹潈闄愩�佽鑹茬瓑浣跨敤UserContext.Current鎿嶄綔
+*Dt_InterfacerecordService瀵瑰銆佸垹銆佹敼鏌ャ�佸鍏ャ�佸鍑恒�佸鏍镐笟鍔′唬鐮佹墿灞曞弬鐓erviceFunFilter
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+using System.Linq;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+using WIDESEA_Core.Extensions;
+using Microsoft.EntityFrameworkCore;
+
+namespace WIDESEA_Services.Services
+{
+ public partial class Dt_InterfacerecordService
+ {
+ public override PageGridData<Dt_Interfacerecord> GetPageData(PageDataOptions pageData)
+ {
+ return base.GetPageData(pageData);
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Sys_DictionaryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Sys_DictionaryService.cs"
index 2c01d13..0fe5aeb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Sys_DictionaryService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Sys_DictionaryService.cs"
@@ -31,17 +31,18 @@
get { return DictionaryManager.Dictionaries; }
}
- public object GetVueDictionary(string[] dicNos)
+ public async Task<object> GetVueDictionary(string[] dicNos)
{
if (dicNos == null || dicNos.Count() == 0) return new string[] { };
- var dicConfig = DictionaryManager.GetDictionaries(dicNos, false).Select(s => new
- {
- dicNo = s.DicNo,
- config = s.Config,
- dbSql = s.DbSql,
- list = s.Sys_DictionaryList.OrderByDescending(o => o.OrderNo)
- .Select(list => new { key = list.DicValue, value = list.DicName })
- }).ToList();
+ var dicConfig = await Task.FromResult(
+ DictionaryManager.GetDictionaries(dicNos, false).Select(s => new
+ {
+ dicNo = s.DicNo,
+ config = s.Config,
+ dbSql = s.DbSql,
+ list = s.Sys_DictionaryList.OrderByDescending(o => o.OrderNo)
+ .Select(list => new { key = list.DicValue, value = list.DicName })
+ }).ToList());
object GetSourceData(string dicNo, string dbSql, object data)
{
@@ -61,6 +62,36 @@
}).ToList();
}
+ //public object GetVueDictionary(string[] dicNos)
+ //{
+ // if (dicNos == null || dicNos.Count() == 0) return new string[] { };
+ // var dicConfig = DictionaryManager.GetDictionaries(dicNos, false).Select(s => new
+ // {
+ // dicNo = s.DicNo,
+ // config = s.Config,
+ // dbSql = s.DbSql,
+ // list = s.Sys_DictionaryList.OrderByDescending(o => o.OrderNo)
+ // .Select(list => new { key = list.DicValue, value = list.DicName })
+ // }).ToList();
+
+ // object GetSourceData(string dicNo, string dbSql, object data)
+ // {
+ // // 2020.05.01澧炲姞鏍规嵁鐢ㄦ埛淇℃伅鍔犺浇瀛楀吀鏁版嵁婧恠ql
+ // dbSql = DictionaryHandler.GetCustomDBSql(dicNo, dbSql);
+ // if (string.IsNullOrEmpty(dbSql))
+ // {
+ // return data as object;
+ // }
+ // return repository.DapperContext.QueryList<object>(dbSql, null);
+ // }
+ // return dicConfig.Select(item => new
+ // {
+ // item.dicNo,
+ // item.config,
+ // data = GetSourceData(item.dicNo, item.dbSql, item.list)
+ // }).ToList();
+ //}
+
/// <summary>
/// 閫氳繃杩滅▼鎼滅储
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/WIDESEA_System.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/WIDESEA_System.csproj"
index 4e35d9b..60c5d77 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/WIDESEA_System.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/WIDESEA_System.csproj"
@@ -26,7 +26,6 @@
<ItemGroup>
<Folder Include="IRepositories\System\" />
- <Folder Include="IServices\System\" />
</ItemGroup>
<ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/Task.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/Task.cs"
new file mode 100644
index 0000000..4233123
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/Task.cs"
@@ -0,0 +1,58 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Comm;
+using WIDESEA_Common;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_WMS.Repositories;
+
+namespace WIDESEA_WMS
+{
+ public class Task
+ {
+ /// <summary>
+ /// 娣诲姞鍘嗗彶浠诲姟
+ /// </summary>
+ /// <param name="task">浠诲姟</param>
+ /// <param name="operatetype">鎿嶄綔绫诲瀷</param>
+ public static void AddHtyTask(dt_agvtask task, string operatetype = "Complete", string compeletor = "AGV")
+ {
+ VOLContext context = new VOLContext();
+ Idt_agvtask_htyRepository htyRepository = new dt_agvtask_htyRepository(context);
+ Idt_agvtaskRepository repository = new dt_agvtaskRepository(context);
+ dt_agvtask_hty agvtask_Hty = new dt_agvtask_hty()
+ {
+ hty_pkid = Guid.NewGuid(),
+ agv_id = Guid.Empty,
+ agv_tasknum = task.agv_tasknum,
+ agv_materielid = task.agv_materielid,
+ agv_qty = task.agv_qty,
+ agv_createtime = task.agv_createtime,
+ agv_realesstime = task.agv_realesstime,
+ agv_executingBeginTime = task.agv_executingBeginTime,
+ agv_executingEndTime = task.agv_executingEndTime,
+ agv_completeBeginTime = task.agv_completeBeginTime,
+ agv_finishedtime = DateTime.Now,
+ agv_taskstate = task.agv_taskstate,
+ agv_tasktype = task.agv_tasktype,
+ agv_fromaddress = task.agv_fromaddress,
+ agv_toaddress = task.agv_toaddress,
+ agv_operatetype = operatetype,
+ agv_compeletor = compeletor,
+ agv_completedate = DateTime.Now,
+ agv_grade = task.agv_grade,
+ agv_userid = task.agv_userid,
+ agv_barcode = task.agv_barcode,
+ agv_code = task.agv_code,
+ agv_worktype = task.agv_worktype,
+ agv_remark = task.agv_remark
+ };
+ htyRepository.Add(agvtask_Hty, true);
+ repository.Delete(task, true);
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/Boxing/Idt_boxingRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/Boxing/Idt_boxingRepository.cs"
new file mode 100644
index 0000000..c51cb48
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/Boxing/Idt_boxingRepository.cs"
@@ -0,0 +1,18 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶笽dt_boxingRepository缂栧啓鎺ュ彛
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Extensions.AutofacManager;
+namespace WIDESEA_WMS.IRepositories
+{
+ public partial interface Idt_boxingRepository : IDependency,IRepository<dt_boxing>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/Boxing/Idt_boxing_htyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/Boxing/Idt_boxing_htyRepository.cs"
new file mode 100644
index 0000000..108f242
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/Boxing/Idt_boxing_htyRepository.cs"
@@ -0,0 +1,18 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶笽dt_boxing_htyRepository缂栧啓鎺ュ彛
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Extensions.AutofacManager;
+namespace WIDESEA_WMS.IRepositories
+{
+ public partial interface Idt_boxing_htyRepository : IDependency,IRepository<dt_boxing_hty>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_areainfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_areainfoRepository.cs"
new file mode 100644
index 0000000..b9202ac
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_areainfoRepository.cs"
@@ -0,0 +1,18 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶笽dt_areainfoRepository缂栧啓鎺ュ彛
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Extensions.AutofacManager;
+namespace WIDESEA_WMS.IRepositories
+{
+ public partial interface Idt_areainfoRepository : IDependency,IRepository<dt_areainfo>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_inventoryRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_inventoryRepository.cs"
new file mode 100644
index 0000000..7b80504
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_inventoryRepository.cs"
@@ -0,0 +1,18 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶笽dt_inventoryRepository缂栧啓鎺ュ彛
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Extensions.AutofacManager;
+namespace WIDESEA_WMS.IRepositories
+{
+ public partial interface Idt_inventoryRepository : IDependency,IRepository<dt_inventory>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_materielinfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_materielinfoRepository.cs"
new file mode 100644
index 0000000..293010f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/system/Idt_materielinfoRepository.cs"
@@ -0,0 +1,18 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶笽dt_materielinfoRepository缂栧啓鎺ュ彛
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Extensions.AutofacManager;
+namespace WIDESEA_WMS.IRepositories
+{
+ public partial interface Idt_materielinfoRepository : IDependency,IRepository<dt_materielinfo>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Idt_boxingService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Idt_boxingService.cs"
new file mode 100644
index 0000000..23a8204
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Idt_boxingService.cs"
@@ -0,0 +1,12 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ */
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_boxingService : IService<dt_boxing>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Idt_boxing_htyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Idt_boxing_htyService.cs"
new file mode 100644
index 0000000..076fd6e
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Idt_boxing_htyService.cs"
@@ -0,0 +1,12 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ */
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_boxing_htyService : IService<dt_boxing_hty>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Partial/Idt_boxingService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Partial/Idt_boxingService.cs"
new file mode 100644
index 0000000..7f578ec
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Partial/Idt_boxingService.cs"
@@ -0,0 +1,13 @@
+/*
+*鎵�鏈夊叧浜巇t_boxing绫荤殑涓氬姟浠ｇ爜鎺ュ彛搴斿湪姝ゅ缂栧啓
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_boxingService
+ {
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Partial/Idt_boxing_htyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Partial/Idt_boxing_htyService.cs"
new file mode 100644
index 0000000..b82e3c8
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/Boxing/Partial/Idt_boxing_htyService.cs"
@@ -0,0 +1,13 @@
+/*
+*鎵�鏈夊叧浜巇t_boxing_hty绫荤殑涓氬姟浠ｇ爜鎺ュ彛搴斿湪姝ゅ缂栧啓
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_boxing_htyService
+ {
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_areainfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_areainfoService.cs"
new file mode 100644
index 0000000..569545d
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_areainfoService.cs"
@@ -0,0 +1,12 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ */
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_areainfoService : IService<dt_areainfo>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_inventoryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_inventoryService.cs"
new file mode 100644
index 0000000..530a577
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_inventoryService.cs"
@@ -0,0 +1,12 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ */
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_inventoryService : IService<dt_inventory>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_materielinfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_materielinfoService.cs"
new file mode 100644
index 0000000..7f89a42
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Idt_materielinfoService.cs"
@@ -0,0 +1,12 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ */
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_materielinfoService : IService<dt_materielinfo>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_areainfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_areainfoService.cs"
new file mode 100644
index 0000000..6a1da6a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_areainfoService.cs"
@@ -0,0 +1,13 @@
+/*
+*鎵�鏈夊叧浜巇t_areainfo绫荤殑涓氬姟浠ｇ爜鎺ュ彛搴斿湪姝ゅ缂栧啓
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_areainfoService
+ {
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_inventoryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_inventoryService.cs"
new file mode 100644
index 0000000..7b7ba0b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_inventoryService.cs"
@@ -0,0 +1,13 @@
+/*
+*鎵�鏈夊叧浜巇t_inventory绫荤殑涓氬姟浠ｇ爜鎺ュ彛搴斿湪姝ゅ缂栧啓
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_inventoryService
+ {
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_materielinfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_materielinfoService.cs"
new file mode 100644
index 0000000..7a59825
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/system/Partial/Idt_materielinfoService.cs"
@@ -0,0 +1,13 @@
+/*
+*鎵�鏈夊叧浜巇t_materielinfo绫荤殑涓氬姟浠ｇ爜鎺ュ彛搴斿湪姝ゅ缂栧啓
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_materielinfoService
+ {
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/Boxing/dt_boxingRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/Boxing/dt_boxingRepository.cs"
new file mode 100644
index 0000000..dc00f8a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/Boxing/dt_boxingRepository.cs"
@@ -0,0 +1,24 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶筪t_boxingRepository缂栧啓浠ｇ爜
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Repositories
+{
+ public partial class dt_boxingRepository : RepositoryBase<dt_boxing> , Idt_boxingRepository
+ {
+ public dt_boxingRepository(VOLContext dbContext)
+ : base(dbContext)
+ {
+
+ }
+ public static Idt_boxingRepository Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_boxingRepository>(); } }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/Boxing/dt_boxing_htyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/Boxing/dt_boxing_htyRepository.cs"
new file mode 100644
index 0000000..46204b8
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/Boxing/dt_boxing_htyRepository.cs"
@@ -0,0 +1,24 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶筪t_boxing_htyRepository缂栧啓浠ｇ爜
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Repositories
+{
+ public partial class dt_boxing_htyRepository : RepositoryBase<dt_boxing_hty> , Idt_boxing_htyRepository
+ {
+ public dt_boxing_htyRepository(VOLContext dbContext)
+ : base(dbContext)
+ {
+
+ }
+ public static Idt_boxing_htyRepository Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_boxing_htyRepository>(); } }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_areainfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_areainfoRepository.cs"
new file mode 100644
index 0000000..aaad607
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_areainfoRepository.cs"
@@ -0,0 +1,24 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶筪t_areainfoRepository缂栧啓浠ｇ爜
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Repositories
+{
+ public partial class dt_areainfoRepository : RepositoryBase<dt_areainfo> , Idt_areainfoRepository
+ {
+ public dt_areainfoRepository(VOLContext dbContext)
+ : base(dbContext)
+ {
+
+ }
+ public static Idt_areainfoRepository Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_areainfoRepository>(); } }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_inventoryRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_inventoryRepository.cs"
new file mode 100644
index 0000000..959ed4e
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_inventoryRepository.cs"
@@ -0,0 +1,24 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶筪t_inventoryRepository缂栧啓浠ｇ爜
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Repositories
+{
+ public partial class dt_inventoryRepository : RepositoryBase<dt_inventory> , Idt_inventoryRepository
+ {
+ public dt_inventoryRepository(VOLContext dbContext)
+ : base(dbContext)
+ {
+
+ }
+ public static Idt_inventoryRepository Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_inventoryRepository>(); } }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_materielinfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_materielinfoRepository.cs"
new file mode 100644
index 0000000..cef5db1
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/system/dt_materielinfoRepository.cs"
@@ -0,0 +1,24 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶筪t_materielinfoRepository缂栧啓浠ｇ爜
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Repositories
+{
+ public partial class dt_materielinfoRepository : RepositoryBase<dt_materielinfo> , Idt_materielinfoRepository
+ {
+ public dt_materielinfoRepository(VOLContext dbContext)
+ : base(dbContext)
+ {
+
+ }
+ public static Idt_materielinfoRepository Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_materielinfoRepository>(); } }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/Partial/dt_boxingService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/Partial/dt_boxingService.cs"
new file mode 100644
index 0000000..f0b7219
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/Partial/dt_boxingService.cs"
@@ -0,0 +1,41 @@
+/*
+ *鎵�鏈夊叧浜巇t_boxing绫荤殑涓氬姟浠ｇ爜搴斿湪姝ゅ缂栧啓
+*鍙娇鐢╮epository.璋冪敤甯哥敤鏂规硶锛岃幏鍙朎F/Dapper绛変俊鎭�
+*濡傛灉闇�瑕佷簨鍔¤浣跨敤repository.DbContextBeginTransaction
+*涔熷彲浣跨敤DBServerProvider.鎵嬪姩鑾峰彇鏁版嵁搴撶浉鍏充俊鎭�
+*鐢ㄦ埛淇℃伅銆佹潈闄愩�佽鑹茬瓑浣跨敤UserContext.Current鎿嶄綔
+*dt_boxingService瀵瑰銆佸垹銆佹敼鏌ャ�佸鍏ャ�佸鍑恒�佸鏍镐笟鍔′唬鐮佹墿灞曞弬鐓erviceFunFilter
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+using System.Linq;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+using WIDESEA_Core.Extensions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_WMS.IRepositories;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_boxingService
+ {
+ private readonly IHttpContextAccessor _httpContextAccessor;
+ private readonly Idt_boxingRepository _repository;//璁块棶鏁版嵁搴�
+
+ [ActivatorUtilitiesConstructor]
+ public dt_boxingService(
+ Idt_boxingRepository dbRepository,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(dbRepository)
+ {
+ _httpContextAccessor = httpContextAccessor;
+ _repository = dbRepository;
+ //澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
+ //base.Init(dbRepository);
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/Partial/dt_boxing_htyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/Partial/dt_boxing_htyService.cs"
new file mode 100644
index 0000000..82fc176
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/Partial/dt_boxing_htyService.cs"
@@ -0,0 +1,41 @@
+/*
+ *鎵�鏈夊叧浜巇t_boxing_hty绫荤殑涓氬姟浠ｇ爜搴斿湪姝ゅ缂栧啓
+*鍙娇鐢╮epository.璋冪敤甯哥敤鏂规硶锛岃幏鍙朎F/Dapper绛変俊鎭�
+*濡傛灉闇�瑕佷簨鍔¤浣跨敤repository.DbContextBeginTransaction
+*涔熷彲浣跨敤DBServerProvider.鎵嬪姩鑾峰彇鏁版嵁搴撶浉鍏充俊鎭�
+*鐢ㄦ埛淇℃伅銆佹潈闄愩�佽鑹茬瓑浣跨敤UserContext.Current鎿嶄綔
+*dt_boxing_htyService瀵瑰銆佸垹銆佹敼鏌ャ�佸鍏ャ�佸鍑恒�佸鏍镐笟鍔′唬鐮佹墿灞曞弬鐓erviceFunFilter
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+using System.Linq;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+using WIDESEA_Core.Extensions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_WMS.IRepositories;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_boxing_htyService
+ {
+ private readonly IHttpContextAccessor _httpContextAccessor;
+ private readonly Idt_boxing_htyRepository _repository;//璁块棶鏁版嵁搴�
+
+ [ActivatorUtilitiesConstructor]
+ public dt_boxing_htyService(
+ Idt_boxing_htyRepository dbRepository,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(dbRepository)
+ {
+ _httpContextAccessor = httpContextAccessor;
+ _repository = dbRepository;
+ //澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
+ //base.Init(dbRepository);
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/dt_boxingService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/dt_boxingService.cs"
new file mode 100644
index 0000000..ce0bc0b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/dt_boxingService.cs"
@@ -0,0 +1,27 @@
+/*
+ *Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,姝ゅ浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *鎵�鏈変笟鍔＄紪鍐欏叏閮ㄥ簲鍦≒artial鏂囦欢澶逛笅dt_boxingService涓嶪dt_boxingService涓紪鍐�
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_WMS.IServices;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_boxingService : ServiceBase<dt_boxing, Idt_boxingRepository>
+ , Idt_boxingService, IDependency
+ {
+ public dt_boxingService(Idt_boxingRepository repository)
+ : base(repository)
+ {
+ Init(repository);
+ }
+ public static Idt_boxingService Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_boxingService>(); } }
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/dt_boxing_htyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/dt_boxing_htyService.cs"
new file mode 100644
index 0000000..6e98d79
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Boxing/dt_boxing_htyService.cs"
@@ -0,0 +1,27 @@
+/*
+ *Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,姝ゅ浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *鎵�鏈変笟鍔＄紪鍐欏叏閮ㄥ簲鍦≒artial鏂囦欢澶逛笅dt_boxing_htyService涓嶪dt_boxing_htyService涓紪鍐�
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_WMS.IServices;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_boxing_htyService : ServiceBase<dt_boxing_hty, Idt_boxing_htyRepository>
+ , Idt_boxing_htyService, IDependency
+ {
+ public dt_boxing_htyService(Idt_boxing_htyRepository repository)
+ : base(repository)
+ {
+ Init(repository);
+ }
+ public static Idt_boxing_htyService Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_boxing_htyService>(); } }
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Taskinfo/Partial/dt_agvtaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Taskinfo/Partial/dt_agvtaskService.cs"
index 304ecfa..93a35a3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Taskinfo/Partial/dt_agvtaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/Taskinfo/Partial/dt_agvtaskService.cs"
@@ -17,6 +17,13 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.AspNetCore.Http;
using WIDESEA_WMS.IRepositories;
+using WIDESEA_WMS.Repositories;
+using WIDESEA_Core.EFDbContext;
+using static System.Collections.Specialized.BitVector32;
+using WIDESEA_Comm.TaskNo;
+using WIDESEA_Common;
+using WIDESEA_Core.ManageUser;
+using WIDESEA_Comm.LogInfo;
namespace WIDESEA_WMS.Services
{
@@ -37,5 +44,60 @@
//澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
//base.Init(dbRepository);
}
- }
+ /// <summary>
+ /// 娣诲姞浠诲姟
+ /// </summary>
+ /// <param name="saveDataModel"></param>
+ /// <returns></returns>
+ public override WebResponseContent Add(SaveModel saveDataModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ VOLContext context = new VOLContext();
+ Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(context);
+ var fromaddress = saveDataModel.MainData["agv_fromaddress"].ToString();
+ var toaddress = saveDataModel.MainData["agv_toaddress"].ToString();
+ var tasktype = saveDataModel.MainData["agv_tasktype"].ToString();
+ var grade = saveDataModel.MainData["agv_grade"].ToInt();
+ var station1 = stationinfoRepository.FindFirst(x => x.stationCode == fromaddress);
+ var station2 = stationinfoRepository.FindFirst(x => x.stationCode == toaddress);
+ if (station1 == null || station2 == null)
+ throw new Exception($"璧风偣鍦板潃{fromaddress}鎴栫粓鐐瑰湴鍧�{toaddress}涓嶅瓨鍦紒");
+ if (string.IsNullOrEmpty(station1.stationType))
+ throw new Exception($"璧风偣{fromaddress}鏈粦瀹氱墿鏂欑被鍨嬶紒");
+ var task = _repository.Find(t => t.agv_fromaddress == fromaddress
+ || t.agv_fromaddress == toaddress
+ || t.agv_toaddress == fromaddress
+ || t.agv_toaddress == toaddress
+ ).Any();
+ if (task)
+ throw new Exception("璧峰鎴栫洰鐨勫湴鍧�锛屽凡瀛樺湪浠诲姟涓紒");
+ dt_agvtask agvtask = new dt_agvtask();
+ agvtask.agv_id = Guid.NewGuid();
+ agvtask.agv_fromaddress = fromaddress;
+ agvtask.agv_toaddress = toaddress;
+ agvtask.agv_tasknum = IdenxManager.GetTaskNo("KH-");
+ agvtask.agv_code = "AGV";
+ agvtask.agv_taskstate = AGVTaskStateEnum.Create.ToString();
+ agvtask.agv_tasktype = tasktype;
+ agvtask.agv_worktype = 1;//宸ヤ綔绫诲瀷
+ agvtask.agv_materielid = station1.stationType;//鐗╂枡绫诲瀷
+ agvtask.agv_qty = station1.quantity;
+ agvtask.agv_createtime = DateTime.Now;
+ agvtask.agv_grade = grade;//浠诲姟浼樺厛绾�
+ agvtask.agv_userid = UserContext.Current.UserName;
+ _repository.Add(agvtask, true);
+ content.OK();
+ WriteDBLog.Success($"鎵嬪姩娣诲姞浠诲姟", new { 鏁版嵁 = saveDataModel }, "WMS", UserContext.Current.UserName);
+ }
+ catch (Exception ex)
+ {
+ WriteDBLog.Error($"鎵嬪姩娣诲姞浠诲姟", new { 鏁版嵁 = saveDataModel, 寮傚父淇℃伅 = ex.Message }, "WMS", UserContext.Current.UserName);
+ content.Error(ex.Message);
+ }
+
+ return content;
+ }
+ }
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_areainfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_areainfoService.cs"
new file mode 100644
index 0000000..db3e67c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_areainfoService.cs"
@@ -0,0 +1,41 @@
+/*
+ *鎵�鏈夊叧浜巇t_areainfo绫荤殑涓氬姟浠ｇ爜搴斿湪姝ゅ缂栧啓
+*鍙娇鐢╮epository.璋冪敤甯哥敤鏂规硶锛岃幏鍙朎F/Dapper绛変俊鎭�
+*濡傛灉闇�瑕佷簨鍔¤浣跨敤repository.DbContextBeginTransaction
+*涔熷彲浣跨敤DBServerProvider.鎵嬪姩鑾峰彇鏁版嵁搴撶浉鍏充俊鎭�
+*鐢ㄦ埛淇℃伅銆佹潈闄愩�佽鑹茬瓑浣跨敤UserContext.Current鎿嶄綔
+*dt_areainfoService瀵瑰銆佸垹銆佹敼鏌ャ�佸鍏ャ�佸鍑恒�佸鏍镐笟鍔′唬鐮佹墿灞曞弬鐓erviceFunFilter
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+using System.Linq;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+using WIDESEA_Core.Extensions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_WMS.IRepositories;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_areainfoService
+ {
+ private readonly IHttpContextAccessor _httpContextAccessor;
+ private readonly Idt_areainfoRepository _repository;//璁块棶鏁版嵁搴�
+
+ [ActivatorUtilitiesConstructor]
+ public dt_areainfoService(
+ Idt_areainfoRepository dbRepository,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(dbRepository)
+ {
+ _httpContextAccessor = httpContextAccessor;
+ _repository = dbRepository;
+ //澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
+ //base.Init(dbRepository);
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_inventoryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_inventoryService.cs"
new file mode 100644
index 0000000..a893838
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_inventoryService.cs"
@@ -0,0 +1,41 @@
+/*
+ *鎵�鏈夊叧浜巇t_inventory绫荤殑涓氬姟浠ｇ爜搴斿湪姝ゅ缂栧啓
+*鍙娇鐢╮epository.璋冪敤甯哥敤鏂规硶锛岃幏鍙朎F/Dapper绛変俊鎭�
+*濡傛灉闇�瑕佷簨鍔¤浣跨敤repository.DbContextBeginTransaction
+*涔熷彲浣跨敤DBServerProvider.鎵嬪姩鑾峰彇鏁版嵁搴撶浉鍏充俊鎭�
+*鐢ㄦ埛淇℃伅銆佹潈闄愩�佽鑹茬瓑浣跨敤UserContext.Current鎿嶄綔
+*dt_inventoryService瀵瑰銆佸垹銆佹敼鏌ャ�佸鍏ャ�佸鍑恒�佸鏍镐笟鍔′唬鐮佹墿灞曞弬鐓erviceFunFilter
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+using System.Linq;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+using WIDESEA_Core.Extensions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_WMS.IRepositories;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_inventoryService
+ {
+ private readonly IHttpContextAccessor _httpContextAccessor;
+ private readonly Idt_inventoryRepository _repository;//璁块棶鏁版嵁搴�
+
+ [ActivatorUtilitiesConstructor]
+ public dt_inventoryService(
+ Idt_inventoryRepository dbRepository,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(dbRepository)
+ {
+ _httpContextAccessor = httpContextAccessor;
+ _repository = dbRepository;
+ //澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
+ //base.Init(dbRepository);
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_materielinfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_materielinfoService.cs"
new file mode 100644
index 0000000..2b7a8ab
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_materielinfoService.cs"
@@ -0,0 +1,41 @@
+/*
+ *鎵�鏈夊叧浜巇t_materielinfo绫荤殑涓氬姟浠ｇ爜搴斿湪姝ゅ缂栧啓
+*鍙娇鐢╮epository.璋冪敤甯哥敤鏂规硶锛岃幏鍙朎F/Dapper绛変俊鎭�
+*濡傛灉闇�瑕佷簨鍔¤浣跨敤repository.DbContextBeginTransaction
+*涔熷彲浣跨敤DBServerProvider.鎵嬪姩鑾峰彇鏁版嵁搴撶浉鍏充俊鎭�
+*鐢ㄦ埛淇℃伅銆佹潈闄愩�佽鑹茬瓑浣跨敤UserContext.Current鎿嶄綔
+*dt_materielinfoService瀵瑰銆佸垹銆佹敼鏌ャ�佸鍏ャ�佸鍑恒�佸鏍镐笟鍔′唬鐮佹墿灞曞弬鐓erviceFunFilter
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+using System.Linq;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+using WIDESEA_Core.Extensions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_WMS.IRepositories;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_materielinfoService
+ {
+ private readonly IHttpContextAccessor _httpContextAccessor;
+ private readonly Idt_materielinfoRepository _repository;//璁块棶鏁版嵁搴�
+
+ [ActivatorUtilitiesConstructor]
+ public dt_materielinfoService(
+ Idt_materielinfoRepository dbRepository,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(dbRepository)
+ {
+ _httpContextAccessor = httpContextAccessor;
+ _repository = dbRepository;
+ //澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
+ //base.Init(dbRepository);
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
index 6bfdcaa..4b4f70c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/Partial/dt_stationinfoService.cs"
@@ -37,5 +37,10 @@
//澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
//base.Init(dbRepository);
}
- }
+ public override WebResponseContent Add(SaveModel saveDataModel)
+ {
+
+ return base.Add(saveDataModel);
+ }
+ }
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_areainfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_areainfoService.cs"
new file mode 100644
index 0000000..3644749
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_areainfoService.cs"
@@ -0,0 +1,27 @@
+/*
+ *Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,姝ゅ浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *鎵�鏈変笟鍔＄紪鍐欏叏閮ㄥ簲鍦≒artial鏂囦欢澶逛笅dt_areainfoService涓嶪dt_areainfoService涓紪鍐�
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_WMS.IServices;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_areainfoService : ServiceBase<dt_areainfo, Idt_areainfoRepository>
+ , Idt_areainfoService, IDependency
+ {
+ public dt_areainfoService(Idt_areainfoRepository repository)
+ : base(repository)
+ {
+ Init(repository);
+ }
+ public static Idt_areainfoService Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_areainfoService>(); } }
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_inventoryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_inventoryService.cs"
new file mode 100644
index 0000000..e613f40
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_inventoryService.cs"
@@ -0,0 +1,27 @@
+/*
+ *Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,姝ゅ浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *鎵�鏈変笟鍔＄紪鍐欏叏閮ㄥ簲鍦≒artial鏂囦欢澶逛笅dt_inventoryService涓嶪dt_inventoryService涓紪鍐�
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_WMS.IServices;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_inventoryService : ServiceBase<dt_inventory, Idt_inventoryRepository>
+ , Idt_inventoryService, IDependency
+ {
+ public dt_inventoryService(Idt_inventoryRepository repository)
+ : base(repository)
+ {
+ Init(repository);
+ }
+ public static Idt_inventoryService Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_inventoryService>(); } }
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_materielinfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_materielinfoService.cs"
new file mode 100644
index 0000000..fa01afd
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/system/dt_materielinfoService.cs"
@@ -0,0 +1,27 @@
+/*
+ *Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,姝ゅ浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *鎵�鏈変笟鍔＄紪鍐欏叏閮ㄥ簲鍦≒artial鏂囦欢澶逛笅dt_materielinfoService涓嶪dt_materielinfoService涓紪鍐�
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_WMS.IServices;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_materielinfoService : ServiceBase<dt_materielinfo, Idt_materielinfoRepository>
+ , Idt_materielinfoService, IDependency
+ {
+ public dt_materielinfoService(Idt_materielinfoRepository repository)
+ : base(repository)
+ {
+ Init(repository);
+ }
+ public static Idt_materielinfoService Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_materielinfoService>(); } }
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
new file mode 100644
index 0000000..a090f04
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
@@ -0,0 +1,147 @@
+锘縰sing Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Security.Policy;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using WIDESEA_Comm.LogInfo;
+using WIDESEA_Common;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Entity.ToAGV;
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_WMS.Repositories;
+
+namespace WIDESEA_WMS
+{
+ public partial class ToAGVServer
+ {
+ /// <summary>
+ /// 淇敼浠诲姟鐘舵��
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
+ public static AGVRespone UpdateTaskState(string json)
+ {
+ VOLContext context = new VOLContext();
+ Idt_agvtaskRepository repository = new dt_agvtaskRepository(context);
+ AGVRespone respone = new AGVRespone();
+ UpdateTasteInfo tasteInfo = new();
+ try
+ {
+ if (string.IsNullOrEmpty(json) || json == "null")
+ throw new Exception("鏈幏鍙栧埌璇锋眰鍙傛暟鏁版嵁");
+ tasteInfo = JsonConvert.DeserializeObject<UpdateTasteInfo>(json);
+ if (string.IsNullOrEmpty(tasteInfo.TASK_NO))
+ throw new Exception("鏈幏鍙栧埌浠诲姟鍙�!");
+ var task = repository.FindFirst(x => x.agv_tasknum == tasteInfo.TASK_NO);
+ if (task == null)
+ throw new Exception("鏈壘鍒颁换鍔�,浠诲姟ID锛�" + tasteInfo.TASK_NO);
+ if (tasteInfo.TASK_State < 1 || tasteInfo.TASK_State > 4)
+ throw new Exception("鏈畾涔夌殑浠诲姟鐘舵��:" + tasteInfo.TASK_State);
+ var StateName = Enum.GetName(typeof(AGVTaskStateEnum), tasteInfo.TASK_State);
+ if (task.agv_taskstate == StateName)
+ {
+ respone.success = 2;
+ respone.Message = tasteInfo.TASK_NO + "锛氶噸澶嶈皟鐢紝浠诲姟鐘舵�佷负锛�" + tasteInfo.TASK_State;
+ return respone;
+ }
+ if (tasteInfo.TASK_State == 1)
+ task.agv_executingBeginTime = DateTime.Now;
+ if (tasteInfo.TASK_State == 2)
+ task.agv_executingEndTime = DateTime.Now;
+ if (tasteInfo.TASK_State == 3)
+ task.agv_completeBeginTime = DateTime.Now;
+ task.agv_taskstate = StateName;
+ var count = repository.Update(task, true);
+ if (count < 1)
+ throw new Exception("浠诲姟鐘舵�佹洿鏂板け璐ワ紒浠诲姟ID锛�" + tasteInfo.TASK_NO + "锛涗换鍔＄姸鎬侊細" + tasteInfo.TASK_State);
+ if (tasteInfo.TASK_State == 4)
+ Task.AddHtyTask(task);
+
+
+ }
+ catch (Exception ex)
+ {
+ respone.success = 3;
+ respone.Message = ex.Message;
+ }
+ WriteWMSLog.LogAdd(tasteInfo.TASK_NO, respone.success == 1 ? "鎴愬姛 " : "澶辫触", "WMS", "AGV", json, JsonConvert.SerializeObject(respone), "AGV鍙嶉浠诲姟鐘舵��", "UpdateTaskState", respone.Message);
+ return respone;
+ }
+
+ /// <summary>
+ /// 涓嬪彂AGV浠诲姟
+ /// </summary>
+ /// <param name="agvtask"></param>
+ public static void SendAGVTask(dt_agvtask agvtask)
+ {
+ if (agvtask == null) return;
+ VOLContext context = new VOLContext();
+ Idt_agvtaskRepository repository = new dt_agvtaskRepository(context);
+ AGVRespone respone = new AGVRespone();
+ RequestTask requestTask = new RequestTask();
+ string postJson = string.Empty;
+ string report = string.Empty;
+ try
+ {
+ requestTask.TASK_NO = agvtask.agv_tasknum;
+ requestTask.FROM_POSITION = agvtask.agv_fromaddress;
+ requestTask.TO_POSITION = agvtask.agv_toaddress;
+ requestTask.Material = agvtask.agv_materielid;
+ requestTask.Priority = agvtask.agv_grade;
+ postJson = JsonConvert.SerializeObject(requestTask);
+ report = RequestData(postJson);
+ respone = JsonConvert.DeserializeObject<AGVRespone>(report);
+ if (respone.success != 1)
+ throw new Exception(respone.Message);
+ agvtask.agv_taskstate = AGVTaskStateEnum.SendOut.ToString();
+ agvtask.agv_realesstime = DateTime.Now;
+ repository.Update(agvtask, true);
+ }
+ catch (Exception ex)
+ {
+ respone.Message = ex.Message;
+ }
+ WriteWMSLog.LogAdd(requestTask.TASK_NO, respone.success == 1 ? "鎴愬姛 " : "澶辫触", "AGV", "WMS", postJson, report, "涓嬪彂AGV浠诲姟", "SendAGVTask", respone.Message);
+ }
+
+ /// <summary>
+ /// post璇锋眰
+ /// </summary>
+ /// <param name="postData">鍙傛暟</param>
+ /// <param name="address">璺緞</param>
+ /// <returns></returns>
+ public static string RequestData(string postData, string address = "")
+ {
+ string reponse = string.Empty;
+ try
+ {
+ //string tmp = "";
+ //if (null != postData)
+ // tmp = JsonConvert.SerializeObject(postData);
+ byte[] param = Encoding.UTF8.GetBytes(postData);
+ HttpWebRequest request = (HttpWebRequest)WebRequest.Create(address);
+ request.Method = "POST";
+ request.ContentType = "application/json";
+ request.GetRequestStream().Write(param, 0, param.Length);
+ using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
+ {
+ Stream stream = response.GetResponseStream();
+ StreamReader streamReader = new StreamReader(stream);
+ string webResponse = streamReader.ReadToEnd();
+ reponse = webResponse;
+ }
+ }
+ catch (Exception ex)
+ {
+ reponse = ex.Message;
+ }
+ return reponse;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToMes/AddToFloat3.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToMes/AddToFloat3.cs"
new file mode 100644
index 0000000..98f323b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToMes/AddToFloat3.cs"
@@ -0,0 +1,77 @@
+锘縰sing Newtonsoft.Json;
+using System;
+using WIDESEA_Comm;
+using WIDESEA_Comm.LogInfo;
+using WIDESEA_Common;
+using WIDESEA_Core.ManageUser;
+using WIDESEA_Core.Utilities;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Entity.DomainModels.Mes;
+
+namespace WIDESEA_WMS
+{
+ public partial class ToMesServer
+ {
+ /// <summary>
+ /// 鎵嬪姩绉诲簱
+ /// </summary>
+ /// <param name="requestTemp"></param>
+ /// <returns></returns>
+ public WebResponseContent AddToFloat3(MesRequestTemp requestTemp)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ //var route = freeDB.Select<dt_stationinfo>().Where(t => t.stationCode == requestTemp.from_address && t.route_end == requestTemp.to_address).ToOne();
+ var station1 = freeDB.Select<dt_stationinfo>().Where(t => t.stationCode == requestTemp.from_address).First();
+ var station2 = freeDB.Select<dt_stationinfo>().Where(t => t.stationCode == requestTemp.to_address).First();
+ if (station1 == null || station2 == null)
+ {
+ throw new Exception($"璺緞{requestTemp.from_address}鍒皗requestTemp.to_address},涓嶅瓨鍦紒");
+ }
+ if (station1.location_state != LocationStateEnum.Stroge.ToString())
+ throw new Exception($"璧风偣{requestTemp.from_address}鏈壘鍒扮墿鏂欙紒");
+ if (station2.location_state != LocationStateEnum.Empty.ToString())
+ throw new Exception($"缁堢偣{requestTemp.to_address}涓嶆槸绌鸿揣浣嶏紒");
+ if (string.IsNullOrEmpty(station1.stationType))
+ throw new Exception($"璧风偣{requestTemp.from_address}鏈粦瀹氱墿鏂欑被鍨嬶紒");
+ if (station1.stationType != station2.stationType)
+ throw new Exception($"璧风偣涓庣粓鐐圭粦瀹氱墿鏂欑被鍨嬩笉涓�鑷达紒");
+
+ var haveInTask = freeDB.Select<dt_agvtask>()
+ .Where(t => t.agv_fromaddress == requestTemp.from_address
+ || t.agv_fromaddress == requestTemp.to_address
+ || t.agv_toaddress == requestTemp.from_address
+ || t.agv_toaddress == requestTemp.to_address
+ ).Any();
+
+ if (!haveInTask)
+ {
+ station2.quantity = station1.quantity;
+ station2.bindSN = station1.bindSN;
+ station2.location_state = station1.location_state;
+ station2.tray_status = station1.tray_status;
+ freeDB.Update(station2);
+
+ station1.quantity = 0;
+ station1.bindSN = string.Empty;
+ station1.location_state = LocationStateEnum.Empty.ToString();
+ station1.tray_status = string.Empty;
+ freeDB.Update(station1);
+ }
+ else
+ {
+ throw new Exception("璧峰鎴栫洰鐨勫湴鍧�锛屽凡瀛樺湪浠诲姟锛�");
+ }
+ content.OK();
+ WriteDBLog.Success($"鎵嬪姩绉诲簱", new { 鏁版嵁 = requestTemp }, "WMS", UserContext.Current.UserTrueName);
+ }
+ catch (Exception ex)
+ {
+ WriteDBLog.Error($"鎵嬪姩绉诲簱", new { 鏁版嵁 = requestTemp, 寮傚父淇℃伅 = ex.Message }, "WMS", UserContext.Current.UserTrueName);
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToMes/ToMesServer.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToMes/ToMesServer.cs"
new file mode 100644
index 0000000..f1262e4
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToMes/ToMesServer.cs"
@@ -0,0 +1,19 @@
+锘縰sing Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using WIDESEA_Core.FreeDB;
+
+namespace WIDESEA_WMS
+{
+ public partial class ToMesServer
+ {
+ FreeDB freeDB = new FreeDB();
+
+ public ToMesServer()
+ {
+
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/WIDESEA_WMS.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/WIDESEA_WMS.csproj"
index 834f34f..2c4e620 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/WIDESEA_WMS.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/WIDESEA_WMS.csproj"
@@ -7,6 +7,7 @@
</PropertyGroup>
<ItemGroup>
+ <ProjectReference Include="..\WIDESEA_Comm\WIDESEA_Comm.csproj" />
<ProjectReference Include="..\WIDESEA_Core\WIDESEA_Core.csproj" />
<ProjectReference Include="..\WIDESEA_Entity\WIDESEA_Entity.csproj" />
</ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/System/Partial/Sys_DictionaryController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/System/Partial/Sys_DictionaryController.cs"
index 89f0e10..39ab9d7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/System/Partial/Sys_DictionaryController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/System/Partial/Sys_DictionaryController.cs"
@@ -11,12 +11,20 @@
{
public partial class Sys_DictionaryController
{
- [HttpPost, Route("GetVueDictionary"), AllowAnonymous]
+ [HttpPost, Route("GetVueDictionary")]
[ApiActionPermission()]
- public IActionResult GetVueDictionary([FromBody] string[] dicNos)
+ public async Task<IActionResult> GetVueDictionary([FromBody] string[] dicNos)
{
- return Content(Service.GetVueDictionary(dicNos).Serialize());
+ return Content((await Service.GetVueDictionary(dicNos)).Serialize());
}
+
+ //[HttpPost, Route("GetVueDictionary"), AllowAnonymous]
+ //[ApiActionPermission()]
+ //public IActionResult GetVueDictionary([FromBody] string[] dicNos)
+ //{
+ // return Content(Service.GetVueDictionary(dicNos).Serialize());
+ //}
+
/// <summary>
/// table鍔犺浇鏁版嵁鍚庡埛鏂板綋鍓峵able鏁版嵁鐨勫瓧鍏搁」(閫傜敤瀛楀吀鏁版嵁閲忔瘮杈冨ぇ鐨勬儏鍐�)
/// </summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/ToAGV/ToAGVController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/ToAGV/ToAGVController.cs"
new file mode 100644
index 0000000..367a4dc
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/ToAGV/ToAGVController.cs"
@@ -0,0 +1,32 @@
+锘縰sing Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using WIDESEA_Core.Utilities;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Entity.ToAGV;
+using WIDESEA_WMS;
+
+namespace ToAGV.Controllers
+{
+ [Route("api/ToAGV")]
+ [ApiController]
+ public class ToAGVController : ControllerBase
+ {
+ /// <summary>
+ /// 鐗╂枡鍏ュ簱/鍑哄簱鍙栨斁璐х偣浣嶄笂鎶�
+ /// </summary>
+ /// <param name="saveModel">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost, Route("UpdateTaskState"), Authorize, AllowAnonymous]
+ public AGVRespone UpdateTaskState([FromBody] object saveModel)
+ {
+ return ToAGVServer.UpdateTaskState(JsonConvert.SerializeObject(saveModel));
+ }
+
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/ToMes/ToWMSController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/ToMes/ToWMSController.cs"
new file mode 100644
index 0000000..08abc08
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/ToMes/ToWMSController.cs"
@@ -0,0 +1,25 @@
+锘縰sing Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.Utilities;
+using WIDESEA_Entity.DomainModels.Mes;
+using WIDESEA_WMS;
+
+namespace WIDESEA_WCSServer.Controllers.ToMes
+{
+ [Route("api/ToMes")]
+ [ApiController]
+ public class ToWMSController : ControllerBase
+ {
+ /// <summary>
+ /// 3妤艰澶囧彨鏂欙紙鎵嬪姩锛屼复鏃讹級
+ /// </summary>
+ /// <param name="request"></param>
+ /// <returns></returns>
+ [HttpPost, Route("AddToFloat3")]
+ public WebResponseContent AddToFloat3([FromBody] MesRequestTemp request)
+ {
+ return new ToMesServer().AddToFloat3(request);
+ }
+
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_System/Dt_InterfacerecordController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_System/Dt_InterfacerecordController.cs"
new file mode 100644
index 0000000..53066b9
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_System/Dt_InterfacerecordController.cs"
@@ -0,0 +1,22 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉瑕佸鍔犳柟娉曡鍦ㄥ綋鍓嶇洰褰曚笅Partial鏂囦欢澶笵t_InterfacerecordController缂栧啓
+ */
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.Controllers.Basic;
+using WIDESEA_Entity.AttributeManager;
+using WIDESEA_Services.IServices;
+
+namespace WIDESEA_Services.Controllers
+{
+ [Route("api/Dt_Interfacerecord")]
+ [PermissionTable(Name = "Dt_Interfacerecord")]
+ public partial class Dt_InterfacerecordController : ApiBaseController<IDt_InterfacerecordService>
+ {
+ public Dt_InterfacerecordController(IDt_InterfacerecordService service)
+ : base(service)
+ {
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_System/Partial/Dt_InterfacerecordController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_System/Partial/Dt_InterfacerecordController.cs"
new file mode 100644
index 0000000..d415791
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_System/Partial/Dt_InterfacerecordController.cs"
@@ -0,0 +1,28 @@
+/*
+ *鎺ュ彛缂栧啓澶�...
+*濡傛灉鎺ュ彛闇�瑕佸仛Action鐨勬潈闄愰獙璇侊紝璇峰湪Action涓婁娇鐢ㄥ睘鎬�
+*濡�: [ApiActionPermission("Dt_Interfacerecord",Enums.ActionPermissionOptions.Search)]
+ */
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_Services.IServices;
+
+namespace WIDESEA_Services.Controllers
+{
+ public partial class Dt_InterfacerecordController
+ {
+ private readonly IDt_InterfacerecordService _service;//璁块棶涓氬姟浠ｇ爜
+ private readonly IHttpContextAccessor _httpContextAccessor;
+
+ [ActivatorUtilitiesConstructor]
+ public Dt_InterfacerecordController(
+ IDt_InterfacerecordService service,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(service)
+ {
+ _service = service;
+ _httpContextAccessor = httpContextAccessor;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_areainfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_areainfoController.cs"
new file mode 100644
index 0000000..f859691
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_areainfoController.cs"
@@ -0,0 +1,33 @@
+/*
+ *鎺ュ彛缂栧啓澶�...
+*濡傛灉鎺ュ彛闇�瑕佸仛Action鐨勬潈闄愰獙璇侊紝璇峰湪Action涓婁娇鐢ㄥ睘鎬�
+*濡�: [ApiActionPermission("dt_areainfo",Enums.ActionPermissionOptions.Search)]
+ */
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_WMS.IServices;
+
+namespace WIDESEA_WMS.Controllers
+{
+ public partial class dt_areainfoController
+ {
+ private readonly Idt_areainfoService _service;//璁块棶涓氬姟浠ｇ爜
+ private readonly IHttpContextAccessor _httpContextAccessor;
+
+ [ActivatorUtilitiesConstructor]
+ public dt_areainfoController(
+ Idt_areainfoService service,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(service)
+ {
+ _service = service;
+ _httpContextAccessor = httpContextAccessor;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_boxingController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_boxingController.cs"
new file mode 100644
index 0000000..fae3437
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_boxingController.cs"
@@ -0,0 +1,33 @@
+/*
+ *鎺ュ彛缂栧啓澶�...
+*濡傛灉鎺ュ彛闇�瑕佸仛Action鐨勬潈闄愰獙璇侊紝璇峰湪Action涓婁娇鐢ㄥ睘鎬�
+*濡�: [ApiActionPermission("dt_boxing",Enums.ActionPermissionOptions.Search)]
+ */
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_WMS.IServices;
+
+namespace WIDESEA_WMS.Controllers
+{
+ public partial class dt_boxingController
+ {
+ private readonly Idt_boxingService _service;//璁块棶涓氬姟浠ｇ爜
+ private readonly IHttpContextAccessor _httpContextAccessor;
+
+ [ActivatorUtilitiesConstructor]
+ public dt_boxingController(
+ Idt_boxingService service,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(service)
+ {
+ _service = service;
+ _httpContextAccessor = httpContextAccessor;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_boxing_htyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_boxing_htyController.cs"
new file mode 100644
index 0000000..624cfff
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_boxing_htyController.cs"
@@ -0,0 +1,33 @@
+/*
+ *鎺ュ彛缂栧啓澶�...
+*濡傛灉鎺ュ彛闇�瑕佸仛Action鐨勬潈闄愰獙璇侊紝璇峰湪Action涓婁娇鐢ㄥ睘鎬�
+*濡�: [ApiActionPermission("dt_boxing_hty",Enums.ActionPermissionOptions.Search)]
+ */
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_WMS.IServices;
+
+namespace WIDESEA_WMS.Controllers
+{
+ public partial class dt_boxing_htyController
+ {
+ private readonly Idt_boxing_htyService _service;//璁块棶涓氬姟浠ｇ爜
+ private readonly IHttpContextAccessor _httpContextAccessor;
+
+ [ActivatorUtilitiesConstructor]
+ public dt_boxing_htyController(
+ Idt_boxing_htyService service,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(service)
+ {
+ _service = service;
+ _httpContextAccessor = httpContextAccessor;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_inventoryController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_inventoryController.cs"
new file mode 100644
index 0000000..e49e52a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_inventoryController.cs"
@@ -0,0 +1,33 @@
+/*
+ *鎺ュ彛缂栧啓澶�...
+*濡傛灉鎺ュ彛闇�瑕佸仛Action鐨勬潈闄愰獙璇侊紝璇峰湪Action涓婁娇鐢ㄥ睘鎬�
+*濡�: [ApiActionPermission("dt_inventory",Enums.ActionPermissionOptions.Search)]
+ */
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_WMS.IServices;
+
+namespace WIDESEA_WMS.Controllers
+{
+ public partial class dt_inventoryController
+ {
+ private readonly Idt_inventoryService _service;//璁块棶涓氬姟浠ｇ爜
+ private readonly IHttpContextAccessor _httpContextAccessor;
+
+ [ActivatorUtilitiesConstructor]
+ public dt_inventoryController(
+ Idt_inventoryService service,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(service)
+ {
+ _service = service;
+ _httpContextAccessor = httpContextAccessor;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_materielinfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_materielinfoController.cs"
new file mode 100644
index 0000000..d8e007c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_materielinfoController.cs"
@@ -0,0 +1,33 @@
+/*
+ *鎺ュ彛缂栧啓澶�...
+*濡傛灉鎺ュ彛闇�瑕佸仛Action鐨勬潈闄愰獙璇侊紝璇峰湪Action涓婁娇鐢ㄥ睘鎬�
+*濡�: [ApiActionPermission("dt_materielinfo",Enums.ActionPermissionOptions.Search)]
+ */
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_WMS.IServices;
+
+namespace WIDESEA_WMS.Controllers
+{
+ public partial class dt_materielinfoController
+ {
+ private readonly Idt_materielinfoService _service;//璁块棶涓氬姟浠ｇ爜
+ private readonly IHttpContextAccessor _httpContextAccessor;
+
+ [ActivatorUtilitiesConstructor]
+ public dt_materielinfoController(
+ Idt_materielinfoService service,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(service)
+ {
+ _service = service;
+ _httpContextAccessor = httpContextAccessor;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_areainfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_areainfoController.cs"
new file mode 100644
index 0000000..925480c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_areainfoController.cs"
@@ -0,0 +1,21 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉瑕佸鍔犳柟娉曡鍦ㄥ綋鍓嶇洰褰曚笅Partial鏂囦欢澶筪t_areainfoController缂栧啓
+ */
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.Controllers.Basic;
+using WIDESEA_Entity.AttributeManager;
+using WIDESEA_WMS.IServices;
+namespace WIDESEA_WMS.Controllers
+{
+ [Route("api/dt_areainfo")]
+ [PermissionTable(Name = "dt_areainfo")]
+ public partial class dt_areainfoController : ApiBaseController<Idt_areainfoService>
+ {
+ public dt_areainfoController(Idt_areainfoService service)
+ : base(service)
+ {
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_boxingController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_boxingController.cs"
new file mode 100644
index 0000000..7e1a9ff
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_boxingController.cs"
@@ -0,0 +1,21 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉瑕佸鍔犳柟娉曡鍦ㄥ綋鍓嶇洰褰曚笅Partial鏂囦欢澶筪t_boxingController缂栧啓
+ */
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.Controllers.Basic;
+using WIDESEA_Entity.AttributeManager;
+using WIDESEA_WMS.IServices;
+namespace WIDESEA_WMS.Controllers
+{
+ [Route("api/dt_boxing")]
+ [PermissionTable(Name = "dt_boxing")]
+ public partial class dt_boxingController : ApiBaseController<Idt_boxingService>
+ {
+ public dt_boxingController(Idt_boxingService service)
+ : base(service)
+ {
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_boxing_htyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_boxing_htyController.cs"
new file mode 100644
index 0000000..5051358
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_boxing_htyController.cs"
@@ -0,0 +1,21 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉瑕佸鍔犳柟娉曡鍦ㄥ綋鍓嶇洰褰曚笅Partial鏂囦欢澶筪t_boxing_htyController缂栧啓
+ */
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.Controllers.Basic;
+using WIDESEA_Entity.AttributeManager;
+using WIDESEA_WMS.IServices;
+namespace WIDESEA_WMS.Controllers
+{
+ [Route("api/dt_boxing_hty")]
+ [PermissionTable(Name = "dt_boxing_hty")]
+ public partial class dt_boxing_htyController : ApiBaseController<Idt_boxing_htyService>
+ {
+ public dt_boxing_htyController(Idt_boxing_htyService service)
+ : base(service)
+ {
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_inventoryController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_inventoryController.cs"
new file mode 100644
index 0000000..fd8bd4d
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_inventoryController.cs"
@@ -0,0 +1,21 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉瑕佸鍔犳柟娉曡鍦ㄥ綋鍓嶇洰褰曚笅Partial鏂囦欢澶筪t_inventoryController缂栧啓
+ */
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.Controllers.Basic;
+using WIDESEA_Entity.AttributeManager;
+using WIDESEA_WMS.IServices;
+namespace WIDESEA_WMS.Controllers
+{
+ [Route("api/dt_inventory")]
+ [PermissionTable(Name = "dt_inventory")]
+ public partial class dt_inventoryController : ApiBaseController<Idt_inventoryService>
+ {
+ public dt_inventoryController(Idt_inventoryService service)
+ : base(service)
+ {
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_materielinfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_materielinfoController.cs"
new file mode 100644
index 0000000..28b89fc
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_materielinfoController.cs"
@@ -0,0 +1,21 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉瑕佸鍔犳柟娉曡鍦ㄥ綋鍓嶇洰褰曚笅Partial鏂囦欢澶筪t_materielinfoController缂栧啓
+ */
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.Controllers.Basic;
+using WIDESEA_Entity.AttributeManager;
+using WIDESEA_WMS.IServices;
+namespace WIDESEA_WMS.Controllers
+{
+ [Route("api/dt_materielinfo")]
+ [PermissionTable(Name = "dt_materielinfo")]
+ public partial class dt_materielinfoController : ApiBaseController<Idt_materielinfoService>
+ {
+ public dt_materielinfoController(Idt_materielinfoService service)
+ : base(service)
+ {
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208134657.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208134657.xlsx"
deleted file mode 100644
index 9dcbccb..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208134657.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208170607.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208170607.xlsx"
deleted file mode 100644
index 53eed4c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208170607.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208171603.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208171603.xlsx"
deleted file mode 100644
index 0cd095a..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208171603.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208173403.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208173403.xlsx"
deleted file mode 100644
index c40e0f7..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208173403.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208175204.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208175204.xlsx"
deleted file mode 100644
index 84bc241..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/20231208/Template/AGV\344\273\273\345\212\24120231208175204.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208152432.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208152432.xlsx"
deleted file mode 100644
index a549c8b..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208152432.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208173004.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208173004.xlsx"
deleted file mode 100644
index 79d9640..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208173004.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208154331.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208154331.xlsx"
deleted file mode 100644
index 7fb9b72..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208154331.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208161840.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208161840.xlsx"
deleted file mode 100644
index 900f851..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208161840.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208162251.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208162251.xlsx"
deleted file mode 100644
index 75d7a80..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208162251.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208163634.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208163634.xlsx"
deleted file mode 100644
index 0766a62..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208163634.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208163750.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208163750.xlsx"
deleted file mode 100644
index e819ea7..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208163750.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208165240.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208165240.xlsx"
deleted file mode 100644
index fc53773..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\345\216\206\345\217\262\344\273\273\345\212\24120231208165240.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219150515.xlsx"
similarity index 74%
copy from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
copy to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219150515.xlsx"
index a562e0a..268ae08 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219150515.xlsx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219151413.xlsx"
similarity index 75%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219151413.xlsx"
index a562e0a..a615fc7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219151413.xlsx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208150437.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219151717.xlsx"
similarity index 75%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208150437.xlsx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219151717.xlsx"
index 491e3cd..f1583ff 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208150437.xlsx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219151717.xlsx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219152111.xlsx"
similarity index 74%
copy from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
copy to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219152111.xlsx"
index a562e0a..87b075a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219152111.xlsx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219152415.xlsx"
similarity index 74%
copy from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
copy to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219152415.xlsx"
index a562e0a..e2ef697 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219152415.xlsx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219152911.xlsx"
similarity index 74%
copy from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
copy to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219152911.xlsx"
index a562e0a..5c614e3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219152911.xlsx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219170232.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219170232.xlsx"
new file mode 100644
index 0000000..4ada057
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219170232.xlsx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219171630.xlsx"
similarity index 74%
copy from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
copy to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219171630.xlsx"
index a562e0a..5c94f42 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219171630.xlsx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219174230.xlsx"
similarity index 74%
copy from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
copy to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219174230.xlsx"
index a562e0a..1f328f9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231208/AGV\344\273\273\345\212\24120231208172503.xlsx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Download/ExcelExport/20231219/AGV\344\273\273\345\212\24120231219174230.xlsx"
Binary files differ
--
Gitblit v1.9.3