From 2b66d4c2dc5b1c00805fa47ba65d9a8d2724ab35 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期三, 25 二月 2026 08:48:01 +0800
Subject: [PATCH] 清理多余文件
---
代码管理/WMS/WMSServices/WIDESEA_IStockRepository/IBlankStockInfo_HtyRepository.cs | 14
代码管理/WMS/WMSServices/WIDESEA_SortOrderRepository/SortOrderRepository.cs | 17
代码管理/WMS/WMSClient/src/extension/stock/mouldStockInfo.js | 56
代码管理/WMS/WMSClient/src/views/taskinfo/task_hty.vue | 495 ++---
代码管理/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shm | 0
代码管理/WMS/WMSServices/WIDESEA_IStockService/IMouldStockInfo_HtyService.cs | 14
代码管理/WMS/WMSClient/src/views/taskinfo/task.vue | 522 ++---
代码管理/WMS/WMSServices/WIDESEA_CheckService/WIDESEA_CheckService.csproj | 1
代码管理/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/BlankStockController.cs | 20
代码管理/WMS/WMSServices/WIDESEA_WMSServer/Filter/CustomProfile.cs | 73
代码管理/WMS/WMSServices/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj | 3
代码管理/WMS/WMSServices/WIDESEA_TaskInfoRepository/TaskRepository.cs | 4
代码管理/WMS/WMSServices/WIDESEA_TaskInfoService/Task_HtyService.cs | 9
代码管理/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 259 --
代码管理/WMS/WMSServices/WIDESEA_IBasicService/IApiInfoService.cs | 10
代码管理/WMS/WMSServices/WIDESEA_StockRepository/MouldStockInfo_HtyRepository.cs | 18
代码管理/WMS/WMSServices/WIDESEA_ISortService/ISortOrderService.cs | 21
代码管理/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Sort/SortOrderDetailController.cs | 19
代码管理/WMS/WMSServices/WIDESEA_StockService/BlankStockInfo_HtyService.cs | 20
代码管理/WMS/WMSServices/WIDESEA_WMSServer.sln | 198 -
代码管理/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/MouldStockInfo_HtyController.cs | 19
代码管理/WMS/WMSClient/src/extension/stock/blankStockInfo.js | 56
代码管理/WMS/WMSServices/WIDESEA_ISortOrderService/ISortOrderDetailService.cs | 11
代码管理/WMS/WMSServices/WIDESEA_BasicService/Base/LocationInfoService.cs | 4
代码管理/WMS/WMSClient/src/views/stock/mouldStockInfo.vue | 177 ++
代码管理/WMS/WMSServices/WIDESEA_BasicService/Service/WarehouseService.cs | 19
代码管理/WMS/WMSServices/WIDESEA_ISortRepository/ISortOrderDetailRepository.cs | 14
代码管理/WMS/WMSClient/src/extension/sort/sortOrderDetail.js | 56
代码管理/WMS/WMSClient/src/router/viewGird.js | 226 --
代码管理/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db | 0
代码管理/WMS/WMSServices/WIDESEA_DTO/WIDESEA_DTO.csproj | 4
代码管理/WMS/WMSServices/WIDESEA_IBasicService/IWarehouseService.cs | 5
代码管理/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs | 25
代码管理/WMS/WMSClient/src/extension/stock/blankStockInfo_Hty.js | 56
代码管理/WMS/WMSClient/src/views/sort/sortOrder.vue | 169 +
代码管理/WMS/WMSServices/WIDESEA_BasicService/Base/WarehouseService.cs | 4
代码管理/WMS/WMSServices/WIDESEA_ISortOrderRepository/ISortOrderRepository.cs | 11
代码管理/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Completed.cs | 36
代码管理/WMS/WMSClient/src/extension/stock/mouldStockInfo_Hty.js | 56
代码管理/WMS/WMSServices/WIDESEA_IBasicRepository/IBasicRepository.cs | 10
代码管理/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm | 0
代码管理/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db | 0
代码管理/WMS/WMSServices/WIDESEA_BasicService/ApiInfoService.cs | 11
代码管理/WMS/WMSServices/WIDESEA_BasicRepository/WarehouseRepository.cs | 3
代码管理/WMS/WMSServices/WIDESEA_SortOrderService/SortOrderService.cs | 20
代码管理/WMS/WMSServices/WIDESEA_ISortService/ISortOrderDetailService.cs | 16
代码管理/WMS/WMSServices/WIDESEA_SortRepository/WIDESEA_SortRepository.csproj | 15
代码管理/WMS/WMSServices/WIDESEA_SystemService/Sys_UserService.cs | 2
代码管理/WMS/WMSServices/WIDESEA_ITaskInfoService/ITask_HtyService.cs | 13
代码管理/WMS/WMSServices/WIDESEA_BasicRepository/ApiInfoRepository.cs | 6
代码管理/WMS/WMSServices/WIDESEA_ISortOrderRepository/WIDESEA_ISortOrderRepository.csproj | 13
代码管理/WMS/WMSServices/WIDESEA_WMSServer/Controllers/PDAController.cs | 6
代码管理/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-wal | 0
代码管理/WMS/WMSServices/WIDESEA_BasicService/UserInfoService.cs | 94 -
代码管理/WMS/WMSServices/WIDESEA_StockService/MouldStockInfoService.cs | 21
代码管理/WMS/WMSServices/WIDESEA_TaskInfoService/WIDESEA_TaskInfoService.csproj | 3
代码管理/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/Task_HtyController.cs | 6
代码管理/WMS/WMSClient/src/views/stock/blankStockInfo.vue | 167 +
代码管理/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_MouldStockInfo_Hty.cs | 2
代码管理/WMS/WMSServices/WIDESEA_IStockService/IBlankStockInfo_HtyService.cs | 16
代码管理/WMS/WMSServices/WIDESEA_IStockService/IBlankStockInfoService.cs | 14
代码管理/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_Warehouse.cs | 2
代码管理/WMS/WMSServices/WIDESEA_StockService/ProStockInfoService.cs | 4
代码管理/WMS/WMSServices/WIDESEA_SortService/WIDESEA_SortService.csproj | 16
代码管理/WMS/WMSClient/src/views/stock/proStockInfo_Hty.vue | 29
代码管理/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs | 210 --
代码管理/WMS/WMSServices/WIDESEA_Model/Models/Sort/Dt_SortOrder.cs | 2
代码管理/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/BlankStockInfo_HtyController.cs | 19
代码管理/WMS/WMSServices/WIDESEA_SortOrderRepository/WIDESEA_SortOrderRepository.csproj | 14
代码管理/WMS/WMSServices/WIDESEA_StockService/MouldStockInfo_Hty.cs | 20
代码管理/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Sort/SortOrderController.cs | 19
代码管理/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/MouldStockController.cs | 20
代码管理/WMS/WMSServices/WIDESEA_ISortOrderService/WIDESEA_ISortOrderService.csproj | 13
代码管理/WMS/WMSServices/WIDESEA_StockRepository/MouldStockInfoRepository.cs | 21
代码管理/WMS/WMSClient/src/views/sort/sortOrderDetail.vue | 171 +
代码管理/WMS/WMSServices/WIDESEA_BasicRepository/LocationInfoRepository.cs | 3
代码管理/WMS/WMSServices/WIDESEA_StockService/WIDESEA_StockService.csproj | 1
代码管理/WMS/WMSServices/WIDESEA_BasicService/BasicService.cs | 17
代码管理/WMS/WMSServices/WIDESEA_IStockService/IMouldStockInfoService.cs | 14
代码管理/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json | 5
代码管理/WMS/WMSServices/WIDESEA_IStockRepository/IMouldStockInfoRepository.cs | 14
代码管理/WMS/WMSServices/WIDESEA_SortOrderRepository/SortOrderDetailRepository.cs | 17
代码管理/WMS/WMSServices/WIDESEA_ISortService/WIDESEA_ISortService.csproj | 14
代码管理/WMS/WMSClient/src/extension/taskinfo/task.js | 155 -
代码管理/WMS/WMSServices/WIDESEA_BasicRepository/BasicRepository.cs | 19
代码管理/WMS/WMSServices/WIDESEA_SortRepository/SortOrderDetailRepository.cs | 21
代码管理/WMS/WMSClient/src/views/stock/mouldStockInfo_Hty.vue | 160 +
代码管理/WMS/WMSClient/src/extension/sort/sortOrder.js | 56
代码管理/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs | 96 -
代码管理/WMS/WMSClient/src/views/stock/proStockInfo.vue | 337 +-
代码管理/WMS/WMSServices/WIDESEA_SortOrderService/SortOrderDetailService.cs | 20
代码管理/WMS/WMSServices/WIDESEA_SortRepository/SortOrderRepository.cs | 21
代码管理/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs | 19
代码管理/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal | 0
代码管理/WMS/WMSServices/WIDESEA_StockRepository/BlankStockInfo_HtyRepository.cs | 18
代码管理/WMS/WMSServices/WIDESEA_IStockRepository/IMouldStockInfo_HtyRepository.cs | 14
代码管理/WMS/WMSServices/WIDESEA_Core/BaseServices/ServiceBase.cs | 7
代码管理/WMS/WMSServices/WIDESEA_IBasicService/ILocationInfoService.cs | 31
代码管理/WMS/WMSServices/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs | 2
代码管理/WMS/WMSServices/WIDESEA_IStockRepository/IBlankStockInfoRepository.cs | 14
代码管理/WMS/WMSServices/WIDESEA_StockRepository/BlankStockInfoRepository.cs | 21
代码管理/WMS/WMSClient/src/extension/taskinfo/task_hty.js | 104
代码管理/WMS/WMSClient/src/views/basic/warehouse.vue | 5
代码管理/WMS/WMSServices/WIDESEA_ISortRepository/ISortOrderRepository.cs | 14
代码管理/WMS/WMSServices/WIDESEA_ITaskInfoService/WIDESEA_ITaskInfoService.csproj | 1
代码管理/WMS/WMSClient/src/views/stock/blankStockInfo_Hty.vue | 160 +
代码管理/WMS/WMSServices/WIDESEA_ISortRepository/WIDESEA_ISortRepository.csproj | 14
代码管理/WMS/WMSServices/WIDESEA_SortOrderService/WIDESEA_SortOrderService.csproj | 15
代码管理/WMS/WMSServices/WIDESEA_StockService/BlankStockInfoService.cs | 21
/dev/null | 29
代码管理/WMS/WMSServices/WIDESEA_IBasicService/IUserInfoService.cs | 16
代码管理/WMS/WMSServices/WIDESEA_ISortOrderRepository/ISortOrderDetailRepository.cs | 11
代码管理/WMS/WMSServices/WIDESEA_IBasicService/IBasicService.cs | 13
代码管理/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_BlankStockInfo_Hty.cs | 2
代码管理/WMS/WMSServices/WIDESEA_ISortOrderService/ISortOrderService.cs | 11
代码管理/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs | 10
116 files changed, 2,944 insertions(+), 2,297 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/customerInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/customerInfo.js"
deleted file mode 100644
index 4bf03de..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/customerInfo.js"
+++ /dev/null
@@ -1,68 +0,0 @@
-//姝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/WMSClient/src/extension/basic/makeCenterInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/makeCenterInfo.js"
deleted file mode 100644
index 8b85be7..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/makeCenterInfo.js"
+++ /dev/null
@@ -1,73 +0,0 @@
-//姝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)
- let isAdd = this.currentAction == 'Add'
- if (isAdd) {
- this.editFormFields.aGVStationCode = 'PNT_'
- }
- }
- }
- };
- 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/WMSClient/src/extension/basic/materielCodeInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/materielCodeInfo.js"
deleted file mode 100644
index 24cec15..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/materielCodeInfo.js"
+++ /dev/null
@@ -1,271 +0,0 @@
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-import gridBody from './extend/materielcodeprintView.vue'
-import modelHeader from './extend/materielcodeSelectView.vue'
-import modelBody from './extend/purchaseOrderNoSelectView.vue'
-import modelFooter from './extend/GetOrderQuantityView.vue'
-import modelSpec from './extend/GetOrderMaterielSpec.vue'
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: gridBody,
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: modelHeader,
- modelBody: modelBody,
- modelFooter: modelFooter,
- modelSpec: modelSpec
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //鑾峰彇琛ㄥ崟閰嶇疆
- getOption(field) {
- let option;
- this.editFormOptions.forEach(x => {
- x.forEach(item => {
- if (item.field == field) {
- option = item;
- }
- })
- })
- return option;
- },
- formatDate(dateStr) {
- let date = new Date(dateStr);
- let year = date.getFullYear();
- let month = String(date.getMonth() + 1).padStart(2, "0");
- let day = String(date.getDate()).padStart(2, "0");
- return year + "-" + month + "-" + day;
- },
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() { //妗嗘灦鍒濆鍖栭厤缃墠锛�
- this.$nextTick(() => {
- this.editFormOptions.forEach((option) => {
- option.forEach((item) => {
- if (item.field == 'materielCode') {
- //鍒濆鍖栧脊鍑烘閫夋嫨鍣ㄩ厤缃�
- item.extra = {
- icon: 'el-icon-zoom-out', //鏄剧ず鍥炬爣
- text: '閫夋嫨鏁版嵁', //鏄剧ず鏂囨湰
- style: 'color: #3a8ee6;font-size: 13px;cursor: pointer;',
- //瑙﹀彂浜嬩欢
- click: (item) => {
- this.$refs.modelHeader.open(this.editFormFields.warehouseId);
- }
- };
- }
- });
- });
- this.editFormOptions.forEach((option) => {
- option.forEach((item) => {
- if (item.field == 'purchaseOrderNo') {
- //鍒濆鍖栧脊鍑烘閫夋嫨鍣ㄩ厤缃�
- item.extra = {
- icon: 'el-icon-zoom-out', //鏄剧ず鍥炬爣
- text: '閫夋嫨鏁版嵁', //鏄剧ず鏂囨湰
- style: 'color: #3a8ee6;font-size: 13px;cursor: pointer;',
- //瑙﹀彂浜嬩欢
- click: (item) => {
- this.$refs.modelBody.open(this.editFormFields.materielCode);
- }
- };
- }
- });
- });
- this.editFormOptions.forEach((option) => {
- option.forEach((item) => {
- if (item.field == 'quantity') {
- //鍒濆鍖栧脊鍑烘閫夋嫨鍣ㄩ厤缃�
- item.extra = {
- icon: 'el-icon-zoom-out', //鏄剧ず鍥炬爣
- text: '閲囪喘鍗曟渶澶ф暟閲�', //鏄剧ず鏂囨湰
- style: 'color: #3a8ee6;font-size: 13px;cursor: pointer;',
- //瑙﹀彂浜嬩欢
- click: (item) => {
- this.$refs.modelFooter.open(this.editFormFields.purchaseOrderNo);
- }
- };
- }
- });
- });
- this.editFormOptions.forEach((option) => {
- option.forEach((item) => {
- if (item.field == 'materielSpec') {
- //鍒濆鍖栧脊鍑烘閫夋嫨鍣ㄩ厤缃�
- item.extra = {
- icon: 'el-icon-zoom-out', //鏄剧ず鍥炬爣
- text: '閫夋嫨鐗╂枡瑙勬牸', //鏄剧ず鏂囨湰
- style: 'color: #3a8ee6;font-size: 13px;cursor: pointer;',
- //瑙﹀彂浜嬩欢
- click: (item) => {
- this.$refs.modelSpec.open(this.editFormFields.purchaseOrderNo,this.editFormFields.materielCode);
- }
- };
- }
- });
- });
- // warehouseIdOption.onChange = (val, option) => {
- // this.editFormFields.materielCode = "";
- // materielCodeOption.data = [];
- // this.editFormFields.purchaseOrderNo = "";
- // purchaseOrderNoOption.data = [];
- // if (val == null || val == 0) {
- // return this.$error("璇烽�夋嫨浠撳簱锛�")
- // }
- // this.http.post("/api/PurchaseOrderDetail/GetPurchaseOrderDetailMaterielCode?warehouseId=" + val, {}, true).then(
- // source => {
- // if (!source.status) return this.$error(source.message);
- // this.$nextTick(() => {
-
- // for (let i = 0; i < source.data.length; i++) {
- // materielCodeOption.data.push({ key: source.data[i], value: source.data[i] })
- // }
- // })
- // })
- // }
- // materielCodeOption.onChange = (val, option) => {
- // this.editFormFields.purchaseOrderNo = "";
- // purchaseOrderNoOption.data = [];
- // if (val == null || val == 0) {
- // return this.$error("璇烽�夋嫨鐗╂枡缂栧彿锛�")
- // }
- // this.http.post("/api/PurchaseOrderDetail/GetPurchaseOrderNos?materielCode=" + val, {}, true).then(
- // source => {
- // if (!source.status) return this.$error(source.message);
- // this.$nextTick(() => {
- // for (let i = 0; i < source.data.length; i++) {
- // purchaseOrderNoOption.data.push({ key: source.data[i], value: source.data[i] })
- // }
- // });
- // })
- // }
- });
-
- // 椤甸潰鍔犺浇鏃跺垵濮嬪寲宸查珮浜殑琛�
- const initHighlightedRows = () => {
- try {
- const highlightedRowIds = localStorage.getItem('highlightedRowIds');
- if (highlightedRowIds) {
- this.highlightedRowIds = JSON.parse(highlightedRowIds);
- } else {
- this.highlightedRowIds = [];
- }
- } catch (e) {
- console.error('Failed to load highlighted rows from localStorage:', e);
- this.highlightedRowIds = [];
- }
- };
-
- // 淇濆瓨楂樹寒琛孖D鍒版湰鍦板瓨鍌�
- const saveHighlightedRows = () => {
- try {
- localStorage.setItem('highlightedRowIds', JSON.stringify(this.highlightedRowIds));
- } catch (e) {
- console.error('Failed to save highlighted rows to localStorage:', e);
- }
- };
-
- // 鍦ㄧ粍浠跺垵濮嬪寲鏃惰皟鐢�
- initHighlightedRows();
-
- this.columns.push({
- field: '鎿嶄綔',
- title: '鎿嶄綔',
- width: 90,
- fixed: 'right',
- align: 'center',
- formatter: (row) => {
- return (
- '<i style="cursor: pointer;color: #2d8cf0;" class="el-icon-printer">鎵撳嵃</i>'
- );
- },
- click: (row) => {
- // 鎵撳紑璇︽儏
- this.$refs.gridBody.open(row);
- // 鑾峰彇琛岀殑鍞竴鏍囪瘑锛堝亣璁緍ow.id鏄敮涓�ID锛�
- const rowId = row.id;
- // 娣诲姞鍒板凡楂樹寒鍒楄〃
- if (!this.highlightedRowIds.includes(rowId)) {
- this.highlightedRowIds.push(rowId);
- // 淇濆瓨鍒版湰鍦板瓨鍌�
- saveHighlightedRows();
- // 鍒锋柊琛ㄦ牸浠ュ簲鐢ㄦ牱寮�
- this.$refs.gridBody.refresh();
- }
- }
- });
-
- // 閰嶇疆cellStyle
- this.columns.forEach((column) => {
- // 淇濆瓨鍘熸湁鐨刢ellStyle鍑芥暟
- const originalCellStyle = column.cellStyle;
-
- column.cellStyle = (row) => {
- // 鍏堝簲鐢ㄥ師鏈夌殑鏍峰紡閫昏緫
- let style = originalCellStyle ? originalCellStyle(row) : {};
-
- // 濡傛灉琛岃鏍囪涓洪珮浜紝鍒欐坊鍔犵豢鑹茶儗鏅�
- if (this.highlightedRowIds.includes(row.id)) {
- style = {
- ...style,
- background: '#d4edda',
- color: '#155724'
- };
- }
-
- return style;
- };
- });
- },
- 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)
- let isAdd = this.currentAction == 'Add';
- if (isAdd) {
- let date = new Date();
- let year = date.getFullYear();
- let month = String(date.getMonth() + 1).padStart(2, "0");
- let day = String(date.getDate()).padStart(2, "0");
- let hour= String(date.getHours()).padStart(2, "0");
- let minute= String(date.getMinutes()).padStart(2, "0");
- let second= String(date.getSeconds()).padStart(2, "0");
- //灏唝ear鎴彇鍚庝袱浣�
- this.editFormFields.lotNo = (year.toString().substr(-2)) + month+day + hour + minute+second;
- this.editFormFields.productionDate = year + "-" + month + "-" + day;
- this.editFormFields.effectiveDate = year + 2 + "-" + month + "-" + day;
- }
- }
- }
-};
-export default extension;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/materielInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/materielInfo.js"
deleted file mode 100644
index 72a7a9c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/materielInfo.js"
+++ /dev/null
@@ -1,72 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- onInited() {
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //this.detailOptions.columns.forEach(column=>{ });
- },
- searchBefore(param) {
- //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
- //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
- return true;
- },
- searchAfter(result) {
- //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
- // if (Array.isArray(result)) {
- // result.forEach(item => {
- // if (item.hasOwnProperty('isCheck')) {
- // item.isCheck = item.isCheck === 'True' ? '鏄�' : '鍚�';
- // }
- // if (item.hasOwnProperty('materielState')) {
- // item.materielState = item.materielState === 'Enable' ? '鍚敤' : '绂佺敤'
- // }
- // });
- // }
- return result;
-
- },
- 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)
- // let isAdd = this.currentAction == 'Add'
- // if (isAdd) {
- // this.editFormFields.materielInvOrgId = '娣畨鐗瑰垱浜屽巶'
- // }
- }
- }
-};
-export default extension;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/palletCodeInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/palletCodeInfo.js"
deleted file mode 100644
index 6c2dee4..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/palletCodeInfo.js"
+++ /dev/null
@@ -1,79 +0,0 @@
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-import gridBody from './extend/printView.vue'
-import gridHeader from './extend/palletCodeAdd.vue'
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: gridHeader,
- gridBody: gridBody,
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- let addBtn = this.buttons.find(x => x.value == 'Add');
- if (addBtn) {
- addBtn.onClick = function () {
- this.$refs.gridHeader.open();
- }
- }
- //妗嗘灦鍒濆鍖栭厤缃墠锛�
- this.columns.push({
- field: '鎿嶄綔',
- title: '鎿嶄綔',
- width: 90,
- fixed: 'right',
- align: 'center',
- formatter: (row) => {
- return (
- '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-printer">鎵撳嵃</i>'
- );
- },
- click: (row) => {
- this.$refs.gridBody.open(row);
- }
- });
- },
- 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/WMSClient/src/extension/basic/roadwayInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/roadwayInfo.js"
deleted file mode 100644
index 4f198a3..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/roadwayInfo.js"
+++ /dev/null
@@ -1,72 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- this.boxOptions.labelWidth = 150;
- this.labelWidth=200;
-
- let enableBtn = this.buttons.find(x => x.value == 'Enable');
- if (enableBtn) {
- enableBtn.onClick = function () {
- this.$message.success('鑷畾涔夋寜閽偣鍑讳簨浠�');
- }
- }
- let disableBtn = this.buttons.find(x => x.value == 'Disable');
- if (disableBtn) {
- disableBtn.onClick = function () {
- this.$message.success('鑷畾涔夋寜閽偣鍑讳簨浠�');
- }
- }
- },
- 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/WMSClient/src/extension/basic/supplierInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/supplierInfo.js"
deleted file mode 100644
index 852a3cb..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/basic/supplierInfo.js"
+++ /dev/null
@@ -1,69 +0,0 @@
-
-//姝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/WMSClient/src/extension/inbound/erpProInOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/erpProInOrder.js"
deleted file mode 100644
index 36acbd5..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/erpProInOrder.js"
+++ /dev/null
@@ -1,71 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- //鎵╁睍椤甸潰鍒濆鍖栨搷浣�
- this.columns.push({
- field: '鎿嶄綔',
- title: '鎿嶄綔',
- width: 90,
- fixed: 'right',
- align: 'center',
- formatter: (row) => {
- return (
- '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅鏄庣粏</i>'
- );
- },
- });
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/inboundOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/inboundOrder.js"
deleted file mode 100644
index 2e7a2f2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/inboundOrder.js"
+++ /dev/null
@@ -1,68 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- onInited() {
- this.detailOptions.summary = true;
- this.detailOptions.columns.forEach(x => {
- if (x.field == 'orderQuantity') {
- x.summary = true;
- //璁＄畻骞冲潎鍊�
- // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
- //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
- // x.numberLength = 4;
- }
- });
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/inboundOrderDetail.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/inboundOrderDetail.js"
deleted file mode 100644
index 24e1d94..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/inboundOrderDetail.js"
+++ /dev/null
@@ -1,58 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/inboundOrderDetail_Hty.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/inboundOrderDetail_Hty.js"
deleted file mode 100644
index 8935403..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/inboundOrderDetail_Hty.js"
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************************
-** 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/WMSClient/src/extension/inbound/inboundOrder_Hty.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/inboundOrder_Hty.js"
deleted file mode 100644
index 8935403..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/inboundOrder_Hty.js"
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************************
-** 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/WMSClient/src/extension/inbound/mesPPBackInboundOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/mesPPBackInboundOrder.js"
deleted file mode 100644
index 24e1d94..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/mesPPBackInboundOrder.js"
+++ /dev/null
@@ -1,58 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/mesPPBackInboundOrderDetail.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/mesPPBackInboundOrderDetail.js"
deleted file mode 100644
index 24e1d94..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/mesPPBackInboundOrderDetail.js"
+++ /dev/null
@@ -1,58 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/mesProInOrderDetail.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/mesProInOrderDetail.js"
deleted file mode 100644
index 24e1d94..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/mesProInOrderDetail.js"
+++ /dev/null
@@ -1,58 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/mesProInOrderInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/mesProInOrderInfo.js"
deleted file mode 100644
index 9892472..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/mesProInOrderInfo.js"
+++ /dev/null
@@ -1,64 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- onInited() {
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //this.detailOptions.columns.forEach(column=>{ });
- },
- searchBefore(param) {
- //鐣岄潰鏌ヨ鍓�,纭繚杩斿洖鏈夋晥鍙傛暟
- if (!param) {
- param = { wheres: [] };
- }
- //鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
- return param;
- },
- searchAfter(result) {
- //鏌ヨ鍚庯紝纭繚姝ｇ‘澶勭悊杩斿洖缁撴灉
- if (result && result.data && Array.isArray(result.data)) {
- return result.data;
- }
- return result;
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/proDeliverBackOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/proDeliverBackOrder.js"
deleted file mode 100644
index 2e7a2f2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/proDeliverBackOrder.js"
+++ /dev/null
@@ -1,68 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- onInited() {
- this.detailOptions.summary = true;
- this.detailOptions.columns.forEach(x => {
- if (x.field == 'orderQuantity') {
- x.summary = true;
- //璁＄畻骞冲潎鍊�
- // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
- //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
- // x.numberLength = 4;
- }
- });
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/proDeliverBackOrderDetail.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/proDeliverBackOrderDetail.js"
deleted file mode 100644
index 2e7a2f2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/proDeliverBackOrderDetail.js"
+++ /dev/null
@@ -1,68 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- onInited() {
- this.detailOptions.summary = true;
- this.detailOptions.columns.forEach(x => {
- if (x.field == 'orderQuantity') {
- x.summary = true;
- //璁＄畻骞冲潎鍊�
- // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
- //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
- // x.numberLength = 4;
- }
- });
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/proInStatistics.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/proInStatistics.js"
deleted file mode 100644
index 24e1d94..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/proInStatistics.js"
+++ /dev/null
@@ -1,58 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/purchaseBSTOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/purchaseBSTOrder.js"
deleted file mode 100644
index 24e1d94..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/purchaseBSTOrder.js"
+++ /dev/null
@@ -1,58 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/purchaseOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/purchaseOrder.js"
deleted file mode 100644
index 24e1d94..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/purchaseOrder.js"
+++ /dev/null
@@ -1,58 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/purchaseOrderDetail.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/purchaseOrderDetail.js"
deleted file mode 100644
index 8935403..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/purchaseOrderDetail.js"
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************************
-** 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/WMSClient/src/extension/inbound/receiveOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/receiveOrder.js"
deleted file mode 100644
index a82bcc5..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/receiveOrder.js"
+++ /dev/null
@@ -1,93 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- let InOrder = this.buttons.find(x => x.value == 'CreateInOrder');
- if (InOrder) {
- InOrder.onClick = function () {
- let rows = this.$refs.table.getSelected();
- if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- if (rows.length > 1) return this.$error("璇烽�夋嫨鍗曟潯鏁版嵁!");
- this.$confirm("纭鍒涘缓鏀惰揣鍗�" + rows[0].receiveOrderNo + "鐨勫叆搴撳悧?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- center: true,
- }).then(() => {
-
- var keys = rows.map(x => { return x.receiveOrderId });
- this.http
- .post("api/ReceiveOrder/CreateInboundOrder?receiveOrderId=" + keys[0], null, "鏁版嵁澶勭悊涓�")
- .then((x) => {
- if (!x.status) return this.$message.error(x.message);
- this.$message.success("鎿嶄綔鎴愬姛");
- this.refresh();
- });
-
- });
- }
-
- }
- },
- onInited() {
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //this.detailOptions.columns.forEach(column=>{ });
- this.detailOptions.summary = true;
- this.detailOptions.columns.forEach(x => {
- if (x.field == 'receivedQuantity') {
- x.summary = true;
- //璁＄畻骞冲潎鍊�
- // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
- //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
- // x.numberLength = 4;
- }
- });
- },
- 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/WMSClient/src/extension/inbound/receiveOrderDetail.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/receiveOrderDetail.js"
deleted file mode 100644
index 8935403..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/receiveOrderDetail.js"
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************************
-** 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/WMSClient/src/extension/inbound/returnBSTOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/returnBSTOrder.js"
deleted file mode 100644
index 2e7a2f2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/returnBSTOrder.js"
+++ /dev/null
@@ -1,68 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- onInited() {
- this.detailOptions.summary = true;
- this.detailOptions.columns.forEach(x => {
- if (x.field == 'orderQuantity') {
- x.summary = true;
- //璁＄畻骞冲潎鍊�
- // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
- //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
- // x.numberLength = 4;
- }
- });
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/returnBSTOrderDetail.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/returnBSTOrderDetail.js"
deleted file mode 100644
index 2e7a2f2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/returnBSTOrderDetail.js"
+++ /dev/null
@@ -1,68 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- onInited() {
- this.detailOptions.summary = true;
- this.detailOptions.columns.forEach(x => {
- if (x.field == 'orderQuantity') {
- x.summary = true;
- //璁＄畻骞冲潎鍊�
- // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
- //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
- // x.numberLength = 4;
- }
- });
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/returnOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/returnOrder.js"
deleted file mode 100644
index cf364ab..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/returnOrder.js"
+++ /dev/null
@@ -1,82 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- let InOrder = this.buttons.find(x => x.value == 'CreateReturnInOrder');
- if (InOrder) {
- InOrder.onClick = function () {
- this.$confirm("鏄惁纭閫�搴�","閫�搴撹鍛�",{
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- center: true,
- }).then(() => {
- let rows = this.$refs.table.getSelected();
- if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- if (rows.length > 1) return this.$error("璇烽�夋嫨鍗曟潯鏁版嵁!");
- var keys = rows.map(x => { return x.id });
- this.http
- .post("api/ReturnOrder/IsReturnCreateInOrder?returnId="+keys[0], null, "鏁版嵁澶勭悊涓�")
- .then((x) => {
- if (!x.status) return this.$message.error(x.message);
- this.$message.success("鎿嶄綔鎴愬姛");
- this.refresh();
- });
- });
-
- }
- }
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/takeStockOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/takeStockOrder.js"
deleted file mode 100644
index 6292426..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/inbound/takeStockOrder.js"
+++ /dev/null
@@ -1,59 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
-
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/extend/MesOutOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/extend/MesOutOrderDetail.vue"
deleted file mode 100644
index 3e5e94d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/extend/MesOutOrderDetail.vue"
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
- <div>
- <vol-box
- v-model="showDetialBox"
- :lazy="true"
- width="75%"
- :padding="15"
- title="鍑哄簱璇︽儏"
- >
- <div class="box-head">
- <el-alert :closable="false" style="width: 100%">
- <el-row>
- <el-col :span="24">
- <span class="less-style">鐗╂枡鍚嶇О锛� {{ row.materialName }} </span>
- <el-divider direction="vertical"></el-divider>
- <span class="less-style">鐗╂枡缂栧彿锛� {{ row.materialCode }} </span>
- <el-divider direction="vertical"></el-divider>
- <span class="less-style"
- >闇�姹傛暟閲忥細 {{ row.orderQuantity }}
- </span>
- <el-divider direction="vertical"></el-divider>
- <span class="less-style"
- >宸插垎閰嶆暟閲忥細 {{ row.lockQuantity }}
- </span>
- </el-col>
- </el-row>
- </el-alert>
- </div>
- <div class="box-table" style="margin-top: 1%">
- <el-table
- ref="singleTable"
- :data="tableData"
- style="width: 100%; height: 100%"
- highlight-current-row
- height="500px"
- >
- >
- <el-table-column
- label="搴忓彿"
- type="index"
- fixed="left"
- width="55"
- align="center"
- ></el-table-column>
- <el-table-column
- v-for="(item, index) in tableColumns.filter((x) => !x.hidden)"
- :key="index"
- :prop="item.prop"
- :label="item.title"
- :width="item.width"
- align="center"
- >
- <template #default="scoped" v-if="item.type == 'icon'">
- <el-tooltip
- class="item"
- effect="dark"
- :content="item.title"
- placement="bottom"
- ><el-button
- type="text"
- @click="tableButtonClick(scoped.row, item)"
- ><i :class="item.icon" style="font-size: 22px"></i></el-button
- ></el-tooltip>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <template #footer>
- <!-- <el-button type="primary" size="small" @click="submit">纭</el-button> -->
- <el-button type="danger" size="small" @click="showDetialBox = false"
- >鍏抽棴</el-button
- >
- </template>
- </vol-box>
- </div>
-</template>
- <script>
-import VolBox from "@/components/basic/VolBox.vue";
-export default {
- components: { VolBox },
- data() {
- return {
- row: null,
- showDetialBox: false,
- tableData: [],
- tableColumns: [
- {
- prop: "id",
- title: "涓婚敭",
- type: "string",
- width: 150,
- hidden: true,
- },
- {
- prop: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- width: 150,
- },
- {
- prop: "orderDetailId",
- title: "鍗曟嵁鏄庣粏涓婚敭",
- type: "string",
- width: 150,
- hidden: true,
- },
- {
- prop: "orderType",
- title: "鍗曟嵁绫诲瀷",
- type: "string",
- width: 90,
- },
- {
- prop: "batchNo",
- title: "鎵规鍙�",
- type: "string",
- width: 120,
- },
- {
- prop: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- },
- {
- prop: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- },
- {
- prop: "stockId",
- title: "搴撳瓨涓婚敭",
- type: "string",
- width: 150,
- hidden: true,
- },
- {
- prop: "originalQuantity",
- title: "鍘熷搴撳瓨閲�",
- type: "string",
- width: 100,
- },
- // {
- // prop: "assignQuantity",
- // title: "鍒嗛厤鍑哄簱閲�",
- // type: "string",
- // width: 100,
- // },
- {
- prop: "taskNum",
- title: "鍑哄簱浠诲姟鍙�",
- type: "string",
- width: 100,
- },
- {
- prop: "palletCode",
- title: "鎵樼洏缂栧彿",
- type: "string",
- width: 150,
- },
- {
- prop: "productionDate",
- title: "鐢熶骇鏃ユ湡",
- type: "string",
- width: 160,
-
- },
- {
- prop: "effectiveDate",
- title: "鏈夋晥鏈�",
- type: "string",
- width: 160,
-
- },
- {
- prop: "locationCode",
- title: "璐т綅缂栧彿",
- type: "string",
- width: 180,
- },
- {
- prop: "status",
- title: "鐘舵��",
- type: "string",
- },
- ],
- };
- },
- methods: {
- open(row) {
- this.row = row;
- this.showDetialBox = true;
- this.getData();
- },
- getData() {
- this.http
- .post(
- "api/OutStockLockInfo/GetByMesOrderDetail?taskNo=" +
- this.row.taskNo,
- null,
- "鏌ヨ涓�"
- )
- .then((x) => {
- var label=[
- { label: '宸插垎閰�', value: 0 },
- { label: '鍑哄簱涓�', value: 1 },
- { label: '鍑哄簱瀹屾垚', value: 2 },
- { label: '鎷ｉ�夊畬鎴�', value: 3 },
- { label: '鎾ら攢', value: 99 }
- ]
- this.tableData=x.map((i) => ({
- ...i,
- status:label.find((j) => j.value === i.status).label
- }))
- });
- },
- },
-};
-</script>
- <style scoped>
-.less-style {
- color: black;
-}
-.equle-style {
- color: green;
-}
-.more-style {
- color: red;
-}
-</style>
-
- <style>
-.text-button:hover {
- background-color: #f0f9eb !important;
-}
-.el-table .warning-row {
- background: oldlace;
-}
-.box-table .el-table tbody tr:hover > td {
- background-color: #d8e0d4 !important;
- /* color: #ffffff; */
-}
-
-.box-table .el-table tbody tr.current-row > td {
- background-color: #f0f9eb !important;
- /* color: #ffffff; */
-}
-
-.el-table .success-row {
- background: #f0f9eb;
-}
-
-.box-table .el-table {
- border: 1px solid #ebeef5;
-}
-.box-head .el-alert__content {
- width: 100%;
-}
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue"
deleted file mode 100644
index 2b10b84..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue"
+++ /dev/null
@@ -1,261 +0,0 @@
-<template>
- <div>
- <vol-box
- v-model="showDetialBox"
- :lazy="true"
- width="75%"
- :padding="15"
- title="鍑哄簱璇︽儏"
- >
- <div class="box-head">
- <el-alert :closable="false" style="width: 100%">
- <el-row>
- <el-col :span="24">
- <span class="less-style">鐗╂枡鍚嶇О锛� {{ row.materialName }} </span>
- <el-divider direction="vertical"></el-divider>
- <span class="less-style">鐗╂枡缂栧彿锛� {{ row.materialNo }} </span>
- <el-divider direction="vertical"></el-divider>
- <span class="less-style"
- >闇�姹傛暟閲忥細 {{ row.xqLen }}
- </span>
- <el-divider direction="vertical"></el-divider>
- <span class="less-style"
- >宸插垎閰嶆暟閲忥細 {{ row.assignTotalUsage }}
- </span>
- </el-col>
- </el-row>
- </el-alert>
- </div>
- <div class="box-table" style="margin-top: 1%">
- <el-table
- ref="singleTable"
- :data="tableData"
- style="width: 100%; height: 100%"
- highlight-current-row
- height="500px"
- >
- >
- <el-table-column
- label="搴忓彿"
- type="index"
- fixed="left"
- width="55"
- align="center"
- ></el-table-column>
- <el-table-column
- v-for="(item, index) in tableColumns.filter((x) => !x.hidden)"
- :key="index"
- :prop="item.prop"
- :label="item.title"
- :width="item.width"
- align="center"
- >
- <template #default="scoped" v-if="item.type == 'icon'">
- <el-tooltip
- class="item"
- effect="dark"
- :content="item.title"
- placement="bottom"
- ><el-button
- type="text"
- @click="tableButtonClick(scoped.row, item)"
- ><i :class="item.icon" style="font-size: 22px"></i></el-button
- ></el-tooltip>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <template #footer>
- <!-- <el-button type="primary" size="small" @click="submit">纭</el-button> -->
- <el-button type="danger" size="small" @click="showDetialBox = false"
- >鍏抽棴</el-button
- >
- </template>
- </vol-box>
- </div>
-</template>
- <script>
-import VolBox from "@/components/basic/VolBox.vue";
-export default {
- components: { VolBox },
- data() {
- return {
- row: null,
- orderNo:null,
- showDetialBox: false,
- tableData: [],
- tableColumns: [
- {
- prop: "id",
- title: "涓婚敭",
- type: "string",
- width: 150,
- hidden: true,
- },
- {
- prop: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- width: 150,
- },
- {
- prop: "orderDetailId",
- title: "鍗曟嵁鏄庣粏涓婚敭",
- type: "string",
- width: 150,
- hidden: true,
- },
- {
- prop: "materielId",
- title: "鐗╂枡Id",
- type: "string",
- width: 90,
- },
- {
- prop: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- },
- {
- prop: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- },
- {
- prop: "materialWide",
- title: "鐗╂枡骞呭",
- type: "string",
- width: 100,
- },
- {
- prop: "materialWeight",
- title: "鐗╂枡閲嶉噺",
- type: "string",
- width: 100,
- },
- {
- prop: "stockId",
- title: "搴撳瓨涓婚敭",
- type: "string",
- width: 150,
- hidden: true,
- },
- {
- prop: "orderQuantity",
- title: "鍗曟嵁闇�姹傞暱搴�",
- type: "string",
- width: 110,
- },
- {
- prop: "originalQuantity",
- title: "鍘熷簱瀛橀暱搴�",
- type: "string",
- width: 110,
- },
- {
- prop: "assignQuantity",
- title: "鍒嗛厤鍑哄簱闀垮害",
- type: "string",
- width: 110,
- },
- {
- prop: "taskNum",
- title: "鍑哄簱浠诲姟",
- type: "string",
- width: 100,
- },
- {
- prop: "palletCode",
- title: "鏉＄爜缂栧彿",
- type: "string",
- width: 130,
- },
- {
- prop: "locationCode",
- title: "璐т綅缂栧彿",
- type: "string",
- width: 200,
- },
- {
- prop: "status",
- title: "鐘舵��",
- type: "string",
- },
- ],
- };
- },
- methods: {
- open(row,orderNo) {
- this.row = row;
- this.orderNo=orderNo;
- this.showDetialBox = true;
- this.getData();
- },
- getData() {
- this.http
- .post(
- "api/OutStockLockInfo/GetByOrderDetailId?orderNo="+this.orderNo+"&orderDetailId=" +
- this.row.id,
- null,
- "鏌ヨ涓�"
- )
- .then((x) => {
-
- var label=[
- { label: '宸插垎閰�', value: 0 },
- { label: '鍑哄簱涓�', value: 1 },
- { label: '鍑哄簱瀹屾垚', value: 2 },
- { label: '鎷ｉ�夊畬鎴�', value: 3 },
- { label: '鎾ら攢', value: 99 }
- ]
- this.tableData=x.map((i) => ({
- ...i,
- status:label.find((j) => j.value === i.status).label
- }))
- });
- },
- },
-};
-</script>
- <style scoped>
-.less-style {
- color: black;
-}
-.equle-style {
- color: green;
-}
-.more-style {
- color: red;
-}
-</style>
-
- <style>
-.text-button:hover {
- background-color: #f0f9eb !important;
-}
-.el-table .warning-row {
- background: oldlace;
-}
-.box-table .el-table tbody tr:hover > td {
- background-color: #d8e0d4 !important;
- /* color: #ffffff; */
-}
-
-.box-table .el-table tbody tr.current-row > td {
- background-color: #f0f9eb !important;
- /* color: #ffffff; */
-}
-
-.el-table .success-row {
- background: #f0f9eb;
-}
-
-.box-table .el-table {
- border: 1px solid #ebeef5;
-}
-.box-head .el-alert__content {
- width: 100%;
-}
-</style>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/extend/outSGOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/extend/outSGOrderDetail.vue"
deleted file mode 100644
index b02081a..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/extend/outSGOrderDetail.vue"
+++ /dev/null
@@ -1,450 +0,0 @@
-<template>
- <div>
- <vol-box
- v-model="showDetialBox"
- :lazy="true"
- width="80%"
- :padding="15"
- title="鍗曟嵁鏄庣粏淇℃伅"
- >
- <div class="box-head">
- <el-alert :closable="false" style="width: 100%">
- <el-row>
- <el-col :span="16">
- <span>宸查�変腑 {{ selection.length }} 椤�</span>
- <el-divider direction="vertical"></el-divider>
- <span>鍗曞彿 {{ row.orderId }} </span>
- </el-col>
- <el-col :span="8">
- <!-- <el-link
- type="primary"
- size="small"
- style="float: right; height: 20px"
- @click="lockstocks"
- >閿佸畾搴撳瓨</el-link
- > -->
- <el-link
- type="primary"
- size="small"
- style="float: right; height: 20px; margin-right: 10px"
- @click="outbound"
- >鐩存帴鍑哄簱</el-link
- >
- <el-link
- type="primary"
- size="small"
- style="float: right; height: 20px; margin-right: 10px"
- @click="getData"
- >鍒锋柊</el-link
- ></el-col
- >
- </el-row>
- </el-alert>
- </div>
- <div class="box-table" style="margin-top: 1%">
- <el-table
- ref="singleTable"
- :data="tableData"
- :summary-method="getSummaries"
- show-summary
- style="width: 100%; height: 100%"
- highlight-current-row
- @current-change="handleCurrentChange"
- height="500px"
- @row-click="handleRowClick"
- @selection-change="handleSelectionChange"
- >
- <el-table-column type="selection" width="55"> </el-table-column>
- <el-table-column
- label="搴忓彿"
- type="index"
- fixed="left"
- width="55"
- align="center"
- ></el-table-column>
- <el-table-column
- v-for="(item, index) in tableColumns.filter((x) => !x.hidden)"
- :key="index"
- :prop="item.prop"
- :label="item.title"
- :width="item.width"
- align="center"
- >
- <template #default="scoped">
- <div v-if="item.type == 'icon'">
- <el-tooltip
- class="item"
- effect="dark"
- :content="item.title"
- placement="bottom"
- ><el-link
- type="primary"
- :disabled="getButtonEnable(item.prop, scoped.row)"
- @click="tableButtonClick(scoped.row, item)"
- ><i :class="item.icon" style="font-size: 22px"></i></el-link
- ></el-tooltip>
- </div>
-
- <div v-else-if="item.type == 'tag'">
- <el-tag size="small">
- {{ getDictionary(scoped.row, item) }}
- </el-tag>
- </div>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </vol-box>
- <stock-select ref="child" @parentCall="parentCall"></stock-select>
- <selected-stock
- ref="selectedStock"
- @parentCall="parentCall"
- ></selected-stock>
- </div>
-</template>
-<script>
-import VolBox from "@/components/basic/VolBox.vue";
-import VolForm from "@/components/basic/VolForm.vue";
-import SelectedStock from "./SelectedStock.vue";
-export default {
- components: { VolBox, VolForm, SelectedStock },
- data() {
- return {
- row: null,
- showDetialBox: false,
- flag: false,
- currentRow: null,
- selection: [],
- tableData: [],
- tableColumns: [
- {
- prop: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- },
- {
- prop: "outSGOrderId",
- title: "鍑哄簱鍗曚富閿�",
- type: "int",
- width: 90,
- hidden: true,
- },
- {
- prop: "鍏宠仈鐨勬槑缁咺D(涓婃父)",
- title: "鍑哄簱鍗曞彿",
- type: "int",
- width: 90,
- hidden: true,
- },
- {
- prop: "materialNo",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- },
- {
- prop: "materialName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- },
- {
- prop: "boardFluteNo",
- title: "妤炲埆",
- type: "string",
- width: 110,
- },
- {
- prop: "machineName",
- title: "鏈哄彴",
- type: "string",
- width: 110,
- },
- {
- prop: "width",
- title: "骞呭",
- type: "string",
- width: 100,
- },
- {
- prop: "xqLen",
- title: "闇�姹傞暱搴�",
- type: "string",
- width: 130,
- },
- {
- prop: "totalUsage",
- title: "鎬荤敤閲嶉噺",
- type: "int",
- width: 130,
- },
- {
- prop: "assignTotalUsage",
- title: "宸插垎閰嶉暱搴�",
- type: "string",
- width: 130,
- },
- {
- prop: "outTotalUsage",
- title: "宸插嚭闀垮害",
- type: "string",
- width: 130,
- },
- {
- prop: "outSGOrderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
- type: "tag",
- width: 180,
- bindKey: "outboundStatusEnum",
- },
- // {
- // prop: "assignStock",
- // title: "鎸囧畾搴撳瓨",
- // type: "icon",
- // width: 90,
- // icon: "el-icon-s-grid",
- // },
- {
- prop: "viewDetail",
- title: "鍑哄簱璇︾粏",
- type: "icon",
- width: 90,
- icon: "el-icon-s-operation",
- },
- {
- prop: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 170,
- },
- // {
- // prop: "modifyDate",
- // title: "淇敼鏃堕棿",
- // type: "datetime",
- // width: 170,
- // },
- ],
- paginations: {
- sort: "id",
- order: "desc",
- Foots: "",
- total: 0,
- // 2020.08.29澧炲姞鑷畾涔夊垎椤垫潯澶у皬
- sizes: [60],
- size: 60, // 榛樿鍒嗛〉澶у皬
- Wheres: [],
- page: 1,
- rows: 60,
- },
- searchFormOptions: [
- [
- {
- title: "鍗曟嵁缂栧彿",
- field: "allocation_code",
- type: "like",
- },
- {
- title: "鍗曟嵁绫诲瀷",
- field: "allocation_type",
- type: "select",
- dataKey: "OrderType",
- data: [],
- },
- {
- title: "鍗曟嵁鐘舵��",
- field: "allocation_state",
- type: "select",
- dataKey: "OrderState",
- data: [],
- },
- ],
- ],
- searchFormFields: {
- allocation_code: "",
- allocation_type: "",
- allocation_state: "",
- },
- dictionaryList: null,
- };
- },
- methods: {
- open(row) {
- this.row = row;
- this.showDetialBox = true;
- console.log(row);
- this.getDictionaryData();
- this.getData();
- },
- getSummaries(param) {
- const { columns, data } = param
- const sums = []
-
- columns.forEach((column, index) => {
- if (index === 0) {
- sums[index] = '鍚堣'
- return
- }
-
- // 浠呭鏁板�煎垪姹傚拰
- if (column.property === 'xqLen' || column.property === 'assignTotalUsage' || column.property === 'outTotalUsage' || column.property === 'totalUsage') {
- const values = data.map(item => Number(item[column.property]))
- if (!values.every(value => isNaN(value))) {
- sums[index] = values.reduce((prev, curr) => {
- return prev + (isNaN(curr) ? 0 : curr)
- }, 0);
- //淇濈暀4浣嶅皬鏁�
- sums[index] = sums[index].toFixed(4)
- } else {
- sums[index] = '-'
- }
- }
-
- })
-
- return sums
- },
- getData() {
- var wheres = [{ name: "outSGOrderId", value: this.row.id }];
- var param = {
- page: this.paginations.page,
- rows: this.paginations.rows,
- sort: this.paginations.sort,
- order: this.paginations.order,
- wheres: JSON.stringify(wheres), // 鏌ヨ鏉′欢锛屾牸寮忎负[{ name: "瀛楁", value: "xx" }]
- };
- this.http
- .post("api/OutSGOrderDetail/GetPageData", param, "鏌ヨ涓�")
- .then((x) => {
- this.tableData = x.rows;
- });
- },
- tableButtonClick(row, column) {
- if (column.prop == "assignStock") {
- this.$refs.child.open(row);
- } else {
- //鐐瑰嚮鎵撳紑鍑哄簱璇︽儏
- this.$refs.selectedStock.open(row,this.row.orderId);
- }
- },
- outbound() {
- if (this.selection.length === 0) {
- return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
- }
- var keys = this.selection.map((item) => item.id); // 鑾峰彇閫変腑琛岀殑id
-
- this.http
- .post("api/Task/CreateBSTOutboundTasks", keys, "鏁版嵁澶勭悊涓�")
- .then((x) => {
- if (!x.status) return this.$message.error(x.message);
- this.$message.success("鎿嶄綔鎴愬姛");
- this.showDetialBox = false;
- this.$emit("parentCall", ($vue) => {
- $vue.getData();
- });
- });
- },
- setCurrent(row) {
- this.$refs.singleTable.setCurrentRow(row);
- },
- handleCurrentChange(val) {
- this.currentRow = val;
- },
- getButtonEnable(propName, row) {
- if (propName == "assignStock") {
- if (
- row.outSGOrderDetailStatus !== 0 &&
- row.outSGOrderDetailStatus !== 60 &&
- row.outSGOrderDetailStatus !== 70 &&
- row.outSGOrderDetailStatus !== 80
- ) {
- return true;
- } else {
- return false;
- }
- }
- return false;
- },
- parentCall(fun) {
- if (typeof fun != "function") {
- return console.log("鎵╁睍缁勪欢闇�瑕佷紶鍏ヤ竴涓洖璋冩柟娉曟墠鑳借幏鍙栫埗绾ue瀵硅薄");
- }
- fun(this);
- },
- handleRowClick(row) {
- this.$refs.singleTable.toggleRowSelection(row);
- },
- handleSelectionChange(val) {
- this.selection = val;
- },
- getDictionaryData() {
- if (this.dictionaryList) {
- return;
- }
- var param = [];
- this.tableColumns.forEach((x) => {
- if (x.type == "tag" && x.bindKey != "") {
- param.push(x.bindKey);
- }
- });
- this.http
- .post("api/Sys_Dictionary/GetVueDictionary", param, "鏌ヨ涓�")
- .then((x) => {
- if (x.length > 0) {
- this.dictionaryList = x;
- }
- });
- },
- getDictionary(row, column) {
- if (this.dictionaryList) {
- var item = this.dictionaryList.find((x) => x.dicNo == column.bindKey);
- if (item) {
- var dicItem = item.data.find((x) => x.key == row[column.prop]);
- // console.log(dicItem);
- if (dicItem) {
- return dicItem.value;
- } else {
- return row[column.prop];
- }
- } else {
- return row[column.prop];
- }
- }
- },
- },
-};
-</script>
-<style scoped>
-.text-button {
- border: 0px;
-}
-</style>
-
-<style>
-.text-button:hover {
- background-color: #f0f9eb !important;
-}
-
-.el-table .warning-row {
- background: oldlace;
-}
-
-.box-table .el-table tbody tr:hover > td {
- background-color: #d8e0d4 !important;
- /* color: #ffffff; */
-}
-
-.box-table .el-table tbody tr.current-row > td {
- background-color: #f0f9eb !important;
- /* color: #ffffff; */
-}
-
-.el-table .success-row {
- background: #f0f9eb;
-}
-
-.box-table .el-table {
- border: 1px solid #ebeef5;
-}
-</style>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outBSTOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outBSTOrder.js"
deleted file mode 100644
index 8855c6b..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outBSTOrder.js"
+++ /dev/null
@@ -1,73 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- //鎵╁睍椤甸潰鍒濆鍖栨搷浣�
- // this.columns.push({
- // field: '鎿嶄綔',
- // title: '鎿嶄綔',
- // width: 90,
- // fixed: 'right',
- // align: 'center',
- // formatter: (row) => {
- // return (
- // '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅鏄庣粏</i>'
- // );
- // },
- // click: (row) => {
- // this.$refs.gridBody.open(row);
- // }
- // });
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outBSTOrderDetail.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outBSTOrderDetail.js"
deleted file mode 100644
index 24e1d94..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outBSTOrderDetail.js"
+++ /dev/null
@@ -1,58 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outBSTPickInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outBSTPickInfo.js"
deleted file mode 100644
index 2e7a2f2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outBSTPickInfo.js"
+++ /dev/null
@@ -1,68 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- onInited() {
- this.detailOptions.summary = true;
- this.detailOptions.columns.forEach(x => {
- if (x.field == 'orderQuantity') {
- x.summary = true;
- //璁＄畻骞冲潎鍊�
- // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
- //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
- // x.numberLength = 4;
- }
- });
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outMESOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outMESOrder.js"
deleted file mode 100644
index e69de29..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outMESOrder.js"
+++ /dev/null
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outSGOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outSGOrder.js"
deleted file mode 100644
index 72eb4d1..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outSGOrder.js"
+++ /dev/null
@@ -1,97 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-import gridBody from './extend/outSGOrderDetail.vue'
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: gridBody,
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- //鎵╁睍椤甸潰鍒濆鍖栨搷浣�
- this.columns.push({
- field: '鎿嶄綔',
- title: '鎿嶄綔',
- width: 90,
- fixed: 'right',
- align: 'center',
- formatter: (row) => {
- return (
- '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅鏄庣粏</i>'
- );
- },
- click: (row) => {
- this.$refs.gridBody.open(row);
- }
- });
- //鍒涘缓鎺掔▼鍑哄簱
- let OutOrder = this.buttons.find(x => x.value == 'CreateSGManualTasks');
- if (OutOrder) {
- OutOrder.onClick = function () {
- let rows = this.$refs.table.getSelected();
- if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- this.$confirm("纭瑕侀�夋嫨鐨勬暟鎹嚭搴撳槢鍚�?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- center: true,
- }).then(() => {
- var keys = rows.map((x) => x.id);
- this.http
- .post("api/Task/CreateSGManualTasks?", keys, "鏁版嵁澶勭悊涓�")
- .then((x) => {
- if (!x.status) return this.$message.error(x.message);
- this.$message.success("鎿嶄綔鎴愬姛");
- this.refresh();
- });
- });
- }
- }
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outSGOrderDetail.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outSGOrderDetail.js"
deleted file mode 100644
index 5362714..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outSGOrderDetail.js"
+++ /dev/null
@@ -1,57 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outStockLockInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outStockLockInfo.js"
deleted file mode 100644
index 92badda..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/outStockLockInfo.js"
+++ /dev/null
@@ -1,76 +0,0 @@
-/*****************************************************************************************
-** 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/proDeliveryOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/proDeliveryOrder.js"
deleted file mode 100644
index 2e7a2f2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/proDeliveryOrder.js"
+++ /dev/null
@@ -1,68 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- onInited() {
- this.detailOptions.summary = true;
- this.detailOptions.columns.forEach(x => {
- if (x.field == 'orderQuantity') {
- x.summary = true;
- //璁＄畻骞冲潎鍊�
- // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
- //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
- // x.numberLength = 4;
- }
- });
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/proDeliveryOrderDetail.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/proDeliveryOrderDetail.js"
deleted file mode 100644
index 2e7a2f2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/outbound/proDeliveryOrderDetail.js"
+++ /dev/null
@@ -1,68 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- onInited() {
- this.detailOptions.summary = true;
- this.detailOptions.columns.forEach(x => {
- if (x.field == 'orderQuantity') {
- x.summary = true;
- //璁＄畻骞冲潎鍊�
- // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
- //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
- // x.numberLength = 4;
- }
- });
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/sort/sortOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/sort/sortOrder.js"
new file mode 100644
index 0000000..f286718
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/sort/sortOrder.js"
@@ -0,0 +1,56 @@
+
+//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
+let extension = {
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: '',
+ gridBody: '',
+ gridFooter: '',
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() {
+ },
+ 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/WMSClient/src/extension/sort/sortOrderDetail.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/sort/sortOrderDetail.js"
new file mode 100644
index 0000000..f286718
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/sort/sortOrderDetail.js"
@@ -0,0 +1,56 @@
+
+//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
+let extension = {
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: '',
+ gridBody: '',
+ gridFooter: '',
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() {
+ },
+ 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/WMSClient/src/extension/stock/ProStockView.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/ProStockView.js"
deleted file mode 100644
index 92ad623..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/ProStockView.js"
+++ /dev/null
@@ -1,134 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-import { el } from "element-plus/es/locales.mjs";
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- // let InOrder = this.buttons.find(x => x.value == 'StockOutbound');
- // if (InOrder) {
- // InOrder.onClick = function () {
- // let rows = this.$refs.table.getSelected();
- // if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- // if (rows.length > 1) return this.$error("璇烽�夋嫨鍗曟潯鏁版嵁!");
- // var keys = rows.map(x => { return x.stockId });
- // this.http
- // .post("api/Task/Outbound?id="+keys[0], null, "鏁版嵁澶勭悊涓�")
- // .then((x) => {
- // if (!x.status) return this.$message.error(x.message);
- // this.$message.success("鎿嶄綔鎴愬姛");
- // this.refresh();
- // });
- // }
- // }
- this.columns.forEach(column => {
- if (column.field == 'materielCode') {
- column.formatter = (row) => {
- var str = '';
- var list = row.materielCode.split(',');
- for (let index = 0; index < list.length; index++) {
- str += list[index] + '<br>';
- }
- return str = list[0] == "" ? "绌虹" : str;
- }
- }
- if (column.field == 'batchNo') {
- column.formatter = (row) => {
- var str = '';
- var list = row.batchNo.split(',');
- for (let index = 0; index < list.length; index++) {
- str += list[index] + '<br>';
- }
- return str = list[0] == "" ? "鏃�" : str;
- }
- }
- if (column.field == 'materielInfo') {
- const today = new Date()
- column.formatter = (row) => {
- if (row.details.length > 0) {
- const today = new Date();
- const closestDate = row.details
- .map(x => {
- const date = new Date(x.effectiveDate);
- const diffInDays = Math.ceil(Math.abs((today - date) / (1000 * 60 * 60 * 24)));
- return { date, diffInDays };
- })
- .reduce((closest, current) => (current.diffInDays < closest.diffInDays ? current : closest))
- .date;
-
- const daysSinceClosest = Math.ceil(Math.abs((today - closestDate) / (1000 * 60 * 60 * 24)));
- return '<span style="color: #F56C6C">' + daysSinceClosest + "澶�" + '</span>';
- } else {
- return '<span style="color: #F56C6C">' + "鏃犱繚璐ㄦ湡" + '</span>';
- }
-
- }
- }
- if (column.field == 'sumStock') {
- column.formatter = (row) => {
- if (row.details.length > 0) {
- var sum = 0;
- const closestDate = row.details
- .map(x => {
- sum += (x.stockQuantity)
- })
- return '<span style="color: #F56C6C">' + sum + row.details[0].unit + '</span>';
- } else {
- return '<span style="color: #F56C6C">' + "1涓�" + '</span>';
- }
-
- }
- }
- })
- },
- 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/WMSClient/src/extension/stock/blankStockInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/blankStockInfo.js"
new file mode 100644
index 0000000..f286718
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/blankStockInfo.js"
@@ -0,0 +1,56 @@
+
+//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
+let extension = {
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: '',
+ gridBody: '',
+ gridFooter: '',
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() {
+ },
+ 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/WMSClient/src/extension/stock/blankStockInfo_Hty.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/blankStockInfo_Hty.js"
new file mode 100644
index 0000000..f286718
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/blankStockInfo_Hty.js"
@@ -0,0 +1,56 @@
+
+//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
+let extension = {
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: '',
+ gridBody: '',
+ gridFooter: '',
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() {
+ },
+ 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/WMSClient/src/extension/stock/materielnfoStatistics.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/materielnfoStatistics.js"
deleted file mode 100644
index 6292426..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/materielnfoStatistics.js"
+++ /dev/null
@@ -1,59 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
-
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/mouldStockInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/mouldStockInfo.js"
new file mode 100644
index 0000000..f286718
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/mouldStockInfo.js"
@@ -0,0 +1,56 @@
+
+//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
+let extension = {
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: '',
+ gridBody: '',
+ gridFooter: '',
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() {
+ },
+ 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/WMSClient/src/extension/stock/mouldStockInfo_Hty.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/mouldStockInfo_Hty.js"
new file mode 100644
index 0000000..f286718
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/mouldStockInfo_Hty.js"
@@ -0,0 +1,56 @@
+
+//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
+let extension = {
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: '',
+ gridBody: '',
+ gridFooter: '',
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() {
+ },
+ 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/WMSClient/src/extension/stock/proStockInfoDetail.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/proStockInfoDetail.js"
deleted file mode 100644
index 6292426..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/proStockInfoDetail.js"
+++ /dev/null
@@ -1,59 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
-
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/proStockInfoDetail_Hty.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/proStockInfoDetail_Hty.js"
deleted file mode 100644
index 6292426..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/proStockInfoDetail_Hty.js"
+++ /dev/null
@@ -1,59 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
-
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/stockInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/stockInfo.js"
deleted file mode 100644
index 7fa2011..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/stockInfo.js"
+++ /dev/null
@@ -1,82 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- //鎸囧畾鍑哄簱
- let OutOrder = this.buttons.find(x => x.value == 'StockOutbound');
- if (OutOrder) {
-
- OutOrder.onClick = function () {
- let rows = this.$refs.table.getSelected();
- if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- this.$confirm("纭瑕侀�夋嫨鐨勬暟鎹嚭搴撳槢鍚�?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- center: true,
- }).then(() => {
- var keys = rows.map((x) => x.id);
- this.http
- .post("api/Task/OldYLOutbound?", keys, "鏁版嵁澶勭悊涓�")
- .then((x) => {
- if (!x.status) return this.$message.error(x.message);
- this.$message.success("鎿嶄綔鎴愬姛");
- this.refresh();
- });
- });
- }
- }
- },
- 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;
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/stockInfo_Hty.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/stockInfo_Hty.js"
deleted file mode 100644
index 8935403..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/stockInfo_Hty.js"
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************************
-** 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/WMSClient/src/extension/stock/stockView.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/stockView.js"
deleted file mode 100644
index 1b2540a..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/stock/stockView.js"
+++ /dev/null
@@ -1,178 +0,0 @@
-
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
-import { el } from "element-plus/es/locales.mjs";
-
-let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
-
- // let InOrder = this.buttons.find(x => x.value == 'StockOutbound');
- // if (InOrder) {
- // InOrder.onClick = function () {
- // let rows = this.$refs.table.getSelected();
- // if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- // if (rows.length > 1) return this.$error("璇烽�夋嫨鍗曟潯鏁版嵁!");
- // var keys = rows.map(x => { return x.stockId });
- // this.http
- // .post("api/Task/Outbound?id="+keys[0], null, "鏁版嵁澶勭悊涓�")
- // .then((x) => {
- // if (!x.status) return this.$message.error(x.message);
- // this.$message.success("鎿嶄綔鎴愬姛");
- // this.refresh();
- // });
- // }
- // }
- this.columns.forEach(column => {
- if (column.field == 'materielCode') {
- column.formatter = (row) => {
- var str = '';
- var list = row.materielCode.split(',');
- for (let index = 0; index < list.length; index++) {
- str += list[index] + '<br>';
- }
- return str = list[0] == "" ? "绌虹" : str;
- }
- }
- if (column.field == 'batchNo') {
- column.formatter = (row) => {
- var str = '';
- var list = row.batchNo.split(',');
- for (let index = 0; index < list.length; index++) {
- str += list[index] + '<br>';
- }
- return str = list[0] == "" ? "鏃�" : str;
- }
- }
- if (column.field == 'materielInfo') {
- const today = new Date()
- column.formatter = (row) => {
- if (row.details.length > 0) {
- const today = new Date();
- const closestDate = row.details
- .map(x => {
- const date = new Date(x.effectiveDate);
- const diffInDays = Math.ceil((date - today) / (1000 * 60 * 60 * 24)); // 鏀逛负璁＄畻鍓╀綑澶╂暟
- return { date, diffInDays };
- })
- .reduce((closest, current) => (current.diffInDays < closest.diffInDays ? current : closest))
- .date;
-
- const daysRemaining = Math.ceil((closestDate - today) / (1000 * 60 * 60 * 24));
-
- row.expiryDays = daysRemaining;
-
- if (daysRemaining <= 0) {
- return '<span style="color:rgb(30, 27, 27)">鏃犱繚璐ㄦ湡</span>';
- } else {
- return '<span style="color: #F56C6C">' + daysRemaining + "澶�" + '</span>';
- }
- } else {
- row.expiryDays = null;
- return '<span style="color:rgb(24, 18, 18)">鏃犱繚璐ㄦ湡</span>';
- }
- }
-
-
- }
- if (column.field == 'sumStock') {
- column.formatter = (row) => {
- if (row.details.length > 0) {
- var sum = 0;
- const closestDate = row.details
- .map(x => {
- sum += (x.stockQuantity)
- })
- return '<span style="color: #F56C6C">' + sum.toFixed(3) + row.details[0].unit + '</span>';
- } else {
- return '<span style="color: #F56C6C">' + "1涓�" + '</span>';
- }
-
- }
- }
- })
- this.columns.forEach((column) => {
- column.cellStyle = (row) => {
- // 鍙鐞嗘湁淇濊川鏈熸暟鎹殑鎯呭喌
- if (row.expiryDays !== null && row.expiryDays !== undefined) {
- if (row.expiryDays <= 0) {
- return { background: 'red' }; // 绾㈣壊鑳屾櫙锛堝凡杩囨湡锛�
- } else if (row.expiryDays <= 30) {
- return { background: 'yellow' }; // 榛勮壊鑳屾櫙锛堜复鏈燂級
- }
- }
- return {}; // 榛樿鏃犺儗鏅壊
- };
-
-
-
-
- //濡傛灉鏍规嵁琛岀殑鏌愪釜鍊艰缃暣琛岄鑹�
- //璁剧疆鏁磋鑳屾櫙棰滆壊
- // x.cellStyle = (row, rowIndex, columnIndex) => {
- // if (row.ProductCode == '10044464880643') {
- // return { background: '#ddecfd' };
- // }
- // };
- });
- },
- onInited() {
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //this.detailOptions.columns.forEach(column=>{ });
- this.detailOptions.summary = true;
- this.detailOptions.columns.forEach(x => {
- if (x.field == 'stockQuantity') {
- x.summary = true;
- //璁＄畻骞冲潎鍊�
- // x.summary = 'avg';//2023.05.03鏇存柊voltable鏂囦欢鍚庢墠鑳戒娇鐢�
- //璁剧疆灏忔暟鏄剧ず浣嶆暟(榛樿2浣�)
- // x.numberLength = 4;
- }
- });
- },
- 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/WMSClient/src/extension/taskinfo/task.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/taskinfo/task.js"
index de64d48..5ebc212 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/taskinfo/task.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/taskinfo/task.js"
@@ -1,41 +1,23 @@
-
+import http from '@/api/http';
//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- let TaskHandCancelBtn = this.buttons.find(x => x.value == 'TaskHandCancel');
- if (TaskHandCancelBtn) {
- TaskHandCancelBtn.onClick = function () {
- let rows = this.$refs.table.getSelected();
- if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉℃暟鎹�!");
- var param = rows[0].taskNum;
- this.http
- .post("api/Task/TaskCancel?taskNum="+param, "鏁版嵁澶勭悊涓�...")
- .then((x) => {
- if (x.status) {
- this.$Message.success('浠诲姟鍙栨秷鎴愬姛.');
- this.refresh();
- } else {
- return this.$error(x.message);
- }
- });
- }
- }
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: '',
+ gridBody: '',
+ gridFooter: '',
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: {
+ view: [], box: [], detail: []
+ }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() {
let TaskHandCompletedBtn = this.buttons.find(x => x.value == 'TaskHandCompleted');
if (TaskHandCompletedBtn) {
TaskHandCompletedBtn.onClick = function () {
@@ -62,68 +44,41 @@
});
}
}
- let ResendTaskBtn = this.buttons.find(x => x.value == 'ResendTask');
- if (ResendTaskBtn) {
- ResendTaskBtn.onClick = function () {
- this.$confirm("鏄惁纭閲嶆柊涓嬪彂浠诲姟","閲嶆柊涓嬪彂浠诲姟璀﹀憡",{
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- center: true,
- }).then(() => {
- let rows = this.$refs.table.getSelected();
- if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉℃暟鎹�!");
- var param = rows[0].taskNum;
- this.http
- .post("api/Task/ResendTask?taskNum="+param, "")
- .then((x) => {
- if (x.status) {
- this.$Message.success('浠诲姟閲嶆柊涓嬪彂');
- this.refresh();
- } else {
- return this.$error(x.message);
- }
- });
- });
- }
- }
- },
- 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)
- }
+ },
+ 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;
-
\ No newline at end of file
+ }
+};
+export default extension;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/taskinfo/task_hty.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/taskinfo/task_hty.js"
index 24e1d94..f286718 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/taskinfo/task_hty.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/extension/taskinfo/task_hty.js"
@@ -1,58 +1,56 @@
//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
-
let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: '',
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: '',
+ gridBody: '',
+ gridFooter: '',
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() {
},
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- },
- 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)
- }
+ 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;
-
\ No newline at end of file
+ }
+};
+export default extension;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/router/viewGird.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/router/viewGird.js"
index 5ba5355..f29ad0a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/router/viewGird.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/router/viewGird.js"
@@ -46,66 +46,11 @@
name: 'locationInfoRow',
component: () => import('@/views/basic/locationInfoRow.vue')
}, {
- path: '/materielInfo',
- name: 'materielInfo',
- component: () => import('@/views/basic/materielInfo.vue')
- }, {
path: '/warehouse',
name: 'warehouse',
component: () => import('@/views/basic/warehouse.vue')
- },{
- path: '/palletCodeInfo',
- name: 'palletCodeInfo',
- component: () => import('@/views/basic/palletCodeInfo.vue')
- },{
- path: '/MaterielCodeInfo',
- name: 'MaterielCodeInfo',
- component: () => import('@/views/basic/materielCodeInfo.vue')
- }, {
- path: '/inboundOrder',
- name: 'inboundOrder',
- component: () => import('@/views/inbound/inboundOrder.vue')
- }, {
- path: '/inboundOrderDetail',
- name: 'inboundOrderDetail',
- component: () => import('@/views/inbound/inboundOrderDetail.vue')
- }, {
- path: '/proDeliverBackOrder',
- name: 'ProDeliverBackOrder',
- component: () => import('@/views/inbound/proDeliverBackOrder.vue')
- }, {
- path: '/proDeliverBackOrderDetail',
- name: 'ProDeliverBackOrderDetail',
- component: () => import('@/views/inbound/proDeliverBackOrderDetail.vue')
- },{
- path: '/outBSTOrder',
- name: 'outBSTOrder',
- component: () => import('@/views/outbound/outBSTOrder.vue')
- }, {
- path: '/outBSTOrderDetail',
- name: 'outBSTOrderDetail',
- component: () => import('@/views/outbound/outBSTOrderDetail.vue')
- }, {
- path: '/outStockLockInfo',
- name: 'outStockLockInfo',
- component: () => import('@/views/outbound/outStockLockInfo.vue')
- },{
- path: '/proDeliveryOrder',
- name: 'ProDeliveryOrder',
- component: () => import('@/views/outbound/proDeliveryOrder.vue')
- },{
- path: '/proDeliveryOrderDetail',
- name: 'ProDeliveryOrderDetail',
- component: () => import('@/views/outbound/proDeliveryOrderDetail.vue')
- },{
- path: '/materielnfoStatistics',
- name: 'materielnfoStatistics',
- component: () => import('@/views/stock/materielnfoStatistics.vue')
- },{
- path: '/stockInfo',
- name: 'stockInfo',
- component: () => import('@/views/stock/stockInfo.vue')
- }, {
+ },
+ {
path: '/task',
name: 'task',
component: () => import('@/views/taskinfo/task.vue')
@@ -114,91 +59,32 @@
path: '/task_hty',
name: 'task_hty',
component: () => import('@/views/taskinfo/task_hty.vue')
- }, {
- path: '/stockView',
- name: 'stockView',
- component: () => import('@/views/stock/stockView.vue')
- }, {
- path: '/stockQuantityChangeRecord',
- name: 'stockQuantityChangeRecord',
- component: () => import('@/views/record/stockQuantityChangeRecord.vue')
- }, {
- path: '/locationStatusChangeRecord',
- name: 'locationStatusChangeRecord',
- component: () => import('@/views/record/locationStatusChangeRecord.vue')
- }, {
- path: '/receiveOrder',
- name: 'receiveOrder',
- component: () => import('@/views/inbound/receiveOrder.vue')
- }, {
- path: '/purchaseOrder',
- name: 'purchaseOrder',
- component: () => import('@/views/inbound/purchaseOrder.vue')
- }
- , {
- path: '/supplierInfo',
- name: 'supplierInfo',
- component: () => import('@/views/basic/supplierInfo.vue')
- }
- , {
- path: '/checkOrder',
- name: 'checkOrder',
- component: () => import('@/views/check/checkOrder.vue')
- }
- , {
- path: '/checkOrderResult',
- name: 'checkOrderResult',
- component: () => import('@/views/check/checkOrderResult.vue')
- }
- , {
- path: '/inboundOrder_Hty',
- name: 'inboundOrder_Hty',
- component: () => import('@/views/inbound/inboundOrder_Hty.vue')
- }
- , {
- path: '/inboundOrderDetail_Hty',
- name: 'inboundOrderDetail_Hty',
- component: () => import('@/views/inbound/inboundOrderDetail_Hty.vue')
- }
- , {
- path: '/purchaseOrderDetail',
- name: 'purchaseOrderDetail',
- component: () => import('@/views/inbound/purchaseOrderDetail.vue')
- }
- , {
- path: '/receiveOrderDetail',
- name: 'receiveOrderDetail',
- component: () => import('@/views/inbound/receiveOrderDetail.vue')
- }
- , {
- path: '/stockInfo_Hty',
- name: 'stockInfo_Hty',
- component: () => import('@/views/stock/stockInfo_Hty.vue')
- }
- , {
- path: '/customerInfo',
- name: 'customerInfo',
- component: () => import('@/views/basic/customerInfo.vue')
- }
- , {
+ },
+ {
+ path: '/locationStatusChangeRecord',
+ name: 'locationStatusChangeRecord',
+ component: () => import('@/views/record/locationStatusChangeRecord.vue')
+ },
+ {
path: '/userInfo',
name: 'userInfo',
component: () => import('@/views/basic/userInfo.vue')
- }
- ,
+ },
{
- path: '/returnOrder',
- name: 'returnOrder',
- component: () => import('@/views/inbound/returnOrder.vue')
- }
- , {
- path: '/takeStockOrder',
- name: 'takeStockOrder',
- component: () => import('@/views/inbound/takeStockOrder.vue')
- },{
path: '/proStockInfo_Hty',
name: 'proStockInfo_Hty',
component: () => import('@/views/stock/proStockInfo_Hty.vue')
+ }
+ ,
+ {
+ path: '/mouldStockInfo_Hty',
+ name: 'mouldStockInfo_Hty',
+ component: () => import('@/views/stock/mouldStockInfo_Hty.vue')
+ },
+ {
+ path: '/blankStockInfo_Hty',
+ name: 'blankStockInfo_Hty',
+ component: () => import('@/views/stock/blankStockInfo_Hty.vue')
},
{
path: '/proStockInfo',
@@ -206,40 +92,15 @@
component: () => import('@/views/stock/proStockInfo.vue')
},
{
- path: '/proStockInfoDetail',
- name: 'proStockInfoDetail',
- component: () => import('@/views/stock/proStockInfoDetail.vue')
- },
- {
- path: '/proStockInfoDetail_Hty',
- name: 'proStockInfoDetail_Hty',
- component: () => import('@/views/stock/proStockInfoDetail_Hty.vue')
- },
- {
- path: '/mesProInOrderInfo',
- name: 'mesProInOrderInfo',
- component: () => import('@/views/inbound/mesProInOrderInfo.vue')
- },
- {
- path: '/mesProInOrderDetail',
- name: 'mesProInOrderDetail',
- component: () => import('@/views/inbound/mesProInOrderDetail.vue')
+ path: '/blankStockInfo',
+ name: 'blankStockInfo',
+ component: () => import('@/views/stock/blankStockInfo.vue')
},
{
- path: '/proStockView',
- name: 'proStockView',
- component: () => import('@/views/stock/ProStockView.vue')
+ path: '/mouldStockInfo',
+ name: 'mouldStockInfo',
+ component: () => import('@/views/stock/mouldStockInfo.vue')
},
- {
- path: '/proInStatistics',
- name: 'proInStatistics',
- component: () => import('@/views/inbound/proInStatistics.vue')
- },
- {
- path: '/erpProInOrder',
- name: 'erpProInOrder',
- component: () => import('@/views/inbound/erpProInOrder.vue')
- },
{
path: '/agvStationInfo',
name: 'agvStationInfo',
@@ -249,32 +110,15 @@
path: '/apiInfo',
name: 'apiInfo',
component: () => import('@/views/basic/apiInfo.vue')
- },
+ },
{
- path: '/makeCenterInfo',
- name: 'makeCenterInfo',
- component: () => import('@/views/basic/makeCenterInfo.vue')
+ path: '/sortOrder',
+ name: 'sortOrder',
+ component: () => import('@/views/sort/sortOrder.vue')
+ }, {
+ path: '/sortOrderDetail',
+ name: 'sortOrderDetail',
+ component: () => import('@/views/sort/sortOrderDetail.vue')
},
- {
- path: '/outSGOrder',
- name: 'outSGOrder',
- component: () => import('@/views/outbound/outSGOrder.vue')
- },{
- path: '/purchaseBSTOrder',
- name: 'purchaseBSTOrder',
- component: () => import('@/views/inbound/purchaseBSTOrder.vue')
- },{
- path: '/outBSTPickInfo',
- name: 'outBSTPickInfo',
- component: () => import('@/views/outbound/outBSTPickInfo.vue')
- },{
- path: '/returnBSTOrder',
- name: 'returnBSTOrder',
- component: () => import('@/views/inbound/returnBSTOrder.vue')
- },{
- path: '/returnBSTOrderDetail',
- name: 'returnBSTOrderDetail',
- component: () => import('@/views/inbound/returnBSTOrderDetail.vue')
- }
]
export default viewgird
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/customerInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/customerInfo.vue"
deleted file mode 100644
index 8573477..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/customerInfo.vue"
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
-*Author锛歫xx
- *Contact锛�283591387@qq.com
- *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
- *涓氬姟璇峰湪@/extension/widesea_wcs/order/Dt_CustomerInfo.js姝ゅ缂栧啓
- -->
-<template>
- <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
- :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
- :table="table" :extend="extend">
- </view-grid>
-</template>
-<script>
-import extend from "@/extension/basic/customerInfo.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: 'id',
- footer: "Foots",
- cnName: '瀹㈡埛淇℃伅',
- name: 'customerInfo',
- url: "/CustomerInfo/",
- sortName: "id"
- });
- const editFormFields = ref({
- outRule: ""
- });
- const editFormOptions = ref([[
- {
- title: "鍑哄叆搴撹鍒�",
- required: true,
- field: "outRule",
- type: "select",
- dataKey: "customerOutRuleEnum",
- data: [],
- },]
- ]);
- const searchFormFields = ref({
- customerCode: "",
- customerName: "",
- shortName: "",
- state: "",
- createDate: ""
- });
- const searchFormOptions = ref([
- [
- { title: "瀹㈡埛缂栫爜", field: "customerCode", type: "like" },
- { title: "瀹㈡埛鍏ㄧО", field: "name", type: "like" },
- { title: "瀹㈡埛绠�绉�", field: "shortName", type: "like" },
- { title: "鐘舵��", field: "status", type: "select", dataKey: "enableEnum", data: [] },
- ],
- [
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ]
- ]);
- const columns = ref([
- { field: 'id', title: '涓婚敭', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
- { field: 'customerCode', title: '瀹㈡埛缂栫爜', type: 'string', width: 110, align: 'left' },
- { field: 'customerName', title: '瀹㈡埛鍏ㄧО', type: 'string', width: 120, align: 'left' },
- { field: 'shortName', title: '瀹㈡埛绠�绉�', type: 'string', width: 110, align: 'left' },
- { field: 'status', title: '鐘舵��', type: 'bool', width: 110, require: true, align: 'left', bind: { key: "enableEnum", data: [] } },
- { field: 'outRule', title: '鍑哄簱瑙勫垯', type: 'string', width: 130, align: 'left', bind: { key: "customerOutRuleEnum", data: [] } },
- { field: 'creater', title: '鍒涘缓鑰�', type: 'string', width: 110, require: true, align: 'left' },
- { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', width: 150, require: true, align: 'left' },
- { field: 'modifier', title: '淇敼浜�', type: 'string', width: 100, align: 'left' },
- { field: 'modifyDate', title: '淇敼鏃ユ湡', type: 'datetime', width: 150, 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/WMSClient/src/views/basic/makeCenterInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/makeCenterInfo.vue"
deleted file mode 100644
index e18aa6f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/makeCenterInfo.vue"
+++ /dev/null
@@ -1,147 +0,0 @@
-
-<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
- </view-grid>
-</template>
- <script>
-import extend from "@/extension/basic/makeCenterInfo.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鍔犲伐涓績淇℃伅",
- name: "makeCenterInfo",
- url: "/MakeCenterInfo/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({
-
- });
- const searchFormOptions = ref([
- [
- { title: "鍔犲伐涓績缂栫爜", field: "makeCode", type: "string" },
- { title: "鍔犲伐涓績鍚嶇О", field: "makeName", type: "string" },
- { title: "鍔犲伐鍖哄煙", field: "makeArea", type: "string" },
- { title: "鐘舵��", field: "enable", type: "select", dataKey: "enableEnum", data: [] },
- ],
- [
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "makeCode",
- title: "鍔犲伐涓績缂栫爜",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "makeName",
- title: "鍔犲伐涓績鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "makeArea",
- title: "鍔犲伐鍖哄煙",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "status",
- title: "鐘舵��",
- type: "string",
- width: 150,
- align: "left",
- bind:{key:"enableEnum",data: [] },
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- hidden:true
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden:true
- },
-
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/materielCodeInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/materielCodeInfo.vue"
deleted file mode 100644
index 8a1f871..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/materielCodeInfo.vue"
+++ /dev/null
@@ -1,246 +0,0 @@
-
-<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
- </view-grid>
-</template>
- <script>
-import extend from "@/extension/basic/materielCodeInfo.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鐗╂枡鐮佷俊鎭�",
- name: "MaterielCodeInfo",
- url: "/MaterielCodeInfo/",
- sortName: "id",
- });
- const editFormFields = ref({
- lotNo: "",
- warehouseId: "",
- purchaseOrderNo: "",
- materielCode: "",
- productionDate: "",
- effectiveDate: "",
- });
- const editFormOptions = ref([
- [
- {
- title: "浠撳簱",
- field: "warehouseId",
- type: "select",
- dataKey: "areainfo",
- data: [],
- required: true,
- },
- ],
- [
-
- {
- title: "鐗╂枡缂栫爜",
- field: "materielCode",
- type: "string",
- },
- ],
- [
- {
- title: "閲囪喘鍗曞彿",
- field: "purchaseOrderNo",
- type: "string",
- },
- ],
- [
- {
- title: "鐗╂枡瑙勬牸",
- field: "materielSpec",
- type: "string",
- },
- ],
- [
- {
- title: "鎵规鍙�",
- field: "lotNo",
- required: true,
- },
- ],
- [
- {
- title: "鏁伴噺",
- field: "quantity",
- type:"int"
- },
- ],
- [
- {
- title: "鐢熶骇鏃ユ湡",
- field: "productionDate",
- // type: "date",
- required: true,
- },
- ],
- [
- {
- title: "鏈夋晥鏈�",
- field: "effectiveDate",
- // type: "date",
- required: true,
- },
- ],
- ]);
- const searchFormFields = ref({
- palletCode: "",
- });
- const searchFormOptions = ref([
- [
- { title: "閲囪喘鍗曞彿", field: "purchaseOrderNo", type: "like" },
- { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materielSpec",
- title: "鐗╂枡瑙勬牸",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind: { key: "areainfo", data: [] },
- },
- {
- field: "purchaseOrderNo",
- title: "閲囪喘鍗曞彿",
- type: "string",
- width: 160,
- align: "left",
- },
- {
- field: "supplierCode",
- title: "渚涘簲鍟嗙紪鍙�",
- type: "string",
- width: 160,
- align: "left",
- },
- {
- field: "lotNo",
- title: "鎵规鍙�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "quantity",
- title: "鏁伴噺",
- type: "int",
- width: 80,
- align: "left",
- },
- {
- field: "productionDate",
- title: "鐢熶骇鏃ユ湡",
- type: "date",
- width: 100,
- align: "left",
- sort: true,
- },
- {
- field: "effectiveDate",
- title: "鏈夋晥鏈�",
- type: "date",
- width: 100,
- align: "left",
- sort: true,
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- sort: true,
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- hidden: true,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden: true,
- sort: true,
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/materielInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/materielInfo.vue"
deleted file mode 100644
index 6db835d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/materielInfo.vue"
+++ /dev/null
@@ -1,317 +0,0 @@
-
-<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
- </view-grid>
-</template>
- <script>
-import extend from "@/extension/basic/materielInfo.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鐗╂枡淇℃伅",
- name: "materielInfo",
- url: "/MaterielInfo/",
- sortName: "id",
- });
- const editFormFields = ref({
- warehouseId: "",
- materielCode: "",
- materielName: "",
- materielSourceType: "",
- materielSpec: "",
- materielUnit: "",
- materielLength: "",
- materielThickness: "",
- materielWide: "",
- materielState: "",
- isCheck: "",
- materielInvOrgId: "",
- materierlWeight: "",
-
- });
- const editFormOptions = ref([
- [
- {
- title: "浠撳簱",
- field: "warehouseId",
- type: "select",
- dataKey: "warehouses",
- data: [],
- required: true,
- },
- {
- title: "鐗╂枡缂栧彿",
- required: true,
- field: "materielCode",
- type: "string",
- },
- {
- title: "鐗╂枡鍚嶇О",
- required: true,
- field: "materielName",
- type: "string",
- },
- {
- title: "鐗╂枡鍒嗙被",
- field: "materielSourceType",
- type: "select",
- dataKey: "materielTypeEnum",
- data: [],
- required: true,
- },
- ],
- [
-
- {
- title: "鐗╂枡瑙勬牸",
- required: true,
- field: "materielSpec",
- type: "string",
- },
- {
- title: "鍩烘湰鍗曚綅",
- required: true,
- field: "materielUnit",
- type: "select",
- dataKey:"materielUnitEnum",
- data:[]
- },
- {
- title: "搴撳瓨缁勭粐",
- required: true,
- field: "materielInvOrgId",
- type: "select",
- dataKey:"materielInvOrgEnum",
- data:[]
- },
- {
- title: "鐗╂枡鐘舵��",
- required: true,
- field: "materielState",
- type: "select",
- dataKey:"enableEnum",
- data:[]
- },
- ],
- [
- {
- title: "鐗╂枡閲嶉噺",
- field: "materielWeight",
- type: "float",
- },
- {
- title: "鐗╂枡闀垮害",
- field: "materielLength",
- type: "float",
- },
- {
- title: "鐗╂枡鍘氬害",
- field: "materielThickness",
- type: "float",
- },
- {
- title: "鐗╂枡瀹藉害",
- field: "materielWide",
- type: "float",
- },
- ],
- [
- {
- title: "鏄惁璐ㄦ",
- required: true,
- field: "isCheck",
- type: "select",
- dataKey:"enableEnum",
- data:[]
- },
- ]
- ]);
- const searchFormFields = ref({
- materielCode: "",
- materielName: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
- { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
- {title: "搴撳瓨缁勭粐", field:"materielInvOrgId",type:"select",dataKey:"materielInvOrgEnum",data:[]},
- {title: "鎵�灞炰粨搴�", field:"warehouseId",type:"select",dataKey:"warehouses",data:[]}
- ],
- [
- {title: "鐗╂枡鍒嗙被", field:"materielSourceType",type:"select",dataKey:"materielTypeEnum",data:[]},
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "materielInvOrgId",
- title: "搴撳瓨缁勭粐",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "materielInvOrgEnum", data: [] },
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materielSourceType",
- title: "鐗╂枡鍒嗙被",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "materielTypeEnum", data: [] },
- },
-
- {
- field: "materielSpec",
- title: "鐗╂枡瑙勬牸",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "materielUnit",
- title: "鍩烘湰鍗曚綅",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "materielUnitEnum", data: [] },
- },
- {
- field: "materielState",
- title: "鐗╂枡鐘舵��",
- type: "select",
- width: 100,
- bind:{key:"",data: [{key:'Enable',value:'鍚敤'},{key:'Disable',value:'绂佺敤'}] },
- align: "left",
- },
- {
- field: "isCheck",
- title: "鏄惁璐ㄦ",
- type: "int",
- bind:{key:"",data: [{key:'False',value:'鍚�'},{key:'True',value:'鏄�'}] },
- width: 100,
- align: "left",
- },
- {
- field: "materielWeight",
- title: "鐗╂枡閲嶉噺",
- type: "float",
- width: 180,
- align: "left",
- },
- {
- field: "materielLength",
- title: "鐗╂枡闀垮害",
- type: "float",
- width: 180,
- align: "left",
- },
- {
- field: "materielThickness",
- title: "鐗╂枡鍘氬害",
- type: "float",
- width: 180,
- align: "left",
- },
- {
- field: "materielWide",
- title: "鐗╂枡瀹藉害",
- type: "float",
- width: 180,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- hidden:true
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden:true
- },
-
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/palletCodeInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/palletCodeInfo.vue"
deleted file mode 100644
index bcdf2bc..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/palletCodeInfo.vue"
+++ /dev/null
@@ -1,159 +0,0 @@
-
-<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
- </view-grid>
-</template>
- <script>
-import extend from "@/extension/basic/palletCodeInfo.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鎵樼洏淇℃伅",
- name: "palletCodeInfo",
- url: "/PalletCodeInfo/",
- sortName: "id",
- });
- const editFormFields = ref({});
- const editFormOptions = ref([
- [
- {
- title: "浠撳簱",
- field: "warehouseId",
- type: "select",
- dataKey: "warehouses",
- data: [],
- required: true,
- },
- {
- title: "鏁伴噺",
- field: "count",
- type: "int",
- required: true,
- },
- ],
- ]);
- const searchFormFields = ref({
- palletCode: "",
- });
- const searchFormOptions = ref([
- [{ title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" }],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱涓婚敭",
- type: "string",
- width: 90,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "palletType",
- title: "鎵樼洏绫诲瀷",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "palletCode",
- title: "鎵樼洏缂栧彿",
- type: "decimal",
- width: 200,
- align: "left",
- },
- {
- field: "status",
- title: "鎵撳嵃鐘舵��",
- type: "string",
- width: 90,
- align: "left",
- bind: { key: "printStatus", data: [] },
- },
- {
- field: "size",
- title: "灏哄",
- type: "int",
- width: 120,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- sort: true,
- },
- {
- field: "modifier",
- title: "鏈�鍚庢墦鍗颁汉鍛�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "鏈�鍚庢墦鍗版椂闂�",
- type: "datetime",
- width: 160,
- align: "left",
- sort: true,
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/supplierInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/supplierInfo.vue"
deleted file mode 100644
index 66a162c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/supplierInfo.vue"
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--
-*Author锛歫xx
- *Contact锛�283591387@qq.com
- *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
- *涓氬姟璇峰湪@/extension/widesea_wcs/order/Dt_SupplierInfo.js姝ゅ缂栧啓
- -->
-<template>
- <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
- :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
- :table="table" :extend="extend">
- </view-grid>
-</template>
-<script>
-import extend from "@/extension/basic/supplierInfo.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: 'id',
- footer: "Foots",
- cnName: '渚涘簲鍟嗕俊鎭�',
- name: 'supplierInfo',
- url: "/SupplierInfo/",
- sortName: "id"
- });
- const editFormFields = ref({});
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([
- [
- { title: "渚涘簲鍟嗙紪鐮�", field: "supplierCode", type: "like" },
- { title: "渚涘簲鍟嗗悕绉�", field: "supplierName", type: "like" },
- { title: "渚涘簲鍟嗙畝绉�", field: "supplierShortName", type: "like" }
- ],
- [
- { title: "搴撳瓨缁勭粐", field: "invOrgId", type: "like" },
- { title: "鐘舵��", field: "status", type: "select", dataKey: "status", data: [] },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" }
- ]
- ]);
- const columns = ref([{ field: 'id', title: '涓婚敭', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
- { field: 'supplierCode', title: '渚涘簲鍟嗙紪鐮�', type: 'string', width: 110, align: 'left', sort: true },
- { field: 'supplierName', title: '渚涘簲鍟嗗悕绉�', type: 'string', width: 180, align: 'left' },
- { field: 'supplierShortName', title: '渚涘簲鍟嗙畝绉�', type: 'string', width: 110, align: 'left' },
- { field: 'contacts', title: '鑱旂郴浜�', type: 'string', width: 110, align: 'left' },
- { field: 'contactNumber', title: '鑱旂郴鐢佃瘽', type: 'string', width: 110, align: 'left' },
- { field: 'contactAddress', title: '鑱旂郴鍦板潃', type: 'string', width: 180, align: 'left' },
- { field: 'email', title: '鐢靛瓙閭', type: 'string', width: 110, align: 'left' },
- { field: 'description', title: '鎻忚堪', type: 'string', width: 180, align: 'left', hidden: true },
- { field: 'invOrgId', title: '搴撳瓨缁勭粐', type: 'string', width: 110, align: 'left' },
- { field: 'status', title: '鐘舵��', type: 'int', width: 110, require: true, align: 'left', bind: { key: "status", data: [] }, },
- { field: 'creater', title: '鍒涘缓鑰�', type: 'string', width: 110, require: true, align: 'left' },
- { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', width: 150, require: true, align: 'left', sort: true },
- { field: 'modifier', title: '淇敼浜�', type: 'string', width: 100, align: 'left', hidden: true },
- { field: 'modifyDate', title: '淇敼鏃ユ湡', type: 'datetime', width: 150, align: 'left', sort: true, hidden: true }]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "#detailTable",
- columns: [],
- sortName: "",
- key: ""
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/warehouse.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/warehouse.vue"
index 83c3c29..0dc4499 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/warehouse.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/basic/warehouse.vue"
@@ -48,6 +48,11 @@
type: "string",
},
{
+ title: "浠撳簱绫诲瀷",
+ field: "warehouseType",
+ type: "string",
+ },
+ {
title: "浠撳簱鎻忚堪",
field: "warehouseDes",
type: "textarea",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/erpProInOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/erpProInOrder.vue"
deleted file mode 100644
index 951b571..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/erpProInOrder.vue"
+++ /dev/null
@@ -1,169 +0,0 @@
-<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/inbound/erpProInOrder.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鎴愬搧璋冩嫧/瀵勫敭鍏ュ簱鍗�",
- name: "erpProInOrder",
- url: "/erpProInOrder/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
- [
-
- ],
- ]);
- const searchFormFields = ref({
- warehouseId: "",
- pCode: "",
- pVer: "",
- orderNo: "",
- upperOrderNo: ""
- });
- const searchFormOptions = ref([
- [
- { title: "浜у搧缂栫爜", field: "pCode",type: "like"},
- {
- title: "浠撳簱",
- field: "warehouseId",
- type: "select",
- dataKey: "warehouses",
- data: []
- },
- { title: "浜у搧鐗堟湰", field: "pVer",type: "like"},
- ],
- [
- { title: "鍗曟嵁缂栧彿", field: "orderNo",type: "like"},
- { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo",type: "like"},
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "鎵�灞炰粨搴�",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "upperOrderNo",
- title: "涓婃父鍗曟嵁缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "orderType",
- title: "鍗曟嵁绫诲瀷",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "proInOrderType", data: [{key:1,value:"璋冩嫧鍏ュ簱"},{key:2,value:"閿�鍞浆鍏�"}] },
- },
- {
- field: "proInStatus",
- title: "璁㈠崟鐘舵��",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "inboundState", data: [] },
- },
- {
- field: "pCode",
- title: "浜у搧鍨嬪彿",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "pVer",
- title: "浜у搧鐗堟湰",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "dateCode",
- title: "浜у搧鍛ㄦ湡",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "qtyPcs",
- title: "Pcs鏁伴噺",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "proSaleOrderNo",
- title: "閿�鍞鍗曞彿",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "鎿嶄綔浜�",
- type: "datetime",
- width: 160,
- align: "left",
- }
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
- </script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/inboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/inboundOrder.vue"
deleted file mode 100644
index b6bc973..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/inboundOrder.vue"
+++ /dev/null
@@ -1,150 +0,0 @@
-<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/inbound/inboundOrder.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鏂板巶鍏ュ簱鍗�",
- name: "inboundOrder",
- url: "/InboundOrder/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({
- warehouseId: "",
- inboundOrderNo: "",
- upperOrderNo: "",
- orderType: "",
- orderStatus: "",
- createDate: "",
- });
- const searchFormOptions = ref([
- [
- { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [] },
- { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
- { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
- { title: "鍗曟嵁绫诲瀷", field: "orderType", type: "select", dataKey: "inOrderTypeEnum", data: [], },
- ],
- [
- { title: "鐘舵��", field: "orderStatus", type: "select", dataKey: "inboundState", data: [], },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ]
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind: { key: "warehouses", data: [] }
- },
- {
- field: "inboundOrderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "upperOrderNo",
- title: "涓婃父鍗曟嵁缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "orderType",
- title: "鍗曟嵁绫诲瀷",
- type: "string",
- width: 150,
- align: "left",
- bind: { key: "inOrderTypeEnum", data: [] },
- },
- {
- field: "inboundOrderStatus",
- title: "鍗曟嵁鐘舵��",
- type: "decimal",
- width: 90,
- align: "left",
- bind: { key: "inboundState", data: [] },
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "鍏ュ簱鍗曟槑缁�",
- table: "",
- columns: [],
- sortName: "",
- key: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/inboundOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/inboundOrderDetail.vue"
deleted file mode 100644
index 16acdf8..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/inboundOrderDetail.vue"
+++ /dev/null
@@ -1,220 +0,0 @@
-<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/inbound/inboundOrderDetail.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鏂板巶鍏ュ簱鍗曟槑缁�",
- name: "inboundOrderDetail",
- url: "/InboundOrderDetail/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({
- orderId: "",
- detailId: "",
- barCode: "",
- materielCode: "",
- materielName: "",
- batchNo: "",
- orderDetailStatus: "",
- createDate: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鍏ュ簱鍗�", field: "orderId", type: "like" },
- { title: "涓婃父鏄庣粏Id", field: "detailId", type: "like" },
- { title: "鐗╂枡鏉＄爜", field: "barCode", type: "like" },
- { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
- ],
- [
- { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
- { title: "鐗╂枡鎵规", field: "batchNo", type: "like" },
- { title: "鐘舵��", field: "orderDetailStatus", type: "select", dataKey: "inboundState", data: [], },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime", },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "orderId",
- title: "鍏ュ簱鍗�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "detailId",
- title: "涓婃父鏄庣粏Id",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "barCode",
- title: "鐗╂枡鏉＄爜",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialLot",
- title: "鐗╂枡鎵规",
- type: "decimal",
- width: 90,
- align: "left",
- },
- {
- field: "materialWide",
- title: "骞呭",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "materialThick",
- title: "鍗峰緞",
- type: "int",
- width: 120,
- align: "left",
- },
- {
- field: "materialWeight",
- title: "閲嶉噺",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "materialSpec",
- title: "瑙勬牸",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "orderQuantity",
- title: "鍗曟嵁鏁伴噺",
- type: "decimal",
- width: 120,
- align: "left",
- },
- {
- field: "bindQuantity",
- title: "缁勭洏鏁伴噺",
- type: "decimal",
- width: 120,
- align: "left",
- },
- {
- field: "inQuantity",
- title: "宸插叆搴撴暟閲�",
- type: "decimal",
- width: 120,
- align: "left",
- },
- {
- field: "orderDetailStatus",
- title: "鏄庣粏鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/inboundOrderDetail_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/inboundOrderDetail_Hty.vue"
deleted file mode 100644
index fece3a0..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/inboundOrderDetail_Hty.vue"
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
-*Author锛歫xx
- *Contact锛�283591387@qq.com
- *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
- *涓氬姟璇峰湪@/extension/widesea_wcs/order/Dt_InboundOrderDetail_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/inbound/inboundOrderDetail_Hty.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: 'id',
- footer: "Foots",
- cnName: '鍘嗗彶鍏ュ簱鍗曟槑缁嗗巻鍙�',
- name: 'inboundOrderDetail_Hty',
- url: "/InboundOrderDetail_Hty/",
- sortName: "id"
- });
- const editFormFields = ref({});
- const editFormOptions = ref([]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([]);
- const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'orderId',title:'鍏ュ簱鍗曚富閿�',type:'int',width:110,require:true,align:'left',sort:true},
- {field:'materielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
- {field:'materielName',title:'鐗╂枡鍚嶇О',type:'string',width:180,require:true,align:'left'},
- {field:'batchNo',title:'鎵规鍙�',type:'string',width:110,require:true,align:'left'},
- {field:'orderQuantity',title:'鍗曟嵁鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'receiptQuantity',title:'缁勭洏鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'overInQuantity',title:'涓婃灦鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'orderDetailStatus',title:'璁㈠崟鏄庣粏鐘舵��',type:'int',width:110,require:true,align:'left'},
- {field:'remark',title:'澶囨敞',type:'string',width:220,align:'left'},
- {field:'sourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
- {field:'operateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
- {field:'creater',title:'鍒涘缓浜�',type:'string',width:110,require:true,align:'left'},
- {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
- {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
- {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
- const 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/WMSClient/src/views/inbound/inboundOrder_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/inboundOrder_Hty.vue"
deleted file mode 100644
index 749258e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/inboundOrder_Hty.vue"
+++ /dev/null
@@ -1,115 +0,0 @@
-<!--
-*Author锛歫xx
- *Contact锛�283591387@qq.com
- *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
- *涓氬姟璇峰湪@/extension/widesea_wcs/order/Dt_InboundOrder_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/inbound/inboundOrder_Hty.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: 'id',
- footer: "Foots",
- cnName: '鍘嗗彶鍏ュ簱鍗�',
- name: 'inboundOrder_Hty',
- url: "/InboundOrder_Hty/",
- sortName: "id"
- });
- const editFormFields = ref({});
- const editFormOptions = ref([]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([
- [
- { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
- { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
- {
- title: "鍗曟嵁绫诲瀷",
- field: "orderType",
- type: "select",
- dataKey: "inOrderType",
- data: [],
- },
- {
- title: "鍗曟嵁鐘舵��",
- field: "orderStatus",
- type: "select",
- dataKey: "inboundState",
- data: [],
- },
- ],
- [
- {
- title: "鍒涘缓鏂瑰紡",
- field: "createType",
- type: "select",
- dataKey: "createType",
- data: [],
- },
- { title: "鍒涘缓鑰�", field: "creater", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ],
- ]);
- const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'orderNo',title:'鍗曟嵁缂栧彿',type:'string',width:110,require:true,align:'left',sort:true},
- {field:'upperOrderNo',title:'涓婃父鍗曟嵁缂栧彿',type:'string',width:110,align:'left'},
- {field:'orderType',title:'鍗曟嵁绫诲瀷',type:'int',width:110,require:true,align:'left'},
- {field:'orderStatus',title:'鍗曟嵁鐘舵��',type:'int',width:110,require:true,align:'left'},
- {field:'createType',title:'鍒涘缓鏂瑰紡',type:'int',width:110,require:true,align:'left'},
- {field:'remark',title:'澶囨敞',type:'string',width:180,align:'left'},
- {field:'sourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
- {field:'operateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
- {field:'creater',title:'鍒涘缓浜�',type:'string',width:110,require:true,align:'left'},
- {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
- {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
- {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
- const detail = ref({
- cnName: "鍘嗗彶鍏ュ簱鍗曟槑缁�",
- table: "InboundOrderDetail_Hty",
- columns: [
- {field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'orderId',title:'鍏ュ簱鍗曚富閿�',type:'int',width:110,require:true,align:'left',sort:true},
- {field:'materielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
- {field:'materielName',title:'鐗╂枡鍚嶇О',type:'string',width:180,require:true,align:'left'},
- {field:'batchNo',title:'鎵规鍙�',type:'string',width:110,require:true,align:'left'},
- {field:'orderQuantity',title:'鍗曟嵁鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'receiptQuantity',title:'缁勭洏鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'overInQuantity',title:'涓婃灦鏁伴噺',type:'decimal',width:110,require:true,align:'left'},
- {field:'orderDetailStatus',title:'璁㈠崟鏄庣粏鐘舵��',type:'int',width:110,require:true,align:'left'},
- {field:'remark',title:'澶囨敞',type:'string',width:220,align:'left'},
- {field:'sourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
- {field:'operateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
- {field:'creater',title:'鍒涘缓浜�',type:'string',width:110,require:true,align:'left'},
- {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
- {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
- {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}
- ],
- sortName: "id",
- key: "id"
- });
- 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/WMSClient/src/views/inbound/mesPPBackInboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/mesPPBackInboundOrder.vue"
deleted file mode 100644
index 6824fd9..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/mesPPBackInboundOrder.vue"
+++ /dev/null
@@ -1,353 +0,0 @@
-
-<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/inbound/mesPPBackInboundOrder.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鍏ュ簱鍗�",
- name: "mesPPBackInboundOrder",
- url: "/mesPPBackInboundOrder/",
- sortName: "id",
- });
- const editFormFields = ref({
- orderType: "",
- inboundOrderNo: "",
- upperOrderNo: "",
- remark: "",
- });
- const editFormOptions = ref([
- [
- {
- title: "鍗曟嵁绫诲瀷",
- required: true,
- field: "orderType",
- type: "select",
- dataKey: "inOrderType",
- data: [],
- },
- {
- field: "inboundOrderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- },
- {
- title: "涓婃父鍗曟嵁缂栧彿",
- field: "upperOrderNo",
- type: "string",
- },
- {
- title: "澶囨敞",
- field: "remark",
- type: "textarea",
- },
- ],
- ]);
- const searchFormFields = ref({
- inboundOrderNo: "",
- upperOrderNo: "",
- orderType: "",
- orderStatus: "",
- createType: "",
- creater: "",
- createDate: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
- { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
- {
- title: "鍗曟嵁绫诲瀷",
- field: "orderType",
- type: "select",
- dataKey: "inOrderType",
- data: [],
- },
- {
- title: "鍗曟嵁鐘舵��",
- field: "orderStatus",
- type: "select",
- dataKey: "inboundState",
- data: [],
- },
- ],
- [
- {
- title: "鍒涘缓鏂瑰紡",
- field: "createType",
- type: "select",
- dataKey: "createType",
- data: [],
- },
- { title: "鍒涘缓鑰�", field: "creater", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "inboundOrderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- width: 120,
- align: "left",
- link: true,
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind:{key: "warehouses", data: []}
- },
- {
- field: "SourceAddressCode",
- title: "婧愬湴鍧�鐮�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "CarrierCode",
- title: "杞藉叿鍙�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "orderType",
- title: "鍗曟嵁绫诲瀷",
- type: "string",
- width: 150,
- align: "left",
- bind: { key: "inOrderType", data: [] },
- },
- {
- field: "orderStatus",
- title: "鍗曟嵁鐘舵��",
- type: "decimal",
- width: 90,
- align: "left",
- bind: { key: "inboundState", data: [] },
- },
- {
- field: "createType",
- title: "鍒涘缓鏂瑰紡",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "createType", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "鍏ュ簱鍗曟槑缁�",
- table: "MesPPBackInboundOrderDetail",
- columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "orderId",
- title: "鍏ュ簱鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialLot",
- title: "鎵规鍙�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "orderQuantity",
- title: "鍗曟嵁鏁伴噺",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "receiptQuantity",
- title: "缁勭洏鏁伴噺",
- type: "int",
- width: 120,
- align: "left",
- },
- {
- field: "overInQuantity",
- title: "涓婃灦鏁伴噺",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "orderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "cutedWidth",
- title: "瑁佸垏瀹�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 50,
- align: "left",
- },
- {
- field: "productionDate",
- title: "鐢熶骇鏃ユ湡",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "effectiveDate",
- title: "鏈夋晥鏃ユ湡",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ],
- sortName: "id",
- key: "id",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue"
deleted file mode 100644
index 915a940..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue"
+++ /dev/null
@@ -1,371 +0,0 @@
-
-<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/inbound/inboundOrder.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鍏ュ簱鍗�",
- name: "inboundOrder",
- url: "/InboundOrder/",
- sortName: "id",
- });
- const editFormFields = ref({
- orderType: "",
- inboundOrderNo: "",
- upperOrderNo: "",
- remark: "",
- });
- const editFormOptions = ref([
- [
- {
- title: "鍗曟嵁绫诲瀷",
- required: true,
- field: "orderType",
- type: "select",
- dataKey: "inOrderType",
- data: [],
- },
- {
- field: "inboundOrderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- },
- {
- title: "涓婃父鍗曟嵁缂栧彿",
- field: "upperOrderNo",
- type: "string",
- },
- {
- title: "澶囨敞",
- field: "remark",
- type: "textarea",
- },
- ],
- ]);
- const searchFormFields = ref({
- inboundOrderNo: "",
- upperOrderNo: "",
- orderType: "",
- orderStatus: "",
- createType: "",
- creater: "",
- createDate: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
- { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
- {
- title: "鍗曟嵁绫诲瀷",
- field: "orderType",
- type: "select",
- dataKey: "inOrderType",
- data: [],
- },
- {
- title: "鍗曟嵁鐘舵��",
- field: "orderStatus",
- type: "select",
- dataKey: "inboundState",
- data: [],
- },
- ],
- [
- {
- title: "鍒涘缓鏂瑰紡",
- field: "createType",
- type: "select",
- dataKey: "createType",
- data: [],
- },
- { title: "鍒涘缓鑰�", field: "creater", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "orderId",
- title: "鍏ュ簱鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialLot",
- title: "鎵规鍙�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "orderQuantity",
- title: "鍗曟嵁鏁伴噺",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "receiptQuantity",
- title: "缁勭洏鏁伴噺",
- type: "int",
- width: 120,
- align: "left",
- },
- {
- field: "overInQuantity",
- title: "涓婃灦鏁伴噺",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "orderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "cutedWidth",
- title: "瑁佸垏瀹�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 50,
- align: "left",
- },
- {
- field: "productionDate",
- title: "鐢熶骇鏃ユ湡",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "effectiveDate",
- title: "鏈夋晥鏃ユ湡",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "鍏ュ簱鍗曟槑缁�",
- table: "InboundOrderDetail",
- columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "orderId",
- title: "鍏ュ簱鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "select",
- width: 150,
- align: "left",
- edit: { type: "" },
- required: true,
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "materielSpec",
- title: "鐗╂枡瑙勬牸",
- type: "select",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "batchNo",
- title: "鎵规鍙�",
- type: "decimal",
- width: 90,
- align: "left",
- edit: { type: "" },
- required: true,
- },
- {
- field: "orderQuantity",
- title: "鍗曟嵁鏁伴噺",
- type: "decimal",
- width: 90,
- align: "left",
- edit: { type: "number" },
- required: true,
- },
- {
- field: "receiptQuantity",
- title: "缁勭洏鏁伴噺",
- type: "int",
- width: 120,
- align: "left",
- },
- {
- field: "overInQuantity",
- title: "涓婃灦鏁伴噺",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "orderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
- type: "string",
- width: 180,
- align: "left",
- bind: { key: "orderDetailStatusEnum", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ],
- sortName: "id",
- key: "id",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/mesProInOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/mesProInOrderDetail.vue"
deleted file mode 100644
index 89816c8..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/mesProInOrderDetail.vue"
+++ /dev/null
@@ -1,254 +0,0 @@
-<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/inbound/mesProInOrderDetail.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鎴愬搧鍏ュ簱鏄庣粏淇℃伅",
- name: "mesProInOrderDetail",
- url: "/mesProInOrderDetail/",
- sortName: "id",
- });
- const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
- });
- const editFormOptions = ref([
- [
- {
- title: "鐗╂枡缂栧彿",
- required: true,
- field: "materielCode",
- type: "string",
- },
- {
- title: "鍗曟嵁缂栧彿",
- required: true,
- field: "materielName",
- type: "string",
- },
- {
- title: "鎵规鍙�",
- required: true,
- field: "orderNo",
- type: "string",
- },
- {
- title: "搴忓垪鍙�",
- required: true,
- field: "serialNumber",
- type: "string",
- },
- ],
-
- ]);
- const searchFormFields = ref({
- materielCode: "",
- materielName: "",
- orderNo: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鐗╂枡缂栧彿", field: "materielCode" },
- { title: "鐗╂枡鍚嶇О", field: "materielName" },
- { title: "鍗曟嵁缂栧彿", field: "orderNo" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "orderId",
- title: "鍏ュ簱鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "bagNo",
- title: "鍐呭寘鍙�",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "productCode",
- title: "浜у搧缂栫爜",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "overInQuantity",
- title: "涓婃灦鏁伴噺",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "productVersion",
- title: "鐗堟湰",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "setQty",
- title: "鍖呰SET鏁伴噺",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "okpcsqty",
- title: "鍚堟牸PCS鏁�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "dateCode",
- title: "鍛ㄦ湡",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "xQty",
- title: "X鏁�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "xSite",
- title: "X浣�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "weight",
- title: "鍐呭寘閲嶉噺",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "packingDate",
- title: "鍖呰鏃堕棿",
- type: "datetime",
- width: 200,
- align: "left",
- },
- {
- field: "lotNumber",
- title: "鎵规鍙�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "erpOrder",
- title: "ERP宸ュ崟",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "moNumber",
- title: "鍒堕�犺鍗�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "saleOrder",
- title: "閿�鍞鍗�",
- type: "string",
- width: 200,
- align: "left",
- }, {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/mesProInOrderInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/mesProInOrderInfo.vue"
deleted file mode 100644
index dee121d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/mesProInOrderInfo.vue"
+++ /dev/null
@@ -1,238 +0,0 @@
-<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/inbound/mesProInOrderInfo.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "MES鎴愬搧/鍗婃垚鍝佸崟",
- name: "mesProInOrderInfo",
- url: "/MesProInOrderInfo/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({
- warehouseId:"",
- productOrderNo:"",
- mESProOrderType:"",
- mESProOrderStatus:"",
- materialCode:"",
- materialLot:"",
- proPackCode:"",
- createDate:"",
- });
- const searchFormOptions = ref([
- [
- { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [], },
- { title: "鐢熶骇璁㈠崟缂栫爜", field: "productOrderNo", type: "like" },
- { title: "璁㈠崟绫诲瀷", field: "mESProOrderType", type: "select", dataKey: "inOrderTypeEnum", data: [], },
- { title: "鍗曟嵁鐘舵��", field: "mESProInStatus", type: "select", dataKey: "inboundState", data: [], },
- ],
- [
- { title: "鐗╂枡缂栧彿", field: "materialCode", type: "like" },
- { title: "鐗╂枡鎵规", field: "materialLot", type: "like" },
- { title: "绾哥鐗╂枡缂栫爜", field: "proPackCode", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind: { key: "warehouses", data: [] }
- },
- {
- field: "productOrderNo",
- title: "鐢熶骇璁㈠崟缂栫爜",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "processNum",
- title: "宸ュ簭搴忓彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "mesProOrderType",
- title: "璁㈠崟绫诲瀷",
- type: "select",
- width: 150,
- align: "left",
- bind: { key: "inOrderTypeEnum", data: [] },
- },
- {
- field: "processNum",
- title: "娲惧崟宸ュ崟缂栫爜",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "materialCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialLot",
- title: "鐗╂枡鎵规",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "gradeCode",
- title: "鐗╂枡绛夌骇",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "proQuantity",
- title: "鐗╂枡鏁伴噺",
- type: "decimal",
- width: 120,
- align: "left",
- },
- {
- field: "barCode",
- title: "鐗╂枡鏉＄爜",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "thickness",
- title: "鍗峰緞",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "wide",
- title: "骞呭",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "weight",
- title: "閲嶉噺",
- type: "decimal",
- width: 120,
- align: "left",
- },
- {
- field: "proPackCode",
- title: "鎴愬搧鍖呮潗绾哥鐗╂枡缂栫爜",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "length",
- title: "绠遍暱",
- type: "decimal",
- width: 120,
- align: "left",
- },
- {
- field: "width",
- title: "绠卞",
- type: "decimal",
- width: 120,
- align: "left",
- },
- {
- field: "height",
- title: "绠遍珮",
- type: "decimal",
- width: 120,
- align: "left",
- },
- {
- field: "mesProInStatus",
- title: "鍗曟嵁鐘舵��",
- type: "decimal",
- width: 90,
- align: "left",
- bind: { key: "inboundState", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "鍏ュ簱鍗曟槑缁�",
- table: "",
- columns: [],
- sortName: "",
- key: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/proDeliverBackOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/proDeliverBackOrder.vue"
deleted file mode 100644
index 5a52c67..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/proDeliverBackOrder.vue"
+++ /dev/null
@@ -1,199 +0,0 @@
-<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/inbound/proDeliverBackOrder.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鎴愬搧閿�鍞��璐у叆搴撳崟",
- name: "proDeliverBackOrder",
- url: "/ProDeliverBackOrder/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
- [
- {
- title: "浠撳簱",
- required: true,
- field: "warehouseId",
- type: "string",
- },
- {
- title: "WMS鍗曟嵁缂栧彿",
- required: true,
- field: "deliveryBackInCode",
- type: "string",
- },
- {
- title: "鎴愬搧閿�鍞��璐у崟鍙�",
- required: true,
- field: "deliveryBackCode",
- type: "string",
- },
- {
- title: "璁㈠崟绫诲瀷",
- required: true,
- field: "orderType",
- type: "string",
- },
- {
- title: "鎿嶄綔鍛樺伐",
- required: true,
- field: "employeeName",
- type: "string",
- },
- {
- title: "鐘舵��",
- required: true,
- field: "deliveryBackStatus",
- type: "decimal",
- },
- {
- title: "澶囨敞",
- required: false,
- field: "remark",
- type: "string",
- },
- ],
- ]);
- const searchFormFields = ref({
- warehouseId: "",
- deliveryBackInCode: "",
- deliveryBackCode: "",
- orderType: "",
- employeeName: "",
- deliveryBackStatus: "",
- });
- const searchFormOptions = ref([
- [
- { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [] },
- { title: "WMS鍗曞彿", field: "deliveryBackInCode", type: "like" },
- { title: "鎴愬搧鍗曞彿", field: "deliveryBackCode", type: "like" },
- { title: "璁㈠崟绫诲瀷", field: "orderType", type: "select", dataKey: "inOrderTypeEnum", data: [] },
- ],
- [
- { title: "鎿嶄綔鍛樺伐", field: "employeeName", type: "like" },
- { title: "鐘舵��", field: "deliveryBackStatus", type: "select", dataKey: "inboundState", data: [] },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 70,
- align: "left",
- },
- {
- field: "deliveryBackInCode",
- title: "WMS鍗曞彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "deliveryBackCode",
- title: "鎴愬搧鍗曞彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "orderType",
- title: "璁㈠崟绫诲瀷",
- type: "select",
- width: 150,
- align: "left",
- bind: { key: "inOrderTypeEnum", data: [] },
- },
- {
- field: "employeeName",
- title: "鎿嶄綔鍛樺伐",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "deliveryBackStatus",
- title: "鐘舵��",
- type: "select",
- width: 90,
- align: "left",
- bind: { key: "inboundState", data: [] },
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/proDeliverBackOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/proDeliverBackOrderDetail.vue"
deleted file mode 100644
index 3c27e48..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/proDeliverBackOrderDetail.vue"
+++ /dev/null
@@ -1,236 +0,0 @@
-<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/inbound/proDeliverBackOrderDetail.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鎴愬搧閿�鍞��璐у叆搴撳崟鏄庣粏",
- name: "proDeliverBackOrderDetail",
- url: "/ProDeliverBackOrderDetail/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
- [
- {
- title: "澶磋〃",
- required: true,
- field: "deliverBackId",
- type: "string",
- },
- {
- title: "閿�鍞嚭搴撳彂璐у崟鍙�",
- required: true,
- field: "deliverCode",
- type: "string",
- },
- {
- title: "閿�鍞崟鍙�",
- required: true,
- field: "saleOrderNo",
- type: "string",
- },
- {
- title: "鐗╂枡鏉＄爜",
- required: true,
- field: "barCode",
- type: "string",
- },
- {
- title: "鐗╂枡缂栧彿",
- required: true,
- field: "materialCode",
- type: "string",
- },
- {
- title: "鐗╂枡鍚嶇О",
- required: true,
- field: "materialName",
- type: "string",
- },
- ],
- ]);
- const searchFormFields = ref({
- deliverBackId: "",
- deliverCode: "",
- saleOrderNo: "",
- barCode: "",
- materialCode: "",
- materialName: "",
- materialLot: "",
- quantity: "",
- customer: "",
- });
- const searchFormOptions = ref([
- [
- { title: "澶磋〃", field: "deliverBackId", type: "like" },
- { title: "鍑哄簱鍗曞彿", field: "deliverCode", type: "like" },
- { title: "閿�鍞崟鍙�", field: "saleOrderNo", type: "like" },
- { title: "鐗╂枡鏉＄爜", field: "barCode", type: "like" },
- ],
- [
- { title: "鐗╂枡缂栧彿", field: "materialCode", type: "like" },
- { title: "鐗╂枡鍚嶇О", field: "materialName", type: "like" },
- { title: "鐗╂枡鎵规", field: "materialLot", type: "like" },
- { title: "瀹㈡埛缂栧彿", field: "customer", type: "like" },
- ],
- [
- { title: "鐘舵��", field: "deliverBackDetailStatus", type: "select", dataKey: "inboundState", data: [] },
- { title:"鍒涘缓鏃堕棿", field:"createDate", type:"datetime" },
- ]
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "deliverBackId",
- title: "澶磋〃",
- type: "string",
- width: 70,
- align: "left",
- },
- {
- field: "deliverCode",
- title: "鍑哄簱鍗曞彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "saleOrderNo",
- title: "閿�鍞崟鍙�",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "barCode",
- title: "鐗╂枡鏉＄爜",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialLot",
- title: "鐗╂枡鎵规",
- type: "decimal",
- width: 90,
- align: "left",
- },
- {
- field: "quantity",
- title: "鏁伴噺",
- type: "decimal",
- width: 90,
- align: "left",
- },
- {
- field: "customer",
- title: "瀹㈡埛缂栧彿",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "backInboundQty",
- title: "宸插叆搴撴暟閲�",
- type: "decimal",
- width: 120,
- align: "left",
- },
- {
- field: "deliverBackDetailStatus",
- title: "鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "inboundState", data: [] },
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 90,
- align: "left",
- },
-
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/proInStatistics.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/proInStatistics.vue"
deleted file mode 100644
index ed50310..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/proInStatistics.vue"
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
- <div>
- <assemble-dist></assemble-dist>
- </div>
- <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/inbound/proInStatistics.js";
- import { ref, defineComponent } from "vue";
- import AssembleDistVue from '../charts/AssembleDist.vue';
- export default defineComponent({
- components: {
- 'assemble-dist': AssembleDistVue,
- },
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鎴愬搧鍏ュ簱缁熻",
- name: "proInStatistics",
- url: "/proInStatistics/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
- [
-
- ],
- ]);
- const searchFormFields = ref({
- warehouseId: "",
- productCode: "",
- productRev: "",
- });
- const searchFormOptions = ref([
- [
- { title: "浜у搧缂栫爜", field: "productCode",type: "like"},
- {
- title: "浠撳簱",
- field: "warehouseId",
- type: "select",
- dataKey: "warehouses",
- data: []
- },
- { title: "浜у搧鐗堟湰", field: "productRev",type: "like"},
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "鎵�灞炰粨搴�",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "productCode",
- title: "浜у搧鍨嬪彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "productRev",
- title: "浜у搧鐗堟湰",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "pcsQty",
- title: "鍖呰Pcs鏁伴噺",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "squareMeter",
- title: "闈㈢Н(銕�)",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- }
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
- </script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/purchaseBSTOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/purchaseBSTOrder.vue"
deleted file mode 100644
index 382309e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/purchaseBSTOrder.vue"
+++ /dev/null
@@ -1,315 +0,0 @@
-
-<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/inbound/purchaseOrder.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鍗氭�濋�氶噰璐崟",
- name: "purchaseBSTOrder",
- url: "/PurchaseBSTOrder/",
- sortName: "id",
- });
- const editFormFields = ref({
- // orderType: "",
- // inboundOrderNo: "",
- // upperOrderNo: "",
- // remark: "",
- });
- const editFormOptions = ref([
- // [
- // {
- // title: "鍗曟嵁绫诲瀷",
- // required: true,
- // field: "orderType",
- // type: "select",
- // dataKey: "inOrderType",
- // data: [],
- // },
- // {
- // field: "inboundOrderNo",
- // title: "鍗曟嵁缂栧彿",
- // type: "string",
- // },
- // {
- // title: "涓婃父鍗曟嵁缂栧彿",
- // field: "upperOrderNo",
- // type: "string",
- // },
- // {
- // title: "澶囨敞",
- // field: "remark",
- // type: "textarea",
- // },
- // ],
- ]);
- const searchFormFields = ref({
- paperReceiptNo: "",
- vendNo: "",
- purchaseOrderStatus: "",
- });
- const searchFormOptions = ref([
- [
- { title: "閲囪喘鍗曞彿", field: "paperReceiptNo", type: "like" },
- { title: "閲囪喘鍗曞彿", field: "vendNo", type: "like" },
- {
- title: "鍗曟嵁鐘舵��",
- field: "purchaseOrderStatus",
- type: "select",
- dataKey: "purchaseOrderStatus",
- data: [],
- },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ]
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "paperReceiptId",
- title: "閲囪喘鏉ユ簮ID",
- type: "int",
- width: 120,
- align: "left",
- hidden:true
- },
- {
- field: "paperReceiptNo",
- title: "閲囪喘鍗曞彿",
- type: "string",
- width: 150,
- align: "left",
- link: true,
- },
- {
- field: "vendNo",
- title: "渚涘簲鍟嗙紪鍙�",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "totalProcurementLength",
- title: "閲囪喘鎬绘暟閲�",
- type: "decimal",
- width: 110,
- align: "left",
- },
- {
- field: "purchaseOrderStatus",
- title: "閲囪喘鍗曠姸鎬�",
- type: "select",
- width: 110,
- align: "left",
- bind: { key: "inboundState", data: [] },
- },
- {
- field: "receiptDate",
- title: "涓嬪崟鏃ユ湡",
- type: "string",
- width: 160,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "閲囪喘鍗曟槑缁�",
- table: "PurchaseBSTOrderDetail",
- columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "purchaseBSTOrderId",
- title: "閲囪喘鍗曚富閿�",
- type: "int",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "paperReceiptId",
- title: "閲囪喘鍗曟潵婧怚D",
- type: "string",
- width: 150,
- align: "left",
- hidden:true
- },
- {
- field: "materialId",
- title: "涓婃父鐗╂枡ID",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "barcode",
- title: "鐗╂枡鏉＄爜",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "rfidCode",
- title: "RFID缂栧彿",
- type: "string",
- width: 160,
- align: "left",
- },
- {
- field: "materialNo",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 100,
- align: "left"
- },
- // {
- // field: "materielSpec",
- // title: "鐗╂枡瑙勬牸",
- // type: "select",
- // type: "string",
- // width: 100,
- // align: "left",
- // },
- // {
- // field: "batchNo",
- // title: "鎵规鍙�",
- // type: "decimal",
- // width: 90,
- // align: "left",
- // edit: { type: "" },
- // required: true,
- // },
- {
- field: "materialWide",
- title: "骞呭",
- type: "decimal",
- width: 100,
- align: "left",
- },
- {
- field: "materialThick",
- title: "鐩村緞",
- type: "decimal",
- width: 100,
- align: "left",
- },
- {
- field: "procurementLength",
- title: "鎬婚暱",
- type: "decimal",
- width: 100,
- align: "left",
- },
- {
- field: "deliveryQty",
- title: "閲嶉噺",
- type: "decimal",
- width: 100,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "purchaseBSTOrderDetailStatus",
- title: "鏄庣粏鐘舵��",
- type: "select",
- width: 120,
- align: "left",
- bind: { key: "inboundState", data: [] },
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- }
- ],
- sortName: "id",
- key: "id",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
- </script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/purchaseOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/purchaseOrder.vue"
deleted file mode 100644
index 0e91bd6..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/purchaseOrder.vue"
+++ /dev/null
@@ -1,184 +0,0 @@
-<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/inbound/purchaseOrder.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "浜屾湡閲囪喘鍗�",
- name: "purchaseOrder",
- url: "/PurchaseOrder/",
- sortName: "id",
- });
- const editFormFields = ref({
- orderType: "",
- inboundOrderNo: "",
- upperOrderNo: "",
- remark: "",
- });
- const editFormOptions = ref([
- [
- {
- title: "鍗曟嵁绫诲瀷",
- required: true,
- field: "orderType",
- type: "select",
- dataKey: "inOrderType",
- data: [],
- },
- {
- field: "inboundOrderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- },
- {
- title: "涓婃父鍗曟嵁缂栧彿",
- field: "upperOrderNo",
- type: "string",
- },
- {
- title: "澶囨敞",
- field: "remark",
- type: "textarea",
- },
- ],
- ]);
- const searchFormFields = ref({
- inboundOrderNo: "",
- upperOrderNo: "",
- orderType: "",
- orderStatus: "",
- createType: "",
- creater: "",
- createDate: "",
- });
- const searchFormOptions = ref([
- [
- { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [], },
- { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
- { title: "涓婃父鍗曞彿", field: "upperOrderNo", type: "like" },
- { title: "鐘舵��", field: "orderStatus", type: "select", dataKey: "inboundState", data: [], },
- ],
- [
- {title: "鍒涘缓鏃堕棿",field: "createDate",type: "datetime",},
- ],
-
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 150,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "purchaseOrderNo",
- title: "閲囪喘鍗曞彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "supplierCode",
- title: "渚涘簲鍟嗙紪鍙�",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "orderQuantity",
- title: "閲囪喘鏁伴噺",
- type: "int",
- width: 90,
- align: "left",
- },
- {
- field: "purchaseOrderStatus",
- title: "鐘舵��",
- type: "string",
- width: 90,
- align: "left",
- bind: { key: "inboundState", data: [] },
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "id",
- key: "id",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/purchaseOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/purchaseOrderDetail.vue"
deleted file mode 100644
index cf30905..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/purchaseOrderDetail.vue"
+++ /dev/null
@@ -1,205 +0,0 @@
-<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/inbound/purchaseOrderDetail.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "浜屾湡閲囪喘鍗曟槑缁�",
- name: "purchaseOrderDetail",
- url: "/PurchaseOrderDetail/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({
- purchaseOrderId: "",
- detailId: "",
- barCode: "",
- materielCode: "",
- materielName: "",
- purchaseDetailStatus: "",
- });
- const searchFormOptions = ref([
- [
- { title: "澶磋〃", field: "purchaseOrderId", type: "like" },
- { title: "涓婃父鏄庣粏Id", field: "detailId", type: "like" },
- { title: "鐗╂枡鏉＄爜", field: "barCode", type: "like" },
- { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
- ],
- [
- { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
- { title: "鐘舵��", field: "purchaseDetailStatus", type: "select", dataKey: "inboundState", data: [] },
- ]
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "purchaseOrderId",
- title: "澶磋〃",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "detailId",
- title: "涓婃父鏄庣粏Id",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "barCode",
- title: "鐗╂枡鏉＄爜",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialLot",
- title: "鐗╂枡鎵规",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "purchaseDetailQuantity",
- title: "鏁伴噺",
- type: "int",
- width: 90,
- align: "left",
- },
- {
- field: "purchaseDetailWide",
- title: "骞呭",
- type: "int",
- width: 90,
- align: "left",
- },
- {
- field: "purchaseDetailThickness",
- title: "鍗峰緞",
- type: "int",
- width: 90,
- align: "left",
- },
- {
- field: "purchaseDetailWeight",
- title: "閲嶉噺",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "materielSpec",
- title: "鐗╂枡瑙勬牸",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "purchaseDetailStatus",
- title: "鏄庣粏鐘舵��",
- type: "string",
- width: 90,
- align: "left",
- bind: { key: "inboundState", data: [] },
- },
- {
- field: "purchaseDetailInboundQty",
- title: "宸插叆搴撴暟閲�",
- type: "int",
- width: 90,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "int",
- width: 90,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
-
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "id",
- key: "id",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/receiveOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/receiveOrder.vue"
deleted file mode 100644
index 14f4655..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/receiveOrder.vue"
+++ /dev/null
@@ -1,390 +0,0 @@
-
-<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/inbound/receiveOrder.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "receiveOrderId",
- footer: "Foots",
- cnName: "鏀惰揣鍗�",
- name: "receiveOrder",
- url: "/ReceiveOrder/",
- sortName: "receiveOrderId",
- });
-
- const searchFormFields = ref({
- receiveOrderNo: "",
- receiveOrderType: "",
- receiveOrderStatus: "",
- creater: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鍗曟嵁缂栧彿", field: "receiveOrderNo", type: "like" },
- {
- title: "鍗曟嵁绫诲瀷",
- field: "receiveOrderType",
- type: "select",
- dataKey: "receiveOrderTypeEnum",
- data: [],
- },
- {
- title: "鍗曟嵁鐘舵��",
- field: "receiveOrderStatus",
- type: "selectList",
- dataKey: "receiveStatus",
- data: [],
- },
- ],
- [
- { title: "渚涘簲鍟�", field: "suppliersId", type: "select",dataKey:"suppliers",data:[]},
- { title: "鍒涘缓鑰�", field: "creater", type: "like" },
- { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],}
- ],
- ]);
-
- const editFormFields = ref({
- receiveOrderNo: "",
- receiveOrderType: "",
- suppliersId: "",
- warehouseId: "",
- deliveryCode: "",
- });
- const editFormOptions = ref([
- [
- {
- field: "receiveOrderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- readonly: "true",
- },
- {
- title: "鍗曟嵁绫诲瀷",
- required: true,
- field: "receiveOrderType",
- type: "select",
- dataKey: "receiveOrderTypeEnum",
- data: [],
- },
- {
- title: "渚涘簲鍟�",
- field: "suppliersId",
- type: "select",
- dataKey: "suppliers",
- data: [],
- required: true,
- },
- {
- title: "浠撳簱",
- field: "warehouseId",
- type: "select",
- dataKey: "warehouses",
- data: [],
- required: true,
- },
- ],
- [
- {
- title: "閫佽揣鍗曞彿",
- field: "deliveryCode",
- type: "string",
- },
- ],
- ]);
- const columns = ref([
- {
- field: "receiveOrderId",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "receiveOrderNo",
- title: "鏀惰揣鍗曞彿",
- type: "string",
- width: 150,
- align: "left",
- link: true,
- },
- {
- field: "receiveOrderType",
- title: "璁㈠崟绫诲瀷",
- type: "string",
- width: 150,
- align: "left",
- bind: { key: "receiveOrderTypeEnum", data: [] },
- },
- {
- field: "receiveOrderStatus",
- title: "璁㈠崟鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "receiveStatus", data: [] },
- },
- {
- field: "customerId",
- title: "瀹㈡埛浠ｅ彿",
- type: "string",
- width: 90,
- align: "left",
- hidden:true
- },
- {
- field: "suppliersId",
- title: "渚涘簲鍟嗕唬鍙�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind:{key: "warehouses", data: []}
- },
- {
- field: "receiveDate",
- title: "鏀惰揣鏃ユ湡",
- type: "string",
- width: 160,
- align: "left",
- },
- {
- field: "deliveryCode",
- title: "閫佽揣鍗曞彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "uploadStatus",
- title: "涓婁紶鐘舵��",
- type: "string",
- width: 90,
- align: "left",
- bind:{key:"enable",data:[]}
- },
- {
- field: "createInOrderStatus",
- title: "鍏ュ簱鍗曞垱寤虹姸鎬�",
- type: "string",
- width: 130,
- align: "left",
- bind:{key:"enable",data:[]}
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "鏀惰揣鍗曟槑缁�",
- table: "Dt_ReceiveOrderDetail",
- columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "receiveOrderId",
- title: "鏀惰揣鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "purchaseOrderDetailRowNo",
- title: "閲囪喘鍗曟槑缁嗚鍙�",
- type: "string",
- width: 60,
- align: "left",
- },
- {
- field: "purchaseOrderNo",
- title: "閲囪喘鍗曞彿",
- type: "select",
- width: 160,
- align: "left",
- required: true,
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "select",
- width: 150,
- align: "left",
- required: true,
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "materielSpec",
- title: "鐗╂枡瑙勬牸",
- type: "select",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "lotNo",
- title: "鎵规鍙�",
- type: "decimal",
- width: 90,
- align: "left",
- required: true,
- },
- {
- field: "receivedQuantity",
- title: "鏀惰揣鏁伴噺",
- type: "decimal",
- width: 90,
- align: "left",
- required: true,
- },
- {
- field: "ifInspection",
- title: "鏄惁妫�楠�",
- type: "int",
- width: 90,
- align: "left",
- bind: { key: "enable", data: [] },
- },
- {
- field: "priceInTax",
- title: "鍚◣浠锋牸",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "taxRate",
- title: "绋庣巼",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ],
- sortName: "id",
- key: "id",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/receiveOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/receiveOrderDetail.vue"
deleted file mode 100644
index c27198a..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/receiveOrderDetail.vue"
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
-*Author锛歫xx
- *Contact锛�283591387@qq.com
- *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
- *涓氬姟璇峰湪@/extension/widesea_wcs/order/Dt_ReceiveOrderDetail.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/inbound/receiveOrderDetail.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: 'id',
- footer: "Foots",
- cnName: '鏀惰揣鍗曟槑缁�',
- name: 'order/Dt_ReceiveOrderDetail',
- url: "/Dt_ReceiveOrderDetail/",
- sortName: "id"
- });
- const editFormFields = ref({});
- const editFormOptions = ref([]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([]);
- const columns = ref([{field:'Id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'ReceiveOrderId',title:'鏀惰揣鍗曚富閿�',type:'int',width:110,require:true,align:'left',sort:true},
- {field:'PurchaseOrderNo',title:'閲囪喘鍗曞彿',type:'string',width:110,require:true,align:'left'},
- {field:'PurchaseOrderDetailRowNo',title:'閲囪喘鍗曟槑缁嗚鍙�',type:'int',width:110,require:true,align:'left'},
- {field:'RowNo',title:'琛屽彿',type:'int',width:110,require:true,align:'left'},
- {field:'MaterielCode',title:'鐗╂枡缂栧彿',type:'string',width:110,require:true,align:'left'},
- {field:'LotNo',title:'鎵规鍙�',type:'string',width:110,require:true,align:'left'},
- {field:'ReceivedQuantity',title:'鏀惰揣鏁伴噺',type:'float',width:110,require:true,align:'left'},
- {field:'IfInspection',title:'鏄惁瑕佹楠�',type:'int',width:110,require:true,align:'left'},
- {field:'PriceInTax',title:'鍚◣浠锋牸',type:'decimal',width:110,require:true,align:'left'},
- {field:'TaxRate',title:'绋庣巼',type:'string',width:110,align:'left'},
- {field:'CurrCode',title:'甯佸埆缂栫爜',type:'string',width:110,align:'left'},
- {field:'Remark',title:'澶囨敞',type:'string',width:220,align:'left'},
- {field:'Unit',title:'Unit',type:'string',width:110,require:true,align:'left'},
- {field:'Creater',title:'鍒涘缓鑰�',type:'string',width:110,require:true,align:'left'},
- {field:'CreateDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
- {field:'Modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
- {field:'ModifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
- const 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/WMSClient/src/views/inbound/returnBSTOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/returnBSTOrder.vue"
deleted file mode 100644
index 39ed9a9..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/returnBSTOrder.vue"
+++ /dev/null
@@ -1,167 +0,0 @@
-<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/inbound/returnBSTOrder.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "BST閫�鏂欏崟",
- name: "returnBSTOrder",
- url: "/returnBSTOrder/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({
- warehouseId:"",
- paperWreturnId:"",
- returnInboundNo:"",
- paperWreturnNo:"",
- returnDate:"",
- });
- const searchFormOptions = ref([
- [
- { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [] },
- { title: "閫�鏂欏崟鏉ユ簮ID", field: "paperWreturnId", type: "like" },
- { title: "WMS鍗曞彿", field: "returnInboundNo", type: "like" },
- { title: "閫�鏂欏崟鍙�", field: "paperWreturnNo", type: "like", },
- ],
- [
- { title: "閫�鏂欐棩鏈�", field: "returnDate", type: "datetime", }
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind: { key: "warehouses", data: [] }
- },
- {
- field: "paperWreturnId",
- title: "閫�鏂欏崟鏉ユ簮ID",
- type: "int",
- width: 120,
- align: "left",
- },
- {
- field: "returnInboundNo",
- title: "WMS鍗曟嵁缂栧彿",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "paperWreturnNo",
- title: "閫�鏂欏崟缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "employeeName",
- title: "閫�鏂欏憳宸�",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "totalPaperWreturnLength",
- title: "閫�鏂欐�婚暱搴�",
- type: "decimal",
- width: 150,
- align: "left",
- },
- {
- field: "returnOrderStatus",
- title: "閫�鏂欏崟鐘舵��",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "wreturnDate",
- title: "閫�鏂欐棩鏈�",
- type: "date",
- width: 150,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "鍏ュ簱鍗曟槑缁�",
- table: "",
- columns: [],
- sortName: "",
- key: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/returnBSTOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/returnBSTOrderDetail.vue"
deleted file mode 100644
index cd02bda..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/returnBSTOrderDetail.vue"
+++ /dev/null
@@ -1,214 +0,0 @@
-<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/inbound/returnBSTOrderDetail.js";
-import { ref, defineComponent } from "vue";
-import { data } from "vue-barcode";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "BST閫�鏂欏崟鏄庣粏",
- name: "returnBSTOrderDetail",
- url: "/ReturnBSTOrderDetail/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({
- returnBSTOrderId:"",
- paperWreturnId:"",
- materialId:"",
- barcode:"",
- materialNo:"",
- materialName:"",
- seqNo:"",
- returnBSTOrderDetailStatus:"",
- });
- const searchFormOptions = ref([
- [
- { title: "澶磋〃", field: "returnBSTOrderId", type: "like" },
- { title: "閫�鏂欐潵婧怚D", field: "paperWreturnId", type: "like" },
- { title: "鐗╂枡鏉ユ簮ID", field: "materialId", type: "like" },
- { title: "鐗╂枡鏉＄爜", field: "barcode", type: "like" },
-
- ],
- [
- { title: "鐗╂枡缂栧彿", field: "materialNo", type: "like" },
- { title: "鐗╂枡鍚嶇О", field: "materialName", type: "like" },
- { title: "鎵规搴忓垪鍙�", field: "seqNo", type: "like" },
- { title: "鐘舵��", field: "returnBSTOrderDetailStatus", type: "select", dataKey: "inboundState", data: [], },
- ],
- [
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ]
-
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "returnBSTOrderId",
- title: "澶磋〃",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "paperWreturnId",
- title: "閫�鏂欐潵婧怚D",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialId",
- title: "鐗╂枡鏉ユ簮ID",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "barcode",
- title: "鐗╂枡鏉＄爜",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialNo",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "seqNo",
- title: "鎵规搴忓垪鍙�",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialWide",
- title: "骞呭",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialThick",
- title: "鐩村緞",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "procurementLength",
- title: "閫�鏂欓暱搴�",
- type: "decimal",
- width: 150,
- align: "left",
- },
- {
- field: "qty",
- title: "閫�鏂欐暟閲�",
- type: "decimal",
- width: 150,
- align: "left",
- },
- {
- field: "returnBSTOrderDetailStatus",
- title: "鐘舵��",
- type: "select",
- width: 90,
- align: "left",
- bind: { key: "inboundState", data: [] },
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "鍏ュ簱鍗曟槑缁�",
- table: "",
- columns: [],
- sortName: "",
- key: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/returnOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/returnOrder.vue"
deleted file mode 100644
index a5da780..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/returnOrder.vue"
+++ /dev/null
@@ -1,290 +0,0 @@
-
-<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/inbound/returnOrder.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "閫�鏂欏崟",
- name: "returnOrder",
- url: "/ReturnOrder/",
- sortName: "id",
- });
-
- const searchFormFields = ref({
- orderNo:''
- });
- const searchFormOptions = ref([
- [
- { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
- ]
- ]);
-
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
-
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "orderNo",
- title: "閫�鏂欏崟鍙�",
- type: "string",
- width: 150,
- align: "left",
- link: true,
- },
- {
- field: "returnOrderType",
- title: "璁㈠崟绫诲瀷",
- type: "string",
- width: 150,
- align: "left",
- bind: { key: "returnType", data: [] },
- },
- {
- field: "returnOrderStatus",
- title: "璁㈠崟鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "returnStatus", data: [] },
- },
- {
- field: "isDev",
- title: "鏄惁鐮斿彂",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind:{key: "warehouses", data: []}
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "閫�鏂欏崟鏄庣粏",
- table: "Dt_ReturnOrderDetail",
- columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "returnId",
- title: "閫�鏂欏崟涓婚敭",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "pickCode",
- title: "鐢宠鍙戞枡鍗曞彿",
- type: "select",
- width: 180,
- align: "left",
- required: true,
- },
- {
- field: "applyRow",
- title: "鐢宠鍗曞彿琛屽彿",
- type: "select",
- width: 150,
- align: "left",
- required: true,
- },
- {
- field: "rowId",
- title: "閫�鏂欒鍙�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "orderDetailStatus",
- title: "鏄庣粏鍗曠姸鎬�",
- type: "select",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "returnStatus", data: [] },
- },
- {
- field: "mCode",
- title: "鐗╂枡缂栫爜",
- type: "string",
- width: 130,
- align: "left",
- required: true,
- },
- {
- field: "qty",
- title: "鍙��鏁伴噺",
- type: "float",
- width: 130,
- align: "left",
- required: true,
- },
- {
- field: "returnQty",
- title: "閫�鍥炴暟閲�",
- type: "float",
- width: 130,
- align: "left",
- required: true,
- },
- {
- field: "overReturnQty",
- title: "宸查��鍥炴暟閲�",
- type: "float",
- width: 130,
- align: "left",
- required: true,
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 90,
- align: "left"
- },
- {
- field: "materielSpec",
- title: "鐗╂枡瑙勬牸",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ],
- sortName: "id",
- key: "id",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
- </script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/takeStockOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/takeStockOrder.vue"
deleted file mode 100644
index 2a5d9b9..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/inbound/takeStockOrder.vue"
+++ /dev/null
@@ -1,277 +0,0 @@
-
-<template>
- <!-- <div>
- <assemble-dist></assemble-dist>
- </div> -->
- <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/inbound/takeStockOrder.js";
- import { ref, defineComponent } from "vue";
- // import AssembleDistVue from '../charts/AssembleDist.vue';
- export default defineComponent({
- // components: {
- // 'assemble-dist': AssembleDistVue,
- // },
- setup() {
- //浣跨敤缁勪欢AssembleDist
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鐩樼偣鍗�",
- name: "takeStockOrder",
- url: "/TakeStockOrder/",
- sortName: "id",
- });
-
- const searchFormFields = ref({
- orderNo:""
- });
- const searchFormOptions = ref([
- [
- { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
- ]
- ]);
-
- const editFormFields = ref({
- orderNo:"",
- warehouseId: "",
- remark:""
- });
- const editFormOptions = ref([
- [
- {
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- readonly: "true",
- },
- {
- title: "浠撳簱",
- field: "warehouseId",
- type: "select",
- dataKey: "warehouses",
- data: [],
- required: true,
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- }
- ]
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "orderNo",
- title: "鐩樼偣鍗曞彿",
- type: "string",
- width: 150,
- align: "left",
- link: true,
- },
- {
- field: "takeStockStatus",
- title: "鐩樼偣鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "returnStatus", data: [] },
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind:{key: "warehouses", data: []}
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "閫�鏂欏崟鏄庣粏",
- table: "Dt_ReturnOrderDetail",
- columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "takeStockId",
- title: "鐩樼偣鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栫爜",
- type: "string",
- width: 90,
- align: "left",
- required: true,
- edit: { type: "string" }
- },
- {
- field: "batchNo",
- title: "鎵规鍙�",
- type: "string",
- width: 90,
- align: "left",
- required: true,
- edit: { type: "string" }
- },
- {
- field: "sysQty",
- title: "璐﹂潰鏁伴噺",
- type: "decimal",
- width: 90,
- align: "left",
- required: true,
- edit: { type: "decimal" }
- },
- {
- field: "qty",
- title: "瀹炵洏鏁伴噺",
- type: "decimal",
- width: 90,
- align: "left",
- required: true,
- edit: { type: "decimal" }
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 90,
- align: "left"
- },
- {
- field: "materielSpec",
- title: "鐗╂枡瑙勬牸",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ],
- sortName: "id",
- key: "id",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
- </script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outBSTOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outBSTOrder.vue"
deleted file mode 100644
index 2cb8e71..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outBSTOrder.vue"
+++ /dev/null
@@ -1,278 +0,0 @@
-
-<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/outbound/outBSTOrder.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鍑哄簱鍗�",
- name: "outBSTOrder",
- url: "/OutBSTOrder/",
- sortName: "id",
- });
- const editFormFields = ref({
- boardMpsNo:""
- });
- const editFormOptions = ref([
- [
- {
- field: "boardMpsNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- readonly:true
- }
- ],
- ]);
- const searchFormFields = ref({
- outBSTOrderNo: "",
- boardMpsId: "",
- boardMpsNo: "",
- outBSTOrderStatus: "",
- warehouseId: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鍗曟嵁缂栧彿", field: "outBSTOrderNo", type: "like" },
- { title: "鍑哄簱涓婃父ID", field: "boardMpsId", type: "like" },
- { title: "涓婃父鍗曟嵁缂栧彿", field: "boardMpsNo", type: "like" },
- {
- title: "鍗曟嵁鐘舵��",
- field: "outBSTOrderStatus",
- type: "select",
- dataKey: "outboundStatusEnum",
- data: [],
- },
- ],
- [
- { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],}
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind:{key: "warehouses", data: []}
- },
- {
- field: "outBSTOrderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- width: 160,
- align: "left",
- // link: true,
- },
- {
- field: "boardMpsId",
- title: "涓婃父鍗曟嵁ID",
- type: "int",
- width: 160,
- align: "left",
- // link: true,
- },
- {
- field: "boardMpsNo",
- title: "涓婃父鍗曟嵁缂栧彿",
- type: "string",
- width: 160,
- align: "left",
- },
- {
- field: "outBSTOrderStatus",
- title: "鍑哄簱鍗曠姸鎬�",
- type: "string",
- width: 110,
- align: "left",
- bind: { key: "outboundStatusEnum", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "鍑哄簱鏄庣粏鍗�",
- table: "OutBSTOrderDetail",
- columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "outBSTOrderId",
- title: "鍑哄簱鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "boardMpsId",
- title: "鍏宠仈鐨勪富琛↖D(涓婃父)",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "materialId",
- title: "鍏宠仈鐨勪富琛↖D(涓婃父)",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "materialNo",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- edit: { type: "string" },
- required: true,
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- edit: { type: "string" },
- },
- {
- field: "width",
- title: "骞呭",
- type: "string",
- width: 110,
- align: "left",
- edit: { type: "string" },
- required: true,
- },
- {
- field: "xqLen",
- title: "闇�姹傞暱搴�",
- type: "string",
- width: 110,
- align: "left",
- edit: { type: "number" },
- required: true,
- },
- {
- field: "totalUsage",
- title: "鎬荤敤閲�",
- type: "string",
- width: 90,
- align: "left",
- edit: { type: "number" },
- required: true,
- },
- {
- field: "procurementLength",
- title: "閲囪喘闀垮害",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "assignTotalUsage",
- title: "宸插垎閰嶇敤閲�",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "outTotalUsage",
- title: "宸插嚭鐢ㄩ噺",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "outBSTOrderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
- type: "string",
- width: 180,
- align: "left",
- bind: { key: "outboundStatusEnum", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- }
- ],
- sortName: "id",
- key: "id",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outBSTOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outBSTOrderDetail.vue"
deleted file mode 100644
index 03d0916..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outBSTOrderDetail.vue"
+++ /dev/null
@@ -1,221 +0,0 @@
-
-<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/outbound/outBSTOrderDetail.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鍑哄簱鍗曟槑缁�",
- name: "outBSTOrderDetail",
- url: "/OutBSTOrderDetail/",
- sortName: "id",
- });
- const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
- });
- const editFormOptions = ref([
- [
- {
- title: "璁惧缂栧彿",
- required: true,
- field: "deviceCode",
- type: "string",
- },
- {
- title: "璁惧鍚嶇О",
- required: true,
- field: "deviceName",
- type: "string",
- },
- {
- title: "璁惧绫诲瀷",
- required: true,
- field: "deviceType",
- type: "string",
- },
- {
- title: "璁惧鐘舵��",
- required: true,
- field: "deviceStatus",
- type: "string",
- },
- ],
- [
- { title: "璁惧IP", required: true, field: "deviceIp", type: "string" },
- {
- title: "璁惧绔彛",
- required: true,
- field: "devicePort",
- type: "string",
- },
- {
- title: "PLC绫诲瀷",
- required: true,
- field: "devicePlcType",
- type: "string",
- },
- {
- title: "澶囨敞",
- field: "deviceRemark",
- type: "string",
- },
- ],
- ]);
- const searchFormFields = ref({
- deviceCode: "",
- deviceType: "",
- deviceStatus: "",
- });
- const searchFormOptions = ref([
- [
- { title: "璁惧缂栧彿", field: "deviceCode" },
- { title: "璁惧绫诲瀷", field: "deviceType" },
- { title: "璁惧鐘舵��", field: "deviceStatus" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- align: "left",
- },
- {
- field: "orderId",
- title: "鍑哄簱鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "batchNo",
- title: "鎵规鍙�",
- type: "decimal",
- width: 90,
- align: "left",
- },
- {
- field: "orderQuantity",
- title: "鍗曟嵁鏁伴噺",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "lockQuantity",
- title: "閿佸畾鏁伴噺",
- type: "int",
- width: 120,
- align: "left",
- },
- {
- field: "overOutQuantity",
- title: "宸插嚭鏁伴噺",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "orderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
- </script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outBSTPickInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outBSTPickInfo.vue"
deleted file mode 100644
index 2d0fa41..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outBSTPickInfo.vue"
+++ /dev/null
@@ -1,187 +0,0 @@
-<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/outbound/outBSTPickInfo.js";
-import { ref, defineComponent } from "vue";
-import { data } from "vue-barcode";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鍗氭�濋�氶鏂欎俊鎭�",
- name: "outBSTPickInfo",
- url: "/OutBSTPickInfo/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({
-
- });
- const searchFormOptions = ref([
- [
- { title: "鍑哄簱涓昏〃ID", field: "outBSTOrderId", type: "like" },
- { title: "鍏宠仈涓昏〃ID", field: "boardMpsId", type: "like" },
- { title: "鐗╂枡鏉ユ簮ID", field: "materialId", type: "like" },
- { title: "鐗╂枡缂栧彿", field: "materialNo", type: "like" },
- ],
- [
- { title: "鐗╂枡鍚嶇О", field: "materialName", type: "like" },
- { title: "鐘舵��", field: "outBSTOrderDetailStatus", type: "select", dataKey: "outboundStatusEnum", data: [] },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "outBSTOrderId",
- title: "鍑哄簱涓昏〃ID",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "boardMpsId",
- title: "鍏宠仈鐨勪富琛↖D",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "width",
- title: "骞呭",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "xqLen",
- title: "闇�姹傞暱搴�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "totalUsage",
- title: "鎬荤敤閲�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "materialId",
- title: "鐗╂枡鏉ユ簮ID",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialNo",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "procurementLength",
- title: "閲囪喘闀垮害",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "assignTotalUsage",
- title: "宸插垎閰嶇敤閲�",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "outTotalUsage",
- title: "宸插嚭鐢ㄩ噺",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "outBSTOrderDetailStatus",
- title: "鐘舵��",
- type: "select",
- width: 90,
- align: "left",
- bind: { key: "outboundStatusEnum", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "鍏ュ簱鍗曟槑缁�",
- table: "",
- columns: [],
- sortName: "",
- key: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outMESOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outMESOrder.vue"
deleted file mode 100644
index e69de29..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outMESOrder.vue"
+++ /dev/null
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outSGOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outSGOrder.vue"
deleted file mode 100644
index 0e7cd71..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outSGOrder.vue"
+++ /dev/null
@@ -1,283 +0,0 @@
-
-<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/outbound/outSGOrder.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鐢熺鎺掔▼鍗�",
- name: "outSGOrder",
- url: "/OutSGOrder/",
- sortName: "id",
- });
- const editFormFields = ref({
- boardMpsNo:""
- });
- const editFormOptions = ref([
- [
- {
- field: "boardMpsNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- readonly:true
- }
- ],
- ]);
- const searchFormFields = ref({
- outSGOrderNo: "",
- boardMpsId: "",
- orderId: "",
- outSGOrderStatus: "",
- warehouseId: "",
- shortName: "",
- });
- const searchFormOptions = ref([
- [
- { title: "WMS鍗曞彿", field: "outSGOrderNo", type: "like" },
- { title: "鍑哄簱涓婃父ID", field: "boardMpsId", type: "like" },
- { title: "涓婃父鐢熶骇鍗曞彿", field: "orderId", type: "like" },
- {
- title: "鍗曟嵁鐘舵��",
- field: "outSGOrderStatus",
- type: "select",
- dataKey: "outboundStatusEnum",
- data: [],
- },
- ],
- [
- { title: "浠撳簱", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],},
- { title: "瀹㈡埛绠�绉�", field: "shortName", type: "like" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind:{key: "warehouses", data: []}
- },
- {
- field: "outSGOrderNo",
- title: "WMS鍗曞彿",
- type: "string",
- width: 160,
- align: "left",
- // link: true,
- },
- {
- field: "boardMpsId",
- title: "涓婃父鍗曟嵁ID",
- type: "int",
- width: 160,
- align: "left",
- // link: true,
- },
- {
- field: "orderId",
- title: "涓婃父鐢熶骇鍗曞彿",
- type: "string",
- width: 160,
- align: "left",
- },
- {
- field: "shortName",
- title: "瀹㈡埛绠�绉�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "outSGOrderStatus",
- title: "鍑哄簱鍗曠姸鎬�",
- type: "string",
- width: 110,
- align: "left",
- bind: { key: "outboundStatusEnum", data: [] },
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "鍑哄簱鏄庣粏鍗�",
- table: "OutSGOrderDetail",
- columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "outSGOrderId",
- title: "鍑哄簱鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "boardMpsId",
- title: "鍏宠仈鐨勪富琛↖D(涓婃父)",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "boardMpsDetailId",
- title: "鍏宠仈鏄庣粏ID(涓婃父)",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "materialNo",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- edit: { type: "string" },
- required: true,
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- edit: { type: "string" },
- },
- {
- field: "boardFluteNo",
- title: "妤炲埆",
- type: "string",
- width: 110,
- align: "left",
- edit: { type: "string" },
- },
- {
- field: "machineName",
- title: "鏈哄彴浣�",
- type: "string",
- width: 110,
- align: "left",
- edit: { type: "string" },
- required: true,
- },
- {
- field: "width",
- title: "骞呭",
- type: "string",
- width: 110,
- align: "left",
- edit: { type: "string" },
- required: true,
- },
- {
- field: "xqLen",
- title: "闇�姹傞暱搴�",
- type: "string",
- width: 110,
- align: "left",
- edit: { type: "number" },
- required: true,
- },
- {
- field: "totalUsage",
- title: "鎬荤敤閲�",
- type: "string",
- width: 90,
- align: "left",
- edit: { type: "number" },
- required: true,
- },
- {
- field: "procurementLength",
- title: "閲囪喘闀垮害",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "assignTotalUsage",
- title: "宸插垎閰嶇敤閲�",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "outTotalUsage",
- title: "宸插嚭鐢ㄩ噺",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "outBSTOrderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
- type: "string",
- width: 180,
- align: "left",
- bind: { key: "outboundStatusEnum", data: [] },
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- }
- ],
- sortName: "id",
- key: "id",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
- </script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outSGOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outSGOrderDetail.vue"
deleted file mode 100644
index 3285c1d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outSGOrderDetail.vue"
+++ /dev/null
@@ -1,221 +0,0 @@
-
-<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/outbound/outSGOrderDetail.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鍑哄簱鍗曟槑缁�",
- name: "outSGOrderDetail",
- url: "/OutSGOrderDetail/",
- sortName: "id",
- });
- const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
- });
- const editFormOptions = ref([
- [
- {
- title: "璁惧缂栧彿",
- required: true,
- field: "deviceCode",
- type: "string",
- },
- {
- title: "璁惧鍚嶇О",
- required: true,
- field: "deviceName",
- type: "string",
- },
- {
- title: "璁惧绫诲瀷",
- required: true,
- field: "deviceType",
- type: "string",
- },
- {
- title: "璁惧鐘舵��",
- required: true,
- field: "deviceStatus",
- type: "string",
- },
- ],
- [
- { title: "璁惧IP", required: true, field: "deviceIp", type: "string" },
- {
- title: "璁惧绔彛",
- required: true,
- field: "devicePort",
- type: "string",
- },
- {
- title: "PLC绫诲瀷",
- required: true,
- field: "devicePlcType",
- type: "string",
- },
- {
- title: "澶囨敞",
- field: "deviceRemark",
- type: "string",
- },
- ],
- ]);
- const searchFormFields = ref({
- deviceCode: "",
- deviceType: "",
- deviceStatus: "",
- });
- const searchFormOptions = ref([
- [
- { title: "璁惧缂栧彿", field: "deviceCode" },
- { title: "璁惧绫诲瀷", field: "deviceType" },
- { title: "璁惧鐘舵��", field: "deviceStatus" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- align: "left",
- },
- {
- field: "outSGOrderId",
- title: "鍑哄簱鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "MaterialNo",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "batchNo",
- title: "鎵规鍙�",
- type: "decimal",
- width: 90,
- align: "left",
- },
- {
- field: "orderQuantity",
- title: "鍗曟嵁鏁伴噺",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "lockQuantity",
- title: "閿佸畾鏁伴噺",
- type: "int",
- width: 120,
- align: "left",
- },
- {
- field: "overOutQuantity",
- title: "宸插嚭鏁伴噺",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "orderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
- </script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outStockLockInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outStockLockInfo.vue"
deleted file mode 100644
index 7eede7f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/outStockLockInfo.vue"
+++ /dev/null
@@ -1,319 +0,0 @@
-
-<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/outbound/outStockLockInfo.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鍑哄簱璇︽儏",
- name: "outStockLockInfo",
- url: "/OutStockLockInfo/",
- sortName: "id",
- });
- const editFormFields = ref({
- orderType: "",
- orderNo:"",
- upperOrderNo: "",
- orderStatus: "",
- remark: "",
- warehouseId:""
- });
- const editFormOptions = ref([
- [
- {
- title: "鍗曟嵁绫诲瀷",
- required: true,
- field: "orderType",
- type: "select",
- dataKey: "outOrderType",
- data: [],
- },
- {
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- readonly:true
- },
- {
- title: "涓婃父鍗曟嵁缂栧彿",
- field: "upperOrderNo",
- type: "string",
- },
- {
- title: "鍗曟嵁鐘舵��",
- field: "orderStatus",
- type: "select",
- dataKey: "inboundState",
- data: [],
- readonly: true,
- },
- {
- title: "浠撳簱",
- field: "warehouseId",
- type: "select",
- dataKey: "warehouses",
- data: [],
- required: true,
- },
- {
- title: "澶囨敞",
- field: "remark",
- type: "textarea",
- },
- ],
- ]);
- const searchFormFields = ref({
- orderNo: "",
- upperOrderNo: "",
- orderType: "",
- orderStatus: "",
- createType: "",
- creater: "",
- createDate: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
- { title: "鎵规鍙�", field: "batchNo", type: "like" },
- { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
- {
- title: "鍗曟嵁绫诲瀷",
- field: "orderType",
- type: "select",
- dataKey: "outOrderTypeEnum",
- data: [],
- },
-
- ],
- [
- {title: "鐗╂枡鍚嶇О",field: "materielName",type: "like",},
- { title: "鍗曟嵁鏁伴噺", field: "orderQuantity", type: "like" },
- { title: "鍘熷搴撳瓨閲�", field: "originalQuantity", type: "like" },
- { title: "鍒嗛厤搴撳瓨閲�", field: "assignQuantity", type: "like" },
- ],
- [
- {title: "璐т綅缂栧彿",field: "locationCode",type: "like",},
- { title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
- { title: "浠诲姟鍙�", field: "taskNum", type: "like" },
- { title: "鐘舵��", field: "status", type: "select",dataKey:"outboundStatusEnum", data:[]},
- ],
- [
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ]
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "orderType",
- title: "鍗曟嵁绫诲瀷",
- type: "string",
- width: 150,
- align: "left",
- bind: { key: "outOrderTypeEnum", data: [] },
- },
- {
- field: "orderDetailId",
- title: "鍗曟嵁鏄庣粏涓婚敭",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "materielId",
- title: "鐗╂枡id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "batchNo",
- title: "鎵规鍙�",
- type: "string",
- width: 160,
- align: "left",
- // link: true,
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 160,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "stockId",
- title: "搴撳瓨涓婚敭",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "orderQuantity",
- title: "鍗曟嵁鏁伴噺",
- type: "string",
- width: 120,
- align: "left"
- },
- {
- field: "originalQuantity",
- title: "鍘熷搴撳瓨閲�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "assignQuantity",
- title: "鍒嗛厤鍑哄簱閲�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "locationCode",
- title: "璐т綅缂栧彿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "palletCode",
- title: "鎵樼洏缂栧彿",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "machineName",
- title: "鏈哄彴浣嶇疆",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "makeCode",
- title: "鍔犲伐涓績",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "taskNum",
- title: "浠诲姟鍙�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "status",
- title: "鐘舵��",
- type: "select",
- width: 100,
- align: "left",
- bind: { key: "outboundStatusEnum", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- hidden: true,
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden: true,
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- columns: [],
- sortName: "",
- key: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/proDeliveryOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/proDeliveryOrder.vue"
deleted file mode 100644
index dd728d5..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/proDeliveryOrder.vue"
+++ /dev/null
@@ -1,169 +0,0 @@
-<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/outbound/proDeliveryOrder.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "閿�鍞嚭搴撳崟",
- name: "proDeliveryOrder",
- url: "/ProDeliveryOrder/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({
- warehouseId: "",
- proDeliveryCode: "",
- deliveryCode: "",
- deliveryType: "",
- proDeliveryStatus: "",
- });
- const searchFormOptions = ref([
- [
- { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [] },
- { title: "WMS鍗曞彿", field: "proDeliveryCode", type: "like" },
- { title: "鍑哄簱鍗曞彿", field: "deliveryCode", type: "like" },
- { title: "璁㈠崟绫诲瀷", field: "deliveryType", type: "select", dataKey: "outOrderTypeEnum", data: [] },
- ],
- [
- { title: "鐘舵��", field: "proDeliveryStatus", type: "select", dataKey: "outboundStatusEnum", data: [] },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind: { key: "warehouses", data: [] }
- },
- {
- field: "proDeliveryCode",
- title: "WMS鍗曞彿",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "deliveryCode",
- title: "鍑哄簱鍗曞彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "deliveryType",
- title: "璁㈠崟绫诲瀷",
- type: "select",
- width: 150,
- align: "left",
- bind: { key: "outOrderTypeEnum", data: [] },
- },
- {
- field: "employeeName",
- title: "鍒涘缓鍛樺伐",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "proDeliveryStatus",
- title: "鐘舵��",
- type: "decimal",
- width: 90,
- align: "left",
- bind: { key: "outboundStatusEnum", data: [] },
- },
- {
- field: "planDate",
- title: "璁″垝棰嗘枡鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "details",
- title: "閲囪喘鍒楄〃",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "鍏ュ簱鍗曟槑缁�",
- table: "",
- columns: [],
- sortName: "",
- key: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/proDeliveryOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/proDeliveryOrderDetail.vue"
deleted file mode 100644
index 7484b77..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/outbound/proDeliveryOrderDetail.vue"
+++ /dev/null
@@ -1,195 +0,0 @@
-<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/outbound/proDeliveryOrderDetail.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "閿�鍞嚭搴撳崟鏄庣粏",
- name: "proDeliveryOrderDetail",
- url: "/ProDeliveryOrderDetail/",
- sortName: "id",
- });
- const editFormFields = ref({
-
- });
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({
- proDeliveryId: "",
- detailId: "",
- saleOrderNo: "",
- customer: "",
- materialCode: "",
- materielName: "",
- materialLot: "",
- proDeliveryDetailStatus: "",
- });
- const searchFormOptions = ref([
- [
- { title: "澶磋〃", field: "proDeliveryId", type: "like" },
- { title: "鍑哄簱鏄庣粏ID", field: "detailId", type: "like" },
- { title: "閿�鍞崟鍙�", field: "saleOrderNo", type: "like" },
- { title: "瀹㈡埛缂栧彿", field: "customer", type: "like" },
- ],
- [
- { title: "鐗╂枡缂栧彿", field: "materialCode", type: "like" },
- { title: "鐗╂枡鍚嶇О", field: "materialName", type: "like" },
- { title: "鐗╂枡鎵规", field: "materialLot", type: "like" },
- { title: "鐘舵��", field: "proDeliveryDetailStatus", type: "select", dataKey: "outboundStatusEnum", data: [] },
- ],
-
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "proDeliveryId",
- title: "澶磋〃",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "detailId",
- title: "鍑哄簱鏄庣粏ID",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "saleOrderNo",
- title: "閿�鍞崟鍙�",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "customer",
- title: "瀹㈡埛缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materialLot",
- title: "鐗╂枡鎵规",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "quantity",
- title: "鏁伴噺",
- type: "decimal",
- width: 120,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "assignTotalUsage",
- title: "宸插垎閰嶉渶姹傛暟閲�",
- type: "decimal",
- width: 120,
- align: "left",
- },
- {
- field: "outTotalUsage",
- title: "宸插嚭闇�姹傛暟閲�",
- type: "decimal",
- width: 120,
- align: "left",
- },
- {
- field: "proDeliveryDetailStatus",
- title: "鐘舵��",
- type: "decimal",
- width: 90,
- align: "left",
- bind: { key: "outboundStatusEnum", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "鍏ュ簱鍗曟槑缁�",
- table: "",
- columns: [],
- sortName: "",
- key: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/sort/sortOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/sort/sortOrder.vue"
new file mode 100644
index 0000000..cd74217
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/sort/sortOrder.vue"
@@ -0,0 +1,169 @@
+<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/sort/sortOrder.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "鍒嗘嫞鍗曟嵁淇℃伅",
+ name: "sortOrder",
+ url: "/SortOrder/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+ [
+ ],
+ ]);
+ const searchFormFields = ref({
+ containerNo: "",
+ sno: "",
+ warehouseId: "",
+ produceLine: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "鏂欐缂栧彿", field: "containerNo", type: "like" },
+ { title: "鍗曟嵁缂栧彿", field: "sno", type: "like" },
+ { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouseEnum", data: [], },
+ { title: "鐢熶骇绾�", field: "produceLine", type: "like" },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "id",
+ type: "int",
+ width: 100,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "containerCode",
+ title: "鏂欐缂栧彿",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "sno",
+ title: "鍗曟嵁缂栧彿",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "grade",
+ title: "浼樺厛绾�",
+ type: "int",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "int",
+ width: 80,
+ align: "left",
+ },
+ {
+ field: "locationCode",
+ title: "璐т綅缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "targetArea",
+ title: "鍒嗘嫞鍖哄煙",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "targetLocation",
+ title: "鍒嗘嫞鐐逛綅",
+ type: "int",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "produceLine",
+ title: "鐢熶骇绾�",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "personName",
+ title: "鍙戣捣浜�",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/sort/sortOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/sort/sortOrderDetail.vue"
new file mode 100644
index 0000000..22a4dc4
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/sort/sortOrderDetail.vue"
@@ -0,0 +1,171 @@
+<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/sort/sortOrderDetail.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "鍒嗘嫞鍗曟嵁淇℃伅",
+ name: "sortOrderDetail",
+ url: "/SortOrderDetail/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+ [
+ ],
+ ]);
+ const searchFormFields = ref({
+ sortId: "",
+ cardNo: "",
+ prdtId: "",
+ orderNo: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "鍒嗘嫞鍗旾D", field: "sortId", type: "int" },
+ { title: "娴佺▼鍗″彿", field: "cardNo", type: "like" },
+ { title: "浜у搧鍨嬪彿", field: "prdtId", type: "like" },
+ { title: "璁㈠崟鍙�", field: "orderNo", type: "like" },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "id",
+ type: "int",
+ width: 100,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "sortId",
+ title: "鍒嗘嫞鍗旾D",
+ type: "int",
+ width: 100,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "cardNo",
+ title: "娴佺▼鍗″彿",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "prdtId",
+ title: "浜у搧鍨嬪彿",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "orderNo",
+ title: "璁㈠崟鍙�",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "alloy",
+ title: "鍚堥噾",
+ type: "int",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "state",
+ title: "鐘舵��",
+ type: "int",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "length",
+ title: "棰滆壊",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "qty",
+ title: "鏁伴噺",
+ type: "int",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "weight",
+ title: "閲嶉噺",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "runState",
+ title: "杩愯鐘舵��",
+ type: "int",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/ProStockView.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/ProStockView.vue"
deleted file mode 100644
index 250cbcd..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/ProStockView.vue"
+++ /dev/null
@@ -1,339 +0,0 @@
-
-<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/stock/ProStockView.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: "proStockId",
- footer: "Foots",
- cnName: "鎴愬搧(杈呮枡)搴撳瓨瑙嗗浘",
- name: "proStockView",
- url: "/proStockView/",
- sortName: "proStockId",
- });
- const editFormFields = ref({
- // palletCode: "",
- // locationCode: "",
- // locationName: "",
- });
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({
- palletCode: "",
- // locationCode: "",
- productCode:"",
- });
- const searchFormOptions = ref([
- [
- { title: "鎵樼洏缂栧彿", field: "palletCode",type: "like" },
- // { title: "璐т綅缂栧彿", field: "locationCode",type: "like" },
- { title: "鐗╂枡缂栧彿", field: "productCode",type: "like" },
- { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
- { title: "搴撳瓨鐘舵��", field: "stockStatus",type: "selectList",dataKey: "stockStatusEmun",data: [],},
- ],
- [
- { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "select",dataKey: "warehouses",data: []},
- { title: "搴撳瓨灞炴��", field: "proStockAttribute" ,type: "selectList",dataKey: "proStockAttributeEnum",data: [],},
- ],
- ]);
- const columns = ref([
- {
- field: "proStockId",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "palletCode",
- title: "鎵樼洏缂栧彿",
- type: "string",
- width: 150,
- link: true,
- align: "left",
- },
- {
- field: "locationCode",
- title: "璐т綅缂栧彿",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "locationName",
- title: "璐т綅鍚嶇О",
- type: "string",
- width: 270,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "鎵�灞炰粨搴�",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "proStockAttribute",
- title: "搴撳瓨灞炴��",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "proStockAttributeEnum", data: [] },
- },
- // {
- // field: "roadwayNo",
- // title: "宸烽亾缂栧彿",
- // type: "decimal",
- // width: 100,
- // align: "left",
- // hidden:true
- // },
- {
- field: "productCode",
- title: "鐗╂枡缂栫爜",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "productName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "lotNumber",
- title: "鐗╂枡鎵瑰彿",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "productSpec",
- title: "鐗╂枡瑙勬牸",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "sumStocks",
- title: "搴撳瓨鏁伴噺",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "productUnit",
- title: "鐗╂枡鍗曚綅",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "materielUnitEnum", data: [] },
- },
- {
- field: "row",
- title: "璐т綅琛�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "column",
- title: "璐т綅鍒�",
- type: "int",
- width: 120,
- align: "left",
- hidden: true,
- },
- {
- field: "layer",
- title: "璐т綅灞�",
- type: "string",
- width: 200,
- align: "left",
- hidden: true,
- },
- // {
- // field: "depth",
- // title: "璐т綅娣卞害",
- // type: "string",
- // width: 180,
- // align: "left",
- // hidden: true,
- // },
- {
- field: "stockStatus",
- title: "搴撳瓨鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "stockStatusEmun", data: [] },
- },
- // {
- // field: "locationType",
- // title: "璐т綅绫诲瀷",
- // type: "string",
- // width: 100,
- // align: "left",
- // bind:{key: "locationTypeEnum", data: []}
- // },
- {
- field: "locationStatus",
- title: "璐т綅鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "locationStatusEnum", data: [] },
- },
- {
- field: "enalbeStatus",
- title: "绂佺敤鐘舵��",
- type: "string",
- width: 80,
- align: "left",
- bind: { key: "enableStatusEnum", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鍏ュ簱鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "搴撳瓨鏄庣粏淇℃伅",
- table: "ProStockInfoDetail",
- columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "proStockId",
- title: "搴撳瓨淇℃伅涓婚敭",
- type: "string",
- width: 90,
- align: "left",
- hidden: true
- },
- {
- field: "productCode",
- title: "鐗╂枡缂栫爜",
- type: "string",
- width: 140,
- align: "left",
- },
- {
- field: "productName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "lotNumber",
- title: "鐗╂枡鎵瑰彿",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "productSpec",
- title: "鐗╂枡瑙勬牸",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "stockQty",
- title: "搴撳瓨鏁�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "productUnit",
- title: "鍗曚綅",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "proStockDetailStatus",
- title: "搴撳瓨鐘舵��",
- type: "int",
- width: 120,
- align: "left",
- bind: { key: "stockStatusEmun", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true
- },
- {
- field: "createDate",
- title: "鍒涘缓鍏ュ簱鏃堕棿",
- type: "datetime",
- width: 130,
- align: "left",
- hidden: true
- },
- ],
- sortName: "id",
- key: "id",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
- </script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/blankStockInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/blankStockInfo.vue"
new file mode 100644
index 0000000..a31f0c2
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/blankStockInfo.vue"
@@ -0,0 +1,167 @@
+<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/stock/blankStockInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "鍧枡闅旂儹搴撳瓨淇℃伅",
+ name: "blankStockInfo",
+ url: "/BlankStockInfo/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+ [
+ ],
+ ]);
+ const searchFormFields = ref({
+ locationCode: "",
+ containerCode: "",
+ containerType: "",
+ warehouseId: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "鏂欐缂栧彿", field: "containerCode", type: "like" },
+ { title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
+ { title: "鏂欐绫诲瀷", field: "containerType", type: "select", dataKey: "containerTypeEnum", data: [], },
+ { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouseEnum", data: [], },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 100,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "containerCode",
+ title: "鏂欐缂栧彿",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "locationCode",
+ title: "璐т綅缂栧彿",
+ type: "string",
+ width: 280,
+ align: "left",
+ },
+ {
+ field: "containerType",
+ title: "鏂欐绫诲瀷",
+ type: "int",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "int",
+ width: 90,
+ align: "left",
+ bind: { key: "warehouseEnum", data: [] },
+ },
+ {
+ field: "stockStatus",
+ title: "搴撳瓨鐘舵��",
+ type: "int",
+ width: 120,
+ align: "left",
+ bind: { key: "stockStatusEnum", data: [] },
+ },
+ {
+ field: "isEmpty",
+ title: "鏄惁绌烘",
+ type: "bool",
+ width: 90,
+ align: "left",
+ bind: { key: "", data: [{ key: "true", value: "鏄�" }, { key: "false", value: "鍚�" }] },
+ },
+ {
+ field: "isFill",
+ title: "鏄惁婊℃",
+ type: "bool",
+ width: 90,
+ align: "left",
+ bind: { key: "", data: [{ key: "true", value: "鏄�" }, { key: "false", value: "鍚�" }] },
+ },
+ {
+ field: "isPick",
+ title: "鏄惁鍒嗘嫞",
+ type: "bool",
+ width: 90,
+ align: "left",
+ bind: { key: "", data: [{ key: "true", value: "鏄�" }, { key: "false", value: "鍚�" }] },
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/blankStockInfo_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/blankStockInfo_Hty.vue"
new file mode 100644
index 0000000..189dc87
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/blankStockInfo_Hty.vue"
@@ -0,0 +1,160 @@
+
+<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/stock/blankStockInfo_Hty.js";
+ import { ref, defineComponent } from "vue";
+ export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "鍧枡闅旂儹搴撳瓨淇℃伅",
+ name: "blankStockInfo_Hty",
+ url: "/blankStockInfo_Hty/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+ deviceCode: "",
+ deviceName: "",
+ deviceType: "",
+ deviceStatus: "",
+ deviceIp: "",
+ devicePort: "",
+ devicePlcType: "",
+ deviceRemark: "",
+ });
+ const editFormOptions = ref([
+ [
+ {field:'containerCode',title:'鏂欐缂栧彿',type:'string'},
+ {field:'locationCode',title:'璐т綅缂栧彿',type:'string'},
+ ]
+ ]);
+ const searchFormFields = ref({
+ containerCode: "",
+ locationCode: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "鏂欐缂栧彿", field: "containerCode" },
+ { title: "璐т綅缂栧彿", field: "locationCode" },
+ ],
+ ]);
+ const columns = ref([
+ {field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {
+ field: "sourceId",
+ title: "sourceId",
+ type: "int",
+ width: 90,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "operateType",
+ title: "鎿嶄綔绫诲瀷",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "insertTime",
+ title: "绉诲叆鍘嗗彶鏃堕棿",
+ type: "datetime",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "containerCode",
+ title: "鏂欐缂栧彿",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "locationCode",
+ title: "璐т綅缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "select",
+ width: 100,
+ align: "left",
+ bind: { key: "warehouses", data: [] },
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ hidden:true
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ hidden:true
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 100,
+ align: "left",
+ hidden:true
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+ });
+ </script>
+
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/materielnfoStatistics.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/materielnfoStatistics.vue"
deleted file mode 100644
index c50070b..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/materielnfoStatistics.vue"
+++ /dev/null
@@ -1,189 +0,0 @@
-<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/stock/materielnfoStatistics.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "stockId",
- footer: "Foots",
- cnName: "鐗╂枡鍒嗙被缁熻",
- name: "materielnfoStatistics",
- url: "/materielnfoStatistics/",
- sortName: "stockId",
- });
- const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
- });
- const editFormOptions = ref([
- [
- {
- title: "鐗╂枡缂栧彿",
- required: true,
- field: "materielCode",
- type: "string",
- },
- {
- title: "鍗曟嵁缂栧彿",
- required: true,
- field: "materielName",
- type: "string",
- },
- {
- title: "鎵规鍙�",
- required: true,
- field: "orderNo",
- type: "string",
- },
- {
- title: "搴忓垪鍙�",
- required: true,
- field: "serialNumber",
- type: "string",
- },
- ],
-
- ]);
- const searchFormFields = ref({
- materielCode: "",
- materielName: "",
- orderNo: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鐗╂枡缂栧彿", field: "materielCode", type:"like"},
- { title: "鐗╂枡鍚嶇О", field: "materielName" ,type:"like"},
- { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "select",dataKey: "warehouses",data: []},
- {title: "搴撳瓨鐘舵��",field: "stockStatus",type: "select",dataKey:"stockStatusEmun", data: []}
- ],
- ]);
- const columns = ref([
- {
- field: "stockId",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "select",
- width: 100,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "stockQuantity",
- title: "搴撳瓨鏁伴噺",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "outboundQuantity",
- title: "鍑哄簱鏁伴噺",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field:"unit",
- title:"鍗曚綅",
- type:"string",
- width:60,
- align:"left"
- },
- {
- field: "stockStatus",
- title: "搴撳瓨鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "stockStatusEmun", data: [] },
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
-
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/mouldStockInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/mouldStockInfo.vue"
new file mode 100644
index 0000000..21a8433
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/mouldStockInfo.vue"
@@ -0,0 +1,177 @@
+
+<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/stock/mouldStockInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "妯″叿搴撳瓨淇℃伅",
+ name: "mouldStockInfo",
+ url: "/MouldStockInfo/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+ [
+ ],
+ ]);
+ const searchFormFields = ref({
+ locationCode: "",
+ containerCode: "",
+ containerType: "",
+ warehouseId: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "鏂欐缂栧彿", field: "containerCode", type: "like" },
+ { title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
+ { title: "鏂欐绫诲瀷", field: "containerType" ,type: "select",dataKey: "containerTypeEnum",data: [],},
+ { title: "浠撳簱", field: "warehouseId" ,type: "select",dataKey: "warehouseEnum",data: [],},
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 100,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "containerCode",
+ title: "鏂欐缂栧彿",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "locationCode",
+ title: "璐т綅缂栧彿",
+ type: "string",
+ width: 280,
+ align: "left",
+ },
+ {
+ field: "containerType",
+ title: "鏂欐绫诲瀷",
+ type: "int",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "int",
+ width: 90,
+ align: "left",
+ bind: { key: "warehouseEnum", data: [] },
+ },
+ {
+ field: "stockStatus",
+ title: "搴撳瓨鐘舵��",
+ type: "int",
+ width: 120,
+ align: "left",
+ bind: { key: "stockStatusEnum", data: [] },
+ },
+ {
+ field: "isEmpty",
+ title: "鏄惁绌烘",
+ type: "bool",
+ width: 90,
+ align: "left",
+ bind: { key: "", data: [{ key: "true", value: "鏄�" }, { key: "false", value: "鍚�" }] },
+ },
+ {
+ field: "isFill",
+ title: "鏄惁婊℃",
+ type: "bool",
+ width: 90,
+ align: "left",
+ bind: { key: "", data: [{ key: "true", value: "鏄�" }, { key: "false", value: "鍚�" }] },
+ },
+ {
+ field: "isPick",
+ title: "鏄惁鍒嗘嫞",
+ type: "bool",
+ width: 90,
+ align: "left",
+ bind: { key: "", data: [{ key: "true", value: "鏄�" }, { key: "false", value: "鍚�" }] },
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
+
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/mouldStockInfo_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/mouldStockInfo_Hty.vue"
new file mode 100644
index 0000000..92ff452
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/mouldStockInfo_Hty.vue"
@@ -0,0 +1,160 @@
+
+<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/stock/mouldStockInfo_Hty.js";
+ import { ref, defineComponent } from "vue";
+ export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "妯″叿搴撳瓨淇℃伅鍘嗗彶",
+ name: "mouldStockInfo_Hty",
+ url: "/mouldStockInfo_Hty/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+ deviceCode: "",
+ deviceName: "",
+ deviceType: "",
+ deviceStatus: "",
+ deviceIp: "",
+ devicePort: "",
+ devicePlcType: "",
+ deviceRemark: "",
+ });
+ const editFormOptions = ref([
+ [
+ {field:'containerCode',title:'鏂欐缂栧彿',type:'string'},
+ {field:'locationCode',title:'璐т綅缂栧彿',type:'string'},
+ ]
+ ]);
+ const searchFormFields = ref({
+ containerCode: "",
+ locationCode: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "鏂欐缂栧彿", field: "containerCode" },
+ { title: "璐т綅缂栧彿", field: "locationCode" },
+ ],
+ ]);
+ const columns = ref([
+ {field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {
+ field: "sourceId",
+ title: "sourceId",
+ type: "int",
+ width: 90,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "operateType",
+ title: "鎿嶄綔绫诲瀷",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "insertTime",
+ title: "绉诲叆鍘嗗彶鏃堕棿",
+ type: "datetime",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "containerCode",
+ title: "鏂欐缂栧彿",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "locationCode",
+ title: "璐т綅缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "select",
+ width: 100,
+ align: "left",
+ bind: { key: "warehouses", data: [] },
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ hidden:true
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ hidden:true
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 100,
+ align: "left",
+ hidden:true
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+ });
+ </script>
+
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfo.vue"
index 021613b..a762b08 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfo.vue"
@@ -1,168 +1,177 @@
<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
- </view-grid>
- </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/stock/proStockInfo.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "鎴愬搧搴撳瓨淇℃伅",
- name: "proStockInfo",
- url: "/proStockInfo/",
- sortName: "id",
- });
- const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
- });
- const editFormOptions = ref([
- [
- {field:'palletCode',title:'鑳舵鍙�',type:'string'},
- {field:'locationCode',title:'璐т綅缂栧彿',type:'string'},
- ]
- ]);
- const searchFormFields = ref({
- palletCode: "",
- locationCode: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鑳舵鍙�", field: "palletCode" },
- { title: "璐т綅缂栧彿", field: "locationCode" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "palletCode",
- title: "鑳舵鍙�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "shipmentOrder",
- title: "鍑鸿揣鍗曞彿",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "palletType",
- title: "鑳舵绫诲瀷",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "locationCode",
- title: "璐т綅缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- // {
- // field: "isFull",
- // title: "鏄惁婊＄洏",
- // type: "string",
- // width: 150,
- // align: "left",
- // bind: { key: "yesno", data: [] },
- // },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "select",
- width: 100,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- hidden:true
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden:true
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- hidden:true
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
- </script>
+import extend from "@/extension/stock/proStockInfo.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "鎴愬搧搴撳瓨淇℃伅",
+ name: "proStockInfo",
+ url: "/ProStockInfo/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+ [
+ ],
+ ]);
+ const searchFormFields = ref({
+ locationCode: "",
+ containerCode: "",
+ containerType: "",
+ warehouseId: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "鏂欐缂栧彿", field: "containerCode", type: "like" },
+ { title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
+ { title: "鏂欐绫诲瀷", field: "containerType" ,type: "select",dataKey: "containerTypeEnum",data: [],},
+ { title: "浠撳簱", field: "warehouseId" ,type: "select",dataKey: "warehouseEnum",data: [],},
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 100,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "containerCode",
+ title: "鏂欐缂栧彿",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "locationCode",
+ title: "璐т綅缂栧彿",
+ type: "string",
+ width: 280,
+ align: "left",
+ },
+ {
+ field: "containerType",
+ title: "鏂欐绫诲瀷",
+ type: "int",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "int",
+ width: 90,
+ align: "left",
+ bind: { key: "warehouseEnum", data: [] },
+ },
+ {
+ field: "stockStatus",
+ title: "搴撳瓨鐘舵��",
+ type: "int",
+ width: 120,
+ align: "left",
+ bind: { key: "stockStatusEnum", data: [] },
+ },
+ {
+ field: "isEmpty",
+ title: "鏄惁绌烘",
+ type: "bool",
+ width: 90,
+ align: "left",
+ bind: { key: "", data: [{ key: "true", value: "鏄�" }, { key: "false", value: "鍚�" }] },
+ },
+ {
+ field: "isFill",
+ title: "鏄惁婊℃",
+ type: "bool",
+ width: 90,
+ align: "left",
+ bind: { key: "", data: [{ key: "true", value: "鏄�" }, { key: "false", value: "鍚�" }] },
+ },
+ {
+ field: "isPick",
+ title: "鏄惁鍒嗘嫞",
+ type: "bool",
+ width: 90,
+ align: "left",
+ bind: { key: "", data: [{ key: "true", value: "鏄�" }, { key: "false", value: "鍚�" }] },
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfoDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfoDetail.vue"
deleted file mode 100644
index 42961a3..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfoDetail.vue"
+++ /dev/null
@@ -1,261 +0,0 @@
-<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/stock/proStockInfoDetail.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "搴撳瓨淇℃伅鏄庣粏",
- name: "proStockInfoDetail",
- url: "/proStockInfoDetail/",
- sortName: "id",
- });
- const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
- });
- const editFormOptions = ref([
- [
- {
- title: "鐗╂枡缂栧彿",
- required: true,
- field: "materielCode",
- type: "string",
- },
- {
- title: "鍗曟嵁缂栧彿",
- required: true,
- field: "materielName",
- type: "string",
- },
- {
- title: "鎵规鍙�",
- required: true,
- field: "orderNo",
- type: "string",
- },
- {
- title: "搴忓垪鍙�",
- required: true,
- field: "serialNumber",
- type: "string",
- },
- ],
-
- ]);
- const searchFormFields = ref({
- materielCode: "",
- materielName: "",
- orderNo: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鐗╂枡缂栧彿", field: "materielCode" },
- { title: "鐗╂枡鍚嶇О", field: "materielName" },
- { title: "鍗曟嵁缂栧彿", field: "orderNo" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "proStockId",
- title: "搴撳瓨淇℃伅涓婚敭",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "bagNo",
- title: "鍐呭寘鍙�",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "productCode",
- title: "浜у搧缂栫爜",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "outboundQuantity",
- title: "鍑哄簱鏁伴噺",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "proOutDetailStatus",
- title: "鎴愬搧搴撳瓨鏄庣粏鐘舵��",
- type: "int",
- width: 90,
- align: "left",
- },
- {
- field: "productVersion",
- title: "鐗堟湰",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "setQty",
- title: "鍖呰SET鏁伴噺",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "okpcsqty",
- title: "鍚堟牸PCS鏁�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "dateCode",
- title: "鍛ㄦ湡",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "xQty",
- title: "X鏁�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "xSite",
- title: "X浣�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "weight",
- title: "鍐呭寘閲嶉噺",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "packingDate",
- title: "鍖呰鏃堕棿",
- type: "datetime",
- width: 200,
- align: "left",
- },
- {
- field: "lotNumber",
- title: "鎵规鍙�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "erpOrder",
- title: "ERP宸ュ崟",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "moNumber",
- title: "鍒堕�犺鍗�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "saleOrder",
- title: "閿�鍞鍗�",
- type: "string",
- width: 200,
- align: "left",
- }, {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfoDetail_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfoDetail_Hty.vue"
deleted file mode 100644
index 6b5ab1f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfoDetail_Hty.vue"
+++ /dev/null
@@ -1,300 +0,0 @@
-<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/stock/proStockInfoDetail_Hty.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "搴撳瓨淇℃伅鏄庣粏",
- name: "proStockInfoDetail_Hty",
- url: "/proStockInfoDetail_Hty/",
- sortName: "id",
- });
- const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
- });
- const editFormOptions = ref([
- [
- {
- title: "鐗╂枡缂栧彿",
- required: true,
- field: "materielCode",
- type: "string",
- },
- {
- title: "鍗曟嵁缂栧彿",
- required: true,
- field: "materielName",
- type: "string",
- },
- {
- title: "鎵规鍙�",
- required: true,
- field: "orderNo",
- type: "string",
- },
- {
- title: "搴忓垪鍙�",
- required: true,
- field: "serialNumber",
- type: "string",
- },
- ],
- ]);
- const searchFormFields = ref({
- materielCode: "",
- materielName: "",
- orderNo: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鐗╂枡缂栧彿", field: "materielCode" },
- { title: "鐗╂枡鍚嶇О", field: "materielName" },
- { title: "鍗曟嵁缂栧彿", field: "orderNo" },
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "sourceId",
- title: "SourceId",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "operateType",
- title: "鎿嶄綔绫诲瀷",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "insertTime",
- title: "绉诲叆鍘嗗彶鏃堕棿",
- type: "datetime",
- width: 90,
- align: "left",
- },
- {
- field: "proStockId",
- title: "搴撳瓨淇℃伅涓婚敭",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "bagNo",
- title: "鍐呭寘鍙�",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "productCode",
- title: "浜у搧缂栫爜",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "outboundQuantity",
- title: "鍑哄簱鏁伴噺",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "proOutDetailStatus",
- title: "鎴愬搧搴撳瓨鏄庣粏鐘舵��",
- type: "int",
- width: 90,
- align: "left",
- },
- {
- field: "productVersion",
- title: "鐗堟湰",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "sETQty",
- title: "鍖呰SET鏁伴噺",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "oKPCSQTY",
- title: "鍚堟牸PCS鏁�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "dateCode",
- title: "鍛ㄦ湡",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "xQty",
- title: "X鏁�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "xSite",
- title: "X浣�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "weight",
- title: "鍐呭寘閲嶉噺",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "packingDate",
- title: "鍖呰鏃堕棿",
- type: "datetime",
- width: 200,
- align: "left",
- },
- {
- field: "oKPCSQTY",
- title: "鍚堟牸PCS鏁�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "lotNumber",
- title: "鎵规鍙�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "eRPOrder",
- title: "ERP宸ュ崟",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "moNumber",
- title: "鍒堕�犺鍗�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "saleOrder",
- title: "閿�鍞鍗�",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfo_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfo_Hty.vue"
index b93f1ae..d52fb07 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfo_Hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/proStockInfo_Hty.vue"
@@ -21,7 +21,7 @@
const table = ref({
key: "id",
footer: "Foots",
- cnName: "鎴愬搧搴撳瓨淇℃伅",
+ cnName: "鎴愬搧搴撳瓨淇℃伅鍘嗗彶",
name: "proStockInfo_Hty",
url: "/proStockInfo_Hty/",
sortName: "id",
@@ -38,17 +38,17 @@
});
const editFormOptions = ref([
[
- {field:'palletCode',title:'鑳舵鍙�',type:'string'},
+ {field:'containerCode',title:'鏂欐缂栧彿',type:'string'},
{field:'locationCode',title:'璐т綅缂栧彿',type:'string'},
]
]);
const searchFormFields = ref({
- palletCode: "",
+ containerCode: "",
locationCode: "",
});
const searchFormOptions = ref([
[
- { title: "鑳舵鍙�", field: "palletCode" },
+ { title: "鏂欐缂栧彿", field: "containerCode" },
{ title: "璐т綅缂栧彿", field: "locationCode" },
],
]);
@@ -59,7 +59,6 @@
title: "sourceId",
type: "int",
width: 90,
- hidden: true,
readonly: true,
require: true,
align: "left",
@@ -78,23 +77,9 @@
width: 90,
align: "left",
},
- {
- field: "palletCode",
- title: "鑳舵鍙�",
- type: "string",
- width: 90,
- align: "left",
- }, {
- field: "shipmentOrder",
- title: "鍑鸿揣鍗曞彿",
- type: "string",
- width: 90,
- align: "left",
- },
-
- {
- field: "palletType",
- title: "鑳舵绫诲瀷",
+ {
+ field: "containerCode",
+ title: "鏂欐缂栧彿",
type: "string",
width: 90,
align: "left",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/stockInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/stockInfo.vue"
deleted file mode 100644
index 15a2a1f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/stockInfo.vue"
+++ /dev/null
@@ -1,287 +0,0 @@
-
-<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/stock/stockInfo.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: "id",
- footer: "Foots",
- cnName: "搴撳瓨淇℃伅",
- name: "stockInfo",
- url: "/StockInfo/",
- sortName: "id",
- });
- const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
- });
- const editFormOptions = ref([
- [
- {field:'palletCode',title:'鎵樼洏缂栧彿',type:'string'},
- {field:'locationCode',title:'璐т綅缂栧彿',type:'string'},
- ]
- ]);
- const searchFormFields = ref({
- palletCode: "",
- locationCode: "",
- materielCode: "",
- materielWide: "",
- rfidCode: "",
- });
- const searchFormOptions = ref([
- [
- { title: "鏉＄爜缂栧彿", field: "palletCode",type:"like" },
- {title: "RFID缂栧彿", field:"rfidCode",type:"like"},
- { title: "璐т綅缂栧彿", field: "locationCode",type:"like" },
- {title: "搴撳瓨缁勭粐", field:"materielInvOrgId",type:"select",dataKey:"materielInvOrgEnum",data:[]},
- ],
- [
- {title: "鐗╂枡缂栧彿", field:"materielCode",type:"like"},
- {title: "鐗╂枡鍚嶇О", field:"materielName",type:"like"},
- {title: "鐗╂枡鎵规", field:"batchNo",type:"like"},
- {title: "鐗╂枡骞呭", field:"materielWide",type:"int"},
- ],
- [
- {title: "搴撳瓨鐘舵��", field:"stockStatus",type:"select",dataKey:"stockStatusEmun",data:[]},
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- {title: "鏁村嵎/娈嬪嵎", field:"isFull",type:"select",dataKey:"",data:[{key: 0, value: "鏁村嵎"}, {key: 1, value: "娈嬪嵎"}]},
- {title:"鎵�灞炰粨搴�",field:"warehouseId",type:"select",dataKey:"warehouses",data:[]},
- ],
- ]);
- const columns = ref([
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "select",
- width: 90,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "palletCode",
- title: "鏉＄爜缂栧彿",
- type: "string",
- width: 160,
- align: "left",
- },
- {
- field: "rfidCode",
- title: "RFID缂栧彿",
- type: "string",
- width: 130,
- align: "left",
- },
- {
- field: "locationCode",
- title: "璐т綅缂栧彿",
- type: "string",
- width: 220,
- align: "left",
- },
- {
- field: "palletType",
- title: "鎵樼洏绫诲瀷",
- type: "string",
- width: 110,
- align: "left",
- bind:{key: "locationTypeEnum", data: []}
- },
- {
- field: "materielInvOrgId",
- title: "搴撳瓨缁勭粐",
- type: "string",
- width: 100,
- align: "left",
- bind:{key: "materielInvOrgEnum", data: []}
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 140,
- align: "left",
- },
- {
- field: "batchNo",
- title: "鐗╂枡鎵规",
- type: "string",
- width: 140,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "stockAttribute",
- title: "鐗╂枡绫诲瀷",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "materielTypeEnum", data: [] },
- },
- {
- field: "stockStatus",
- title: "搴撳瓨鐘舵��",
- type: "string",
- width: 170,
- align: "left",
- bind: { key: "stockStatusEmun", data: [] },
- },
- {
- field: "isFull",
- title: "鏁村嵎/娈嬪嵎",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "", data: [{key: 0, value: "鏁村嵎"}, {key: 1, value: "娈嬪嵎"}] },
- },
- {
- field: "stockLength",
- title: "搴撳瓨鎬婚暱",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "materielWeight",
- title: "鐗╂枡閲嶉噺",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "checkWeight",
- title: "妫�娴嬮噸閲�",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "materielThickness",
- title: "鐗╂枡鐩村緞",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "checkThickness",
- title: "妫�娴嬬洿寰�",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "materielWide",
- title: "鐗╂枡骞呭",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "checkWide",
- title: "妫�娴嬪箙瀹�",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 80,
- align: "left",
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- hidden:true
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden:true
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- hidden:true
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
- });
- </script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/stockInfo_Hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/stockInfo_Hty.vue"
deleted file mode 100644
index e0a65ff..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/stockInfo_Hty.vue"
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--
-*Author锛歫xx
- *Contact锛�283591387@qq.com
- *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
- *涓氬姟璇峰湪@/extension/widesea_wcs/鍘嗗彶搴撳瓨淇℃伅/Dt_StockInfo_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/stock/stockInfo_Hty.js";
- import { ref, defineComponent } from "vue";
- export default defineComponent({
- setup() {
- const table = ref({
- key: 'id',
- footer: "Foots",
- cnName: '鍘嗗彶搴撳瓨淇℃伅',
- name: 'stockInfo_Hty',
- url: "/StockInfo_Hty/",
- sortName: "id"
- });
- const editFormFields = ref({});
- const editFormOptions = ref([]);
- const searchFormFields = ref({});
- const searchFormOptions = ref([]);
- const columns = ref([{field:'id',title:'涓婚敭',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
- {field:'palletCode',title:'鎵樼洏缂栧彿',type:'string',width:110,require:true,align:'left',sort:true},
- {field:'locationCode',title:'璐т綅缂栧彿',type:'string',width:110,align:'left'},
- {field:'isFull',title:'鏄惁婊＄洏',type:'bool',width:110,require:true,align:'left'},
- {field:'stockStatus',title:'搴撳瓨鐘舵��',type:'int',width:110,require:true,align:'left'},
- {field:'remark',title:'澶囨敞',type:'string',width:220,align:'left'},
- {field:'sourceId',title:'婧愪富閿�',type:'int',width:110,require:true,align:'left'},
- {field:'operateType',title:'澶囨敞',type:'string',width:110,require:true,align:'left'},
- {field:'creater',title:'鍒涘缓浜�',type:'string',width:110,require:true,align:'left'},
- {field:'createDate',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,require:true,align:'left',sort:true},
- {field:'modifier',title:'淇敼浜�',type:'string',width:100,align:'left'},
- {field:'modifyDate',title:'淇敼鏃ユ湡',type:'datetime',width:150,align:'left',sort:true}]);
- const 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/WMSClient/src/views/stock/stockView.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/stockView.vue"
deleted file mode 100644
index 59be617..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/stock/stockView.vue"
+++ /dev/null
@@ -1,399 +0,0 @@
-
-<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/stock/stockView.js";
-import { ref, defineComponent } from "vue";
-export default defineComponent({
- setup() {
- const table = ref({
- key: "stockId",
- footer: "Foots",
- cnName: "搴撳瓨瑙嗗浘",
- name: "stockView",
- url: "/stockView/",
- sortName: "stockId",
- });
- const editFormFields = ref({
- palletCode: "",
- locationCode: "",
- locationName: "",
- });
- const editFormOptions = ref([
-
- ]);
- const searchFormFields = ref({
- palletCode: "",
- // locationCode: "",
- materielCode:"",
- batchNo:""
- });
- const searchFormOptions = ref([
- [
- { title: "鎵樼洏缂栧彿", field: "palletCode",type: "like" },
- // { title: "璐т綅缂栧彿", field: "locationCode",type: "like" },
- { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
- { title: "搴撳瓨鐘舵��", field: "stockStatus",type: "selectList",dataKey: "stockStatusEmun",data: [],},
- ],
- [
- { title: "鐗╂枡缂栧彿", field: "materielCode",type: "like"},
- { title: "鎵规鍙�", field: "batchNo",type: "like"},
- { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],},
- ],
- ]);
- const columns = ref([
- {
- field: "stockId",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "palletCode",
- title: "鎵樼洏缂栧彿",
- type: "string",
- width: 150,
- link: true,
- align: "left",
- },
- {
- field: "locationCode",
- title: "璐т綅缂栧彿",
- type: "string",
- width: 200,
- align: "left",
- },
- {
- field: "locationName",
- title: "璐т綅鍚嶇О",
- type: "string",
- width: 270,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "鎵�灞炰粨搴�",
- type: "string",
- width: 80,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "roadwayNo",
- title: "宸烽亾缂栧彿",
- type: "decimal",
- width: 100,
- align: "left",
- hidden:true
- },
- {
- field: "materielCode",
- title: "鎵�鍚墿鏂欑紪鍙�",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "batchNo",
- title: "鎵�鍚墿鏂欐壒娆�",
- type: "string",
- width: 200,
- align: "left"
- },
- {
- field: "materielInfo",
- title: "鎵�鍚墿鏂欐渶鏃╀复鏈�",
- type: "string",
- width: 140,
- align: "left",
- },
- {
- field: "sumStock",
- title: "鎬诲簱瀛�",
- type: "string",
- width: 140,
- align: "left",
- },
- {
- field: "row",
- title: "璐т綅琛�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "column",
- title: "璐т綅鍒�",
- type: "int",
- width: 120,
- align: "left",
- hidden: true,
- },
- {
- field: "layer",
- title: "璐т綅灞�",
- type: "string",
- width: 200,
- align: "left",
- hidden: true,
- },
- {
- field: "depth",
- title: "璐т綅娣卞害",
- type: "string",
- width: 180,
- align: "left",
- hidden: true,
- },
- {
- field: "stockStatus",
- title: "搴撳瓨鐘舵��",
- type: "string",
- width: 200,
- align: "left",
- bind: { key: "stockStatusEmun", data: [] },
- },
- {
- field: "locationType",
- title: "璐т綅绫诲瀷",
- type: "string",
- width: 100,
- align: "left",
- bind:{key: "locationTypeEnum", data: []}
- },
- {
- field: "locationStatus",
- title: "璐т綅鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "locationStatusEnum", data: [] },
- },
- {
- field: "enalbeStatus",
- title: "绂佺敤鐘舵��",
- type: "string",
- width: 80,
- align: "left",
- bind: { key: "enableStatusEnum", data: [] },
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- hidden:true
- },
- ]);
- const detail = ref({
- cnName: "搴撳瓨鏄庣粏淇℃伅",
- table: "StockInfoDetail",
- columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "stockId",
- title: "搴撳瓨淇℃伅涓婚敭",
- type: "string",
- width: 90,
- align: "left",
- hidden: true
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 130,
- align: "left",
- },
- {
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "decimal",
- width: 130,
- align: "left",
- },
- {
- field: "batchNo",
- title: "鎵规鍙�",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "materielSpec",
- title: "瑙勬牸鍨嬪彿",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "serialNumber",
- title: "搴忓垪鍙�",
- type: "int",
- width: 120,
- align: "left",
- hidden: true,
- },
- {
- field: "stockQuantity",
- title: "搴撳瓨鏁伴噺",
- type: "string",
- width: 80,
- align: "left",
- },
- {
- field: "outboundQuantity",
- title: "鍑哄簱鏁伴噺",
- type: "string",
- width: 80,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 50,
- align: "left",
- },
- {
- field: "productionDate",
- title: "鐢熶骇鏃ユ湡",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "effectiveDate",
- title: "鏈夋晥鏃ユ湡",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "status",
- title: "搴撳瓨鏄庣粏鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "stockStatusEmun", data: [] }
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden: true
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- hidden: true
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden: true
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- hidden: true
- },
- ],
- sortName: "id",
- key: "id",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
-});
-</script>
-
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/taskinfo/task.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/taskinfo/task.vue"
index 3a5627b..c399fba 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/taskinfo/task.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/taskinfo/task.vue"
@@ -1,297 +1,243 @@
<template>
- <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
- :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
- :table="table" :extend="extend">
- </view-grid>
+ <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/taskinfo/task.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
- setup() {
- const table = ref({
- key: "taskId",
- footer: "Foots",
- cnName: "浠诲姟淇℃伅",
- name: "task",
- url: "/Task/",
- sortName: "CreateDate",
- });
- const editFormFields = ref({});
- const editFormOptions = ref([]);
- const searchFormFields = ref({
- taskNum: "",
- palletCode: "",
- roadway: "",
- taskStatus: "",
- taskType: "",
- sourceAddress: "",
- rfidCode: "",
- targetAddress: "",
- currentAddress: "",
- nextAddress: "",
- creater: "",
- createDate: "",
- });
- const searchFormOptions = ref([
- [
- { title: "浠诲姟鍙�", field: "taskNum", type: "int" },
- { title: "鏉＄爜/鎵樼洏鍙�", field: "palletCode", type: "like" },
- { title: "RFID缂栧彿", field: "rfidCode", type: "like" },
- { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" }
- ],
- [
- { title: "浠诲姟绫诲瀷", field: "taskType", type: "selectList", dataKey: "taskType", data: [], },
- { title: "浠诲姟鐘舵��", field: "taskStatus", type: "selectList", dataKey: "taskStatusEnum", data: [], },
- {
- title: "宸烽亾鍙�", field: "roadway", type: "selectList", dataKey: "", data: [{ key: "SC01_CP", value: "1鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC02_CP", value: "2鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC03_CP", value: "3鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC04_CP", value: "4鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC05_CP", value: "5鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC01_YL", value: "1鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC02_YL", value: "2鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC03_YLDual", value: "3鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC04_YLDual", value: "4鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC05_YLDual", value: "5鍙峰爢鍨涙満-鍘熸枡搴�" },
- ],
- },
- { title: "鎵�灞炰粨搴�", field: "warehouseId", type: "selectList", dataKey: "warehouses", data: [], },
- ],
- [
- { title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
- { title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
- { title: "涓嬩竴鍦板潃", field: "nextAddress", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "浠诲姟淇℃伅",
+ name: "task",
+ url: "/Task/",
+ sortName: "taskId",
+ });
+ const editFormFields = ref({
- ],
- [
- { title: "鍒涘缓浜�", field: "creater", type: "like" },
- ],
- ]);
- const columns = ref([
- {
- field: "taskId",
- title: "taskId",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "taskNum",
- title: "浠诲姟鍙�",
- type: "int",
- width: 110,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "鎵�灞炰粨搴�",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "palletCode",
- title: "鏉＄爜/鎵樼洏鍙�",
- type: "string",
- width: 170,
- align: "left",
- },
- {
- field: "rfidCode",
- title: "RFID缂栧彿",
- type: "string",
- width: 170,
- align: "left",
- },
- {
- field: "roadway",
- title: "宸烽亾鍙�",
- type: "string",
- width: 130,
- align: "left",
- bind: {
- key: "", data: [
- { key: "SC01_CP", value: "1鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC02_CP", value: "2鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC03_CP", value: "3鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC04_CP", value: "4鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC05_CP", value: "5鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC01_YL", value: "1鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC02_YL", value: "2鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC03_YLDual", value: "3鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC04_YLDual", value: "4鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC05_YLDual", value: "5鍙峰爢鍨涙満-鍘熸枡搴�" },
- ]
- },
- },
- {
- field: "taskType",
- title: "浠诲姟绫诲瀷",
- type: "int",
- width: 130,
- align: "left",
- bind: { key: "taskType", data: [] },
- },
- {
- field: "taskStatus",
- title: "浠诲姟鐘舵��",
- type: "int",
- width: 150,
- align: "left",
- bind: { key: "taskStatusEnum", data: [] },
- },
- {
- field: "sourceAddress",
- title: "璧峰鍦板潃",
- type: "int",
- width: 220,
- align: "left",
- },
- {
- field: "targetAddress",
- title: "鐩爣鍦板潃",
- type: "string",
- width: 220,
- align: "left",
- },
- {
- field: "nextAddress",
- title: "涓嬩竴浣嶇疆",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- // {
- // field: "currentAddress",
- // title: "褰撳墠浣嶇疆",
- // type: "string",
- // width: 120,
- // align: "left",
- // },
- // {
- // field: "nextAddress",
- // title: "涓嬩竴浣嶇疆",
- // type: "string",
- // width: 120,
- // align: "left",
- // },
- {
- field: "exceptionMessage",
- title: "寮傚父淇℃伅",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "grade",
- title: "浼樺厛绾�",
- type: "int",
- width: 80,
- align: "left",
- },
- {
- field: "depth",
- title: "娣卞害",
- type: "int",
- width: 80,
- align: "left",
- },
- {
- field: "dispatchertime",
- title: "浠诲姟涓嬪彂鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden: true,
- },
- {
- field: "wMSId",
- title: "WMS浠诲姟涓婚敭",
- type: "int",
- width: 120,
- align: "left",
- hidden: true,
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- hidden: true,
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "quantity",
- title: "鐗╂枡鏁伴噺",
- type: "float",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
+ });
+ const editFormOptions = ref([
+ [
+ ],
+ ]);
+ const searchFormFields = ref({
+ taskNum: "",
+ containerNo: "",
+ warehouseId: "",
+ roadwayNo: "",
+ taskType: "",
+ taskStatus: "",
+ orderNo: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "浠诲姟鍙�", field: "taskNum", type: "like" },
+ { title: "鏂欐缂栧彿", field: "containerNo", type: "like" },
+ { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [], },
+ { title: "宸烽亾", field: "roadwayNo", type: "select", dataKey: "", data: [
+ { key: "SC01_MJ", value: "1鍙峰爢鍨涙満-妯″叿搴�" },
+ { key: "SC02_MJ", value: "2鍙峰爢鍨涙満-妯″叿搴�" },
+ { key: "SC03_MJ", value: "3鍙峰爢鍨涙満-妯″叿搴�" },
+ { key: "SC04_MJ", value: "4鍙峰爢鍨涙満-妯″叿搴�" },
+ { key: "SC05_MJ", value: "5鍙峰爢鍨涙満-妯″叿搴�" },
+ { key: "SC01_CP", value: "1鍙峰爢鍨涙満-鎴愬搧搴�" },
+ { key: "SC02_CP", value: "2鍙峰爢鍨涙満-鎴愬搧搴�" },
+ { key: "SC03_CP", value: "3鍙峰爢鍨涙満-鎴愬搧搴�" },
+ { key: "SC04_CP", value: "4鍙峰爢鍨涙満-鎴愬搧搴�" },
+ { key: "SC05_CP", value: "5鍙峰爢鍨涙満-鎴愬搧搴�" },
+ { key: "SC01_PL", value: "1鍙峰爢鍨涙満-鍧枡闅旂儹搴�" },
+ { key: "SC02_PL", value: "2鍙峰爢鍨涙満-鍧枡闅旂儹搴�" },
+ { key: "SC03_PL", value: "3鍙峰爢鍨涙満-鍧枡闅旂儹搴�" },
+ { key: "SC04_PL", value: "4鍙峰爢鍨涙満-鍧枡闅旂儹搴�" },
+ { key: "SC05_PL", value: "5鍙峰爢鍨涙満-鍧枡闅旂儹搴�" },
+ ], },
+ ],
+ [
+ { title: "浠诲姟绫诲瀷", field: "taskType", type: "selectList", dataKey: "taskTypeEnum", data: [], },
+ { title: "浠诲姟鐘舵��", field: "taskStatus", type: "selectList", dataKey: "taskStatusEnum", data: [], },
+ { title: "璁㈠崟鍙�", field: "orderNo", type: "like" },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "taskId",
+ title: "taskId",
+ type: "int",
+ width: 100,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "taskNum",
+ title: "浠诲姟鍙�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "containerNo",
+ title: "鏂欐缂栧彿",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "int",
+ width: 100,
+ align: "left",
+ bind: { key: "warehouseEnum", data: [] },
+ },
+ {
+ field: "roadwayNo",
+ title: "宸烽亾",
+ type: "int",
+ width: 150,
+ align: "left",
+ bind: {
+ key: "", data: [
+ { key: "SC01_MJ", value: "1鍙峰爢鍨涙満-妯″叿搴�" },
+ { key: "SC02_MJ", value: "2鍙峰爢鍨涙満-妯″叿搴�" },
+ { key: "SC03_MJ", value: "3鍙峰爢鍨涙満-妯″叿搴�" },
+ { key: "SC04_MJ", value: "4鍙峰爢鍨涙満-妯″叿搴�" },
+ { key: "SC05_MJ", value: "5鍙峰爢鍨涙満-妯″叿搴�" },
+ { key: "SC01_CP", value: "1鍙峰爢鍨涙満-鎴愬搧搴�" },
+ { key: "SC02_CP", value: "2鍙峰爢鍨涙満-鎴愬搧搴�" },
+ { key: "SC03_CP", value: "3鍙峰爢鍨涙満-鎴愬搧搴�" },
+ { key: "SC04_CP", value: "4鍙峰爢鍨涙満-鎴愬搧搴�" },
+ { key: "SC05_CP", value: "5鍙峰爢鍨涙満-鎴愬搧搴�" },
+ { key: "SC01_PL", value: "1鍙峰爢鍨涙満-鍧枡闅旂儹搴�" },
+ { key: "SC02_PL", value: "2鍙峰爢鍨涙満-鍧枡闅旂儹搴�" },
+ { key: "SC03_PL", value: "3鍙峰爢鍨涙満-鍧枡闅旂儹搴�" },
+ { key: "SC04_PL", value: "4鍙峰爢鍨涙満-鍧枡闅旂儹搴�" },
+ { key: "SC05_PL", value: "5鍙峰爢鍨涙満-鍧枡闅旂儹搴�" },
+ ]
+ },
+ },
+ {
+ field: "taskType",
+ title: "浠诲姟绫诲瀷",
+ type: "int",
+ width: 120,
+ align: "left",
+ bind: { key: "taskTypeEnum", data: [] },
+ },
+ {
+ field: "taskStatus",
+ title: "浠诲姟鐘舵��",
+ type: "int",
+ width: 120,
+ align: "left",
+ bind: { key: "taskStatusEnum", data: [] },
+ },
+ {
+ field: "sourceAddress",
+ title: "璧峰浣嶇疆",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "targetAddress",
+ title: "鐩爣浣嶇疆",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "currentAddress",
+ title: "褰撳墠浣嶇疆",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "nextAddress",
+ title: "涓嬩竴浣嶇疆",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "orderNo",
+ title: "璁㈠崟鍙�",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "grade",
+ title: "浼樺厛绾�",
+ type: "int",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "dispatchertime",
+ title: "浠诲姟鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
});
</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/taskinfo/task_hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/taskinfo/task_hty.vue"
index 7a93902..4c3df7d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/taskinfo/task_hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSClient/src/views/taskinfo/task_hty.vue"
@@ -1,296 +1,213 @@
<template>
- <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
- :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
- :table="table" :extend="extend">
- </view-grid>
+ <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/taskinfo/task_hty.js";
+import extend from "@/extension/taskinfo/task_Hty.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
- setup() {
- const table = ref({
- key: "taskId",
- footer: "Foots",
- cnName: "浠诲姟鍘嗗彶淇℃伅",
- name: "task_hty",
- url: "/Task_Hty/",
- sortName: "taskId",
- });
- const editFormFields = ref({});
- const editFormOptions = ref([]);
- const searchFormFields = ref({
- taskNum: "",
- palletCode: "",
- roadway: "",
- taskStatus: "",
- taskType: "",
- sourceAddress: "",
- targetAddress: "",
- currentAddress: "",
- nextAddress: "",
- creater: "",
- createDate: "",
- rfidCode: "",
- });
- const searchFormOptions = ref([
- [
- { title: "浠诲姟鍙�", field: "taskNum", type: "int" },
- { title: "鏉＄爜/鎵樼洏鍙�", field: "palletCode", type: "like" },
- { title: "RFID缂栧彿", field: "rfidCode", type: "like" },
- { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
- ],
- [
- { title: "浠诲姟绫诲瀷", field: "taskType", type: "selectList", dataKey: "taskType", data: [], },
- { title: "浠诲姟鐘舵��", field: "taskStatus", type: "selectList", dataKey: "taskStatusEnum", data: [], },
- {
- title: "宸烽亾鍙�", field: "roadway", type: "selectList", dataKey: "", data: [{ key: "SC01_CP", value: "1鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC02_CP", value: "2鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC03_CP", value: "3鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC04_CP", value: "4鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC05_CP", value: "5鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC01_YL", value: "1鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC02_YL", value: "2鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC03_YLDual", value: "3鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC04_YLDual", value: "4鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC05_YLDual", value: "5鍙峰爢鍨涙満-鍘熸枡搴�" },
- ],
- },
- { title: "鎵�灞炰粨搴�", field: "warehouseId", type: "selectList", dataKey: "warehouses", data: [], },
- ],
- [
- { title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
- { title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
- { title: "涓嬩竴鍦板潃", field: "nextAddress", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ],
- [
- { title: "鍒涘缓浜�", field: "creater", type: "like" },
- ],
- ]);
- const columns = ref([
- {
- field: "taskId",
- title: "taskId",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "taskNum",
- title: "浠诲姟鍙�",
- type: "int",
- width: 120,
- align: "left",
- },
- {
- field: "warehouseId",
- title: "鎵�灞炰粨搴�",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
- {
- field: "palletCode",
- title: "鏉＄爜/鎵樼洏鍙�",
- type: "string",
- width: 160,
- align: "left",
- },
- {
- field: "rfidCode",
- title: "RFID缂栧彿",
- type: "string",
- width: 160,
- align: "left",
- },
- {
- field: "roadway",
- title: "宸烽亾鍙�",
- type: "string",
- width: 130,
- align: "left",
- bind: {
- key: "", data: [
- { key: "SC01_CP", value: "1鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC02_CP", value: "2鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC03_CP", value: "3鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC04_CP", value: "4鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC05_CP", value: "5鍙峰爢鍨涙満-鎴愬搧搴�" },
- { key: "SC01_YL", value: "1鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC02_YL", value: "2鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC03_YLDual", value: "3鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC04_YLDual", value: "4鍙峰爢鍨涙満-鍘熸枡搴�" },
- { key: "SC05_YLDual", value: "5鍙峰爢鍨涙満-鍘熸枡搴�" },
- ]
- },
- },
- {
- field: "taskType",
- title: "浠诲姟绫诲瀷",
- type: "int",
- width: 120,
- align: "left",
- bind: { key: "taskType", data: [] },
- },
- {
- field: "taskStatus",
- title: "浠诲姟鐘舵��",
- type: "int",
- width: 150,
- align: "left",
- bind: { key: "taskStatusEnum", data: [] },
- },
- {
- field: "sourceAddress",
- title: "璧峰鍦板潃",
- type: "int",
- width: 220,
- align: "left",
- },
- {
- field: "targetAddress",
- title: "鐩爣鍦板潃",
- type: "string",
- width: 220,
- align: "left",
- },
- {
- field: "nextAddress",
- title: "涓嬩竴浣嶇疆",
- type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- // {
- // field: "currentAddress",
- // title: "褰撳墠浣嶇疆",
- // type: "string",
- // width: 120,
- // align: "left",
- // },
- // {
- // field: "nextAddress",
- // title: "涓嬩竴浣嶇疆",
- // type: "string",
- // width: 120,
- // align: "left",
- // },
- {
- field: "exceptionMessage",
- title: "寮傚父淇℃伅",
- type: "string",
- width: 90,
- align: "left",
- hidden: true,
- },
- {
- field: "grade",
- title: "浼樺厛绾�",
- type: "int",
- width: 80,
- align: "left",
- },
- {
- field: "depth",
- title: "娣卞害",
- type: "int",
- width: 80,
- align: "left",
- },
- {
- field: "dispatchertime",
- title: "浠诲姟涓嬪彂鏃堕棿",
- type: "datetime",
- width: 150,
- align: "left",
- },
- {
- field: "wMSId",
- title: "WMS浠诲姟涓婚敭",
- type: "int",
- width: 120,
- align: "left",
- hidden: true,
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- hidden: true,
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
- align: "left",
- },
- {
- field: "quantity",
- title: "鐗╂枡鏁伴噺",
- type: "float",
- width: 100,
- align: "left",
- },
- ]);
- const detail = ref({
- cnName: "#detailCnName",
- table: "",
- columns: [],
- sortName: "",
- });
- return {
- table,
- extend,
- editFormFields,
- editFormOptions,
- searchFormFields,
- searchFormOptions,
- columns,
- detail,
- };
- },
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "鍘嗗彶浠诲姟淇℃伅",
+ name: "task_hty",
+ url: "/Task_Hty/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+ [
+ ],
+ ]);
+ const searchFormFields = ref({
+ taskNum: "",
+ containerNo: "",
+ warehouseId: "",
+ roadwayNo: "",
+ taskType: "",
+ orderNo: "",
+ });
+ const searchFormOptions = ref([
+ [
+ { title: "浠诲姟鍙�", field: "taskNum", type: "like" },
+ { title: "鏂欐缂栧彿", field: "containerNo", type: "like" },
+ { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouseEnum", data: [], },
+ { title: "宸烽亾", field: "roadwayNo", type: "select", dataKey: "roadwayEnum", data: [], },
+ ],
+ [
+ { title: "浠诲姟绫诲瀷", field: "taskType", type: "selectList", dataKey: "taskTypeEnum", data: [], },
+ { title: "璁㈠崟鍙�", field: "orderNo", type: "like" },
+ ],
+ ]);
+ const columns = ref([
+ {
+ field: "id",
+ title: "Id",
+ type: "int",
+ width: 100,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "operateType",
+ title: "鎿嶄綔绫诲瀷",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "taskNum",
+ title: "浠诲姟鍙�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "containerNo",
+ title: "鏂欐缂栧彿",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "int",
+ width: 80,
+ align: "left",
+ bind: { key: "warehouseEnum", data: [] },
+ },
+ {
+ field: "roadwayNo",
+ title: "宸烽亾",
+ type: "int",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "taskType",
+ title: "浠诲姟绫诲瀷",
+ type: "int",
+ width: 120,
+ align: "left",
+ bind: { key: "taskTypeEnum", data: [] },
+ },
+ {
+ field: "taskStatus",
+ title: "浠诲姟鐘舵��",
+ type: "int",
+ width: 120,
+ align: "left",
+ bind: { key: "taskStatusEnum", data: [] },
+ },
+ {
+ field: "sourceAddress",
+ title: "璧峰浣嶇疆",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "targetAddress",
+ title: "鐩爣浣嶇疆",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "currentAddress",
+ title: "褰撳墠浣嶇疆",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "nextAddress",
+ title: "涓嬩竴浣嶇疆",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "orderNo",
+ title: "璁㈠崟鍙�",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "grade",
+ title: "浼樺厛绾�",
+ type: "int",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "dispatchertime",
+ title: "浠诲姟鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "",
+ columns: [],
+ sortName: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
});
</script>
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db"
index ef085a5..a73edfd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shm" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shm"
new file mode 100644
index 0000000..56b9438
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shm"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-wal" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-wal"
new file mode 100644
index 0000000..55d3f88
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-wal"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db"
index 36593cd..94f25c7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm"
new file mode 100644
index 0000000..b9a41ab
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal"
new file mode 100644
index 0000000..0ab2037
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/AGVStationInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/AGVStationInfoRepository.cs"
deleted file mode 100644
index 1646870..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/AGVStationInfoRepository.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicRepository
-{
- /// <summary>
- /// 鎺ュ彛淇℃伅浠撳偍瀹炵幇灞�
- /// </summary>
- public class AGVStationInfoRepository : RepositoryBase<Dt_AGVStationInfo>, IAGVStationInfoRepository
- {
- public AGVStationInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/ApiInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/ApiInfoRepository.cs"
index f5649bb..d651a8e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/ApiInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/ApiInfoRepository.cs"
@@ -1,12 +1,14 @@
-锘縰sing System;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
+using WIDESEA_IBasicRepository;
using WIDESEA_Model.Models;
-namespace WIDESEA_IBasicRepository
+namespace WIDESEA_BasicRepository
{
/// <summary>
/// 鎺ュ彛淇℃伅浠撳偍瀹炵幇灞�
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/BasicRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/BasicRepository.cs"
index 3201871..9891ed3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/BasicRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/BasicRepository.cs"
@@ -16,32 +16,15 @@
public ILocationInfoRepository LocationInfoRepository { get; }
/// <summary>
- /// 鐗╂枡浠撳偍灞�
- /// </summary>
- public IMaterielInfoRepository MaterielInfoRepository { get; }
-
- /// <summary>
/// 浠撳簱浠撳偍灞�
/// </summary>
public IWarehouseRepository WarehouseRepository { get; }
- public IPalletTypeInfoRepository PalletTypeInfoRepository { get; }
-
- public ISupplierInfoRepository SupplierInfoRepository { get; }
- public ICustomerInfoRepository CustomerInfoRepository { get; }
- public IMakeCenterInfoRepository MakeCenterInfoRepository { get; }
- public IAGVStationInfoRepository AGVStationInfoRepository { get; }
public IApiInfoRepository ApiInfoRepository { get; }
- public BasicRepository(ILocationInfoRepository locationInfoRepository, IMaterielInfoRepository materielInfoRepository, IWarehouseRepository warehouseRepository, IPalletTypeInfoRepository palletTypeInfoRepository, ISupplierInfoRepository supplierInfoRepository, ICustomerInfoRepository customerInfoRepository, IMakeCenterInfoRepository makeCenterInfoRepository, IAGVStationInfoRepository aGVStationInfoRepository, IApiInfoRepository apiInfoRepository)
+ public BasicRepository(ILocationInfoRepository locationInfoRepository,IWarehouseRepository warehouseRepository, IApiInfoRepository apiInfoRepository)
{
LocationInfoRepository = locationInfoRepository;
- MaterielInfoRepository = materielInfoRepository;
WarehouseRepository = warehouseRepository;
- PalletTypeInfoRepository = palletTypeInfoRepository;
- SupplierInfoRepository = supplierInfoRepository;
- CustomerInfoRepository = customerInfoRepository;
- MakeCenterInfoRepository = makeCenterInfoRepository;
- AGVStationInfoRepository = aGVStationInfoRepository;
ApiInfoRepository = apiInfoRepository;
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/CustomerInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/CustomerInfoRepository.cs"
deleted file mode 100644
index 03490f3..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/CustomerInfoRepository.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicRepository
-{
- /// <summary>
- /// 瀹㈡埛淇℃伅浠撳偍瀹炵幇灞�
- /// </summary>
- public class CustomerInfoRepository : RepositoryBase<Dt_CustomerInfo>, ICustomerInfoRepository
- {
- public CustomerInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/LocationInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/LocationInfoRepository.cs"
index c51357b..7bfff57 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/LocationInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/LocationInfoRepository.cs"
@@ -1,4 +1,4 @@
-锘縰sing SqlSugar;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -9,6 +9,7 @@
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Basic;
+using WIDESEA_Core;
using WIDESEA_IBasicRepository;
using WIDESEA_Model.Models;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/MakeCenterInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/MakeCenterInfoRepository.cs"
deleted file mode 100644
index 09fe2e9..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/MakeCenterInfoRepository.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IBasicRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicRepository
-{
- /// <summary>
- /// 鐗╂枡淇℃伅浠撳偍瀹炵幇灞�
- /// </summary>
- public class MakeCenterInfoRepository : RepositoryBase<Dt_MakeCenterInfo>, IMakeCenterInfoRepository
- {
- public MakeCenterInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/MaterielCodeInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/MaterielCodeInfoRepository.cs"
deleted file mode 100644
index 33c8a88..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/MaterielCodeInfoRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IBasicRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicRepository
-{
- public class MaterielCodeInfoRepository : RepositoryBase<Dt_MaterielCodeInfo>, IMaterielCodeInfoRepository
- {
- public MaterielCodeInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/MaterielInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/MaterielInfoRepository.cs"
deleted file mode 100644
index 457a465..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/MaterielInfoRepository.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IBasicRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicRepository
-{
- /// <summary>
- /// 鐗╂枡淇℃伅浠撳偍瀹炵幇灞�
- /// </summary>
- public class MaterielInfoRepository : RepositoryBase<Dt_MaterielInfo>, IMaterielInfoRepository
- {
- public MaterielInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/PalletCodeInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/PalletCodeInfoRepository.cs"
deleted file mode 100644
index ed89fe0..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/PalletCodeInfoRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IBasicRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicRepository
-{
- public class PalletCodeInfoRepository : RepositoryBase<Dt_PalletCodeInfo>, IPalletCodeInfoRepository
- {
- public PalletCodeInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/PalletTypeInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/PalletTypeInfoRepository.cs"
deleted file mode 100644
index a38afd5..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/PalletTypeInfoRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IBasicRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicRepository
-{
- public class PalletTypeInfoRepository : RepositoryBase<Dt_PalletTypeInfo>, IPalletTypeInfoRepository
- {
- public PalletTypeInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/SupplierInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/SupplierInfoRepository.cs"
deleted file mode 100644
index eb04802..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/SupplierInfoRepository.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IBasicRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicRepository
-{
- /// <summary>
- /// 渚涘簲鍟嗕俊鎭粨鍌ㄥ疄鐜板眰
- /// </summary>
- public class SupplierInfoRepository : RepositoryBase<Dt_SupplierInfo>, ISupplierInfoRepository
- {
- public SupplierInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/WarehouseRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/WarehouseRepository.cs"
index 34cd13d..2623768 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/WarehouseRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicRepository/WarehouseRepository.cs"
@@ -1,4 +1,4 @@
-锘縰sing SqlSugar.Extensions;
+using SqlSugar.Extensions;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -7,6 +7,7 @@
using WIDESEA_Common.CommonEnum;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.Enums;
+using WIDESEA_Core;
using WIDESEA_IBasicRepository;
using WIDESEA_Model.Models;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/AGVStationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/AGVStationInfoService.cs"
deleted file mode 100644
index 0e0243b..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/AGVStationInfoService.cs"
+++ /dev/null
@@ -1,24 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_BasicRepository;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicService
-{
- public class AGVStationInfoService : ServiceBase<Dt_AGVStationInfo, IAGVStationInfoRepository>, IAGVStationInfoService
- {
- public IAGVStationInfoRepository Repository => BaseDal;
- public AGVStationInfoService(IAGVStationInfoRepository BaseDal) : base(BaseDal)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/ApiInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/ApiInfoService.cs"
index cc13b96..7e4982c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/ApiInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/ApiInfoService.cs"
@@ -1,13 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_BasicRepository;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
+锘縰sing WIDESEA_Core.BaseServices;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Base/LocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Base/LocationInfoService.cs"
index 7ff15b5..aa9ab65 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Base/LocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Base/LocationInfoService.cs"
@@ -31,14 +31,12 @@
{
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IBasicRepository _basicRepository;
- private readonly IStockInfoRepository _stockInfoRepository;
public ILocationInfoRepository Repository => BaseDal;
- public LocationInfoService(ILocationInfoRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IBasicRepository basicRepository, IStockInfoRepository stockInfoRepository) : base(BaseDal)
+ public LocationInfoService(ILocationInfoRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IBasicRepository basicRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_basicRepository = basicRepository;
- _stockInfoRepository = stockInfoRepository;
}
/// <summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs"
deleted file mode 100644
index e57f1b0..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Base/MaterielInfoService.cs"
+++ /dev/null
@@ -1,193 +0,0 @@
-锘縰sing AutoMapper;
-using SqlSugar.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.MaterielEnum;
-using WIDESEA_Common.WareHouseEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Basic;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicService
-{
- public partial class MaterielInfoService : ServiceBase<Dt_MaterielInfo, IMaterielInfoRepository>, IMaterielInfoService
- {
- private readonly IBasicRepository _basicRepository;
-
- public IMaterielInfoRepository Repository => BaseDal;
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IMapper _mapper;
-
- public MaterielInfoService(IMaterielInfoRepository BaseDal, IBasicRepository basicRepository,IUnitOfWorkManage unitOfWorkManage,IMapper mapper) : base(BaseDal)
- {
- _basicRepository = basicRepository;
- _unitOfWorkManage = unitOfWorkManage;
- _mapper = mapper;
- }
- /// <summary>
- /// 娣诲姞鑰佸巶鐗╂枡淇℃伅
- /// </summary>
- /// <returns></returns>
- public WebResponseContent AddMaterial(List<BSTMaterialDTO> bSTMaterialDTOs)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- List<Dt_MaterielInfo> OldMaterielInfos = BaseDal.QueryData(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt());
- //鏂板
- List<BSTMaterialDTO> bSTMaterialsDTOAdd = bSTMaterialDTOs.Where(x => x.Way == 1).ToList();
- //淇敼
- List<BSTMaterialDTO> bSTMaterialsDTOUpdate = bSTMaterialDTOs.Where(x => x.Way == 2).ToList();
- //鍒犻櫎
- List<BSTMaterialDTO> bSTMaterialsDTODel = bSTMaterialDTOs.Where(x => x.Way == 3).ToList();
- List<Dt_MaterielInfo> materielInfosAdd = new List<Dt_MaterielInfo>();
- List<Dt_MaterielInfo> materielInfosUpdate = new List<Dt_MaterielInfo>();
- //鏂板
- if (bSTMaterialsDTOAdd.Count>0)
- {
- //鍒ゆ柇閲嶅鎻掑叆
- Dt_MaterielInfo? ExistMaterial = OldMaterielInfos.FirstOrDefault(x => bSTMaterialsDTOAdd.Select(x => x.MaterialId).Contains(x.MaterialSourceId));
- if (ExistMaterial != null)
- {
- return content.Error($"鐗╂枡{nameof(BSTMaterialDTO.MaterialId)}:{ExistMaterial.MaterialSourceId}宸插瓨鍦�");
- }
-
- foreach (var item in bSTMaterialsDTOAdd)
- {
- if (bSTMaterialsDTOUpdate.FirstOrDefault(x=>x.MaterialId==item.MaterialId)!=null)
- {
- continue;
- }
- Dt_MaterielInfo materielInfo = _mapper.Map<Dt_MaterielInfo>(item);
- materielInfosAdd.Add(materielInfo);
- }
- }
- //鏇存柊
- if (bSTMaterialsDTOUpdate.Count > 0)
- {
- //鑾峰彇宸插瓨鍦ㄧ殑鐗╂枡
- List<Dt_MaterielInfo>? ExistbSTMaterialsUpdate = OldMaterielInfos.Where(x => bSTMaterialsDTOUpdate.Select(x => x.MaterialId).Contains(x.MaterialSourceId)).ToList();
- foreach (var item in bSTMaterialsDTOUpdate)
- {
- Dt_MaterielInfo? materielInfoUpdate = ExistbSTMaterialsUpdate.FirstOrDefault(x => x.MaterialSourceId == item.MaterialId);
- //濡傛灉鐗╂枡宸插瓨鍦ㄥ垯杩涜鏇存敼
- if (materielInfoUpdate!=null)
- {
- materielInfoUpdate.MaterielCode = item.MaterialNo;
- materielInfoUpdate.MaterielName = item.Name;
- materielInfoUpdate.MaterielSpec = item.Spec;
- materielInfoUpdate.MaterielWide = item.MaterielWide;
- materielInfoUpdate.MaterielThickness = item.MaterielThickness;
- materielInfoUpdate.MaterielLength = item.MaterielLength;
- materielInfoUpdate.MaterielWeight = item.Weight;
- materielInfoUpdate.MaterielUnit = item.Unit;
- materielInfosUpdate.Add(materielInfoUpdate);
- }
- else//濡傛灉涓嶅瓨鍦ㄥ垯杩涜鏂板
- {
- Dt_MaterielInfo materielInfo = _mapper.Map<Dt_MaterielInfo>(item);
- materielInfosAdd.Add(materielInfo);
- }
- }
- }
- //鍒犻櫎
- if (bSTMaterialsDTODel.Count > 0)
- {
-
- }
- //鏇存柊鏁版嵁
- _unitOfWorkManage.BeginTran();
- BaseDal.AddData(materielInfosAdd);
- BaseDal.UpdateData(materielInfosUpdate);
- _unitOfWorkManage.CommitTran();
- return content.OK("鎺ユ敹鎴愬姛");
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 娣诲姞浜屾湡鐗╂枡
- /// </summary>
- /// <param name="eRPMaterialDTOs"></param>
- /// <returns></returns>
- public WebResponseContent ReceiveMaterial(ERPMaterialDTO eRPMaterialDTO)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (eRPMaterialDTO==null)
- {
- return content.Error("鐗╂枡淇℃伅涓嶈兘浼犲叆涓虹┖");
- }
- List<Dt_MaterielInfo> OldMaterielInfos = BaseDal.QueryData(x => x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
- Dt_Warehouse warehouse=_basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode== eRPMaterialDTO.WarehouseCode);
- if (warehouse==null)
- {
- return content.Error($"鏈壘鍒颁粨搴撲唬鍙�:{eRPMaterialDTO.WarehouseCode}");
- }
- if (eRPMaterialDTO.OperateType==1)
- {
- //鍒ゆ柇閲嶅鎻掑叆
- Dt_MaterielInfo? ExistMaterial = OldMaterielInfos.FirstOrDefault(x => x.MaterielCode == eRPMaterialDTO.MaterielNo);
- if (ExistMaterial != null)
- {
- return content.Error($"鐗╂枡{ExistMaterial.MaterielCode}宸插瓨鍦�");
- }
- Dt_MaterielInfo materielInfo = _mapper.Map<Dt_MaterielInfo>(eRPMaterialDTO);
- materielInfo.WarehouseId = warehouse.WarehouseId;
- BaseDal.AddData(materielInfo);
- }
- else if (eRPMaterialDTO.OperateType == 2)
- {
- //鍒ゆ柇鏄惁瀛樺湪
- Dt_MaterielInfo? ExistMaterial = OldMaterielInfos.FirstOrDefault(x => x.MaterielCode == eRPMaterialDTO.MaterielNo);
- if (ExistMaterial == null)
- {
- return content.Error($"鏇存柊鐗╂枡{eRPMaterialDTO.MaterielNo}涓嶅瓨鍦�");
- }
- Dt_MaterielInfo materielInfo = _mapper.Map<Dt_MaterielInfo>(eRPMaterialDTO);
- materielInfo.WarehouseId = warehouse.WarehouseId;
- materielInfo.Id = ExistMaterial.Id;
- _unitOfWorkManage.BeginTran();
- BaseDal.UpdateData(materielInfo);
- _unitOfWorkManage.CommitTran();
- }
- else if (eRPMaterialDTO.OperateType == 3)
- {
- //鍒ゆ柇鏄惁瀛樺湪
- Dt_MaterielInfo? ExistMaterial = OldMaterielInfos.FirstOrDefault(x => x.MaterielCode == eRPMaterialDTO.MaterielNo);
- if (ExistMaterial == null)
- {
- return content.Error($"鏇存柊鐗╂枡{eRPMaterialDTO.MaterielNo}涓嶅瓨鍦�");
- }
- _unitOfWorkManage.BeginTran();
- BaseDal.DeleteData(ExistMaterial);
- _unitOfWorkManage.CommitTran();
- }
- else
- {
- return content.Error("鏈壘鍒版搷浣滅被鍨�");
- }
- //鏇存柊鏁版嵁
- return content.OK("鎺ユ敹鎴愬姛");
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Base/WarehouseService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Base/WarehouseService.cs"
index c0777b0..4171a12 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Base/WarehouseService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Base/WarehouseService.cs"
@@ -18,12 +18,10 @@
public partial class WarehouseService : ServiceBase<Dt_Warehouse, IWarehouseRepository>, IWarehouseService
{
private readonly ICacheService _cacheService;
- private readonly IPalletTypeInfoRepository _palletTypeInfoRepository;
- public WarehouseService(IWarehouseRepository BaseDal,ICacheService cacheService, IPalletTypeInfoRepository palletTypeInfoRepository) : base(BaseDal)
+ public WarehouseService(IWarehouseRepository BaseDal,ICacheService cacheService) : base(BaseDal)
{
_cacheService = cacheService;
- _palletTypeInfoRepository = palletTypeInfoRepository;
}
public IWarehouseRepository Repository => BaseDal;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/BasicService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/BasicService.cs"
index 79516fb..dbe3249 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/BasicService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/BasicService.cs"
@@ -14,31 +14,16 @@
{
public class BasicService : IBasicService
{
- public IPalletCodeInfoService PalletCodeInfoService { get; }
-
public ILocationInfoService LocationInfoService { get; }
-
- public IMaterielInfoService MaterielInfoService { get; }
public IWarehouseService WarehouseService { get; }
- public IMaterielCodeInfoService MaterielCodeInfoService { get; }
-
- public ISupplierInfoService SupplierInfoService { get; }
-
- public ICustomerInfoService CustomerInfoService { get; }
-
public IUserInfoService UserInfoService { get; }
- public BasicService(ILocationInfoService locationInfoService, IMaterielInfoService materielInfoService, IWarehouseService warehouseService,IPalletCodeInfoService palletCodeInfoService, IMaterielCodeInfoService materielCodeInfoService, ISupplierInfoService supplierInfoService, ICustomerInfoService customerInfoService,IUserInfoService userInfoService)
+ public BasicService(ILocationInfoService locationInfoService, IWarehouseService warehouseService, IUserInfoService userInfoService)
{
LocationInfoService = locationInfoService;
- MaterielInfoService = materielInfoService;
WarehouseService = warehouseService;
- PalletCodeInfoService = palletCodeInfoService;
- MaterielCodeInfoService = materielCodeInfoService;
- SupplierInfoService = supplierInfoService;
- CustomerInfoService = customerInfoService;
UserInfoService = userInfoService;
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/CustomerInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/CustomerInfoService.cs"
deleted file mode 100644
index a1ed488..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/CustomerInfoService.cs"
+++ /dev/null
@@ -1,96 +0,0 @@
-锘縰sing AutoMapper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_BasicRepository;
-using WIDESEA_Common.MaterielEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicService
-{
- public class CustomerInfoService : ServiceBase<Dt_CustomerInfo, ICustomerInfoRepository>, ICustomerInfoService
- {
- public ICustomerInfoRepository Repository => BaseDal;
- private readonly IMapper _mapper;
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- public CustomerInfoService(ICustomerInfoRepository BaseDal,IMapper mapper,IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
- {
- _mapper = mapper;
- _unitOfWorkManage = unitOfWorkManage;
- }
- /// <summary>
- /// 鎺ユ敹浜屾湡瀹㈡埛淇℃伅
- /// </summary>
- /// <param name="eRPCustomerDTO"></param>
- /// <returns></returns>
- public WebResponseContent ReceiveCustomer(ERPCustomerDTO eRPCustomerDTO)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (eRPCustomerDTO == null)
- {
- return content.Error("瀹㈡埛淇℃伅涓嶈兘浼犲叆涓虹┖");
- }
- List<Dt_CustomerInfo> OldcustomerInfos = BaseDal.QueryData();
-
- if (eRPCustomerDTO.OperateType == 1)
- {
- //鍒ゆ柇閲嶅鎻掑叆
- Dt_CustomerInfo? customerInfoOld = OldcustomerInfos.FirstOrDefault(x => x.CustomerCode == eRPCustomerDTO.CustomerCode);
- if (customerInfoOld != null)
- {
- return content.Error($"瀹㈡埛{customerInfoOld.CustomerCode}宸插瓨鍦�");
- }
- Dt_CustomerInfo customerInfo = _mapper.Map<Dt_CustomerInfo>(eRPCustomerDTO);
- //鏂板
- BaseDal.AddData(customerInfo);
- }
- else if (eRPCustomerDTO.OperateType == 2)
- {
- //鍒ゆ柇鏄惁瀛樺湪
- Dt_CustomerInfo? customerInfoOld = OldcustomerInfos.FirstOrDefault(x => x.CustomerCode == eRPCustomerDTO.CustomerCode);
- if (customerInfoOld == null)
- {
- return content.Error($"鏇存柊瀹㈡埛{eRPCustomerDTO.CustomerCode}涓嶅瓨鍦�");
- }
- Dt_CustomerInfo customerInfo = _mapper.Map<Dt_CustomerInfo>(eRPCustomerDTO);
- customerInfo.Id = customerInfoOld.Id;
- //鏇存柊
- BaseDal.UpdateData(customerInfoOld);
- }
- else if (eRPCustomerDTO.OperateType == 3)
- {
- // 鍒ゆ柇鏄惁瀛樺湪
- Dt_CustomerInfo? customerInfoOld = OldcustomerInfos.FirstOrDefault(x => x.CustomerCode == eRPCustomerDTO.CustomerCode);
- if (customerInfoOld == null)
- {
- return content.Error($"鏇存柊瀹㈡埛{eRPCustomerDTO.CustomerCode}涓嶅瓨鍦�");
- }
- BaseDal.DeleteData(customerInfoOld);
- }
- else
- {
- return content.Error("鏈壘鍒版搷浣滅被鍨�");
- }
- //鏇存柊鏁版嵁
- return content.OK("鎺ユ敹鎴愬姛");
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/MakeCenterInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/MakeCenterInfoService.cs"
deleted file mode 100644
index bcbfa1e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/MakeCenterInfoService.cs"
+++ /dev/null
@@ -1,24 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicService
-{
- /// <summary>
- /// 鍔犲伐涓績涓氬姟灞�
- /// </summary>
- public partial class MakeCenterInfoService : ServiceBase<Dt_MakeCenterInfo, IMakeCenterInfoRepository>, IMakeCenterInfoService
- {
- public IMakeCenterInfoRepository Repository => BaseDal;
- public MakeCenterInfoService(IMakeCenterInfoRepository BaseDal) : base(BaseDal)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/MaterielCodeInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/MaterielCodeInfoService.cs"
deleted file mode 100644
index 780a26c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/MaterielCodeInfoService.cs"
+++ /dev/null
@@ -1,25 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.WareHouseEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Helper;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicService
-{
- public class MaterielCodeInfoService : ServiceBase<Dt_MaterielCodeInfo, IMaterielCodeInfoRepository>, IMaterielCodeInfoService
- {
- private readonly IBasicRepository _basicRepository;
- public MaterielCodeInfoService(IMaterielCodeInfoRepository BaseDal, IBasicRepository basicRepository) : base(BaseDal)
- {
- _basicRepository = basicRepository;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/PalletCodeInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/PalletCodeInfoService.cs"
deleted file mode 100644
index 25c032c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/PalletCodeInfoService.cs"
+++ /dev/null
@@ -1,164 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.WareHouseEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Helper;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicService
-{
- public class PalletCodeInfoService : ServiceBase<Dt_PalletCodeInfo, IPalletCodeInfoRepository>, IPalletCodeInfoService
- {
- private readonly IWarehouseRepository _warehouseRepository;
- private readonly IPalletTypeInfoRepository _palletTypeInfoRepository;
-
- public PalletCodeInfoService(IPalletCodeInfoRepository BaseDal, IWarehouseRepository warehouseRepository, IPalletTypeInfoRepository palletTypeInfoRepository) : base(BaseDal)
- {
- _warehouseRepository = warehouseRepository;
- _palletTypeInfoRepository = palletTypeInfoRepository;
- }
-
- static object locker = new object();
- //public override WebResponseContent AddData(SaveModel saveModel)
- //{
- // int warehouseId = 0;
- // int count = 0;
- // if (saveModel.MainData.TryGetValue("warehouseId", out object? warehouse) && warehouse != null)
- // {
- // warehouseId = warehouse.ObjToInt();
- // }
- // if (saveModel.MainData.TryGetValue("count", out object? countValue) && countValue != null)
- // {
- // count = countValue.ObjToInt();
- // }
- // lock (locker)
- // {
- // List<Dt_PalletCodeInfo> palletCodeInfos = new List<Dt_PalletCodeInfo>();
- // int serialNo = 0;
- // DateTime now = DateTime.Now;
- // Dt_PalletCodeInfo palletCodeInfo = BaseDal.QueryFirst(x => x.WarehouseId == warehouseId, new Dictionary<string, OrderByType> { { nameof(Dt_PalletCodeInfo.SerialNo), OrderByType.Desc } });
- // if (palletCodeInfo != null && palletCodeInfo.CreateDate.Year == now.Year && palletCodeInfo.CreateDate.Month == now.Month && palletCodeInfo.CreateDate.Day == now.Day)
- // {
- // serialNo = palletCodeInfo.SerialNo + 1;
-
- // }
- // else
- // {
- // serialNo = 1;
- // }
- // Dt_Warehouse _Warehouse = _warehouseRepository.QueryFirst(x => x.WarehouseId == warehouseId);
- // string uplen = "";
- // uplen = _Warehouse.WarehouseCode switch
- // {
- // "HA57" => "B",
- // "HA58" => "P",
- // "HA152" => "G",
- // "HA64" => "S",
- // "闃荤剨浠�" => "Z",
- // "HA153" => "Y",
- // "HA71" => "C",
- // "HA60" => "F",
- // _ => "N"
- // };
- // for (int i = 0; i < count; i++)
- // {
-
- // palletCodeInfos.Add(new Dt_PalletCodeInfo
- // {
- // SerialNo = serialNo,
- // PalletCode = uplen + now.ToString("yyyyMMdd") + serialNo.ToString().PadLeft(3, '0'),
- // PalletType = 1,
- // PalletTypeId = 0,
- // WarehouseId = warehouseId,
- // Status = 0,
- // Size = 0
- // });
-
- // serialNo = serialNo + 1;
- // }
- // return base.AddData(palletCodeInfos);
- // }
- // }
- //}
-
-
- public WebResponseContent AddData(int warehouseId, int count, int palletTypeId)
- {
- try
- {
- Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.Id == palletTypeId && x.WarehouseId == warehouseId);
- if (palletTypeInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樼被鍨嬮厤缃俊鎭�");
- }
- lock (locker)
- {
- List<Dt_PalletCodeInfo> palletCodeInfos = new List<Dt_PalletCodeInfo>();
- int serialNo = 0;
- DateTime now = DateTime.Now;
- Dt_PalletCodeInfo palletCodeInfo = BaseDal.QueryFirst(x => x.WarehouseId == warehouseId && x.PalletTypeId==palletTypeId && x.CreateDate.Year == now.Year && x.CreateDate.Month == now.Month && x.CreateDate.Day == now.Day, new Dictionary<string, OrderByType> { { nameof(Dt_PalletCodeInfo.SerialNo), OrderByType.Desc } });
- if (palletCodeInfo != null && palletCodeInfo.CreateDate.Year == now.Year && palletCodeInfo.CreateDate.Month == now.Month && palletCodeInfo.CreateDate.Day == now.Day)
- {
- serialNo = palletCodeInfo.SerialNo + 1;
- }
- else
- {
- serialNo = 1;
- }
-
- for (int i = 0; i < count; i++)
- {
-
- palletCodeInfos.Add(new Dt_PalletCodeInfo
- {
- SerialNo = serialNo,
- PalletCode = palletTypeInfo.CodeStartStr + now.ToString("yyyyMMdd") + serialNo.ToString().PadLeft(3, '0'),
- PalletType = 1,
- PalletTypeId = palletTypeId,
- WarehouseId = warehouseId,
- Status = 0,
- Size = 0
- });
-
- serialNo = serialNo + 1;
- }
- BaseDal.AddData(palletCodeInfos);
- }
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- public WebResponseContent PrintStatusUp(string printCode)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- Dt_PalletCodeInfo palletCodeInfo = BaseDal.QueryFirst(x => x.PalletCode == printCode);
- if (palletCodeInfo == null)
- {
- return content.Error("鎵撳嵃鐨勬墭鐩樼爜涓嶅瓨鍦�");
- }
- palletCodeInfo.Status = PrintStatusEnum.Printed.ObjToInt();
- BaseDal.UpdateData(palletCodeInfo);
- return content.OK();
- }
- catch (Exception ex)
- {
- content.Error("閿欒:" + ex.Message);
- }
- return content;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Service/LocationInfoService_Common.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Service/LocationInfoService_Common.cs"
deleted file mode 100644
index b116769..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Service/LocationInfoService_Common.cs"
+++ /dev/null
@@ -1,359 +0,0 @@
-锘縰sing AutoMapper;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.Utilities;
-using WIDESEA_DTO.Basic;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IRecordService;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.LocationEnum;
-using WIDESEA_Common.TaskEnum;
-using WIDESEA_Common.WareHouseEnum;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
-
-namespace WIDESEA_BasicService
-{
- public partial class LocationInfoService
- {
- /// <summary>
- /// 鍒嗛厤璐т綅
- /// </summary>
- public Dt_LocationInfo? AssignLocation(string roadwayNo, int palletType, int warehouseId, Dt_StockInfo? stockInfo = null)
- {
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == warehouseId);
- if (warehouse == null)
- {
- throw new Exception($"鏈壘鍒颁粨搴撲俊鎭�");
- }
- Dt_PalletTypeInfo? palletTypeInfo = _basicRepository.PalletTypeInfoRepository.QueryFirst(x => x.PalletType == palletType && x.WarehouseId == warehouseId);
- if (palletTypeInfo == null)
- {
- if (warehouse.WarehouseCode == WarehouseEnum.LLDYL.ToString())
- {
- throw new Exception($"璇烽厤缃墭鐩樼被鍨嬩俊鎭�");
- }
- }
-
- return warehouse.WarehouseCode switch
- {
- "LLDCP" or "LLDFL" => AssignLocation(roadwayNo),
- "LLDYL" => AssignLocationYL(roadwayNo, palletTypeInfo, stockInfo),
- _ => throw new Exception($"鏈壘鍒颁粨搴撹揣浣嶅垎閰嶆柟娉�")
- };
- }
-
- private readonly static object _locker = new object();
- private readonly static object _AssignLocationYL = new object();
- private static List<LocationCache> locationCaches = new List<LocationCache>();
- /// <summary>
- /// 鍒嗛厤璐т綅
- /// </summary>
- /// <param name="roadwayNo"></param>
- /// <returns></returns>
- public Dt_LocationInfo? AssignLocation(string roadwayNo)
- {
- lock (_locker)
- {
- List<LocationCache> removeItems = locationCaches.Where(x => (DateTime.Now - x.DateTime).TotalMinutes > 5).ToList();//鏌ヨ娣诲姞闈欐�佸彉閲忚秴杩�5鍒嗛挓鐨勮揣浣�
- int count = removeItems.Count;
- for (int i = 0; i < count; i++)
- {
- locationCaches.Remove(removeItems[i]);//绉婚櫎鏌ヨ娣诲姞闈欐�佸彉閲忚秴杩�5鍒嗛挓鐨勮揣浣�
- }
-
- List<string> lockLocations = locationCaches.Select(x => x.LocationCode).ToList();
-
- Dictionary<string, OrderByType> orderBy = new Dictionary<string, OrderByType>()
- {
- { nameof(Dt_LocationInfo.Columns),OrderByType.Desc },
- { nameof(Dt_LocationInfo.Layer),OrderByType.Asc },
- { nameof(Dt_LocationInfo.Depth),OrderByType.Desc },
- { nameof(Dt_LocationInfo.Row),OrderByType.Asc }
- };
-
- return BaseDal.QueryFirst(x => x.RoadwayNo == roadwayNo && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && !lockLocations.Contains(x.LocationCode), orderBy);//鏌ヨ绌鸿揣浣嶄俊鎭苟鎺掗櫎5鍒嗛挓鍐呭垎閰嶇殑璐т綅,鏍规嵁灞傘�佸垪銆佹繁搴︺�佽鎺掑簭
- }
- }
- /// <summary>
- /// 鍘熸枡鍒嗛厤璐т綅
- /// </summary>
- /// <returns></returns>
- public Dt_LocationInfo? AssignLocationYL(string roadwayNo, Dt_PalletTypeInfo palletTypeInfo,Dt_StockInfo stockInfo)
- {
- lock (_AssignLocationYL)
- {
- List<LocationCache> removeItems = locationCaches.Where(x => (DateTime.Now - x.DateTime).TotalMinutes > 5).ToList();//鏌ヨ娣诲姞闈欐�佸彉閲忚秴杩�5鍒嗛挓鐨勮揣浣�
- int count = removeItems.Count;
- for (int i = 0; i < count; i++)
- {
- locationCaches.Remove(removeItems[i]);//绉婚櫎鏌ヨ娣诲姞闈欐�佸彉閲忚秴杩�5鍒嗛挓鐨勮揣浣�
- }
-
- List<string> lockLocations = locationCaches.Select(x => x.LocationCode).ToList();
-
- List<Dt_LocationInfo> locationInfos = BaseDal.QueryData(x => x.RoadwayNo == roadwayNo);//鏌ヨ宸烽亾鎵�鏈夎揣浣嶄俊鎭�
-
- Dictionary<string, OrderByType> orderBy = new Dictionary<string, OrderByType>()
- {
- { nameof(Dt_LocationInfo.Columns),OrderByType.Desc },
- { nameof(Dt_LocationInfo.Layer),OrderByType.Asc },
- { nameof(Dt_LocationInfo.Row),OrderByType.Asc }
- };
- if (roadwayNo.Contains("YLDual"))
- {
- if (palletTypeInfo.LocaitonCount==1)
- {
- return BaseDal.QueryFirst(x => x.LocationType == LocationTypeEnum.SmallPallet.ObjToInt() && x.RoadwayNo == roadwayNo && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && !lockLocations.Contains(x.LocationCode), orderBy);//鏌ヨ绌鸿揣浣嶄俊鎭苟鎺掗櫎5鍒嗛挓鍐呭垎閰嶇殑璐т綅,鏍规嵁灞傘�佸垪銆佹繁搴︺�佽鎺掑簭
- }
- else
- {
- bool LayerLimit = false;
- if (stockInfo.CheckThickness <=700)
- {
- LayerLimit = true;
- }
- //鏌ヨ绌鸿揣浣嶄俊鎭苟鎺掗櫎5鍒嗛挓鍐呭垎閰嶇殑璐т綅,鏍规嵁灞傘�佸垪銆佹繁搴︺�佽鎺掑簭
- List<Dt_LocationInfo> locationInfosMedium = BaseDal.QueryData(x => x.LocationType == LocationTypeEnum.MediumPallet.ObjToInt() && x.RoadwayNo == roadwayNo && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && !lockLocations.Contains(x.LocationCode), orderBy);
- Dt_LocationInfo locationInfo = new Dt_LocationInfo();
- foreach (var item in locationInfosMedium)
- {
- if (item.Layer == 7 || item.Layer == 8)
- {
- locationInfo = item;
- break;
- }
- //鑾峰彇鏇存敼搴撲綅
- Dt_LocationInfo? nearLocation1;
- Dt_LocationInfo? nearLocation2;
-
- nearLocation1 = locationInfos.FirstOrDefault(x => x.LocationType == LocationTypeEnum.SmallPallet.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && x.Row == item.Row && x.Layer == item.Layer && x.Depth == item.Depth && x.Columns == item.Columns - 1);
- nearLocation2 = locationInfos.FirstOrDefault(x => x.LocationType == LocationTypeEnum.SmallPallet.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && x.Row == item.Row && x.Layer == item.Layer && x.Depth == item.Depth && x.Columns == item.Columns + 1);
- if (nearLocation1!=null && nearLocation2!=null)
- {
- locationInfo = item;
- break;
- }
- }
- return locationInfo;
- }
- }
- else
- {
- bool LayerLimit = false;
- if (stockInfo.CheckThickness > 1300)
- {
- LayerLimit = true;
- }
- return BaseDal.QueryFirst(x => x.RoadwayNo == roadwayNo && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.Disable.ObjToInt() && !lockLocations.Contains(x.LocationCode) && (LayerLimit ? x.Columns >= 56 : x.Columns <= 55), orderBy);//鏌ヨ绌鸿揣浣嶄俊鎭苟鎺掗櫎5鍒嗛挓鍐呭垎閰嶇殑璐т綅,鏍规嵁灞傘�佸垪銆佹繁搴︺�佽鎺掑簭
- }
-
- }
- }
- /// <summary>
- /// 淇敼璐т綅鐘舵�佸強绫诲瀷
- /// </summary>
- /// <param name="locationCode">璐т綅缂栧彿</param>
- /// <param name="palletType">鎵樼洏绫诲瀷</param>
- /// <param name="locationStatus">璐т綅鐘舵��</param>
- public void UpdateLocationStatus(string locationCode, int ContainerType, LocationStatusEnum locationStatus, int warehousId)
- {
- Dt_LocationInfo location = Repository.QueryFirst(x => x.LocationCode == locationCode);
- if (location == null)
- {
- throw new Exception($"鏈壘鍒拌揣浣嶄俊鎭�,{locationCode}");
- }
- UpdateLocationStatus(location, ContainerType, locationStatus, warehousId);
- }
-
- /// <summary>
- /// 淇敼璐т綅鐘舵�佸強绫诲瀷
- /// </summary>
- /// <param name="locationCode">璐т綅缂栧彿</param>
- /// <param name="palletType">鎵樼洏绫诲瀷</param>
- /// <param name="locationStatus">璐т綅鐘舵��</param>
- public void UpdateLocationStatus1(int ContainerType, LocationStatusEnum locationStatus, int warehousId)
- {
- Dt_LocationInfo location = Repository.QueryFirst(x => x.LocationCode == locationCode);
- if (location == null)
- {
- throw new Exception($"鏈壘鍒拌揣浣嶄俊鎭�,{locationCode}");
- }
- UpdateLocationStatus(location, ContainerType, locationStatus, warehousId);
- }
-
-
- public void UpdateLocationStatus(Dt_LocationInfo location, int palletType, LocationStatusEnum locationStatus, int warehouseId)
- {
- List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => x.RoadwayNo == location.RoadwayNo);
-
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == warehouseId);
-
- Dt_PalletTypeInfo? palletTypeInfo = _basicRepository.PalletTypeInfoRepository.QueryFirst(x => x.PalletType == palletType && x.WarehouseId == warehouseId);
- if (palletTypeInfo == null)
- {
- if (warehouse.WarehouseCode == WarehouseEnum.LLDYL.ToString())
- {
- throw new Exception($"璇烽厤缃墭鐩樼被鍨嬩俊鎭�");
- }
- }
- List<Dt_LocationInfo> locations = GetGroupLocations(locationInfos, location);
- if (locationInfos.Max(x => x.Depth) < 3)
- {
- for (int i = 0; i < locations.Count; i++)
- {
- if (locations[i].LocationType != palletType)
- {
- locations[i].LocationType = palletType;
- }
-
- if (locations[i].LocationCode == location.LocationCode)
- {
- locations[i].LocationStatus = locationStatus.ObjToInt();
- }
- else
- {
- if (locationStatus == LocationStatusEnum.Lock)
- {
- if (locations[i].LocationStatus == LocationStatusEnum.InStock.ObjToInt())
- {
- locations[i].LocationStatus = LocationStatusEnum.InStockLock.ObjToInt();
- }
- else if (locations[i].LocationStatus == LocationStatusEnum.Free.ObjToInt())
- {
- locations[i].LocationStatus = LocationStatusEnum.FreeLock.ObjToInt();
- }
- }
- else if (locationStatus == LocationStatusEnum.Free || locationStatus == LocationStatusEnum.InStock)
- {
- if (locations[i].LocationStatus == LocationStatusEnum.InStockLock.ObjToInt())
- {
- locations[i].LocationStatus = LocationStatusEnum.InStock.ObjToInt();
- }
- else if (locations[i].LocationStatus == LocationStatusEnum.FreeLock.ObjToInt())
- {
- locations[i].LocationStatus = LocationStatusEnum.Free.ObjToInt();
- }
- }
- }
- }
-
- if (warehouse.WarehouseCode == WarehouseEnum.LLDYL.ToString() && palletTypeInfo.LocaitonCount == 2 && location.RoadwayNo.Contains("Dual"))
- {
- //鑾峰彇鏇存敼搴撲綅
- Dt_LocationInfo? nearLocation1;
- Dt_LocationInfo? nearLocation2;
-
- nearLocation1 = locationInfos.FirstOrDefault(x => x.LocationType == LocationTypeEnum.SmallPallet.ObjToInt() && x.Row == location.Row && x.Layer == location.Layer && x.Depth == location.Depth && x.Columns == location.Columns - 1);
- nearLocation2 = locationInfos.FirstOrDefault(x => x.LocationType == LocationTypeEnum.SmallPallet.ObjToInt() && x.Row == location.Row && x.Layer == location.Layer && x.Depth == location.Depth && x.Columns == location.Columns + 1);
-
-
- if (nearLocation1 != null && nearLocation2 != null)
- {
- //鍙岃緟鏂�
- List<Dt_LocationInfo> nearLocations = new List<Dt_LocationInfo>()
- {
- nearLocation1,
- nearLocation2
- };
- for (int i = 0; i < nearLocations.Count; i++)
- {
- if (locationStatus == LocationStatusEnum.Lock)
- {
- if (nearLocations[i].LocationStatus == LocationStatusEnum.Free.ObjToInt())
- {
- nearLocations[i].LocationStatus = LocationStatusEnum.FreeLock.ObjToInt();
- }
- }
- else if (locationStatus == LocationStatusEnum.Free)
- {
- if (nearLocations[i].LocationStatus == LocationStatusEnum.FreeLock.ObjToInt())
- {
- nearLocations[i].LocationStatus = LocationStatusEnum.Free.ObjToInt();
- }
- }
- }
- locations.AddRange(nearLocations);
- }
- }
- }
- Repository.UpdateData(locations);
- }
-
- /// <summary>
- /// 鑾峰彇涓嶅悓娣卞害鐨勫悓缁勮揣浣嶄俊鎭�
- /// </summary>
- /// <param name="locationInfos"></param>
- /// <param name="location"></param>
- /// <returns></returns>
- public List<Dt_LocationInfo> GetGroupLocations(List<Dt_LocationInfo> locationInfos, Dt_LocationInfo location)
- {
- List<Dt_LocationInfo> groupLocations = new List<Dt_LocationInfo>() { location };
- int maxDepth = locationInfos.Max(x => x.Depth);
- int row = location.Row;
- for (int j = location.Depth + 1; j <= maxDepth; j++)
- {
- row += 1;
- Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Columns == location.Columns && x.Layer == location.Layer && x.Row == row);
- if (locationInfo != null)
- {
- groupLocations.Add(locationInfo);
- }
- }
-
- for (int j = location.Depth - 1; j >= 1; j--)
- {
- row -= 1;
- Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Columns == location.Columns && x.Layer == location.Layer && x.Row == row);
- if (locationInfo != null)
- {
- groupLocations.Add(locationInfo);
- }
- }
- return groupLocations;
- }
-
- /// <summary>
- /// 鑾峰彇涓嶅悓娣卞害鐨勫悓缁勮揣浣嶄俊鎭�
- /// </summary>
- /// <param name="location"></param>
- /// <returns></returns>
- public List<Dt_LocationInfo> GetGroupLocations(Dt_LocationInfo location)
- {
- List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => x.RoadwayNo == location.RoadwayNo && x.WarehouseId == location.WarehouseId);
-
- List<Dt_LocationInfo> groupLocations = new List<Dt_LocationInfo>() { location };
- int maxDepth = locationInfos.Max(x => x.Depth);
- int row = location.Row;
- for (int j = location.Depth + 1; j <= maxDepth; j++)
- {
- Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Columns == location.Columns && x.Layer == location.Layer && (x.Row == row + 1 || x.Row == row - 1));
- if (locationInfo != null)
- {
- groupLocations.Add(locationInfo);
- }
- }
-
- for (int j = location.Depth - 1; j >= 1; j--)
- {
- Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Columns == location.Columns && x.Layer == location.Layer && (x.Row == row + 1 || x.Row == row - 1));
- if (locationInfo != null)
- {
- groupLocations.Add(locationInfo);
- }
- }
- return groupLocations;
- }
- }
-
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Service/MaterielInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Service/MaterielInfoService.cs"
deleted file mode 100644
index 1415895..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Service/MaterielInfoService.cs"
+++ /dev/null
@@ -1,80 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_BasicRepository;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.MaterielEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicService
-{
- public partial class MaterielInfoService : ServiceBase<Dt_MaterielInfo, IMaterielInfoRepository>, IMaterielInfoService
- {
- /// <summary>
- /// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
- /// </summary>
- /// <param name="materielCode">鐗╂枡缂栧彿</param>
- /// <returns></returns>
- public bool ExsitMateriel(string materielCode)
- {
- return BaseDal.QueryFirst(x => x.MaterielCode == materielCode) != null;
- }
-
- /// <summary>
- /// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
- /// </summary>
- /// <param name="materielCodes">鐗╂枡缂栧彿闆嗗悎</param>
- /// <returns></returns>
- public bool ExsitMateriels(List<string> materielCodes)
- {
- return BaseDal.QueryData(x => materielCodes.Contains(x.MaterielCode)).Count == materielCodes.Count;
- }
-
- /// <summary>
- /// 鑾峰彇鐗╂枡淇℃伅
- /// </summary>
- /// <param name="materielCode">鐗╂枡缂栧彿</param>
- /// <returns></returns>
- public Dt_MaterielInfo GetMaterielInfo(string materielCode)
- {
- return BaseDal.QueryFirst(x => x.MaterielCode == materielCode);
- }
-
- /// <summary>
- /// 鏌ヨ鐗╂枡淇℃伅
- /// </summary>
- /// <param name="materielCodes">鐗╂枡缂栧彿</param>
- /// <returns></returns>
- public List<Dt_MaterielInfo> GetMaterielInfos(List<string> materielCodes)
- {
- return BaseDal.QueryData(x => materielCodes.Contains(x.MaterielCode));
- }
-
- /// <summary>
- /// 鑾峰彇搴撳尯鐗╂枡淇℃伅
- /// </summary>
- /// <param name="warehouseId"></param>
- /// <returns></returns>
- public WebResponseContent GetWarehouseMaterielInfos(int warehouseId)
- {
- try
- {
- List<Dt_MaterielInfo> materielInfos = BaseDal.QueryData(x => x.WarehouseId == warehouseId);
- return WebResponseContent.Instance.OK(data: materielInfos);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Service/WarehouseService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Service/WarehouseService.cs"
index 768ee2f..b726b04 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Service/WarehouseService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/Service/WarehouseService.cs"
@@ -16,24 +16,5 @@
{
public partial class WarehouseService
{
- public WebResponseContent GetWarehouseDicByUser()
- {
- try
- {
- List<int> warehouseIds = Db.Queryable<Sys_RoleDataPermission>().Where(x => x.RoleId == App.User.RoleId).Select(x => x.WarehouseId).ToList();
- List<DictionaryDTO> dic = Repository.QueryData(x => new DictionaryDTO { Key = x.WarehouseId, Value = x.WarehouseName + $"({x.WarehouseCode})" }, x => warehouseIds.Contains(x.WarehouseId)).ToList();
- List<Dt_PalletTypeInfo> palletTypeInfos = _palletTypeInfoRepository.QueryData();//x => x.TypeName + $"({x.CodeStartStr})", x => true
- dic.ForEach(x =>
- {
- x.Extra = palletTypeInfos.Where(v => v.WarehouseId == x.Key.ObjToInt()).Select(x => new DictionaryDTO { Key = x.Id, Value = x.TypeName + $"({x.CodeStartStr})" }).ToList();
- });
-
- return WebResponseContent.Instance.OK(data: dic);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/SupplierInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/SupplierInfoService.cs"
deleted file mode 100644
index 01f191f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/SupplierInfoService.cs"
+++ /dev/null
@@ -1,185 +0,0 @@
-锘縰sing AutoMapper;
-using SqlSugar.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_BasicRepository;
-using WIDESEA_Common.MaterielEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Basic;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_BasicService
-{
- public class SupplierInfoService : ServiceBase<Dt_SupplierInfo, ISupplierInfoRepository>, ISupplierInfoService
- {
- public ISupplierInfoRepository Repository => BaseDal;
-
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IMapper _mapper;
- public SupplierInfoService(ISupplierInfoRepository BaseDal,IUnitOfWorkManage unitOfWorkManage,IMapper mapper) : base(BaseDal)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _mapper = mapper;
- }
- /// <summary>
- /// 娣诲姞鑰佸巶渚涘簲鍟嗕俊鎭�
- /// </summary>
- /// <param name="bSTSupplierDTOs"></param>
- /// <returns></returns>
- public WebResponseContent AddSupplier(List<BSTSupplierDTO> bSTSupplierDTOs)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- List<Dt_SupplierInfo> OldsupplierInfos = BaseDal.QueryData(x => x.InvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt());
- //鏂板
- List<BSTSupplierDTO> bSTSupplierDTOsAdd = bSTSupplierDTOs.Where(x => x.Way == 1).ToList();
- //淇敼
- List<BSTSupplierDTO> bSTSupplierDTOsUpdate = bSTSupplierDTOs.Where(x => x.Way == 2).ToList();
- //鍒犻櫎
- List<BSTSupplierDTO> bSTSupplierDTOsDTODel = bSTSupplierDTOs.Where(x => x.Way == 3).ToList();
- List<Dt_SupplierInfo> supplierInfosAdd = new List<Dt_SupplierInfo>();
- List<Dt_SupplierInfo> supplierInfosUpdate = new List<Dt_SupplierInfo>();
- //鏂板
- if (bSTSupplierDTOsAdd.Count > 0)
- {
- //鍒ゆ柇閲嶅鎻掑叆
- Dt_SupplierInfo? ExistSupplier = OldsupplierInfos.FirstOrDefault(x => bSTSupplierDTOsAdd.Select(x => x.VendId).Contains(x.SupplierSourceId));
- if (ExistSupplier != null)
- {
- return content.Error($"渚涘簲鍟唟nameof(BSTSupplierDTO.VendId)}:{ExistSupplier.SupplierSourceId}宸插瓨鍦�");
- }
-
- foreach (var item in bSTSupplierDTOsAdd)
- {
- if (bSTSupplierDTOsUpdate.FirstOrDefault(x => x.VendId == item.VendId) != null)
- {
- continue;
- }
- Dt_SupplierInfo supplierInfo = _mapper.Map<Dt_SupplierInfo>(item);
- supplierInfosAdd.Add(supplierInfo);
- }
- }
- //鏇存柊
- if (bSTSupplierDTOsUpdate.Count > 0)
- {
- //鑾峰彇宸插瓨鍦ㄧ殑鐗╂枡
- List<Dt_SupplierInfo>? ExistbSTSuppliersUpdate = OldsupplierInfos.Where(x => bSTSupplierDTOsUpdate.Select(x => x.VendId).Contains(x.SupplierSourceId)).ToList();
- foreach (var item in bSTSupplierDTOsUpdate)
- {
- Dt_SupplierInfo? supplierInfoUpdate = ExistbSTSuppliersUpdate.FirstOrDefault(x => x.SupplierSourceId == item.VendId);
- //濡傛灉鐗╂枡宸插瓨鍦ㄥ垯杩涜鏇存敼
- if (supplierInfoUpdate != null)
- {
- supplierInfoUpdate.SupplierSourceId = item.VendId;
- supplierInfoUpdate.SupplierCode = item.VendNo;
- supplierInfoUpdate.SupplierShortName = item.ShortName;
- supplierInfoUpdate.SupplierName = item.ShortName;
- supplierInfoUpdate.Contacts = item.BusinessContact;
- supplierInfoUpdate.ContactNumber = item.Tel;
- supplierInfoUpdate.ContactAddress = item.Address;
- supplierInfosUpdate.Add(supplierInfoUpdate);
- }
- else//濡傛灉涓嶅瓨鍦ㄥ垯杩涜鏂板
- {
- Dt_SupplierInfo supplierInfo = _mapper.Map<Dt_SupplierInfo>(item);
- supplierInfosAdd.Add(supplierInfo);
- }
- }
- }
- //鍒犻櫎
- if (bSTSupplierDTOsDTODel.Count > 0)
- {
-
- }
- //鏇存柊鏁版嵁
- _unitOfWorkManage.CommitTran();
- BaseDal.AddData(supplierInfosAdd);
- BaseDal.UpdateData(supplierInfosUpdate);
- _unitOfWorkManage.CommitTran();
- content.OK("鎺ユ敹鎴愬姛");
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
-
- /// <summary>
- /// 娣诲姞浜屾湡渚涘簲鍟嗕俊鎭�
- /// </summary>
- /// <param name="bSTSupplierDTOs"></param>
- /// <returns></returns>
- public WebResponseContent ReceiveSupplier(ERPSupplierDTO eRPSupplierDTO)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (eRPSupplierDTO == null)
- {
- return content.Error("渚涘簲鍟嗕俊鎭笉鑳戒紶鍏ヤ负绌�");
- }
- List<Dt_SupplierInfo> OldsupplierInfos = BaseDal.QueryData(x => x.InvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
-
- if (eRPSupplierDTO.OperateType == 1)
- {
- //鍒ゆ柇閲嶅鎻掑叆
- Dt_SupplierInfo? supplierInfoOld = OldsupplierInfos.FirstOrDefault(x => x.SupplierCode == eRPSupplierDTO.SupplierCode);
- if (supplierInfoOld != null)
- {
- return content.Error($"渚涘簲鍟唟supplierInfoOld.SupplierCode}宸插瓨鍦�");
- }
- Dt_SupplierInfo supplierInfo = _mapper.Map<Dt_SupplierInfo>(eRPSupplierDTO);
- //鏂板
- BaseDal.AddData(supplierInfo);
- }
- else if (eRPSupplierDTO.OperateType == 2)
- {
- //鍒ゆ柇鏄惁瀛樺湪
- Dt_SupplierInfo? ExistsupplierInfo = OldsupplierInfos.FirstOrDefault(x => x.SupplierCode == eRPSupplierDTO.SupplierCode);
- if (ExistsupplierInfo == null)
- {
- return content.Error($"鏇存柊渚涘簲鍟唟eRPSupplierDTO.SupplierCode}涓嶅瓨鍦�");
- }
- Dt_SupplierInfo supplierInfo = _mapper.Map<Dt_SupplierInfo>(eRPSupplierDTO);
- supplierInfo.Id = ExistsupplierInfo.Id;
- //鏇存柊
- _unitOfWorkManage.BeginTran();
- BaseDal.UpdateData(supplierInfo);
- _unitOfWorkManage.CommitTran();
- }
- else if (eRPSupplierDTO.OperateType == 3)
- {
- //鍒ゆ柇鏄惁瀛樺湪
- Dt_SupplierInfo? ExistsupplierInfo = OldsupplierInfos.FirstOrDefault(x => x.SupplierCode == eRPSupplierDTO.SupplierCode);
- if (ExistsupplierInfo == null)
- {
- return content.Error($"鏇存柊渚涘簲鍟唟eRPSupplierDTO.SupplierCode}涓嶅瓨鍦�");
- }
- _unitOfWorkManage.BeginTran();
- BaseDal.DeleteData(ExistsupplierInfo);
- _unitOfWorkManage.CommitTran();
- }
- else
- {
- return content.Error("鏈壘鍒版搷浣滅被鍨�");
- }
- //鏇存柊鏁版嵁
- return content.OK("鎺ユ敹鎴愬姛");
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/UserInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/UserInfoService.cs"
index 3810fe3..e22a466 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/UserInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_BasicService/UserInfoService.cs"
@@ -1,16 +1,8 @@
锘縰sing AutoMapper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Const;
using WIDESEA_Core.Helper;
-using WIDESEA_DTO;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_ISystemRepository;
@@ -28,92 +20,6 @@
_mapper = mapper;
}
- public IUserInfoRepository Repository => BaseDal;
- /// <summary>
- /// 鎺ユ敹浜屾湡鍛樺伐淇℃伅
- /// </summary>
- /// <param name="eRPUserInfoDTO"></param>
- /// <returns></returns>
- public WebResponseContent ReceiveStaff(ERPUserInfoDTO eRPUserInfoDTO)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (eRPUserInfoDTO == null)
- {
- return content.Error("鍛樺伐淇℃伅涓嶈兘浼犲叆涓虹┖");
- }
- List<Dt_UserInfo> OlduserInfos = BaseDal.QueryData();
-
- if (eRPUserInfoDTO.OperateType == 1)
- {
- //鍒ゆ柇閲嶅鎻掑叆
- Dt_UserInfo? userInfoOld = OlduserInfos.FirstOrDefault(x => x.Code == eRPUserInfoDTO.StaffCode);
- if (userInfoOld != null)
- {
- return content.Error($"宸ュ彿{userInfoOld.Code}锛屽憳宸userInfoOld.Name}宸插瓨鍦�");
- }
- Dt_UserInfo userInfo = _mapper.Map<Dt_UserInfo>(eRPUserInfoDTO);
- Sys_User user = new Sys_User()
- {
- UserName = userInfo.Code,
- RoleId = 0,
- UserPwd = "LLD123456".EncryptDES(AppSecret.User),
- RoleName = "",
- Enable = (byte)userInfo.State,
- LastModifyPwdDate = DateTime.Now,
- Address = "绯荤粺鏈嶅姟鍣�",
- TenantId = 0,
- Creater = "绯荤粺",
- UserTrueName = userInfo.Name,
- };
- //鏂板
- BaseDal.AddData(userInfo);
- _userRepository.AddData(user);
- }
- else if (eRPUserInfoDTO.OperateType == 2)
- {
- //鍒ゆ柇鏄惁瀛樺湪
- Dt_UserInfo? userInfoOld = OlduserInfos.FirstOrDefault(x => x.Code == eRPUserInfoDTO.StaffCode);
- if (userInfoOld == null)
- {
- return content.Error($"鏇存柊宸ュ彿{eRPUserInfoDTO.StaffCode}锛屽憳宸eRPUserInfoDTO.StaffName}涓嶅瓨鍦�");
- }
- Dt_UserInfo userInfo = _mapper.Map<Dt_UserInfo>(eRPUserInfoDTO);
- userInfo.Id = userInfoOld.Id;
- Sys_User user = _userRepository.QueryFirst(x=>x.UserName== userInfo.Code);
- if (userInfoOld == null)
- {
- return content.Error($"鏇存柊宸ュ彿{eRPUserInfoDTO.StaffCode}锛屽憳宸eRPUserInfoDTO.StaffName}锛學MS璐﹀彿涓嶅瓨鍦�");
- }
- user.Enable = (byte)userInfo.State;
- user.UserTrueName = userInfo.Name;
- //鏇存柊
- BaseDal.UpdateData(userInfo);
- _userRepository.UpdateData(user);
- }
- else if (eRPUserInfoDTO.OperateType == 3)
- {
- //鍒ゆ柇鏄惁瀛樺湪
- Dt_UserInfo? userInfoOld = OlduserInfos.FirstOrDefault(x => x.Code == eRPUserInfoDTO.StaffCode);
- if (userInfoOld == null)
- {
- return content.Error($"鏇存柊宸ュ彿{eRPUserInfoDTO.StaffCode}锛屽憳宸eRPUserInfoDTO.StaffName}涓嶅瓨鍦�");
- }
- BaseDal.DeleteData(userInfoOld);
- }
- else
- {
- return content.Error("鏈壘鍒版搷浣滅被鍨�");
- }
- //鏇存柊鏁版嵁
- return content.OK("鎺ユ敹鎴愬姛");
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
public WebResponseContent AddUser()
{
try
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_CheckService/WIDESEA_CheckService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_CheckService/WIDESEA_CheckService.csproj"
index f958b64..4b7900e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_CheckService/WIDESEA_CheckService.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_CheckService/WIDESEA_CheckService.csproj"
@@ -10,7 +10,6 @@
<ProjectReference Include="..\WIDESEA_External\WIDESEA_External.csproj" />
<ProjectReference Include="..\WIDESEA_IApprovalRepository\WIDESEA_IApprovalRepository.csproj" />
<ProjectReference Include="..\WIDESEA_ICheckService\WIDESEA_ICheckService.csproj" />
- <ProjectReference Include="..\WIDESEA_IInboundRepository\WIDESEA_IInboundRepository.csproj" />
<ProjectReference Include="..\WIDESEA_ISystemRepository\WIDESEA_ISystemRepository.csproj" />
</ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Core/BaseServices/ServiceBase.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Core/BaseServices/ServiceBase.cs"
index 98d28b2..326d9af 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Core/BaseServices/ServiceBase.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Core/BaseServices/ServiceBase.cs"
@@ -1,4 +1,4 @@
-锘縰sing AutoMapper.Execution;
+using AutoMapper.Execution;
using Magicodes.ExporterAndImporter.Core;
using Magicodes.ExporterAndImporter.Core.Models;
using Magicodes.ExporterAndImporter.Excel;
@@ -195,15 +195,14 @@
if (userRole == null)
throw new Exception($"鏃犳潈闄�");
- if (type.IsAssignableFrom(typeof(BaseWarehouseEntity)) || type.GetProperty(nameof(BaseWarehouseEntity.WarehouseId)) != null)
+ if (typeof(BaseWarehouseEntity).IsAssignableFrom(type))
{
if (userRole.WarehouseIds.Count > 0)
{
return $"{nameof(BaseWarehouseEntity.WarehouseId)} in ({userRole.WarehouseIds.Serialize().Replace("[", "").Replace("]", "")})";
}
-
else
- return $"1 != 1";
+ return "1 = 1";
}
else
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/BSTMaterialDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/BSTMaterialDTO.cs"
deleted file mode 100644
index dd58b5f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/BSTMaterialDTO.cs"
+++ /dev/null
@@ -1,95 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.Basic
-{
- /// <summary>
- /// 鍗氭�濋�氱墿鏂欐帴鏀跺疄浣�
- /// </summary>
- [ModelValidate]
- public class BSTMaterialDTO
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷<br/>
- /// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true)]
- public int Way { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍞竴鏍囪瘑ID<br/>
- /// </summary>
- [PropertyValidate("鐗╂枡鍞竴鏍囪瘑ID", NotNullAndEmpty = true)]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [PropertyValidate("鐗╂枡鍚嶇О", NotNullAndEmpty = true)]
- public string Name { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- [PropertyValidate("鐗╂枡瑙勬牸", NotNullAndEmpty = false)]
- public string Spec { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫诲瀷
- /// </summary>
- [PropertyValidate("鐗╂枡绫诲瀷", NotNullAndEmpty = true)]
- public int MaterielType { get; set; }
-
- /// <summary>
- /// 鐗╂枡瀹藉害锛�0琛ㄧず鏈缃級
- /// </summary>
- [PropertyValidate("鐗╂枡瀹藉害锛�0琛ㄧず鏈缃級", NotNullAndEmpty = true)]
- public decimal MaterielWide { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍘氬害锛�0琛ㄧず鏈缃級
- /// </summary>
- [PropertyValidate("鐗╂枡鍘氬害锛�0琛ㄧず鏈缃級", NotNullAndEmpty = true)]
- public decimal MaterielThickness { get; set; }
-
- /// <summary>
- /// 鐗╂枡闀垮害锛�0琛ㄧず鏈缃級
- /// </summary>
- [PropertyValidate("鐗╂枡闀垮害锛�0琛ㄧず鏈缃級", NotNullAndEmpty = true)]
- public decimal MaterielLength { get; set; }
-
- /// <summary>
- /// 鐗╂枡閲嶉噺锛堝崟浣嶉噸閲忥紝绮剧‘鏁板�硷級
- /// </summary>
- [PropertyValidate("鐗╂枡閲嶉噺锛堝崟浣嶉噸閲忥紝绮剧‘鏁板�硷級", NotNullAndEmpty = true)]
- public decimal Weight { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [PropertyValidate("鐘舵��", NotNullAndEmpty = true)]
- public int Status { get; set; }
-
- /// <summary>
- /// 搴撳瓨缁勭粐
- /// </summary>
- [PropertyValidate("搴撳瓨缁勭粐", NotNullAndEmpty = true)]
- public int InvOrgId { get; set; }
-
- /// <summary>
- /// 璁￠噺鍗曚綅锛圞g锛氬崈鍏嬶級
- /// </summary>
- [PropertyValidate("璁￠噺鍗曚綅锛圞g锛氬崈鍏嬶級", NotNullAndEmpty = true)]
- public string Unit { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/BSTSupplierDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/BSTSupplierDTO.cs"
deleted file mode 100644
index a65d823..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/BSTSupplierDTO.cs"
+++ /dev/null
@@ -1,65 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.Basic
-{
- /// <summary>
- /// 鍗氭�濋�氫緵搴斿晢鎺ユ敹瀹炰綋
- /// </summary>
- [ModelValidate]
- public class BSTSupplierDTO
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true)]
- public int Way { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗗敮涓�鏍囪瘑ID
- /// </summary>
- [PropertyValidate("渚涘簲鍟嗗敮涓�鏍囪瘑ID", NotNullAndEmpty = true)]
- public int VendId { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鍙�/浠ｇ爜
- /// </summary>
- [PropertyValidate("渚涘簲鍟嗙紪鍙�/浠ｇ爜", NotNullAndEmpty = true)]
- public string VendNo { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙畝绉�
- /// </summary>
- [PropertyValidate("渚涘簲鍟嗙畝绉�", NotNullAndEmpty = true)]
- public string ShortName { get; set; }
-
- /// <summary>
- /// 鍟嗗姟鑱旂郴浜�
- /// </summary>
- [PropertyValidate("summary", NotNullAndEmpty = true)]
- public string BusinessContact { get; set; }
-
- /// <summary>
- /// 鑱旂郴鐢佃瘽
- /// </summary>
- [PropertyValidate("鑱旂郴鐢佃瘽", NotNullAndEmpty = true)]
- public string Tel { get; set; }
-
- /// <summary>
- /// 鍏徃鍦板潃
- /// </summary>
- [PropertyValidate("鍏徃鍦板潃", NotNullAndEmpty = true)]
- public string Address { get; set; }
-
- /// <summary>
- /// 鐘舵�佹爣璇嗭紙1琛ㄧず鍚敤/鏈夋晥鐘舵�侊級
- /// </summary>
- [PropertyValidate("鐘舵�佹爣璇�", NotNullAndEmpty = true)]
- public int Status { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/ERPCustomerDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/ERPCustomerDTO.cs"
deleted file mode 100644
index 715cb09..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/ERPCustomerDTO.cs"
+++ /dev/null
@@ -1,46 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.Basic
-{
- /// <summary>
- /// 浜屾湡ERP瀹㈡埛鎺ユ敹瀹炰綋
- /// </summary>
- [ModelValidate]
- public class ERPCustomerDTO
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2, 3 })]
- public int OperateType { get; set; }
-
- /// <summary>
- /// 瀹㈡埛缂栫爜
- /// </summary>
- [PropertyValidate("瀹㈡埛缂栫爜", NotNullAndEmpty = true)]
- public string CustomerCode { get; set; }
-
- /// <summary>
- /// 瀹㈡埛鍚嶇О
- /// </summary>
- [PropertyValidate("瀹㈡埛鍚嶇О", NotNullAndEmpty = true)]
- public string CustomerName { get; set; }
-
- /// <summary>
- /// 瀹㈡埛绠�绉�
- /// </summary>
- [PropertyValidate("瀹㈡埛绠�绉�", NotNullAndEmpty = true)]
- public string ShortName { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [PropertyValidate("鐘舵��", NotNullAndEmpty = true)]
- public int State { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/ERPMaterialDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/ERPMaterialDTO.cs"
deleted file mode 100644
index 9a3b1bf..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/ERPMaterialDTO.cs"
+++ /dev/null
@@ -1,98 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.Basic
-{
- /// <summary>
- /// 浜屾湡ERP鐗╂枡鎺ユ敹瀹炰綋
- /// </summary>
- [ModelValidate]
- public class ERPMaterialDTO
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷 1:鏂板銆�2:淇敼銆�3:鍒犻櫎
- /// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2, 3 })]
- public int OperateType { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
- public string MaterielNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [PropertyValidate("鐗╂枡鍚嶇О", NotNullAndEmpty = true)]
- public string MaterielName { get; set; }
-
- /// <summary>
- /// 瑙勬牸
- /// </summary>
- [PropertyValidate("瑙勬牸", NotNullAndEmpty = false)]
- public string MaterielSpec { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫诲瀷 鎴愬搧 = 1,鍗婃垚鍝� = 2,鍘熸潗鏂� = 3,杈呮枡澶囦欢 = 4
- /// </summary>
- [PropertyValidate("鐗╂枡绫诲瀷 鎴愬搧 = 1,鍗婃垚鍝� = 2,鍘熸潗鏂� = 3,杈呮枡澶囦欢 = 4", NotNullAndEmpty = true)]
- public int MaterielType { get; set; }
-
- /// <summary>
- /// 鐗╂枡瀹�
- /// </summary>
- [PropertyValidate("鐗╂枡瀹�", NotNullAndEmpty = true)]
- public decimal MaterielWidth { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍘氬害
- /// </summary>
- [PropertyValidate("鐗╂枡鍘氬害", NotNullAndEmpty = true)]
- public decimal MaterielThickness { get; set; }
-
- /// <summary>
- /// 鐗╂枡闀�
- /// </summary>
- [PropertyValidate("鐗╂枡闀�", NotNullAndEmpty = true)]
- public decimal MaterielLength { get; set; }
-
- /// <summary>
- /// 鐗╂枡閲�
- /// </summary>
- [PropertyValidate("鐗╂枡閲�", NotNullAndEmpty = true)]
- public decimal Weight { get; set; }
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [PropertyValidate("0:绂佺敤銆�1:鍙敤锛涢粯璁や负1", NotNullAndEmpty = true)]
- public int State { get; set; }
-
- /// <summary>
- /// 鏄惁妫�楠� 1=鏄紝0=鍚�
- /// </summary>
- [PropertyValidate("鏄惁妫�楠� 1=鏄紝0=鍚�", NotNullAndEmpty = true)]
- public int IsCheck { get; set; }
-
- /// <summary>
- /// 浠撳簱浠ｅ彿
- /// </summary>
- [PropertyValidate("浠撳簱浠ｅ彿", NotNullAndEmpty = true)]
- public string WarehouseCode { get; set; }
-
- /// <summary>
- /// 璁￠噺鍗曚綅
- /// </summary>
- [PropertyValidate("璁￠噺鍗曚綅锛欿g:鍏枻銆丮锛氱背銆丳cs锛氫釜(鍙�)", NotNullAndEmpty = true)]
- public string Unit { get; set; }
- /// <summary>
- /// 璁￠噺鍗曚綅
- /// </summary>
- [PropertyValidate("璁￠噺鍗曚綅锛欿g:鍏枻銆丮锛氱背銆丳cs锛氫釜(鍙�)", NotNullAndEmpty = true)]
- public string AssistUnitCode { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/ERPSupplierDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/ERPSupplierDTO.cs"
deleted file mode 100644
index df8cc2a..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/ERPSupplierDTO.cs"
+++ /dev/null
@@ -1,76 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.Basic
-{
- /// <summary>
- /// 浜屾湡ERP渚涘簲鍟嗘帴鏀跺疄浣�
- /// </summary>
- [ModelValidate]
- public class ERPSupplierDTO
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2, 3 })]
- public int OperateType { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鍙�/浠ｇ爜
- /// </summary>
- [PropertyValidate("渚涘簲鍟嗙紪鍙�/浠ｇ爜", NotNullAndEmpty = true)]
- public string SupplierCode { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗗叏绉�
- /// </summary>
- [PropertyValidate("渚涘簲鍟嗗叏绉�", NotNullAndEmpty = true)]
- public string SupplierName { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙畝绉�
- /// </summary>
- [PropertyValidate("渚涘簲鍟嗙畝绉�", NotNullAndEmpty = true)]
- public string ShortName { get; set; }
-
- /// <summary>
- /// 鑱旂郴浜�
- /// </summary>
- [PropertyValidate("鑱旂郴浜�", NotNullAndEmpty = true)]
- public string Contacts { get; set; }
-
- /// <summary>
- /// 鑱旂郴鐢佃瘽
- /// </summary>
- [PropertyValidate("鑱旂郴鐢佃瘽", NotNullAndEmpty = true)]
- public string ContactNumber { get; set; }
-
- /// <summary>
- /// 鑱旂郴鍦板潃
- /// </summary>
- [PropertyValidate("鑱旂郴鍦板潃", NotNullAndEmpty = true)]
- public string ContactAddress { get; set; }
-
- /// <summary>
- /// 鐢靛瓙閭
- /// </summary>
- [PropertyValidate("鐢靛瓙閭", NotNullAndEmpty = true)]
- public string Email { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- [PropertyValidate("鎻忚堪", NotNullAndEmpty = true)]
- public string Description { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [PropertyValidate("鐘舵��", NotNullAndEmpty = true)]
- public int State { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/ERPUserInfoDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/ERPUserInfoDTO.cs"
deleted file mode 100644
index eb8704b..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/ERPUserInfoDTO.cs"
+++ /dev/null
@@ -1,46 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.Basic
-{
- /// <summary>
- /// 浜屾湡ERP鍛樺伐鎺ユ敹瀹炰綋
- /// </summary>
- [ModelValidate]
- public class ERPUserInfoDTO
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷", NotNullAndEmpty = true, Check = new object[] { 1, 2, 3 })]
- public int OperateType { get; set; }
-
- /// <summary>
- /// 鍛樺伐宸ュ彿
- /// </summary>
- [PropertyValidate("鍛樺伐宸ュ彿", NotNullAndEmpty = true)]
- public string StaffCode { get; set; }
-
- /// <summary>
- /// 鍛樺伐濮撳悕
- /// </summary>
- [PropertyValidate("鍛樺伐濮撳悕", NotNullAndEmpty = true)]
- public string StaffName { get; set; }
-
- /// <summary>
- /// 鍛樺伐鐢佃瘽
- /// </summary>
- [PropertyValidate("鍛樺伐鐢佃瘽", NotNullAndEmpty = true)]
- public string PhoneNumber { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [PropertyValidate("鐘舵��", NotNullAndEmpty = true)]
- public int State { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/MatSerNumAnalysisModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/MatSerNumAnalysisModel.cs"
deleted file mode 100644
index d8c83e1..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Basic/MatSerNumAnalysisModel.cs"
+++ /dev/null
@@ -1,59 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-
-namespace WIDESEA_DTO.Basic
-{
- /// <summary>
- ///
- /// </summary>
- [AnalysisRule, ModelValidate]
- public class MatSerNumAnalysisModel
- {
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [AnalysisItemRule(AnalysisFormatTypeEnum.MTC), PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
- public string MaterielCode { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- [AnalysisItemRule(AnalysisFormatTypeEnum.BHN), PropertyValidate("鎵规鍙�", NotNullAndEmpty = true)]
- public string LotNo { get; set; }
-
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- [AnalysisItemRule(AnalysisFormatTypeEnum.MTPD), PropertyValidate("鐢熶骇鏃ユ湡", NotNullAndEmpty = true)]
- public string ProductionDate { get; set; }
-
- /// <summary>
- /// 鏈夋晥鏈�
- /// </summary>
- [AnalysisItemRule(AnalysisFormatTypeEnum.ED), PropertyValidate("鏈夋晥鏈�", NotNullAndEmpty = true)]
- public string EffectiveDate { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- [AnalysisItemRule(AnalysisFormatTypeEnum.ODN), PropertyValidate("閲囪喘鍗曞彿", NotNullAndEmpty = true)]
- public string PurchaseOrderNo { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [AnalysisItemRule(AnalysisFormatTypeEnum.MTQ), PropertyValidate("鏁伴噺", NotNullAndEmpty = true)]
- public float Quantity { get; set; }
-
- /// <summary>
- /// 鍘熷鏁版嵁
- /// </summary>
- [AnalysisItemRule(AnalysisFormatTypeEnum.BD), PropertyValidate("鍘熷鏁版嵁", NotNullAndEmpty = true)]
- public string SerialNumber { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTOutOrderDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTOutOrderDTO.cs"
deleted file mode 100644
index 37d1ded..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTOutOrderDTO.cs"
+++ /dev/null
@@ -1,94 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鍗氭�濋�氱敓浜ф帓绋嬫帴鏀跺疄浣�
- /// </summary>
- [ModelValidate]
- public class BSTOutOrderDTO
- {
- /// <summary>
- /// 鏁版嵁鑾峰彇鏂瑰紡鏍囪瘑(1:鏂板 2:淇敼 3:鍒犻櫎)
- /// </summary>
- [PropertyValidate("鏁版嵁鑾峰彇鏂瑰紡鏍囪瘑(1:鏂板 2:淇敼 3:鍒犻櫎)", NotNullAndEmpty = true)]
- public int Way { get; set; }
-
- /// <summary>
- /// 绾告澘涓荤敓浜ц鍒扞D
- /// </summary>
- [PropertyValidate("绾告澘涓荤敓浜ц鍒扞D", NotNullAndEmpty = true)]
- public int BoardMpsId { get; set; }
-
- /// <summary>
- /// 璁″垝缂栧彿
- /// </summary>
- [PropertyValidate("璁″垝缂栧彿", NotNullAndEmpty = true)]
- public string BoardMpsNo { get; set; }
-
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- [PropertyValidate("鐢熶骇鏃ユ湡", NotNullAndEmpty = true)]
- public long ProductionDate { get; set; }
-
- /// <summary>
- /// 绾歌川鍑哄簱鍗曟槑缁嗗垪琛�
- /// </summary>
- [PropertyValidate("绾歌川鍑哄簱鍗曟槑缁嗗垪琛�", NotNullAndEmpty = true)]
- public List<BstBoardMpsDetailItem> BstBoardMpsDetails { get; set; }
- }
- /// <summary>
- /// 鐢熶骇鎺掔▼鏄庣粏
- /// </summary>
- public class BstBoardMpsDetailItem
- {
- /// <summary>
- /// 鍏宠仈鐨勪富琛↖D
- /// </summary>
- [PropertyValidate("鍏宠仈鐨勪富琛↖D", NotNullAndEmpty = true)]
- public int BoardMpsId { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [PropertyValidate("骞呭", NotNullAndEmpty = true)]
- public decimal Width { get; set; }
-
- /// <summary>
- /// 闇�姹傞暱搴�
- /// </summary>
- [PropertyValidate("闇�姹傞暱搴�", NotNullAndEmpty = true)]
- public decimal XqLen { get; set; }
-
- /// <summary>
- /// 鎬荤敤閲�
- /// </summary>
- [PropertyValidate("鎬荤敤閲�", NotNullAndEmpty = true)]
- public decimal TotalUsage { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉ユ簮ID(涓婃父)
- /// </summary>
- [PropertyValidate("鐗╂枡ID", NotNullAndEmpty = true)]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 閲囪喘闀垮害
- /// </summary>
- [PropertyValidate("閲囪喘闀垮害", NotNullAndEmpty = true)]
- public decimal ProcurementLength { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTPickInfoDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTPickInfoDTO.cs"
deleted file mode 100644
index 6fbc529..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTPickInfoDTO.cs"
+++ /dev/null
@@ -1,111 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鍗氭�濋�氱敓浜ч鏂欐帴鏀跺疄浣�
- /// </summary>
- [ModelValidate]
- public class BSTPickInfoDTO
- {
- /// <summary>
- /// 鏁版嵁鑾峰彇鏂瑰紡鏍囪瘑(1:鏂板 2:淇敼 3:鍒犻櫎)
- /// </summary>
- [PropertyValidate("鏁版嵁鑾峰彇鏂瑰紡鏍囪瘑(1:鏂板 2:淇敼 3:鍒犻櫎)", NotNullAndEmpty = true)]
- public int Way { get; set; }
-
- /// <summary>
- /// 棰嗘枡鍗旾D
- /// </summary>
- [PropertyValidate("棰嗘枡鍗旾D", NotNullAndEmpty = true)]
- public int PaperMattakeId { get; set; }
-
- /// <summary>
- /// 棰嗘枡鍗曞彿
- /// </summary>
- [PropertyValidate("棰嗘枡鍗曞彿", NotNullAndEmpty = true)]
- public string PaperMattakeNo { get; set; }
-
- /// <summary>
- /// 棰嗙敤鏃ユ湡
- /// </summary>
- [PropertyValidate("鐢熶骇鏃ユ湡", NotNullAndEmpty = true)]
- public long MattakeDate { get; set; }
-
- /// <summary>
- /// 棰嗙敤鍛樺伐
- /// </summary>
- [PropertyValidate("棰嗙敤鍛樺伐", NotNullAndEmpty = true)]
- public long EmployeeName { get; set; }
-
- /// <summary>
- /// 棰嗙敤鏄庣粏
- /// </summary>
- [PropertyValidate("棰嗙敤鏄庣粏", NotNullAndEmpty = true)]
- public List<PaperMattakeDetailItem> PaperMattakeDetails { get; set; }
- }
- /// <summary>
- /// 鐢熶骇鎺掔▼棰嗙敤鏄庣粏
- /// </summary>
- public class PaperMattakeDetailItem
- {
- /// <summary>
- /// 鍏宠仈鐨勪富琛↖D
- /// </summary>
- [PropertyValidate("鍏宠仈鐨勪富琛↖D", NotNullAndEmpty = true)]
- public int PaperMattakeId { get; set; }
-
- /// <summary>
- /// 鍏宠仈鐨勪富琛↖D
- /// </summary>
- [PropertyValidate("鐗╂枡ID", NotNullAndEmpty = true)]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [PropertyValidate("鐗╂枡鏉＄爜", NotNullAndEmpty = true)]
- public string Barcode { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [PropertyValidate("鐗╂枡缂栫爜", NotNullAndEmpty = true)]
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- [PropertyValidate("鎵规鍙�", NotNullAndEmpty = true)]
- public string SeqNo { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [PropertyValidate("骞呭", NotNullAndEmpty = true)]
- public decimal W { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [PropertyValidate("鏁伴噺", NotNullAndEmpty = true)]
- public decimal Qty { get; set; }
-
- /// <summary>
- /// 閲囪喘闀垮害
- /// </summary>
- [PropertyValidate("閲囪喘闀垮害", NotNullAndEmpty = true)]
- public decimal ProcurementLength { get; set; }
-
- /// <summary>
- /// 闇�姹傞暱搴�
- /// </summary>
- [PropertyValidate("闇�姹傞暱搴�", NotNullAndEmpty = true)]
- public string Unit { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTPurchaseOrderDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTPurchaseOrderDTO.cs"
deleted file mode 100644
index a0f9838..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTPurchaseOrderDTO.cs"
+++ /dev/null
@@ -1,130 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鍗氭�濋�氶噰璐叆搴撳崟鎺ユ敹瀹炰綋
- /// </summary>
- [ModelValidate]
- public class BSTPurchaseOrderDTO
- {
- /// <summary>
- /// 鏁版嵁鑾峰彇鏂瑰紡鏍囪瘑(1:鏂板 2:淇敼 3:鍒犻櫎)
- /// </summary>
- [PropertyValidate("鏁版嵁鑾峰彇鏂瑰紡鏍囪瘑(1:鏂板 2:淇敼 3:鍒犻櫎)", NotNullAndEmpty = true)]
- public int Way { get; set; }
-
- /// <summary>
- /// 绾歌川鏀惰揣鍗曚富琛↖D
- /// </summary>
- [PropertyValidate("绾歌川鏀惰揣鍗曚富琛↖D", NotNullAndEmpty = true)]
- public int PaperReceiptId { get; set; }
-
- /// <summary>
- /// 绾歌川鏀惰揣鍗曠紪鍙�
- /// </summary>
- [PropertyValidate("绾歌川鏀惰揣鍗曠紪鍙�", NotNullAndEmpty = true)]
- public string PaperReceiptNo { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鍙�
- /// </summary>
- [PropertyValidate("渚涘簲鍟嗙紪鍙�", NotNullAndEmpty = true)]
- public string VendNo { get; set; }
-
- /// <summary>
- /// 鎬婚噰璐暱搴�
- /// </summary>
- [PropertyValidate("鎬婚噰璐暱搴�", NotNullAndEmpty = true)]
- public decimal TotalProcurementLength { get; set; }
-
- /// <summary>
- /// 鏀惰揣鏃ユ湡
- /// </summary>
- [PropertyValidate("鏀惰揣鏃ユ湡", NotNullAndEmpty = true)]
- public long ReceiptDate { get; set; }
-
- /// <summary>
- /// 澶囨敞淇℃伅
- /// </summary>
- [PropertyValidate("澶囨敞淇℃伅", NotNullAndEmpty = false)]
- public string? Remark { get; set; }
-
- /// <summary>
- /// 绾歌川鏀惰揣鍗曟槑缁嗗垪琛�
- /// </summary>
- [PropertyValidate("绾歌川鏀惰揣鍗曟槑缁嗗垪琛�", NotNullAndEmpty = true)]
- public List<PaperReceiptDetailsItem> PaperReceiptDetails { get; set; }
- }
- /// <summary>
- /// 閲囪喘鏀惰揣鏄庣粏
- /// </summary>
- public class PaperReceiptDetailsItem
- {
- /// <summary>
- /// 鍏宠仈鐨勪富琛↖D
- /// </summary>
- [PropertyValidate("鍏宠仈鐨勪富琛↖D", NotNullAndEmpty = true)]
- public int PaperReceiptId { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [PropertyValidate("鐗╂枡鏉＄爜", NotNullAndEmpty = true)]
- public string Barcode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉ユ簮ID(涓婃父)
- /// </summary>
- [PropertyValidate("鐗╂枡ID", NotNullAndEmpty = true)]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鎵规搴忓垪鍙�
- /// </summary>
- [PropertyValidate("鎵规搴忓垪鍙�", NotNullAndEmpty = true)]
- public int SeqNo { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [PropertyValidate("骞呭", NotNullAndEmpty = true)]
- public decimal W { get; set; }
-
- /// <summary>
- /// 鍘氬害
- /// </summary>
- [PropertyValidate("鍘氬害", NotNullAndEmpty = true)]
- public decimal Thick { get; set; }
-
- /// <summary>
- /// 閲囪喘闀垮害
- /// </summary>
- [PropertyValidate("閲囪喘闀垮害", NotNullAndEmpty = true)]
- public decimal ProcurementLength { get; set; }
-
- /// <summary>
- /// 浜よ揣鏁伴噺
- /// </summary>
- [PropertyValidate("浜よ揣鏁伴噺", NotNullAndEmpty = true)]
- public decimal DeliveryQty { get; set; }
-
- /// <summary>
- /// 璁￠噺鍗曚綅锛圞G锛�
- /// </summary>
- [PropertyValidate("璁￠噺鍗曚綅", NotNullAndEmpty = true)]
- public string Unit { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTReturnOrderDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTReturnOrderDTO.cs"
deleted file mode 100644
index d4647af..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTReturnOrderDTO.cs"
+++ /dev/null
@@ -1,103 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鍗氭�濋�氶��鏂欐帴鏀跺疄浣�
- /// </summary>
- [ModelValidate]
- public class BSTReturnOrderDTO
- {
- /// <summary>
- /// 鏁版嵁鑾峰彇鏂瑰紡鏍囪瘑(1:鏂板 2:淇敼 3:鍒犻櫎)
- /// </summary>
- [PropertyValidate("鏁版嵁鑾峰彇鏂瑰紡鏍囪瘑(1:鏂板 2:淇敼 3:鍒犻櫎)", NotNullAndEmpty = true)]
- public int Way { get; set; }
- /// <summary>
- /// 閫�鏂欏崟ID
- /// </summary>
- [PropertyValidate("閫�鏂欏崟ID", NotNullAndEmpty = true)]
- public int PaperWreturnId { get; set; }
- /// <summary>
- /// 閫�鏂欏崟缂栧彿
- /// </summary>
- [PropertyValidate("閫�鏂欏崟缂栧彿", NotNullAndEmpty = true)]
- public string PaperWreturnNo { get; set; }
- /// <summary>
- /// 閫�鏂欐棩鏈�
- /// </summary>
- [PropertyValidate("閫�鏂欐棩鏈�", NotNullAndEmpty = true)]
- public long WreturnDate { get; set; }
- /// <summary>
- /// 閫�鏂欏憳宸�
- /// </summary>
- [PropertyValidate("閫�鏂欏憳宸�", NotNullAndEmpty = false)]
- public string EmployeeName { get; set; }
- /// <summary>
- /// 閫�鏂欐槑缁�
- /// </summary>
- [PropertyValidate("閫�鏂欐槑缁�", NotNullAndEmpty = true)]
- public List<BSTReturnOrderDTOItem> BstPaperWreturnDetails { get; set; }
- }
- /// <summary>
- /// 閫�鏂欐槑缁�
- /// </summary>
- public class BSTReturnOrderDTOItem
- {
- /// <summary>
- /// 閫�鏂橧D
- /// </summary>
- [PropertyValidate("閫�鏂橧D", NotNullAndEmpty = true)]
- public int PaperWreturnId { get; set; }
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- [PropertyValidate("鐗╂枡ID", NotNullAndEmpty = true)]
- public int MaterialId { get; set; }
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [PropertyValidate("鐗╂枡鏉＄爜", NotNullAndEmpty = true)]
- public string Barcode { get; set; }
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
- public string MaterialNo { get; set; }
- /// <summary>
- /// 鐗╂枡鎵规搴忓彿
- /// </summary>
- [PropertyValidate("鐗╂枡鎵规搴忓彿", NotNullAndEmpty = true)]
- public int SeqNo { get; set; }
- /// <summary>
- /// 骞呭锛坢m锛�
- /// </summary>
- [PropertyValidate("骞呭锛坢m锛�", NotNullAndEmpty = true)]
- public decimal W { get; set; }
- /// <summary>
- /// 鐩村緞
- /// </summary>
- [PropertyValidate("鐩村緞", NotNullAndEmpty = true)]
- public decimal Thick { get; set; }
- /// <summary>
- /// 闀垮害
- /// </summary>
- [PropertyValidate("闀垮害", NotNullAndEmpty = true)]
- public decimal ProcurementLength { get; set; }
- /// <summary>
- /// 閫�璐ф暟閲�
- /// </summary>
- [PropertyValidate("閫�璐ф暟閲�", NotNullAndEmpty = true)]
- public decimal Qty { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [PropertyValidate("鍗曚綅", NotNullAndEmpty = true)]
- public string Unit { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTStockInfoDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTStockInfoDTO.cs"
deleted file mode 100644
index 7d004ac..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/BSTStockInfoDTO.cs"
+++ /dev/null
@@ -1,63 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鍗氭�濋�氬簱瀛樺悓姝�
- /// </summary>
- public class BSTStockInfoDTO
- {
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- public string Barcode { get; set; }
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- public int MaterialId { get; set; }
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- public string MaterialNo { get; set; }
- /// <summary>
- /// 鍏ュ簱鏃ユ湡
- /// </summary>
- public string ReceiptDate { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string MaterialName { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- public string Unit { get; set; }
- /// <summary>
- /// 骞呭
- /// </summary>
- public decimal W { get; set; }
- /// <summary>
- /// 鐩村緞
- /// </summary>
- public decimal Thick { get; set; }
- /// <summary>
- /// 鎬婚暱
- /// </summary>
- public decimal StockMeter { get; set; }
- /// <summary>
- /// 閲嶉噺
- /// </summary>
- public decimal Qty { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string VendShortName { get; set; }
- /// <summary>
- /// 榫欏埄寰�
- /// </summary>
- public string Vendbarcode { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPInboundOrderDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPInboundOrderDTO.cs"
deleted file mode 100644
index 66cfd83..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPInboundOrderDTO.cs"
+++ /dev/null
@@ -1,81 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鍏ュ簱鏄庣粏淇℃伅
- /// </summary>
- public class InboundDetailItem
- {
- /// <summary>
- /// 鍏ュ簱鏄庣粏ID
- /// </summary>
- public int DetailId { get; set; }
- /// <summary>
- /// 鍏ュ簱鐗╂枡鏉＄爜
- /// </summary>
- public string BarCode { get; set; }
- /// <summary>
- /// 鍏ュ簱鐗╂枡缂栫爜
- /// </summary>
- public string MaterialCode { get; set; }
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- public string MaterialLot { get; set; }
- /// <summary>
- /// 鐗╂枡鏁伴噺
- /// </summary>
- public decimal MaterialQty { get; set; }
- /// <summary>
- /// 鍗峰緞
- /// </summary>
- public decimal Thickness { get; set; }
- /// <summary>
- /// 骞呭
- /// </summary>
- public decimal Wide { get; set; }
- /// <summary>
- /// 閲嶉噺
- /// </summary>
- public decimal Weight { get; set; }
- }
- /// <summary>
- /// ERP闈炵敓浜ч噰璐叆搴撳崟鎺ユ敹瀹炰綋
- /// </summary>
- public class ERPInboundOrderDTO
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- public int OperateType { get; set; }
- /// <summary>
- /// 浠撳簱缂栧彿
- /// </summary>
- public string WarehouseCode { get; set; }
- /// <summary>
- /// 璁㈠崟绫诲瀷
- /// </summary>
- public int OrderType { get; set; }
- /// <summary>
- /// 鍒涘缓浜哄憳
- /// </summary>
- public string Creater { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- /// </summary>
- public string InboundCode { get; set; }
- /// <summary>
- /// 鍏ュ簱鏄庣粏淇℃伅
- /// </summary>
- public List<InboundDetailItem> InboundDetail { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPPickOutOrderDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPPickOutOrderDTO.cs"
deleted file mode 100644
index 34a9f90..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPPickOutOrderDTO.cs"
+++ /dev/null
@@ -1,64 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.ERP
-{
- public class PickDetailItem
- {
- /// <summary>
- ///
- /// </summary>
- public int DetailId { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string BarCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string MaterialCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string MaterialLot { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int MaterialQty { get; set; }
- }
-
- public class ERPPickOutOrderDTO
- {
- /// <summary>
- ///
- /// </summary>
- public int OperateType { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string PickCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string WarehouseCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int OrderType { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Remark { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Creater { get; set; }
- /// <summary>
- ///
- /// </summary>
- public List<PickDetailItem> PickDetail { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPProDeliverBackDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPProDeliverBackDTO.cs"
deleted file mode 100644
index 62f6302..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPProDeliverBackDTO.cs"
+++ /dev/null
@@ -1,72 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.ERP
-{
- public class DeliveryBackDetailItem
- {
- /// <summary>
- ///
- /// </summary>
- public string SaleOrderNo { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string DeliveryCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string MaterialCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Customer { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string BarCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string MaterialLot { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int MaterialQty { get; set; }
- }
-
- public class ERPProDeliverBackDTO
- {
- /// <summary>
- ///
- /// </summary>
- public int OperateType { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string DeliveryBackCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string WarehouseCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int DeliveryType { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Remark { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Creater { get; set; }
- /// <summary>
- ///
- /// </summary>
- public List<DeliveryBackDetailItem> DeliveryBackDetail { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPProDeliveryDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPProDeliveryDTO.cs"
deleted file mode 100644
index 23765f2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPProDeliveryDTO.cs"
+++ /dev/null
@@ -1,72 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.ERP
-{
- public class DeliveryDetailItem
- {
- /// <summary>
- ///
- /// </summary>
- public int DetailId { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string SaleOrderNo { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Customer { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string MaterialCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string MaterialLot { get; set; }
- /// <summary>
- ///
- /// </summary>
- public decimal MaterialQty { get; set; }
- }
-
- public class ERPProDeliveryDTO
- {
- /// <summary>
- ///
- /// </summary>
- public string DeliveryCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string WarehouseCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Creater { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int DeliveryType { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string PlanDate { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Remark { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int OperateType { get; set; }
- /// <summary>
- ///
- /// </summary>
- public List<DeliveryDetailItem> DeliveryDetail { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPPurchaseOrderDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPPurchaseOrderDTO.cs"
deleted file mode 100644
index 3ae4808..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPPurchaseOrderDTO.cs"
+++ /dev/null
@@ -1,111 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// ERP閲囪喘鍏ュ簱鍗曟帴鏀跺疄浣�
- /// </summary>
- [ModelValidate]
- public class ERPPurchaseOrderDTO
- {
- /// <summary>
- /// 鎿嶄綔绫诲瀷(1:鏂板 2:淇敼 3:鍒犻櫎)
- /// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷(1:鏂板 2:淇敼 3:鍒犻櫎)", NotNullAndEmpty = true)]
- public int OperateType { get; set; }
-
- /// <summary>
- /// 閲囪喘鍏ュ簱鍗曞彿
- /// </summary>
- [PropertyValidate("閲囪喘鍏ュ簱鍗曞彿", NotNullAndEmpty = true)]
- public string PurchaseInCode { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栧彿
- /// </summary>
- [PropertyValidate("浠撳簱缂栧彿", NotNullAndEmpty = true)]
- public string WarehouseCode { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鍙�
- /// </summary>
- [PropertyValidate("渚涘簲鍟嗙紪鍙�", NotNullAndEmpty = true)]
- public string SupplierCode { get; set; }
-
- /// <summary>
- /// 鎬婚噰璐暟閲�
- /// </summary>
- [PropertyValidate("鎬婚噰璐暟閲�", NotNullAndEmpty = true)]
- public decimal SumQty { get; set; }
-
- /// <summary>
- /// 澶囨敞淇℃伅
- /// </summary>
- [PropertyValidate("澶囨敞淇℃伅", NotNullAndEmpty = false)]
- public string? Remark { get; set; }
-
- /// <summary>
- /// 閲囪喘鍏ュ簱鏄庣粏
- /// </summary>
- [PropertyValidate("閲囪喘鍏ュ簱鏄庣粏", NotNullAndEmpty = true)]
- public List<PurchaseInDetailItem> PurchaseInDetail { get; set; }
- }
- /// <summary>
- /// 閲囪喘鍏ュ簱鏄庣粏
- /// </summary>
- public class PurchaseInDetailItem
- {
- /// <summary>
- /// 閲囪喘鍏ュ簱鏄庣粏ID
- /// </summary>
- [PropertyValidate("閲囪喘鍏ュ簱鏄庣粏ID", NotNullAndEmpty = true)]
- public int DetailId { get; set; }
-
- /// <summary>
- /// 閲囪喘鍏ュ簱鐗╂枡鏉＄爜
- /// </summary>
- [PropertyValidate("閲囪喘鍏ュ簱鐗╂枡鏉＄爜", NotNullAndEmpty = true)]
- public string Barcode { get; set; }
-
- /// <summary>
- /// 閲囪喘鍏ュ簱鐗╂枡缂栧彿
- /// </summary>
- [PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 閲囪喘鍏ュ簱鐗╂枡鎵规
- /// </summary>
- [PropertyValidate("鐗╂枡鎵规", NotNullAndEmpty = true)]
- public string MaterialLot { get; set; }
-
- /// <summary>
- /// 閲囪喘鍏ュ簱鐗╂枡鏁伴噺
- /// </summary>
- [PropertyValidate("骞呭", NotNullAndEmpty = true)]
- public decimal MaterialQty { get; set; }
-
- /// <summary>
- /// 閲囪喘鍏ュ簱鍗锋枡鍗峰緞
- /// </summary>
- [PropertyValidate("閲囪喘鍏ュ簱鍗锋枡鍗峰緞", NotNullAndEmpty = false)]
- public decimal Thickness { get; set; }
-
- /// <summary>
- /// 閲囪喘鍏ュ簱閲嶉噺
- /// </summary>
- [PropertyValidate("閲囪喘鍏ュ簱閲嶉噺", NotNullAndEmpty = true)]
- public decimal Weight { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [PropertyValidate("骞呭", NotNullAndEmpty = true)]
- public decimal Wide { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPReturnOrderDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPReturnOrderDTO.cs"
deleted file mode 100644
index 06176a5..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPReturnOrderDTO.cs"
+++ /dev/null
@@ -1,60 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.ERP
-{
- public class ReturnDetailItem
- {
- /// <summary>
- ///
- /// </summary>
- public int DetailId { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string BarCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string MaterialCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string MaterialLot { get; set; }
- /// <summary>
- ///
- /// </summary>
- public int MaterialQty { get; set; }
- }
-
- public class ERPReturnOrderDTO
- {
- /// <summary>
- ///
- /// </summary>
- public int OperateType { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string ReturnCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Creater { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Remark { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string WarehouseCode { get; set; }
- /// <summary>
- ///
- /// </summary>
- public List<ReturnDetailItem> ReturnDetail { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPRoot.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPRoot.cs"
deleted file mode 100644
index 8fb8420..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/ERPRoot.cs"
+++ /dev/null
@@ -1,31 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- [ModelValidate]
- public class ERPRoot<T>
- {
- /// <summary>
- ///
- /// </summary>
- public string From { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string DateTime { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string Message { get; set; }
- /// <summary>
- ///
- /// </summary>
- [PropertyValidate("鍐呭", NotNullAndEmpty = true)]
- public T Content { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/SGOutOrderDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/SGOutOrderDTO.cs"
deleted file mode 100644
index 5143ed0..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/ERP/SGOutOrderDTO.cs"
+++ /dev/null
@@ -1,105 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.ERP
-{
- /// <summary>
- /// 鐢熺鎺掔▼鎺ユ敹瀹炰綋
- /// </summary>
- public class SGOutOrderDTO
- {
- /// <summary>
- /// 涓绘帓绋婭d
- /// </summary>
- [PropertyValidate("涓绘帓绋婭d", NotNullAndEmpty = true)]
- public int BoardMpsId { get; set; }
-
- /// <summary>
- /// 鎺掔▼鏄庣粏ID
- /// </summary>
- [PropertyValidate("鎺掔▼鏄庣粏ID", NotNullAndEmpty = true)]
- public int BoardMpsDetailId { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [PropertyValidate("骞呭", NotNullAndEmpty = true)]
- public decimal Width { get; set; }
-
- /// <summary>
- /// 闇�姹傞暱搴�
- /// </summary>
- [PropertyValidate("闇�姹傞暱搴�", NotNullAndEmpty = true)]
- public decimal XqLen { get; set; }
-
- /// <summary>
- /// 鎬荤敤閲�
- /// </summary>
- [PropertyValidate("鎬荤敤閲�", NotNullAndEmpty = true)]
- public decimal TotalUsage { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉ユ簮ID(涓婃父)
- /// </summary>
- [PropertyValidate("鐗╂枡ID", NotNullAndEmpty = true)]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 閲囪喘闀垮害
- /// </summary>
- [PropertyValidate("閲囪喘闀垮害", NotNullAndEmpty = true)]
- public decimal ProcurementLength { get; set; }
-
- /// <summary>
- /// 妤炲埆
- /// </summary>
- [PropertyValidate("妤炲埆", NotNullAndEmpty = true)]
- public string BoardFluteNo { get; set; }
-
- /// <summary>
- /// 鏈哄彴浣嶇疆
- /// </summary>
- [PropertyValidate("鏈哄彴浣嶇疆", NotNullAndEmpty = true)]
- public string MachineName { get; set; }
-
- /// <summary>
- /// 瀹㈡埛绠�绉�
- /// </summary>
- [PropertyValidate("瀹㈡埛绠�绉�", NotNullAndEmpty = true)]
- public string ShortName { get; set; }
-
- /// <summary>
- /// 鎬婚暱
- /// </summary>
- [PropertyValidate("鎬婚暱", NotNullAndEmpty = true)]
- public decimal TotalLenth { get; set; }
-
- /// <summary>
- /// 鐢熶骇宸ュ崟鍙�(涓婃父)
- /// </summary>
- [PropertyValidate("鐢熶骇宸ュ崟鍙�", NotNullAndEmpty = true)]
- public string OrderId { get; set; }
-
- /// <summary>
- /// 宸ュ崟鐢ㄧ焊搴忓彿(涓婃父)
- /// </summary>
- [PropertyValidate("宸ュ崟鐢ㄧ焊搴忓彿", NotNullAndEmpty = true)]
- public int Number { get; set; }
-
- /// <summary>
- /// 澶囨敞(涓婃父)
- /// </summary>
- [PropertyValidate("宸ュ崟鐢ㄧ焊搴忓彿", NotNullAndEmpty = true)]
- public string Remark { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Inbound/InboundOrderAddDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Inbound/InboundOrderAddDTO.cs"
deleted file mode 100644
index fe58a6b..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Inbound/InboundOrderAddDTO.cs"
+++ /dev/null
@@ -1,79 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.Inbound
-{
- [ModelValidate]
- public class InboundOrderAddDTO
- {
- /// <summary>
- /// 涓婃父鍗曟嵁缂栧彿
- /// </summary>
- [PropertyValidate("涓婃父鍗曟嵁缂栧彿", NotNullAndEmpty = true)]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷
- /// </summary>
- [PropertyValidate("鍗曟嵁绫诲瀷", NotNullAndEmpty = true)]
- public int Type { get; set; }
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- [PropertyValidate("鎿嶄綔绫诲瀷", Check = new object[] { 1, 2, 3, 4 })]
- public int OperateType { get; set; }
-
- /// <summary>
- /// 閲囪喘鏁伴噺
- /// </summary>
- [PropertyValidate("閲囪喘鏁伴噺", MinValue = 0, IsContainMinValue = false)]
- public decimal Amount { get; set; }
-
- /// <summary>
- /// 涓嬪崟鏃ユ湡
- /// </summary>
- [PropertyValidate("涓嬪崟鏃ユ湡", NotNullAndEmpty = true)]
- public string OrderDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Note { get; set; }
-
- [PropertyValidate("鍗曟嵁鏄庣粏淇℃伅", NotNullAndEmpty = true)]
- public List<InboundOrderDetailAddDTO> MList { get; set; }
- }
-
- [ModelValidate]
- public class InboundOrderDetailAddDTO
- {
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
- public string MaterielCode { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [PropertyValidate("鏁伴噺", NotNullAndEmpty = true, MinValue = 0, IsContainMinValue = false)]
- public decimal Qty { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栧彿
- /// </summary>
- [PropertyValidate("浠撳簱缂栧彿", NotNullAndEmpty = true)]
- public int WaId { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [PropertyValidate("鍗曚綅", NotNullAndEmpty = true)]
- public string Unit { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESAutoIssueDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESAutoIssueDTO.cs"
deleted file mode 100644
index 890ba2e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESAutoIssueDTO.cs"
+++ /dev/null
@@ -1,46 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// MES棰嗘枡鑷姩鍙枡鎺ユ敹瀹炰綋
- /// </summary>
- [ModelValidate]
- public class MESAutoIssueDTO
- {
- /// <summary>
- /// 鍑哄簱鏉ユ簮鏄庣粏ID
- /// </summary>
- [PropertyValidate("鍑哄簱鏉ユ簮鏄庣粏ID", NotNullAndEmpty = true)]
- public int OutDetailId { get; set; }
-
- /// <summary>
- /// 鏈哄彴浣欐枡鍙敤鏃堕暱
- /// </summary>
- [PropertyValidate("鏈哄彴浣欐枡鍙敤鏃堕暱", NotNullAndEmpty = true)]
- public int OddsTime { get; set; }
-
- /// <summary>
- /// 涓婃枡鍛ㄨ浆浣嶄綑鏂欐暟閲�
- /// </summary>
- [PropertyValidate("涓婃枡鍛ㄨ浆浣嶄綑鏂欐暟閲�", NotNullAndEmpty = true)]
- public decimal OddsQuantity { get; set; }
-
- /// <summary>
- /// 鍛ㄨ浆浣嶇疆缂栧彿
- /// </summary>
- [PropertyValidate("鍛ㄨ浆浣嶇疆缂栧彿", NotNullAndEmpty = true)]
- public string PointCode { get; set; }
-
- /// <summary>
- /// 鍛ㄨ浆浣嶆槸鍚﹀瓨鍦ㄧ┖鎵�
- /// </summary>
- [PropertyValidate("鍛ㄨ浆浣嶆槸鍚﹀瓨鍦ㄧ┖鎵�", NotNullAndEmpty = true)]
- public int IsEmptyPallet { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESManualIssueDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESManualIssueDTO.cs"
deleted file mode 100644
index 5c21a84..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESManualIssueDTO.cs"
+++ /dev/null
@@ -1,34 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// MES棰嗘枡鑷姩鍙枡鎺ユ敹瀹炰綋
- /// </summary>
- [ModelValidate]
- public class MESManualIssueDTO
- {
- /// <summary>
- /// 鍑哄簱鏉ユ簮鏄庣粏ID
- /// </summary>
- [PropertyValidate("鍑哄簱鏉ユ簮鏄庣粏ID", NotNullAndEmpty = true)]
- public int OutDetailId { get; set; }
-
- /// <summary>
- /// 鍛煎彨Id
- /// </summary>
- [PropertyValidate("鍛煎彨Id", NotNullAndEmpty = true)]
- public string IssueId { get; set; }
-
- /// <summary>
- /// 鍛ㄨ浆浣嶇疆缂栧彿
- /// </summary>
- [PropertyValidate("鍛ㄨ浆浣嶇疆缂栧彿", NotNullAndEmpty = true)]
- public string PointCode { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESOrderStopDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESOrderStopDTO.cs"
deleted file mode 100644
index 755882c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESOrderStopDTO.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// MES宸ュ崟鍋滄鍙枡鎺ユ敹瀹炰綋
- /// </summary>
- [ModelValidate]
- public class MESOrderStopDTO
- {
- /// <summary>
- /// 鐢熶骇璁㈠崟缂栫爜
- /// </summary>
- [PropertyValidate("鐢熶骇璁㈠崟缂栫爜", NotNullAndEmpty = true)]
- public string ProductOrderNo { get; set; }
- /// <summary>
- /// 鍋滄鏍囪瘑
- /// </summary>
- [PropertyValidate("鍋滄鏍囪瘑", NotNullAndEmpty = true)]
- public int IsStop { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESProInDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESProInDTO.cs"
deleted file mode 100644
index 8eb88f9..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESProInDTO.cs"
+++ /dev/null
@@ -1,131 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// MES鎴愬搧/鍗婃垚鍝佹帴鏀跺疄浣�
- /// </summary>
- [ModelValidate]
- public class MESProInDTO
- {
- /// <summary>
- /// 鐢熶骇璁㈠崟缂栫爜(涓婃父)
- /// </summary>
- [PropertyValidate("鐢熶骇璁㈠崟缂栫爜", NotNullAndEmpty = true)]
- public string ProductOrderNo { get; set; }
-
- /// <summary>
- /// 娲惧崟宸ュ崟缂栫爜(涓婃父)
- /// </summary>
- [PropertyValidate("娲惧崟宸ュ崟缂栫爜", NotNullAndEmpty = true)]
- public string SendOrderNo { get; set; }
-
- /// <summary>
- /// 宸ュ簭搴忓彿(涓婃父)
- /// </summary>
- [PropertyValidate("宸ュ簭搴忓彿(涓婃父)", NotNullAndEmpty = true)]
- public int ProcessNum { get; set; }
-
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [PropertyValidate("浠撳簱", NotNullAndEmpty = true)]
- public string WarehouseCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [PropertyValidate("鐗╂枡缂栫爜", NotNullAndEmpty = true)]
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- [PropertyValidate("鐗╂枡鎵规", NotNullAndEmpty = true)]
- public string MaterialLot { get; set; }
-
- /// <summary>
- /// 鐗╂枡绛夌骇
- /// </summary>
- [PropertyValidate("鐗╂枡绛夌骇", NotNullAndEmpty = true)]
- public string GradeCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏁伴噺
- /// </summary>
- [PropertyValidate("鐗╂枡鏁伴噺", NotNullAndEmpty = true)]
- public decimal ProQuantity { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [PropertyValidate("鐗╂枡鏉＄爜", NotNullAndEmpty = true)]
- public string BarCode { get; set; }
-
- /// <summary>
- /// 鍔犲伐涓績缂栫爜(鏈哄彴)
- /// </summary>
- [PropertyValidate("鍔犲伐涓績缂栫爜", NotNullAndEmpty = true)]
- public string MakeCode { get; set; }
-
- /// <summary>
- /// 鏄惁灏剧
- /// </summary>
- [PropertyValidate("鏄惁灏剧", NotNullAndEmpty = true)]
- public bool IsMantissa { get; set; }
-
- /// <summary>
- /// 浣嶇疆缂栧彿
- /// </summary>
- [PropertyValidate("浣嶇疆缂栧彿", NotNullAndEmpty = true)]
- public string PointCode { get; set; }
-
- /// <summary>
- /// 鍗峰緞
- /// </summary>
- [PropertyValidate("鍗峰緞", NotNullAndEmpty = true)]
- public decimal Thickness { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [PropertyValidate("骞呭", NotNullAndEmpty = true)]
- public decimal Wide { get; set; }
-
- /// <summary>
- /// 閲嶉噺
- /// </summary>
- [PropertyValidate("閲嶉噺", NotNullAndEmpty = true)]
- public decimal Weight { get; set; }
-
- /// <summary>
- /// 鎴愬搧鍖呮潗绾哥鐗╂枡缂栫爜
- /// </summary>
- [PropertyValidate("鎴愬搧鍖呮潗绾哥鐗╂枡缂栫爜", NotNullAndEmpty = true)]
- public string ProPackCode { get; set; }
-
- /// <summary>
- /// 绠遍暱
- /// </summary>
- [PropertyValidate("绠遍暱", NotNullAndEmpty = true)]
- public decimal Length { get; set; }
-
- /// <summary>
- /// 绠卞
- /// </summary>
- [PropertyValidate("绠卞", NotNullAndEmpty = true)]
- public decimal Width { get; set; }
-
- /// <summary>
- /// 绠遍珮
- /// </summary>
- [PropertyValidate("绠遍珮", NotNullAndEmpty = true)]
- public decimal Height { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESReturnIssueDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESReturnIssueDTO.cs"
deleted file mode 100644
index 196c8d0..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MESReturnIssueDTO.cs"
+++ /dev/null
@@ -1,91 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// MES绌烘墭/浣欐枡鎺ユ敹瀹炰綋
- /// </summary>
- [ModelValidate]
- public class MESReturnIssueDTO
- {
- /// <summary>
- /// 鍛煎彨Id
- /// </summary>
- [PropertyValidate("鍛煎彨Id", NotNullAndEmpty = true)]
- public string IssueId { get; set; }
-
- /// <summary>
- /// 鍔犲伐涓績
- /// </summary>
- [PropertyValidate("鍔犲伐涓績", NotNullAndEmpty = true)]
- public string MakeCode { get; set; }
-
- /// <summary>
- /// 鍛ㄨ浆浣嶇疆缂栧彿
- /// </summary>
- [PropertyValidate("鍛ㄨ浆浣嶇疆缂栧彿", NotNullAndEmpty = true)]
- public string PointCode { get; set; }
-
- /// <summary>
- /// 浣欐枡淇℃伅
- /// </summary>
- [PropertyValidate("浣欐枡淇℃伅", NotNullAndEmpty = false)]
- public MESReturnMaterial? ReturnMaterial { get; set; }
- }
- /// <summary>
- /// 浣欐枡淇℃伅
- /// </summary>
- public class MESReturnMaterial
- {
- /// <summary>
- /// 鏉＄爜淇℃伅
- /// </summary>
- [PropertyValidate("鏉＄爜淇℃伅", NotNullAndEmpty = true)]
- public string BarCode { get; set; }
- /// <summary>
- /// 鐗╂枡浠ｇ爜
- /// </summary>
- [PropertyValidate("鐗╂枡浠ｇ爜", NotNullAndEmpty = true)]
- public string MaterialCode { get; set; }
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- [PropertyValidate("鐗╂枡鎵规", NotNullAndEmpty = true)]
- public string MaterialLot { get; set; }
- /// <summary>
- /// 閫�鏂欐暟閲�
- /// </summary>
- [PropertyValidate("閫�鏂欐暟閲�", NotNullAndEmpty = true)]
- public decimal ReturnQuantity { get; set; }
- /// <summary>
- /// 鏄惁棰嗘枡锛�1鏈鏂� 0宸查鏂欙級
- /// </summary>
- [PropertyValidate("鏄惁棰嗘枡锛�1鏈鏂� 0宸查鏂欙級", NotNullAndEmpty = true)]
- public int Whether { get; set; }
- /// <summary>
- /// 閫�鏂欏伐鍗曞彿(ERP鐩稿叧)
- /// </summary>
- [PropertyValidate("閫�鏂欏伐鍗曞彿(ERP鐩稿叧)", NotNullAndEmpty = false)]
- public string ReturnOrderNo { get; set; }
- /// <summary>
- /// 鐩村緞
- /// </summary>
- [PropertyValidate("鐩村緞", NotNullAndEmpty = true)]
- public decimal Thickness { get; set; }
- /// <summary>
- /// 骞呭
- /// </summary>
- [PropertyValidate("骞呭", NotNullAndEmpty = true)]
- public decimal Wide { get; set; }
- /// <summary>
- /// 閲嶉噺
- /// </summary>
- [PropertyValidate("閲嶉噺", NotNullAndEmpty = true)]
- public decimal Weight { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MesResponseContent.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MesResponseContent.cs"
deleted file mode 100644
index e30e1db..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/MesResponseContent.cs"
+++ /dev/null
@@ -1,101 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO
-{
- /// <summary>
- ///
- /// </summary>
- [ModelValidate]
- public class MesResponseContent
- {
- /// <summary>
- ///
- /// </summary>
- public bool BSucc { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string StrCode { get; set; }
- /// <summary>
- /// 鎵ц鎴愬姛
- /// </summary>
- public string StrMsg { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string DataTime { get; set; }
-
- public static MesResponseContent Instance
- {
- get { return new MesResponseContent(); }
- }
-
- public MesResponseContent OK(string message = null)
- {
- BSucc = true;
- StrCode = "0000";
- StrMsg = message == null ? "鎵ц鎴愬姛" : message;
- DataTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- return this;
- }
-
- public MesResponseContent Error(string message = null)
- {
- BSucc = false;
- StrCode = "404";
- StrMsg = message == null ? "鎵ц澶辫触" : message;
- DataTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- return this;
- }
- public object Content { get; set; }
- }
-
- public class Contents
- {
- public string Contacts { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string MaterialCode { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public decimal Quantity { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- public string Unit { get; set; }
- /// <summary>
- /// 搴撳尯
- /// </summary>
- public string Warehouse { get; set; }
- /// <summary>
- /// 搴撳尯鍚嶇О
- /// </summary>
- public string WarehouseName { get; set; }
- /// <summary>
- /// 瑁佸垏鍚庡搴�
- /// </summary>
- public decimal CutedWidth { get; set; }
- /// <summary>
- /// 杞藉叿鍙�
- /// </summary>
- public string CarrierCode { get; set; }
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- public string MaterialLot { get; set; }
- }
- /// <summary>
- /// PP搴撳瓨鏌ヨ锛屽洖澶峂ES
- /// </summary>
- public class QueryPpByWidthModelCount
- {
-
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/OutMESOrderDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/OutMESOrderDTO.cs"
deleted file mode 100644
index 97035da..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/MES/OutMESOrderDTO.cs"
+++ /dev/null
@@ -1,82 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-
-namespace WIDESEA_DTO.MES
-{
- /// <summary>
- /// MES棰嗘枡璁″垝鎺ユ敹瀹炰綋
- /// </summary>
- [ModelValidate]
- public class OutMESOrderDTO
- {
- /// <summary>
- /// 鍑哄簱鏉ユ簮鏄庣粏ID
- /// </summary>
- [PropertyValidate("鍑哄簱鏉ユ簮鏄庣粏ID", NotNullAndEmpty = true)]
- public int OutDetailId { get; set; }
-
- /// <summary>
- /// 浠撳簱浠ｅ彿
- /// </summary>
- [PropertyValidate("浠撳簱浠ｅ彿", NotNullAndEmpty = true)]
- public string WarehouseCode { get; set; }
-
- /// <summary>
- /// 鐢熶骇璁㈠崟缂栫爜
- /// </summary>
- [PropertyValidate("鐢熶骇璁㈠崟缂栫爜", NotNullAndEmpty = true)]
- public string ProductOrderNo { get; set; }
-
- /// <summary>
- /// 娲惧崟宸ュ崟缂栫爜
- /// </summary>
- [PropertyValidate("娲惧崟宸ュ崟缂栫爜", NotNullAndEmpty = true)]
- public string SendOrderNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [PropertyValidate("鐗╂枡缂栫爜", NotNullAndEmpty = true)]
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- [PropertyValidate("鐗╂枡鎵规", NotNullAndEmpty = false)]
- public string MaterialLot { get; set; }
-
- /// <summary>
- /// 鐗╂枡绛夌骇
- /// </summary>
- [PropertyValidate("鐗╂枡绛夌骇", NotNullAndEmpty = false)]
- public string GradeCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡闇�姹傛暟閲�
- /// </summary>
- [PropertyValidate("鐗╂枡闇�姹傛暟閲�", NotNullAndEmpty = true)]
- public decimal ReqQuantity { get; set; }
-
- /// <summary>
- /// 鍔犲伐涓績缂栫爜(鏈哄彴)
- /// </summary>
- [PropertyValidate("鍔犲伐涓績缂栫爜(鏈哄彴)", NotNullAndEmpty = true)]
- public string MakeCode { get; set; }
-
- /// <summary>
- /// 璁″垝棰嗘枡鏃堕棿
- /// </summary>
- [PropertyValidate("璁″垝棰嗘枡鏃堕棿", NotNullAndEmpty = true)]
- public DateTime PlanDate { get; set; }
-
- /// <summary>
- /// 缁撴潫鏃堕棿
- /// </summary>
- [PropertyValidate("缁撴潫鏃堕棿", NotNullAndEmpty = true)]
- public DateTime EndDate { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Outbound/YLWMSTaskOutDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Outbound/YLWMSTaskOutDTO.cs"
deleted file mode 100644
index cb81b03..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Outbound/YLWMSTaskOutDTO.cs"
+++ /dev/null
@@ -1,31 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_DTO.Outbound
-{
- /// <summary>
- /// 鍘熸枡WMS涓存椂鍑哄簱
- /// </summary>
- public class YLWMSTaskOutDTO
- {
- /// <summary>
- /// 鐗╂枡浠ｇ爜
- /// </summary>
- public string MaterialCode { get; set; }
- /// <summary>
- /// 骞呭
- /// </summary>
- public int Wide { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public int Count { get; set; }
- /// <summary>
- /// 鍦板潃
- /// </summary>
- public string Address { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Stock/ProStockViewDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Stock/ProStockViewDTO.cs"
deleted file mode 100644
index a01cce7..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Stock/ProStockViewDTO.cs"
+++ /dev/null
@@ -1,170 +0,0 @@
-锘縰sing Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_DTO.Stock
-{
- /// <summary>
- /// 鎴愬搧搴撳瓨瑙嗗浘
- /// </summary>
- public class ProStockViewDTO
- {
- /// <summary>
- /// 浠撳簱ID
- /// </summary>
- [ExporterHeader(DisplayName = "浠撳簱ID")]
- public int WarehouseId { get; set; }
- /// <summary>
- /// 璐т綅鍚嶇О
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅鍚嶇О")]
- public string LocationName { get; set; }
- /// <summary>
- /// 璐т綅缂栧彿
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅缂栧彿")]
- public string LocationCode { get; set; }
- /// <summary>
- /// 璐т綅鍒�
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅鍒�")]
- public int Column { get; set; }
-
- /// <summary>
- /// 璐т綅琛�
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅琛�")]
- public int Row { get; set; }
-
- /// <summary>
- /// 璐т綅灞�
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅灞�")]
- public int Layer { get; set; }
- /// <summary>
- /// 搴撳瓨鏁伴噺
- /// </summary>
- [ExporterHeader(DisplayName = "搴撳瓨鏁伴噺")]
- public decimal SumStocks { get; set; }
- /// <summary>
- /// 璐т綅鐘舵��
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅鐘舵��")]
- public int LocationStatus { get; set; }
- /// <summary>
- /// 绂佺敤鐘舵��
- /// </summary>
- [ExporterHeader(IsIgnore = true)]
- public int EnalbeStatus { get; set; }
-
- /// <summary>
- /// 搴撳瓨涓婚敭
- /// </summary>
- [ExporterHeader(IsIgnore = true)]
- public int ProStockId { get; set; }
- /// <summary>
- /// 鍑鸿揣鍗曞彿
- /// </summary>
- [ExporterHeader(DisplayName = "鍑鸿揣鍗曞彿")]
- public string ShipmentOrder { get; set; }
- /// <summary>
- /// 鎵樼洏鍙�
- /// </summary>
- [ExporterHeader(DisplayName = "鎵樼洏鍙�")]
- public string PalletCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡缂栫爜")]
- public string ProductCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡鍚嶇О")]
- public string? ProductName { get; set; }
-
- /// <summary>
- /// 瑙勬牸
- /// </summary>
- [ExporterHeader(DisplayName = "瑙勬牸")]
- public string ProductSpec { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [ExporterHeader(DisplayName = "鍗曚綅")]
- public string ProductUnit { get; set; }
-
- /// <summary>
- /// 浜у搧鎵瑰彿
- /// </summary>
- [ExporterHeader(DisplayName = "浜у搧鎵瑰彿")]
- public string LotNumber { get; set; }
-
- /// <summary>
- /// ERP宸ュ崟
- /// </summary>
- [ExporterHeader(DisplayName = "ERP宸ュ崟")]
- public string ERPOrder { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗�
- /// </summary>
- [ExporterHeader(DisplayName = "閿�鍞鍗�")]
- public string SaleOrder { get; set; }
- /// <summary>
- /// 搴撳瓨灞炴��
- /// </summary>
- [ExporterHeader(DisplayName = "搴撳瓨灞炴��")]
- public int ProStockAttribute { get; set; }
- /// <summary>
- /// 搴撳瓨鐘舵��
- /// </summary>
- [ExporterHeader(IsIgnore = true)]
- public int StockStatus { get; set; }
-
- /// <summary>
- /// 搴撳瓨澶囨敞
- /// </summary>
- [ExporterHeader(DisplayName = "搴撳瓨澶囨敞")]
- public string StockRemark { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [ExporterHeader(DisplayName = "鍒涘缓浜�")]
- public string Creater { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [ExporterHeader(DisplayName = "鍒涘缓鏃堕棿")]
- public DateTime CreateDate { get; set; }
-
- /// <summary>
- /// 淇敼浜�
- /// </summary>
- [ExporterHeader(DisplayName = "淇敼浜�")]
- public string Modifier { get; set; }
-
- /// <summary>
- /// 淇敼鏃堕棿
- /// </summary>
- [ExporterHeader(DisplayName = "淇敼鏃堕棿")]
- public DateTime? ModifyDate { get; set; }
-
- /// <summary>
- /// 搴撳瓨璇︽儏
- /// </summary>
- [ExporterHeader(IsIgnore = true)]
- [Navigate(NavigateType.OneToMany, nameof(Dt_ProStockInfoDetail.ProStockId), nameof(ProStockId))]
- public List<Dt_ProStockInfoDetail> Details { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Stock/StockViewDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Stock/StockViewDTO.cs"
deleted file mode 100644
index ad1c2c6..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/Stock/StockViewDTO.cs"
+++ /dev/null
@@ -1,73 +0,0 @@
-锘縰sing Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_DTO.Stock
-{
- /// <summary>
- /// 搴撳瓨鍒嗙被缁熻/鎬绘暟
- /// </summary>
- public class StockViewDTO
- {
- /// <summary>
- /// 浠撳簱ID
- /// </summary>
- [ExporterHeader(DisplayName = "浠撳簱ID")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡缂栧彿")]
- public string MaterielCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡骞呭")]
- public string MaterielWide { get; set; }
-
- /// <summary>
- /// 搴撳瓨鎬婚暱
- /// </summary>
- [ExporterHeader(DisplayName = "搴撳瓨鎬婚暱")]
- public decimal StockQuantity { get; set; }
-
- /// <summary>
- /// 鍑哄簱鏁伴噺
- /// </summary>
- [ExporterHeader(DisplayName = "鍑哄簱鏁伴噺")]
- public decimal OutboundQuantity { get; set; }
-
- /// <summary>
- /// 搴撳瓨鐘舵��
- /// </summary>
- [ExporterHeader(IsIgnore = true)]
- public int StockStatus { get; set; }
-
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [ExporterHeader(DisplayName = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [ExporterHeader(DisplayName = "澶囨敞")]
- public string Remark { get; set; }
-
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/WIDESEA_DTO.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/WIDESEA_DTO.csproj"
index 502ce7c..12bd2e6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/WIDESEA_DTO.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_DTO/WIDESEA_DTO.csproj"
@@ -11,4 +11,8 @@
<ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="Stock\" />
+ </ItemGroup>
+
</Project>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IAGVStationInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IAGVStationInfoRepository.cs"
deleted file mode 100644
index aa1ee44..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IAGVStationInfoRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicRepository
-{
- /// <summary>
- /// 鎺ュ彛淇℃伅浠撳偍鎺ュ彛灞�
- /// </summary>
- public interface IAGVStationInfoRepository : IRepository<Dt_AGVStationInfo>
- {
-
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IBasicRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IBasicRepository.cs"
index 68d2134..34ffbef 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IBasicRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IBasicRepository.cs"
@@ -12,17 +12,7 @@
{
ILocationInfoRepository LocationInfoRepository { get; }
- IMaterielInfoRepository MaterielInfoRepository { get; }
-
IWarehouseRepository WarehouseRepository { get; }
-
- IPalletTypeInfoRepository PalletTypeInfoRepository { get; }
-
- ISupplierInfoRepository SupplierInfoRepository { get; }
- ICustomerInfoRepository CustomerInfoRepository { get; }
- IMakeCenterInfoRepository MakeCenterInfoRepository { get; }
-
- IAGVStationInfoRepository AGVStationInfoRepository { get; }
IApiInfoRepository ApiInfoRepository { get; }
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/ICustomerInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/ICustomerInfoRepository.cs"
deleted file mode 100644
index 18685f9..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/ICustomerInfoRepository.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicRepository
-{
- /// <summary>
- /// 瀹㈡埛淇℃伅浠撳偍鎺ュ彛灞�
- /// </summary>
- public interface ICustomerInfoRepository : IRepository<Dt_CustomerInfo>
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IMakeCenterInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IMakeCenterInfoRepository.cs"
deleted file mode 100644
index 815c382..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IMakeCenterInfoRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicRepository
-{
- /// <summary>
- /// 鐗╂枡淇℃伅浠撳偍鎺ュ彛灞�
- /// </summary>
- public interface IMakeCenterInfoRepository : IRepository<Dt_MakeCenterInfo>
- {
-
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IMaterielCodeInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IMaterielCodeInfoRepository.cs"
deleted file mode 100644
index 3b32f57..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IMaterielCodeInfoRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicRepository
-{
- public interface IMaterielCodeInfoRepository : IRepository<Dt_MaterielCodeInfo>
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IMaterielInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IMaterielInfoRepository.cs"
deleted file mode 100644
index ac38d73..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IMaterielInfoRepository.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicRepository
-{
- /// <summary>
- /// 鐗╂枡淇℃伅浠撳偍鎺ュ彛灞�
- /// </summary>
- public interface IMaterielInfoRepository : IRepository<Dt_MaterielInfo>
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IPalletCodeInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IPalletCodeInfoRepository.cs"
deleted file mode 100644
index a348322..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IPalletCodeInfoRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicRepository
-{
- public interface IPalletCodeInfoRepository : IRepository<Dt_PalletCodeInfo>
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IPalletTypeInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IPalletTypeInfoRepository.cs"
deleted file mode 100644
index 5eef1f6..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/IPalletTypeInfoRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicRepository
-{
- public interface IPalletTypeInfoRepository : IRepository<Dt_PalletTypeInfo>
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/ISupplierInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/ISupplierInfoRepository.cs"
deleted file mode 100644
index bd20303..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicRepository/ISupplierInfoRepository.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicRepository
-{
- /// <summary>
- /// 渚涘簲鍟嗕俊鎭粨鍌ㄦ帴鍙ｅ眰
- /// </summary>
- public interface ISupplierInfoRepository : IRepository<Dt_SupplierInfo>
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IAGVStationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IAGVStationInfoService.cs"
deleted file mode 100644
index f7b4519..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IAGVStationInfoService.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
-using WIDESEA_IBasicRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicService
-{
- public interface IAGVStationInfoService : IService<Dt_AGVStationInfo>
- {
- IAGVStationInfoRepository Repository { get; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IApiInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IApiInfoService.cs"
index 0a6dad0..588692a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IApiInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IApiInfoService.cs"
@@ -1,12 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
+锘縰sing WIDESEA_Core.BaseServices;
using WIDESEA_IBasicRepository;
using WIDESEA_Model.Models;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IBasicService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IBasicService.cs"
index 3780907..08632b5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IBasicService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IBasicService.cs"
@@ -15,22 +15,9 @@
ILocationInfoService LocationInfoService { get; }
/// <summary>
- /// 鐗╂枡涓氬姟灞�
- /// </summary>
- IMaterielInfoService MaterielInfoService { get; }
-
- /// <summary>
/// 浠撳簱涓氬姟灞�
/// </summary>
IWarehouseService WarehouseService { get; }
-
- IPalletCodeInfoService PalletCodeInfoService { get; }
-
- IMaterielCodeInfoService MaterielCodeInfoService { get; }
-
- ISupplierInfoService SupplierInfoService { get; }
-
- ICustomerInfoService CustomerInfoService { get; }
IUserInfoService UserInfoService { get; }
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/ICustomerInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/ICustomerInfoService.cs"
deleted file mode 100644
index 096361c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/ICustomerInfoService.cs"
+++ /dev/null
@@ -1,25 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
-using WIDESEA_IBasicRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicService
-{
- public interface ICustomerInfoService : IService<Dt_CustomerInfo>
- {
- ICustomerInfoRepository Repository { get; }
- /// <summary>
- /// 鎺ユ敹浜屾湡瀹㈡埛淇℃伅
- /// </summary>
- /// <param name="eRPCustomerDTO"></param>
- /// <returns></returns>
- WebResponseContent ReceiveCustomer(ERPCustomerDTO eRPCustomerDTO);
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/ILocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/ILocationInfoService.cs"
index b1a21d1..e3775c3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/ILocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/ILocationInfoService.cs"
@@ -51,36 +51,5 @@
/// <param name="initializationLocationDTO"></param>
/// <returns></returns>
WebResponseContent InitializationLocation(InitializationLocationDTO initializationLocationDTO);
-
- /// <summary>
- /// 璐т綅鍒嗛厤閫昏緫
- /// </summary>
- /// <param name="roadwayNo">宸烽亾鍙�</param>
- /// <param name="palletType">鎵樼洏绫诲瀷</param>
- /// <returns></returns>
- Dt_LocationInfo? AssignLocation(string roadwayNo, int palletType, int warehouseId, Dt_StockInfo? stockInfo = null);
-
- /// <summary>
- /// 淇敼璐т綅鐘舵�佸強绫诲瀷
- /// </summary>
- /// <param name="locationCode">璐т綅缂栧彿</param>
- /// <param name="palletType">鎵樼洏绫诲瀷</param>
- /// <param name="locationStatus">璐т綅鐘舵��</param>
- void UpdateLocationStatus(string locationCode, int palletType, LocationStatusEnum locationStatus, int warehousId);
-
- /// <summary>
- /// 淇敼璐т綅鐘舵�佸強绫诲瀷
- /// </summary>
- /// <param name="location">璐т綅瀵硅薄</param>
- /// <param name="palletType">鎵樼洏绫诲瀷</param>
- /// <param name="locationStatus">璐т綅鐘舵��</param>
- void UpdateLocationStatus(Dt_LocationInfo location, int palletType, LocationStatusEnum locationStatus, int warehousId);
-
- /// <summary>
- /// 鑾峰彇涓嶅悓娣卞害鐨勫悓缁勮揣浣嶄俊鎭�
- /// </summary>
- /// <param name="location"></param>
- /// <returns></returns>
- List<Dt_LocationInfo> GetGroupLocations(Dt_LocationInfo location);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IMakeCenterInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IMakeCenterInfoService.cs"
deleted file mode 100644
index 0a50b06..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IMakeCenterInfoService.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IBasicRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicService
-{
- /// <summary>
- /// 鍔犲伐涓績鎺ュ彛涓氬姟灞�
- /// </summary>
- public interface IMakeCenterInfoService : IService<Dt_MakeCenterInfo>
- {
- IMakeCenterInfoRepository Repository { get; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IMaterielCodeInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IMaterielCodeInfoService.cs"
deleted file mode 100644
index 507be03..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IMaterielCodeInfoService.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicService
-{
- public interface IMaterielCodeInfoService : IService<Dt_MaterielCodeInfo>
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IMaterielInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IMaterielInfoService.cs"
deleted file mode 100644
index 2c7d3e2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IMaterielInfoService.cs"
+++ /dev/null
@@ -1,68 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
-using WIDESEA_IBasicRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicService
-{
- public interface IMaterielInfoService : IService<Dt_MaterielInfo>
- {
- IMaterielInfoRepository Repository { get; }
-
- /// <summary>
- /// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
- /// </summary>
- /// <param name="materielCode">鐗╂枡缂栧彿</param>
- /// <returns></returns>
- bool ExsitMateriel(string materielCode);
-
- /// <summary>
- /// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
- /// </summary>
- /// <param name="materielCodes">鐗╂枡缂栧彿闆嗗悎</param>
- /// <returns></returns>
- bool ExsitMateriels(List<string> materielCodes);
-
- /// <summary>
- /// 鑾峰彇鐗╂枡淇℃伅
- /// </summary>
- /// <param name="materielCode">鐗╂枡缂栧彿</param>
- /// <returns></returns>
- Dt_MaterielInfo GetMaterielInfo(string materielCode);
-
- /// <summary>
- /// 鏌ヨ鐗╂枡淇℃伅
- /// </summary>
- /// <param name="materielCodes"></param>
- /// <returns></returns>
- List<Dt_MaterielInfo> GetMaterielInfos(List<string> materielCodes);
-
- /// <summary>
- /// 鑾峰彇搴撳尯鐗╂枡淇℃伅
- /// </summary>
- /// <param name="warehouseId"></param>
- /// <returns></returns>
- WebResponseContent GetWarehouseMaterielInfos(int warehouseId);
-
- /// <summary>
- /// 娣诲姞鑰佸巶鐗╂枡
- /// </summary>
- /// <param name="bSTMaterialDTO"></param>
- /// <returns></returns>
- WebResponseContent AddMaterial(List<BSTMaterialDTO> bSTMaterialDTOs );
-
- /// <summary>
- /// 娣诲姞浜屾湡鐗╂枡
- /// </summary>
- /// <param name="eRPMaterialDTOs"></param>
- /// <returns></returns>
- WebResponseContent ReceiveMaterial(ERPMaterialDTO eRPMaterialDTO);
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IPalletCodeInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IPalletCodeInfoService.cs"
deleted file mode 100644
index 1961cf4..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IPalletCodeInfoService.cs"
+++ /dev/null
@@ -1,31 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicService
-{
- public interface IPalletCodeInfoService : IService<Dt_PalletCodeInfo>
- {
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="warehouseId"></param>
- /// <param name="count"></param>
- /// <param name="palletTypeId"></param>
- /// <returns></returns>
- WebResponseContent AddData(int warehouseId, int count, int palletTypeId);
-
- /// <summary>
- /// 鏇存柊鎵撳嵃鐘舵��
- /// </summary>
- /// <param name="printCode"></param>
- /// <returns></returns>
- WebResponseContent PrintStatusUp(string printCode);
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/ISupplierInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/ISupplierInfoService.cs"
deleted file mode 100644
index dceb9f7..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/ISupplierInfoService.cs"
+++ /dev/null
@@ -1,31 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Basic;
-using WIDESEA_IBasicRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IBasicService
-{
- public interface ISupplierInfoService : IService<Dt_SupplierInfo>
- {
- ISupplierInfoRepository Repository { get; }
-
- /// <summary>
- /// 娣诲姞鑰佸巶渚涘簲鍟嗕俊鎭�
- /// </summary>
- /// <param name="bSTSupplierDTOs"></param>
- /// <returns></returns>
- WebResponseContent AddSupplier(List<BSTSupplierDTO> bSTSupplierDTOs);
- /// <summary>
- /// 娣诲姞浜屾湡渚涘簲鍟嗕俊鎭�
- /// </summary>
- /// <param name="eRPSupplierDTO"></param>
- /// <returns></returns>
- WebResponseContent ReceiveSupplier(ERPSupplierDTO eRPSupplierDTO);
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IUserInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IUserInfoService.cs"
index 037f171..64d73de 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IUserInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IUserInfoService.cs"
@@ -1,12 +1,5 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
+锘縰sing WIDESEA_Core;
using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
using WIDESEA_IBasicRepository;
using WIDESEA_Model.Models;
@@ -14,12 +7,5 @@
{
public interface IUserInfoService:IService<Dt_UserInfo>
{
- IUserInfoRepository Repository { get; }
- /// <summary>
- /// 鎺ユ敹浜屾湡鍛樺伐淇℃伅
- /// </summary>
- /// <param name="content"></param>
- /// <returns></returns>
- WebResponseContent ReceiveStaff(ERPUserInfoDTO content);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IWarehouseService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IWarehouseService.cs"
index fbe0142..7bb7d4c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IWarehouseService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IBasicService/IWarehouseService.cs"
@@ -42,10 +42,5 @@
/// <returns></returns>
WebResponseContent WarehouseDisableStatus(int key);
- /// <summary>
- ///
- /// </summary>
- /// <returns></returns>
- WebResponseContent GetWarehouseDicByUser();
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IRecordRepository/IRecordRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IRecordRepository/IRecordRepository.cs"
deleted file mode 100644
index aa89557..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IRecordRepository/IRecordRepository.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-
-namespace WIDESEA_IRecordRepository
-{
- public interface IRecordRepository : IDependency
- {
- ILocationStatusChangeRecordRepository LocationStatusChangeRecordRepository { get; }
-
- IStockQuantityChangeRecordRepository StockQuantityChangeRecordRepository { get; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IRecordRepository/IStockQuantityChangeRecordRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IRecordRepository/IStockQuantityChangeRecordRepository.cs"
deleted file mode 100644
index 7dbf84e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IRecordRepository/IStockQuantityChangeRecordRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRecordRepository
-{
- public interface IStockQuantityChangeRecordRepository : IRepository<Dt_StockQuantityChangeRecord>
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IRecordService/IRecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IRecordService/IRecordService.cs"
deleted file mode 100644
index 5c9e120..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IRecordService/IRecordService.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-
-namespace WIDESEA_IRecordService
-{
- public interface IRecordService : IDependency
- {
- ILocationStatusChangeRecordService LocationStatusChangeRecordSetvice { get; }
-
- IStockQuantityChangeRecordService StockQuantityChangeRecordService { get; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IRecordService/IStockQuantityChangeRecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IRecordService/IStockQuantityChangeRecordService.cs"
deleted file mode 100644
index e858fea..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IRecordService/IStockQuantityChangeRecordService.cs"
+++ /dev/null
@@ -1,39 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.StockEnum;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_IRecordRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IRecordService
-{
- public interface IStockQuantityChangeRecordService : IService<Dt_StockQuantityChangeRecord>
- {
- IStockQuantityChangeRecordRepository Repository { get; }
- /// <summary>
- /// 鍗锋枡鍙樺姩搴撳瓨璁板綍
- /// </summary>
- /// <param name="stockInfo">搴撳瓨</param>
- /// <param name="beforeQuantity">鍙樺姩鍓嶅簱瀛�</param>
- /// <param name="changeQuantity">鍙樺姩搴撳瓨</param>
- /// <param name="changeType">鍙樺姩绫诲瀷</param>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="orderNo">鍗曟嵁缂栧彿</param>
- void AddStockChangeRecord(Dt_StockInfo stockInfo, decimal beforeQuantity, decimal changeQuantity, StockChangeTypeEnum changeType, int? taskNum = 0, string orderNo = "");
- /// <summary>
- /// 鎴愬搧杈呮枡搴撳瓨璁板綍
- /// </summary>
- /// <param name="proStockInfo">搴撳瓨</param>
- /// <param name="beforeQuantity">鍙樺姩鍓嶅簱瀛�</param>
- /// <param name="changeQuantity">鍙樺姩搴撳瓨</param>
- /// <param name="changeType">鍙樺姩绫诲瀷</param>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="orderNo"></param>
- /// <exception cref="Exception"></exception>
- void AddStockChangeRecord(Dt_ProStockInfo proStockInfo, decimal beforeQuantity, decimal changeQuantity, StockChangeTypeEnum changeType, int? taskNum = null, string orderNo = "");
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderRepository/ISortOrderDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderRepository/ISortOrderDetailRepository.cs"
new file mode 100644
index 0000000..7f52a45
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderRepository/ISortOrderDetailRepository.cs"
@@ -0,0 +1,11 @@
+锘縰sing WIDESEA_Core.BaseRepository;
+using WIDESEA_Model.Models;
+using WIDESEA_Core;
+
+namespace WIDESEA_ISortOrderRepository
+{
+ public interface ISortOrderDetailRepository : IRepository<Dt_SortOrderDetail>
+ {
+
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderRepository/ISortOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderRepository/ISortOrderRepository.cs"
new file mode 100644
index 0000000..419fa21
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderRepository/ISortOrderRepository.cs"
@@ -0,0 +1,11 @@
+锘縰sing WIDESEA_Core.BaseRepository;
+using WIDESEA_Model.Models;
+using WIDESEA_Core;
+
+namespace WIDESEA_ISortOrderRepository
+{
+ public interface ISortOrderRepository : IRepository<Dt_SortOrder>
+ {
+
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderRepository/WIDESEA_ISortOrderRepository.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderRepository/WIDESEA_ISortOrderRepository.csproj"
new file mode 100644
index 0000000..a70161f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderRepository/WIDESEA_ISortOrderRepository.csproj"
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEA_DTO\WIDESEA_DTO.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderService/ISortOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderService/ISortOrderDetailService.cs"
new file mode 100644
index 0000000..4d24c89
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderService/ISortOrderDetailService.cs"
@@ -0,0 +1,11 @@
+锘縰sing WIDESEA_Core.BaseServices;
+using WIDESEA_ISortOrderRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_ISortOrderService
+{
+ public interface ISortOrderDetailService : IService<Dt_SortOrderDetail>
+ {
+ ISortOrderDetailRepository Repository { get; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderService/ISortOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderService/ISortOrderService.cs"
new file mode 100644
index 0000000..665b531
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderService/ISortOrderService.cs"
@@ -0,0 +1,11 @@
+锘縰sing WIDESEA_Core.BaseServices;
+using WIDESEA_ISortOrderRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_ISortOrderService
+{
+ public interface ISortOrderService : IService<Dt_SortOrder>
+ {
+ ISortOrderRepository Repository { get; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderService/WIDESEA_ISortOrderService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderService/WIDESEA_ISortOrderService.csproj"
new file mode 100644
index 0000000..3d37376
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortOrderService/WIDESEA_ISortOrderService.csproj"
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEA_SortOrderRepository\WIDESEA_SortOrderRepository.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortRepository/ISortOrderDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortRepository/ISortOrderDetailRepository.cs"
new file mode 100644
index 0000000..4ae567d
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortRepository/ISortOrderDetailRepository.cs"
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_ISortRepository
+{
+ public interface ISortOrderDetailRepository : IRepository<Dt_SortOrderDetail>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortRepository/ISortOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortRepository/ISortOrderRepository.cs"
new file mode 100644
index 0000000..e534721
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortRepository/ISortOrderRepository.cs"
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_ISortRepository
+{
+ public interface ISortOrderRepository : IRepository<Dt_SortOrder>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortRepository/WIDESEA_ISortRepository.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortRepository/WIDESEA_ISortRepository.csproj"
new file mode 100644
index 0000000..17d93c8
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortRepository/WIDESEA_ISortRepository.csproj"
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEA_Core\WIDESEA_Core.csproj" />
+ <ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortService/ISortOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortService/ISortOrderDetailService.cs"
new file mode 100644
index 0000000..c103a2a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortService/ISortOrderDetailService.cs"
@@ -0,0 +1,16 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_ISortRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_ISortService
+{
+ public interface ISortOrderDetailService : IService<Dt_SortOrderDetail>
+ {
+ ISortOrderDetailRepository Repository { get; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortService/ISortOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortService/ISortOrderService.cs"
new file mode 100644
index 0000000..a137e5c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortService/ISortOrderService.cs"
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_ISortRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_ISortService
+{
+ public interface ISortOrderService : IService<Dt_SortOrder>
+ {
+
+ WebResponseContent GetAll();
+
+ ISortOrderRepository Repository { get; }
+
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortService/WIDESEA_ISortService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortService/WIDESEA_ISortService.csproj"
new file mode 100644
index 0000000..938fd0f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ISortService/WIDESEA_ISortService.csproj"
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEA_ISortRepository\WIDESEA_ISortRepository.csproj" />
+ <ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IBlankStockInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IBlankStockInfoRepository.cs"
new file mode 100644
index 0000000..d5c9706
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IBlankStockInfoRepository.cs"
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_IStockRepository
+{
+ public interface IBlankStockInfoRepository : IRepository<Dt_BlankStockInfo>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IBlankStockInfo_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IBlankStockInfo_HtyRepository.cs"
new file mode 100644
index 0000000..edc3bb2
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IBlankStockInfo_HtyRepository.cs"
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_IStockRepository
+{
+ public interface IBlankStockInfo_HtyRepository : IRepository<Dt_BlankStockInfo_Hty>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IMouldStockInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IMouldStockInfoRepository.cs"
new file mode 100644
index 0000000..00b2e5f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IMouldStockInfoRepository.cs"
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_IStockRepository
+{
+ public interface IMouldStockInfoRepository : IRepository<Dt_MouldStockInfo>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IMouldStockInfo_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IMouldStockInfo_HtyRepository.cs"
new file mode 100644
index 0000000..ac50f0f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IMouldStockInfo_HtyRepository.cs"
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_IStockRepository
+{
+ public interface IMouldStockInfo_HtyRepository : IRepository<Dt_MouldStockInfo_Hty>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IProStockInfoDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IProStockInfoDetailRepository.cs"
deleted file mode 100644
index dc47aab..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IProStockInfoDetailRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IStockRepository
-{
- public interface IProStockInfoDetailRepository : IRepository<Dt_ProStockInfoDetail>
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IProStockInfoDetail_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IProStockInfoDetail_HtyRepository.cs"
deleted file mode 100644
index cd5f98d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IProStockInfoDetail_HtyRepository.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IStockRepository
-{
- public interface IProStockInfoDetail_HtyRepository : IRepository<Dt_ProStockInfoDetail_Hty>
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IStockInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IStockInfoRepository.cs"
deleted file mode 100644
index ce468ae..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IStockInfoRepository.cs"
+++ /dev/null
@@ -1,32 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_DTO.Stock;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IStockRepository
-{
- public interface IStockInfoRepository : IRepository<Dt_StockInfo>
- {
- Dt_StockInfo GetStockInfo(string palletCode);
-
- List<Dt_StockInfo> GetStockInfos(string materielCode);
-
- List<Dt_StockInfo> GetStockInfos(int materielId,decimal width, List<string> locationCodes);
- /// <summary>
- /// 鑾峰彇鐢熺鍙娇鐢ㄥ簱瀛�
- /// </summary>
- List<Dt_StockInfo> GetStockInfos(string materielCode, decimal width, List<string> locationCodes);
-
- List<Dt_StockInfo> GetStockInfos(string materielCode, List<string> locationCodes);
-
- List<Dt_StockInfo> GetStockInfosByIds(List<int> ids);
-
- List<Dt_StockInfo> GetStockInfosByPalletCodes(List<string> palletCodes);
-
- List<Dt_StockInfo> GetStockInfosExclude(string materielCode, List<string> palletCodes);
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IStockInfo_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IStockInfo_HtyRepository.cs"
deleted file mode 100644
index cbeccbb..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IStockInfo_HtyRepository.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_DTO.Stock;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IStockRepository
-{
- public interface IStockInfo_HtyRepository : IRepository<Dt_StockInfo_Hty>
- {
-
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IStockRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IStockRepository.cs"
deleted file mode 100644
index 44839b5..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockRepository/IStockRepository.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-
-namespace WIDESEA_IStockRepository
-{
- public interface IStockRepository : IDependency
- {
- IStockInfoRepository StockInfoRepository { get; }
- IStockInfo_HtyRepository StockInfo_HtyRepository { get; }
- IProStockInfoRepository ProStockInfoRepository { get; }
- IProStockInfoDetailRepository ProStockInfoDetailRepository { get; }
- IProStockInfo_HtyRepository ProStockInfo_HtyRepository { get; }
- IProStockInfoDetail_HtyRepository ProStockInfoDetail_HtyRepository { get; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IBlankStockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IBlankStockInfoService.cs"
new file mode 100644
index 0000000..d4ca0de
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IBlankStockInfoService.cs"
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_IStockService
+{
+ public interface IBlankStockInfoService : IService<Dt_BlankStockInfo>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IBlankStockInfo_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IBlankStockInfo_HtyService.cs"
new file mode 100644
index 0000000..946f1fc
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IBlankStockInfo_HtyService.cs"
@@ -0,0 +1,16 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_IStockRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_IStockService
+{
+ public interface IBlankStockInfo_HtyService : IService<Dt_BlankStockInfo_Hty>
+ {
+ IBlankStockInfo_HtyRepository Repository { get; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IMouldStockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IMouldStockInfoService.cs"
new file mode 100644
index 0000000..13c1830
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IMouldStockInfoService.cs"
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_IStockService
+{
+ public interface IMouldStockInfoService : IService<Dt_MouldStockInfo>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IMouldStockInfo_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IMouldStockInfo_HtyService.cs"
new file mode 100644
index 0000000..2f40f80
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IMouldStockInfo_HtyService.cs"
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_IStockService
+{
+ public interface IMouldStockInfo_HtyService : IService<Dt_MouldStockInfo_Hty>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IProStockInfoDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IProStockInfoDetailService.cs"
deleted file mode 100644
index a48f918..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IProStockInfoDetailService.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IStockRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IStockService
-{
- public interface IProStockInfoDetailService : IService<Dt_ProStockInfoDetail>
- {
- IProStockInfoDetailRepository Repository { get; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IProStockInfoDetail_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IProStockInfoDetail_HtyService.cs"
deleted file mode 100644
index 6659594..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IProStockInfoDetail_HtyService.cs"
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IStockRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IStockService
-{
- public interface IProStockInfoDetail_HtyService : IService<Dt_ProStockInfoDetail_Hty>
- {
- IProStockInfoDetail_HtyRepository Repository { get; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IProStockViewService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IProStockViewService.cs"
deleted file mode 100644
index 8460ffe..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IProStockViewService.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_DTO.Stock;
-
-namespace WIDESEA_IStockService
-{
- public interface IProStockViewService : IDependency
- {
- PageGridData<ProStockViewDTO> GetPageData(PageDataOptions options);
-
- object GetDetailPage(PageDataOptions pageData);
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IStockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IStockInfoService.cs"
deleted file mode 100644
index 323451d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IStockInfoService.cs"
+++ /dev/null
@@ -1,50 +0,0 @@
-锘縰sing OfficeOpenXml.FormulaParsing.Excel.Operators;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IStockRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IStockService
-{
- public interface IStockInfoService : IService<Dt_StockInfo>
- {
- IStockInfoRepository Repository { get; }
- WebResponseContent StockQueryData(SaveModel saveModel);
- /// <summary>
- /// 鎵嬪姩缁勭洏
- /// </summary>
- WebResponseContent ManualMaterielGroup(SaveModel saveModel);
- /// <summary>
- /// 鏇存柊鑰佸巶娈嬪嵎搴撳瓨
- /// </summary>
- /// <returns></returns>
- WebResponseContent UpBSTStock(int operate);
- /// <summary>
- /// 鑾峰彇鍙娇鐢ㄥ簱瀛�
- /// </summary>
- List<Dt_StockInfo> GetUseableStocks(int materielId,decimal width, int warehoseId);
- /// <summary>
- /// 鑾峰彇鐢熺鍙娇鐢ㄥ簱瀛�
- /// </summary>
- List<Dt_StockInfo> GetUseableStocks(string materielCode, decimal width, int warehoseId);
- /// <summary>
- /// 鑾峰彇鍙娇鐢ㄥ簱瀛�
- /// </summary>
- List<Dt_StockInfo> GetUseableStocks(string materielCode, int warehoseId);
- /// <summary>
- /// 鍒嗛厤瀹為檯搴撳瓨
- /// </summary>
- List<Dt_StockInfo> GetOutboundStocks(List<Dt_StockInfo> stockInfos, decimal needQuantity);
-
- /// <summary>
- /// 鍒嗛厤鑰佸巶搴撳瓨
- /// </summary>
- List<Dt_StockInfo> GetOutOldStocks(List<Dt_StockInfo> stockInfos, decimal needQuantity);
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IStockInfo_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IStockInfo_HtyService.cs"
deleted file mode 100644
index faad892..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IStockInfo_HtyService.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IStockRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IStockService
-{
- public interface IStockInfo_HtyService : IService<Dt_StockInfo_Hty>
- {
- IStockInfo_HtyRepository Repository { get; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IStockService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IStockService.cs"
deleted file mode 100644
index 7db380d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IStockService.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-
-namespace WIDESEA_IStockService
-{
- public interface IStockService : IDependency
- {
- IStockInfoService StockInfoService { get; }
- IStockInfo_HtyService StockInfo_HtyService { get; }
- IProStockInfoService ProStockInfoService { get; }
- IProStockInfoDetailService ProStockInfoDetailService { get; }
- IProStockInfo_HtyService ProStockInfo_HtyService { get; }
- IProStockInfoDetail_HtyService ProStockInfoDetail_HtyService { get; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IStockViewService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IStockViewService.cs"
deleted file mode 100644
index 55a7f27..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_IStockService/IStockViewService.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_DTO.Stock;
-
-namespace WIDESEA_IStockService
-{
- public interface IStockViewService : IDependency
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs"
index 88fc6d7..a508fc1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -15,23 +15,8 @@
*----------------------------------------------------------------*/
#endregion << 鐗� 鏈� 娉� 閲� >>
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.CommonEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_DTO;
-using WIDESEA_DTO.ERP;
-using WIDESEA_DTO.MES;
-using WIDESEA_DTO.Outbound;
-using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoRepository;
using WIDESEA_Model.Models;
@@ -57,78 +42,6 @@
/// <param name="agvDescription"></param>
/// <returns></returns>
WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "");
-
- /// <summary>
- /// 浠呯敵璇蜂换鍔★紝璁￤CS鏍规嵁璺敱纭畾涓嬩竴鍦板潃
- /// </summary>
- /// <param name="stationCode"></param>
- /// <param name="palletCode"></param>
- /// <returns></returns>
- WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode);
-
- /// <summary>
- /// 鍘熸枡鍏ュ簱浠诲姟璇锋眰
- /// </summary>
- /// <returns></returns>
- WebResponseContent RequestYLWMSTaskSimple(string stationCode, string palletCode);
-
- /// <summary>
- /// 鍘熸枡鍏ュ簱鐢宠
- /// </summary>
- /// <param name="palletCode"></param>
- /// <returns></returns>
- WebResponseContent YLPurchaseBoxing(string palletCode, decimal weight = 0, decimal thickness = 0, decimal wide = 0,string stationCode = "");
- /// <summary>
- /// 鍘熸枡閲囪喘缁戝畾RFID
- /// </summary>
- /// <param name="palletCode">绾稿嵎鏉＄爜</param>
- /// <returns></returns>
- WebResponseContent PurchaseBoxing(string palletCode, int orderType = 0);
-
- /// <summary>
- /// 鍒嗛厤鍘熸枡宸烽亾
- /// </summary>
- /// <returns></returns>
- string AssignYLRoadwayNo(string palletCode);
-
-
- /// <summary>
- /// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="roadwayNo">宸烽亾鍙�</param>
- /// <param name="palletType">鎵樼洏绫诲瀷</param>
- /// <returns></returns>
- WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo);
-
- /// <summary>
- /// 鍚慦MS鐢宠鍑哄簱AGV缁堢偣
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <returns></returns>
- WebResponseContent AssignOutTargetAddress(int taskNum);
-
- /// <summary>
- /// 浠诲姟瀹屾垚
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- Task<WebResponseContent> TaskCompleted(int taskNum);
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="taskNum"></param>
- /// <param name="locationCode"></param>
- /// <returns></returns>
- //WebResponseContent IsRelocation(int taskNum, string locationCode);
-
- /// <summary>
- /// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟
- /// </summary>
- /// <param name="id"></param>
- /// <returns></returns>
- WebResponseContent Outbound(List<int> ids);
/// <summary>
/// 淇敼浠诲姟鐘舵��
@@ -137,128 +50,5 @@
/// <returns></returns>
WebResponseContent UpdateTaskInfo(WCSTaskDTO task);
- /// <summary>
- /// 鎴愬搧绌烘墭鍥炲簱
- /// </summary>
- /// <param name="barCode"></param>
- /// <param name="startPoint"></param>
- /// <returns></returns>
- WebResponseContent EmptyBackTask(string barCode, string startPoint);
-
- /// <summary>
- /// 杈呮枡/鎴愬搧涓存椂鍏ュ簱
- /// </summary>
- /// <returns></returns>
- WebResponseContent InboundFLOrCPTask(string barCode, string startPoint, string matCode, int matCount,int oneCount);
-
- /// <summary>
- /// 杈呮枡(鎴愬搧)閲囪喘/鏈熷垵鍏ュ簱
- /// </summary>
- /// <returns></returns>
- WebResponseContent InboundOrderInTask(string bindCode, string barCode, string startPoint, int orderType = 0);
-
- /// <summary>
- /// 鎴愬搧鍑哄簱
- /// </summary>
- /// <returns></returns>
- WebResponseContent RequestCPWMSTaskOut(string materialCode, int Count,string targetId);
-
- ///// <summary>
- ///// 鏃犵汉甯冨嚭搴�
- ///// </summary>
- ///// <param name="Count"></param>
- ///// <returns></returns>
- //WebResponseContent RequestWFBWMSTaskOut(int Count);
-
- /// <summary>
- /// 鍘熸枡鍑哄簱浠诲姟
- /// </summary>
- /// <param name="materielCode">鐗╂枡浠ｇ爜</param>
- /// <param name="materielWide">鐗╂枡骞呭</param>
- /// <param name="Count">鍗锋暟</param>
- /// <returns></returns>
- WebResponseContent RequestYLWMSTaskOut(YLWMSTaskOutDTO yLWMSTaskOutDTO);
-
- /// <summary>
- /// 鍘熸枡绉诲簱
- /// </summary>
- /// <param name="startAddress"></param>
- /// <param name="endAddress"></param>
- /// <param name="roadWay"></param>
- /// <returns></returns>
- WebResponseContent IsRelocation(string startAddress, string endAddress, string roadWay);
- /// <summary>
- /// 鍘熸枡宸烽亾闂寸Щ搴撲换鍔�
- /// </summary>
- WebResponseContent RelocationRoadWay(string roadWay,int Count);
-
- /// <summary>
- /// 鍒嗛厤宸烽亾
- /// </summary>
- /// <returns></returns>
- string AssignCPRoadwayNo();
- /// <summary>
- /// 鍗板埛浣欐枡閫�鏂欎换鍔�
- /// </summary>
- /// <param name="saveModel"></param>
- /// <returns></returns>
- WebResponseContent PrintBackInbound(SaveModel saveModel);
- /// <summary>
- /// 鍗婃垚鍝佹垚鍝佷俊鎭�
- /// </summary>
- /// <param name="proInDTOs"></param>
- /// <returns></returns>
- WebResponseContent ReceiveProCodeInfo(List<MESProInDTO> proInDTOs);
- /// <summary>
- /// 鍗板埛涓嬫枡浠诲姟
- /// </summary>
- /// <param name="saveModel"></param>
- /// <returns></returns>
- WebResponseContent PrintInbound(SaveModel saveModel);
- /// <summary>
- /// 鍒涘缓鍘熺焊鐢熺鍑哄簱浠诲姟
- /// </summary>
- /// <param name="keys"></param>
- /// <returns></returns>
- WebResponseContent CreateSGOutboundTasks(int[] keys);
- /// <summary>
- /// MES鎺掔▼璁″垝鍑哄簱
- /// </summary>
- /// <returns></returns>
- WebResponseContent ReceiveOutBound(List<OutMESOrderDTO> outMESOrderDTOs);
- /// <summary>
- /// MES鑷姩鍙枡鎺ュ彛
- /// </summary>
- /// <returns></returns>
- WebResponseContent ReceiveAutoIssue(MESAutoIssueDTO autoIssueDTO);
- /// <summary>
- /// MES鎵嬪姩鍙枡鎺ュ彛
- /// </summary>
- /// <returns></returns>
- WebResponseContent ReceiveManualIssue(MESManualIssueDTO manualIssueDTO);
- /// <summary>
- /// MES绌烘墭/浣欐枡鍛煎彨鎺ュ彛
- /// </summary>
- /// <returns></returns>
- WebResponseContent ReceiveReturnIssue(List<MESReturnIssueDTO> returnIssueDTOs);
- /// <summary>
- /// 娣诲姞鐢熺
- /// </summary>
- /// <param name="outOrderDTOs"></param>
- /// <returns></returns>
- WebResponseContent AddOutSGOrder(List<SGOutOrderDTO> outOrderDTOs);
- /// <summary>
- /// BST棰嗘枡淇℃伅鍚屾
- /// </summary>
- /// <param name="bSTPickInfoDTO"></param>
- /// <returns></returns>
- WebResponseContent ReceivePicking(List<BSTPickInfoDTO> bSTPickInfoDTOs);
-
- /// <summary>
- /// 鍒涘缓鐢熺鎵嬪姩鍑哄簱
- /// </summary>
- /// <param name="ids"></param>
- /// <returns></returns>
- WebResponseContent CreateSGManualTasks(List<int> ids);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ITaskInfoService/ITask_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ITaskInfoService/ITask_HtyService.cs"
index 7a83fc0..cdbc707 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ITaskInfoService/ITask_HtyService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ITaskInfoService/ITask_HtyService.cs"
@@ -1,15 +1,4 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_DTO.Stock;
-using WIDESEA_ITaskInfoRepository;
+锘縰sing WIDESEA_Core.BaseServices;
using WIDESEA_Model.Models;
namespace WIDESEA_ITaskInfoService;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ITaskInfoService/WIDESEA_ITaskInfoService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ITaskInfoService/WIDESEA_ITaskInfoService.csproj"
index 64dad22..f53dd49 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ITaskInfoService/WIDESEA_ITaskInfoService.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_ITaskInfoService/WIDESEA_ITaskInfoService.csproj"
@@ -7,6 +7,7 @@
</PropertyGroup>
<ItemGroup>
+ <ProjectReference Include="..\WIDESEA_ISortOrderRepository\WIDESEA_ISortOrderRepository.csproj" />
<ProjectReference Include="..\WIDESEA_TaskInfoRepository\WIDESEA_TaskInfoRepository.csproj" />
</ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_AGVStationInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_AGVStationInfo.cs"
deleted file mode 100644
index b4e37b0..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_AGVStationInfo.cs"
+++ /dev/null
@@ -1,55 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// AGV绔欑偣淇℃伅琛�
- /// </summary>
- [SugarTable(nameof(Dt_AGVStationInfo), "AGV绔欑偣淇℃伅琛�")]
- public class Dt_AGVStationInfo : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
- /// <summary>
- /// 绔欑偣缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "绔欑偣缂栧彿")]
- public string AGVStationCode { get; set; }
- /// <summary>
- /// 鍖哄煙
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍖哄煙")]
- public string StationArea { get; set; }
- /// <summary>
- /// MES瀵瑰簲鍛ㄨ浆浣�
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "MES瀵瑰簲鍛ㄨ浆浣�")]
- public string MESPointCode { get; set; }
-
- /// <summary>
- /// 娣变綅
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "娣变綅")]
- public int Depth { get; set; }
-
- /// <summary>
- /// 鏄惁鍗犵敤
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鏄惁鍗犵敤")]
- public int IsOccupied { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_CustomerInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_CustomerInfo.cs"
deleted file mode 100644
index ae23e8f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_CustomerInfo.cs"
+++ /dev/null
@@ -1,53 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 瀹㈡埛淇℃伅
- /// </summary>
- [SugarTable(nameof(Dt_CustomerInfo), "瀹㈡埛淇℃伅")]
- public class Dt_CustomerInfo : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 瀹㈡埛缂栫爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "瀹㈡埛缂栫爜")]
- public string CustomerCode { get; set; }
-
- /// <summary>
- /// 瀹㈡埛鍏ㄧО
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "瀹㈡埛鍏ㄧО")]
- public string CustomerName { get; set; }
-
- /// <summary>
- /// 瀹㈡埛绠�绉�
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "瀹㈡埛绠�绉�")]
- public string ShortName { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐘舵��")]
- public int Status { get; set; }
-
- /// <summary>
- /// 鍑哄簱瑙勫垯
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱瑙勫垯")]
- public int OutRule { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MakeCenterInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MakeCenterInfo.cs"
deleted file mode 100644
index d21246f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MakeCenterInfo.cs"
+++ /dev/null
@@ -1,53 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鍔犲伐涓績淇℃伅
- /// </summary>
- [SugarTable(nameof(Dt_MakeCenterInfo), "鍔犲伐涓績淇℃伅")]
- public class Dt_MakeCenterInfo : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鍔犲伐涓績缂栫爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍔犲伐涓績缂栫爜")]
- public string MakeCode { get; set; }
-
- /// <summary>
- /// 鍔犲伐涓績鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍔犲伐涓績鍚嶇О")]
- public string MakeName { get; set; }
-
- /// <summary>
- /// 鍔犲伐鍖哄煙
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍔犲伐鍖哄煙")]
- public int MakeArea { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐘舵��")]
- public int Status { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielCodeInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielCodeInfo.cs"
deleted file mode 100644
index b906186..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielCodeInfo.cs"
+++ /dev/null
@@ -1,88 +0,0 @@
-锘縰sing Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鐗╂枡鐮佷俊鎭�
- /// </summary>
- [SugarTable(nameof(Dt_MaterielCodeInfo), "鐗╂枡鐮佷俊鎭�")]
- public class Dt_MaterielCodeInfo : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterielCode { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱缂栧彿")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鎵规鍙�")]
- public string LotNo { get; set; }
-
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- [ImporterHeader(Name = "鐢熶骇鏃ユ湡")]
- [ExporterHeader(DisplayName = "鐢熶骇鏃ユ湡")]
- [SugarColumn(IsNullable = false, IsOnlyIgnoreUpdate = true, ColumnDescription = "鐢熶骇鏃ユ湡")]
- public DateTime ProductionDate { get; set; }
-
- /// <summary>
- /// 鏈夋晥鏈�
- /// </summary>
- [ImporterHeader(Name = "鏈夋晥鏈�")]
- [ExporterHeader(DisplayName = "鏈夋晥鏈�")]
- [SugarColumn(IsNullable = false, IsOnlyIgnoreUpdate = true, ColumnDescription = "鏈夋晥鏈�")]
- public DateTime EffectiveDate { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閲囪喘鍗曞彿")]
- public string PurchaseOrderNo { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏁伴噺")]
- public decimal Quantity { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "渚涘簲鍟嗙紪鐮�")]
- public string SupplierCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡瑙勬牸")]
- public string MaterielSpec { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
deleted file mode 100644
index d116aef..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
+++ /dev/null
@@ -1,122 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.MaterielEnum;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鐗╂枡淇℃伅
- /// </summary>
- [SugarTable(nameof(Dt_MaterielInfo), "鐗╂枡淇℃伅")]
- [SugarIndex("unique_materielinfo_materielcode", nameof(MaterielCode), OrderByType.Asc, true)]
- public class Dt_MaterielInfo : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鏉ユ簮Id
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鏉ユ簮Id")]
- public int MaterialSourceId { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱缂栧彿")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterielCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍒嗙被
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鍒嗙被")]
- public int MaterielSourceType { get; set; }
-
- /// <summary>
- /// 搴撳瓨缁勭粐
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨缁勭粐")]
- public int MaterielInvOrgId { get; set; }
-
- /// <summary>
- /// 鐗╂枡闀垮害
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡闀垮害")]
- public decimal? MaterielLength { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍘氬害
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍘氬害")]
- public decimal? MaterielThickness { get; set; }
-
- /// <summary>
- /// 鐗╂枡渚ч潰骞呭(m)
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡渚ч潰骞呭(m)")]
- public decimal? MaterielWide { get; set; }
-
- /// <summary>
- /// 鐗╂枡閲嶉噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡閲嶉噺")]
- public decimal? MaterielWeight { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 255, ColumnDescription = "鐗╂枡瑙勬牸")]
- public string MaterielSpec { get; set; }
-
- /// <summary>
- /// 鍩烘湰鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍩烘湰鍗曚綅")]
- public string MaterielUnit { get; set; }
-
- /// <summary>
- /// 杈呭崟浣�
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "杈呭崟浣�")]
- public string AssistUnitCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鐘舵��(0:绂佺敤銆�1:鍙敤)
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鐘舵��(0:绂佺敤銆�1:鍙敤)")]
- public EnableEnum MaterielState { get; set; }
-
- /// <summary>
- /// 鏄惁闇�瑕佽川妫�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁闇�瑕佽川妫�")]
- public WhetherEnum IsCheck { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_PalletCodeInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_PalletCodeInfo.cs"
deleted file mode 100644
index cfbc12e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_PalletCodeInfo.cs"
+++ /dev/null
@@ -1,41 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鎵樼洏缂栧彿淇℃伅
- /// </summary>
- [SugarTable(nameof(Dt_PalletCodeInfo), "鎵樼洏缂栧彿淇℃伅")]
- public class Dt_PalletCodeInfo : BaseEntity
- {
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- [SugarColumn(IsNullable = false, ColumnDescription = "鎵樼洏绫诲瀷")]
- public int PalletType { get; set; }
-
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鎵樼洏缂栧彿")]
- public string PalletCode { get; set; }
-
- [SugarColumn(IsNullable = false, ColumnDescription = "娴佹按鍙�")]
- public int SerialNo { get; set; }
-
- [SugarColumn(IsNullable = false, ColumnDescription = "鎵撳嵃鐘舵��")]
- public int Status { get; set; }
-
- [SugarColumn(IsNullable = false, ColumnDescription = "灏哄")]
- public int Size { get; set; }
-
- [SugarColumn(IsNullable = false, ColumnDescription = "鎵樼洏绫诲瀷涓婚敭")]
- public int PalletTypeId { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_PalletTypeInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_PalletTypeInfo.cs"
deleted file mode 100644
index 5e15a8c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_PalletTypeInfo.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鎵樼洏绫诲瀷
- /// </summary>
- [SugarTable(nameof(Dt_PalletTypeInfo), "鎵樼洏绫诲瀷")]
- public class Dt_PalletTypeInfo : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鎵樼洏绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鎵樼洏绫诲瀷")]
- public int PalletType { get; set; }
-
- /// <summary>
- /// 鎵樼洏鍙疯捣濮嬪瓧绗︿覆
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵樼洏鍙疯捣濮嬪瓧绗︿覆")]
- public string CodeStartStr { get; set; }
-
- /// <summary>
- /// 鎵樼洏绫诲瀷鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵樼洏绫诲瀷鍚嶇О")]
- public string TypeName { get; set; }
-
- /// <summary>
- /// 闀垮害
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "闀垮害")]
- public int Length { get; set; }
-
- /// <summary>
- /// 瀹藉害
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "瀹藉害")]
- public int Width { get; set; }
-
- /// <summary>
- /// 楂樺害
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "楂樺害")]
- public int Height { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐘舵��")]
- public int Enbale { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱缂栧彿")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 鎵�灞炲眰
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵�灞炲眰")]
- public string SortNum { get; set; }
-
- /// <summary>
- /// 鍗犵敤璐т綅鏁�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗犵敤璐т綅鏁�")]
- public int LocaitonCount { get; set; }
-
- /// <summary>
- /// 澶ф墭鐩樻槸鍚︽斁濂囨暟鍒�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "澶ф墭鐩樻槸鍚︽斁濂囨暟鍒�")]
- public bool IsOdd { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_SupplierInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_SupplierInfo.cs"
deleted file mode 100644
index 8395f8a..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_SupplierInfo.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 渚涘簲鍟嗕俊鎭�
- /// </summary>
- [SugarTable(nameof(Dt_SupplierInfo), "渚涘簲鍟嗕俊鎭�")]
- public class Dt_SupplierInfo : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗘潵婧怚D(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "渚涘簲鍟嗘潵婧怚D(涓婃父)")]
- public int SupplierSourceId { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "渚涘簲鍟嗙紪鐮�")]
- public string SupplierCode { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗗悕绉�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "渚涘簲鍟嗗悕绉�")]
- public string SupplierName { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙畝绉�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "渚涘簲鍟嗙畝绉�")]
- public string SupplierShortName { get; set; }
-
- /// <summary>
- /// 鑱旂郴浜�
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鑱旂郴浜�")]
- public string Contacts { get; set; }
-
- /// <summary>
- /// 鑱旂郴鐢佃瘽
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鑱旂郴鐢佃瘽")]
- public string ContactNumber { get; set; }
-
- /// <summary>
- /// 鑱旂郴鍦板潃
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鑱旂郴鍦板潃")]
- public string ContactAddress { get; set; }
-
- /// <summary>
- /// 鐢靛瓙閭
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐢靛瓙閭")]
- public string Email { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鎻忚堪")]
- public string Description { get; set; }
-
- /// <summary>
- /// 搴撳瓨缁勭粐
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨缁勭粐")]
- public int InvOrgId { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐘舵��")]
- public int Status { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_Warehouse.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_Warehouse.cs"
index fa11459..2bd6630 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_Warehouse.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Basic/Dt_Warehouse.cs"
@@ -41,7 +41,7 @@
/// <summary>
/// 浠撳簱鐘舵��
/// </summary>
- [SugarColumn(IsNullable = false, DefaultValue = "0", ColumnDescription = "浠撳簱鐘舵��")]
+ [SugarColumn(IsNullable = false, DefaultValue = "1", ColumnDescription = "浠撳簱鐘舵��")]
public int WarehouseStatus { get; set; }
/// <summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs"
deleted file mode 100644
index 6954cfa..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs"
+++ /dev/null
@@ -1,68 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鍏ュ簱鍗曟嵁
- /// </summary>
- [SugarTable(nameof(Dt_InboundOrder), "鍏ュ簱鍗曟嵁")]
- public class Dt_InboundOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- [CodeRule(RuleCodeEnum.InboundOrderRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
- public string InboundOrderNo { get; set; }
-
- /// <summary>
- /// 涓婃父鍗曟嵁缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "涓婃父鍗曟嵁缂栧彿")]
- public string UpperOrderNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁绫诲瀷")]
- public int OrderType { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鐘舵��")]
- public int InboundOrderStatus { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鍗曟槑缁�
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_InboundOrderDetail.OrderId), nameof(Id))]
- public List<Dt_InboundOrderDetail> Details { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs"
deleted file mode 100644
index 5dbc594..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs"
+++ /dev/null
@@ -1,121 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鍏ュ簱鍗曟槑缁�
- /// </summary>
- [SugarTable(nameof(Dt_InboundOrderDetail), "鍏ュ簱鍗曟槑缁�")]
- public class Dt_InboundOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鍗曚富閿�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍏ュ簱鍗曚富閿�")]
- public int OrderId { get; set; }
-
- /// <summary>
- /// 涓婃父鏄庣粏Id
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "涓婃父鏄庣粏Id")]
- public int DetailId { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鏉＄爜")]
- public string BarCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鎵规")]
- public string MaterialLot { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "骞呭", DefaultValue = "0")]
- public decimal MaterialWide { get; set; }
-
- /// <summary>
- /// 鍗峰緞
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗峰緞", DefaultValue = "0")]
- public decimal MaterialThick { get; set; }
-
- /// <summary>
- /// 閲嶉噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲嶉噺", DefaultValue = "0")]
- public decimal MaterialWeight { get; set; }
-
- /// <summary>
- /// 瑙勬牸
- /// </summary>
- [SugarColumn(IsNullable = true,Length = 255, ColumnDescription = "瑙勬牸")]
- public string MaterialSpec { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鏁伴噺")]
- public decimal OrderQuantity { get; set; }
-
- /// <summary>
- /// 缁勭洏鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "缁勭洏鏁伴噺", DefaultValue = "0")]
- public decimal BindQuantity { get; set; }
-
- /// <summary>
- /// 宸插叆搴撴暟閲�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "宸插叆搴撴暟閲�", DefaultValue = "0")]
- public decimal InQuantity { get; set; }
-
- /// <summary>
- /// 璁㈠崟鏄庣粏鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟鏄庣粏鐘舵��")]
- public int OrderDetailStatus { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_MESProInOrderInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_MESProInOrderInfo.cs"
deleted file mode 100644
index 35a86cf..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_MESProInOrderInfo.cs"
+++ /dev/null
@@ -1,145 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.DB.Models;
-
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// MES鎴愬搧/鍗婃垚鍝佸崟
- /// </summary>
- [SugarTable(nameof(Dt_MESProInOrderInfo), "MES鎴愬搧/鍗婃垚鍝佸崟")]
- public class Dt_MESProInOrderInfo : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 鐢熶骇璁㈠崟缂栫爜(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐢熶骇璁㈠崟缂栫爜(涓婃父)")]
- public string ProductOrderNo { get; set; }
-
- /// <summary>
- /// 宸ュ簭搴忓彿(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "宸ュ簭搴忓彿(涓婃父)")]
- public int ProcessNum { get; set; }
-
- /// <summary>
- /// 璁㈠崟绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟绫诲瀷")]
- public int MESProOrderType { get; set; }
-
- /// <summary>
- /// 娲惧崟宸ュ崟缂栫爜(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "娲惧崟宸ュ崟缂栫爜")]
- public string SendOrderNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栫爜")]
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗╂枡鎵规")]
- public string MaterialLot { get; set; }
-
- /// <summary>
- /// 鐗╂枡绛夌骇
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡绛夌骇")]
- public string GradeCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鏁伴噺")]
- public decimal ProQuantity { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鏉＄爜")]
- public string BarCode { get; set; }
-
- /// <summary>
- /// 鍔犲伐涓績缂栫爜(鏈哄彴)
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍔犲伐涓績缂栫爜(鏈哄彴)")]
- public string MakeCode { get; set; }
-
- /// <summary>
- /// 浣嶇疆缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "浣嶇疆缂栧彿")]
- public string PointCode { get; set; }
-
- /// <summary>
- /// 鍗峰緞
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鍗峰緞")]
- public decimal Thickness { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "骞呭")]
- public decimal Wide { get; set; }
-
- /// <summary>
- /// 閲嶉噺
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "閲嶉噺")]
- public decimal Weight { get; set; }
-
- /// <summary>
- /// 鎴愬搧鍖呮潗绾哥鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鎴愬搧鍖呮潗绾哥鐗╂枡缂栫爜")]
- public string ProPackCode { get; set; }
-
- /// <summary>
- /// 绠遍暱
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "绠遍暱")]
- public decimal Length { get; set; }
-
- /// <summary>
- /// 绠卞
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "绠卞")]
- public decimal Width { get; set; }
-
- /// <summary>
- /// 绠遍珮
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "绠遍珮")]
- public decimal Height { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐘舵��")]
- public int MESProInStatus { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_ProDeliverBackOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_ProDeliverBackOrder.cs"
deleted file mode 100644
index d9bdbbe..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_ProDeliverBackOrder.cs"
+++ /dev/null
@@ -1,75 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// ERP鎴愬搧閿�鍞��璐у叆搴撳崟
- /// </summary>
- [SugarTable(nameof(Dt_ProDeliverBackOrder), "ERP鎴愬搧閿�鍞��璐у叆搴撳崟"), ModelValidate]
- public class Dt_ProDeliverBackOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱缂栧彿")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// WMS鍗曟嵁缂栧彿
- /// </summary>
- [CodeRule(RuleCodeEnum.ProBackCodeRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "WMS鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)]
- public string DeliveryBackInCode { get; set; }
-
- /// <summary>
- /// 鎴愬搧閿�鍞��璐у崟鍙凤紙涓婃父锛�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎴愬搧閿�鍞��璐у崟鍙凤紙涓婃父锛�")]
- public string DeliveryBackCode { get; set; }
-
- /// <summary>
- /// 璁㈠崟绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟绫诲瀷")]
- public int OrderType { get; set; }
-
- /// <summary>
- /// 鎿嶄綔鍛樺伐
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎿嶄綔鍛樺伐")]
- public string EmployeeName { get; set; }
-
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐘舵��")]
- public int DeliveryBackStatus { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曟槑缁�
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_ProDeliverBackOrderDetail.DeliverBackId), nameof(Id))]
- public List<Dt_ProDeliverBackOrderDetail> Details { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_ProDeliverBackOrderDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_ProDeliverBackOrderDetail.cs"
deleted file mode 100644
index ec5cd9f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_ProDeliverBackOrderDetail.cs"
+++ /dev/null
@@ -1,96 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- ///ERP鎴愬搧閿�鍞��璐у叆搴撳崟鏄庣粏
- /// </summary>
- [SugarTable(nameof(Dt_ProDeliverBackOrderDetail), "ERP鎴愬搧閿�鍞��璐у叆搴撳崟鏄庣粏"), ModelValidate]
- public class Dt_ProDeliverBackOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶磋〃涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "澶磋〃涓婚敭")]
- public int DeliverBackId { get; set; }
-
- /// <summary>
- /// 閿�鍞嚭搴撳彂璐у崟鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閿�鍞嚭搴撳彂璐у崟鍙�")]
- public string DeliverCode { get; set; }
-
- /// <summary>
- /// 閿�鍞崟鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閿�鍞崟鍙�")]
- public string SaleOrderNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鏉＄爜")]
- public string BarCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鎵规")]
- public string MaterialLot { get; set; }
-
- // <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏁伴噺")]
- public decimal Quantity { get; set; }
-
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "瀹㈡埛缂栧彿")]
- public string Customer { get; set; }
-
- /// <summary>
- /// 宸插叆搴撴暟閲�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "宸插叆搴撴暟閲�")]
- public decimal BackInboundQty { get; set; }
-
- /// <summary>
- /// 閿�鍞��璐ф槑缁嗙姸鎬�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閿�鍞��璐ф槑缁嗙姸鎬�")]
- public int DeliverBackDetailStatus { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseBSTOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseBSTOrder.cs"
deleted file mode 100644
index 821e6fd..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseBSTOrder.cs"
+++ /dev/null
@@ -1,72 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// BST閲囪喘鍏ュ簱鍗�
- /// </summary>
- [SugarTable(nameof(Dt_PurchaseBSTOrder), "BST閲囪喘鍏ュ簱鍗�")]
- public class Dt_PurchaseBSTOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 閲囪喘鏀惰揣鍗曟潵婧怚D
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘鍏ュ簱鍗曟潵婧怚D")]
- public int PaperReceiptId { get; set; }
-
- /// <summary>
- /// 閲囪喘鏀惰揣鍗曠紪鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閲囪喘鍏ュ簱鍗曠紪鍙�")]
- public string PaperReceiptNo { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "渚涘簲鍟嗙紪鍙�")]
- public string VendNo { get; set; }
-
- /// <summary>
- /// 鎬婚噰璐暱搴�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鎬婚噰璐暱搴�")]
- public decimal TotalProcurementLength { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曠姸鎬�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘鍗曞叆搴撶姸鎬�")]
- public int PurchaseOrderStatus { get; set; }
-
- /// <summary>
- /// 閲囪喘鏀惰揣鏃ユ湡
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閲囪喘鍏ュ簱鏃ユ湡")]
- public DateTime ReceiptDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 閲囪喘鍒楄〃
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_PurchaseBSTOrderDetail.PurchaseBSTOrderId), nameof(Id))]
- public List<Dt_PurchaseBSTOrderDetail> Details { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseBSTOrderDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseBSTOrderDetail.cs"
deleted file mode 100644
index e7ec9cd..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseBSTOrderDetail.cs"
+++ /dev/null
@@ -1,108 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// BST閲囪喘鍏ュ簱鍗曟槑缁�
- /// </summary>
- [SugarTable(nameof(Dt_PurchaseBSTOrderDetail), "BST閲囪喘鍏ュ簱鍗曟槑缁�")]
- public class Dt_PurchaseBSTOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶磋〃涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "澶磋〃涓婚敭")]
- public int PurchaseBSTOrderId { get; set; }
-
- /// <summary>
- /// 閲囪喘鏀惰揣鍗曟潵婧怚D
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘鍗曟潵婧怚D")]
- public int PaperReceiptId { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鏉＄爜")]
- public string Barcode { get; set; }
-
- /// <summary>
- /// RFID淇℃伅
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "RFID淇℃伅")]
- public string RfidCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉ユ簮ID(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鏉ユ簮ID(涓婃父)")]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鎵规搴忓垪鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鎵规搴忓垪鍙�")]
- public int SeqNo { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "骞呭")]
- public decimal MaterialWide { get; set; }
-
- /// <summary>
- /// 鍘氬害
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍘氬害")]
- public decimal MaterialThick { get; set; }
-
- /// <summary>
- /// 閲囪喘闀垮害
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘闀垮害")]
- public decimal ProcurementLength { get; set; }
-
- /// <summary>
- /// 閲囪喘浜よ揣鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘浜よ揣鏁伴噺")]
- public decimal DeliveryQty { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曟槑缁嗙姸鎬�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘鍏ュ簱鍗曟槑缁嗙姸鎬�")]
- public int PurchaseBSTOrderDetailStatus { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrder.cs"
deleted file mode 100644
index 8b39be4..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrder.cs"
+++ /dev/null
@@ -1,67 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// ERP浜屾湡閲囪喘鍗�
- /// </summary>
- [SugarTable(nameof(Dt_PurchaseOrder), "ERP浜屾湡閲囪喘鍗�"), ModelValidate]
- public class Dt_PurchaseOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false , ColumnDescription = "浠撳簱缂栧彿")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閲囪喘鍗曞彿")]
- public string PurchaseOrderNo { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "渚涘簲鍟嗙紪鍙�")]
- public string SupplierCode { get; set; }
-
- /// <summary>
- /// 閲囪喘鏁伴噺
- /// </summary>
- [PropertyValidate("閲囪喘鏁伴噺", MinValue = 0, IsContainMinValue = false)]
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘鏁伴噺")]
- public decimal OrderQuantity { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曠姸鎬�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘鍗曠姸鎬�")]
- public int PurchaseOrderStatus { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曟槑缁�
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_PurchaseOrderDetail.PurchaseOrderId), nameof(Id))]
- public List<Dt_PurchaseOrderDetail> Details { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrderDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrderDetail.cs"
deleted file mode 100644
index 1ba5739..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrderDetail.cs"
+++ /dev/null
@@ -1,108 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// ERP浜屾湡閲囪喘鍗曟槑缁�
- /// </summary>
- [SugarTable(nameof(Dt_PurchaseOrderDetail), "ERP浜屾湡閲囪喘鍗曟槑缁�"), ModelValidate]
- public class Dt_PurchaseOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶磋〃涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "澶磋〃涓婚敭")]
- public int PurchaseOrderId { get; set; }
-
- /// <summary>
- /// 涓婃父鏄庣粏Id
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "涓婃父鏄庣粏Id")]
- public int DetailId { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鏉＄爜")]
- public string BarCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鎵规")]
- public string MaterialLot { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏁伴噺")]
- public decimal PurchaseDetailQuantity { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "骞呭")]
- public decimal PurchaseDetailWide { get; set; }
-
- /// <summary>
- /// 鍗峰緞
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗峰緞")]
- public decimal PurchaseDetailThickness { get; set; }
-
- /// <summary>
- /// 閲嶉噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲嶉噺")]
- public decimal PurchaseDetailWeight { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 255, ColumnDescription = "鐗╂枡瑙勬牸")]
- public string MaterielSpec { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曟槑缁嗙姸鎬�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘鍗曟槑缁嗙姸鎬�")]
- public int PurchaseDetailStatus { get; set; }
-
- /// <summary>
- /// 宸插叆搴撴暟閲�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "宸插叆搴撴暟閲�")]
- public decimal PurchaseDetailInboundQty { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_ReturnBSTOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_ReturnBSTOrder.cs"
deleted file mode 100644
index be050f6..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_ReturnBSTOrder.cs"
+++ /dev/null
@@ -1,85 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// BST閫�鏂欏崟
- /// </summary>
- [SugarTable(nameof(Dt_ReturnBSTOrder), "BST閫�鏂欏崟")]
- public class Dt_ReturnBSTOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 閫�鏂欏崟鏉ユ簮ID
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閫�鏂欏崟鏉ユ簮ID")]
- public int PaperWreturnId { get; set; }
- /// <summary>
- /// WMS鍗曟嵁缂栧彿
- /// </summary>
- [CodeRule(RuleCodeEnum.TLCodeRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "WMS鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)]
- public string ReturnInboundNo { get; set; }
-
- /// <summary>
- /// 閫�鏂欏崟缂栧彿(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閫�鏂欏崟缂栧彿(涓婃父)")]
- public string PaperWreturnNo { get; set; }
-
- /// <summary>
- /// 閫�鏂欏憳宸�
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "閫�鏂欏憳宸�")]
- public string EmployeeName { get; set; }
-
- /// <summary>
- /// 閫�鏂欐�婚暱搴�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閫�鏂欐�婚暱搴�")]
- public decimal TotalPaperWreturnLength { get; set; }
-
- /// <summary>
- /// 閫�鏂欏崟鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閫�鏂欏崟鍏ュ簱鐘舵��")]
- public int ReturnOrderStatus { get; set; }
-
- /// <summary>
- /// 閫�鏂欐棩鏈�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閫�鏂欐棩鏈�")]
- public DateTime WreturnDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 閲囪喘鍒楄〃
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_ReturnBSTOrderDetail.ReturnBSTOrderId), nameof(Id))]
- public List<Dt_ReturnBSTOrderDetail> Details { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_ReturnBSTOrderDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_ReturnBSTOrderDetail.cs"
deleted file mode 100644
index cadc975..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_ReturnBSTOrderDetail.cs"
+++ /dev/null
@@ -1,101 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// BST閫�鏂欏崟鏄庣粏
- /// </summary>
- [SugarTable(nameof(Dt_ReturnBSTOrderDetail), "BST閫�鏂欏崟鏄庣粏")]
- public class Dt_ReturnBSTOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶磋〃涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "澶磋〃涓婚敭")]
- public int ReturnBSTOrderId { get; set; }
-
- /// <summary>
- /// 閫�鏂欐潵婧怚D
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閫�鏂欐潵婧怚D")]
- public int PaperWreturnId { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉ユ簮ID(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鏉ユ簮ID(涓婃父)")]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鏉＄爜")]
- public string Barcode { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鎵规搴忓垪鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鎵规搴忓垪鍙�")]
- public int SeqNo { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "骞呭")]
- public decimal MaterialWide { get; set; }
-
- /// <summary>
- /// 鐩村緞
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐩村緞")]
- public decimal MaterialThick { get; set; }
-
- /// <summary>
- /// 閫�鏂欓暱搴�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閫�鏂欓暱搴�")]
- public decimal ProcurementLength { get; set; }
-
- /// <summary>
- /// 閫�璐ф暟閲�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閫�璐ф暟閲�")]
- public decimal Qty { get; set; }
-
- /// <summary>
- /// 閫�鏂欏崟鏄庣粏鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閫�鏂欏崟鏄庣粏鐘舵��")]
- public int ReturnBSTOrderDetailStatus { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_YLInboundCache.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_YLInboundCache.cs"
deleted file mode 100644
index c767c08..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_YLInboundCache.cs"
+++ /dev/null
@@ -1,87 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鍘熸枡鏉＄爜缁戝畾缂撳瓨
- /// </summary>
- [SugarTable(nameof(Dt_YLInboundCache), "鍘熸枡鏉＄爜缁戝畾缂撳瓨")]
- public class Dt_YLInboundCache : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鎵�灞�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵�灞�")]
- public string InvOrg { get; set; }
-
- /// <summary>
- /// 绾稿嵎鏉＄爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "绾稿嵎鏉＄爜")]
- public string BarCode { get; set; }
-
- /// <summary>
- /// RFID淇℃伅
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "RFID淇℃伅")]
- public string RfidCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "骞呭")]
- public decimal MaterialWide { get; set; }
-
- /// <summary>
- /// 鍘氬害锛堢洿寰勶級
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍘氬害锛堢洿寰勶級")]
- public decimal MaterialThick { get; set; }
-
- /// <summary>
- /// 閲囪喘闀垮害
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘闀垮害")]
- public decimal ProcurementLength { get; set; }
-
- /// <summary>
- /// 閲囪喘浜よ揣閲嶉噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘浜よ揣閲嶉噺")]
- public decimal DeliveryQty { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
- /// <summary>
- /// 缁戝畾鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "缁戝畾鐘舵��")]
- public int BindStatus { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutBSTOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutBSTOrder.cs"
deleted file mode 100644
index b91341d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutBSTOrder.cs"
+++ /dev/null
@@ -1,74 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// BST鍑哄簱鎺掔▼鍗�
- /// </summary>
- [SugarTable(nameof(Dt_OutBSTOrder), "BST鍑哄簱鎺掔▼鍗�"), ModelValidate]
- public class Dt_OutBSTOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 鍑哄簱鏉ユ簮ID
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鏉ユ簮ID")]
- public int BoardMpsId { get; set; }
-
- /// <summary>
- /// WMS鍗曟嵁缂栧彿
- /// </summary>
- [CodeRule(RuleCodeEnum.OutboundOrderRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "WMS鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)]
- public string OutBSTOrderNo { get; set; }
-
- /// <summary>
- /// 鍑哄簱缂栧彿(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍑哄簱缂栧彿(涓婃父)")]
- public string BoardMpsNo { get; set; }
-
- /// <summary>
- /// 鍑哄簱鍗曠姸鎬�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鍗曠姸鎬�")]
- public int OutBSTOrderStatus { get; set; }
-
- /// <summary>
- /// 鍑哄簱璁″垝鏃堕棿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍑哄簱璁″垝鏃堕棿")]
- public DateTime ProductionDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 閲囪喘鍒楄〃
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_OutBSTOrderDetail.OutBSTOrderId), nameof(Id))]
- public List<Dt_OutBSTOrderDetail> Details { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutBSTOrderDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutBSTOrderDetail.cs"
deleted file mode 100644
index 4251cc5..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutBSTOrderDetail.cs"
+++ /dev/null
@@ -1,96 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// BST鍑哄簱鎺掔▼鏄庣粏
- /// </summary>
- [SugarTable(nameof(Dt_OutBSTOrderDetail), "BST鍑哄簱鎺掔▼鏄庣粏"), ModelValidate]
- public class Dt_OutBSTOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鍑哄簱涓昏〃ID
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱涓昏〃ID")]
- public int OutBSTOrderId { get; set; }
-
- /// <summary>
- /// 鍏宠仈鐨勪富琛↖D(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍏宠仈鐨勪富琛↖D(涓婃父)")]
- public int BoardMpsId { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "骞呭")]
- public decimal Width { get; set; }
-
- /// <summary>
- /// 闇�姹傞暱搴�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "闇�姹傞暱搴�")]
- public decimal XqLen { get; set; }
-
- /// <summary>
- /// 鎬荤敤閲�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鎬荤敤閲�")]
- public decimal TotalUsage { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉ユ簮ID(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鏉ユ簮ID(涓婃父)")]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 閲囪喘闀垮害
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘闀垮害")]
- public decimal ProcurementLength { get; set; }
-
- /// <summary>
- /// 宸插垎閰嶇敤閲�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插垎閰嶇敤閲�")]
- public decimal AssignTotalUsage { get; set; }
-
- /// <summary>
- /// 宸插嚭鐢ㄩ噺
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插嚭鐢ㄩ噺")]
- public decimal OutTotalUsage { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 鍑哄簱鍗曟槑缁嗙姸鎬�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鍗曟槑缁嗙姸鎬�")]
- public int OutBSTOrderDetailStatus { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutBSTPickInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutBSTPickInfo.cs"
deleted file mode 100644
index e8da1dd..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutBSTPickInfo.cs"
+++ /dev/null
@@ -1,96 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鍗氭�濋�氶鏂欎俊鎭�
- /// </summary>
- [SugarTable(nameof(Dt_OutBSTPickInfo), "鍗氭�濋�氶鏂欎俊鎭�"), ModelValidate]
- public class Dt_OutBSTPickInfo : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鍑哄簱涓昏〃ID
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱涓昏〃ID")]
- public int OutBSTOrderId { get; set; }
-
- /// <summary>
- /// 鍏宠仈鐨勪富琛↖D(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍏宠仈鐨勪富琛↖D(涓婃父)")]
- public int BoardMpsId { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "骞呭")]
- public decimal Width { get; set; }
-
- /// <summary>
- /// 闇�姹傞暱搴�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "闇�姹傞暱搴�")]
- public decimal XqLen { get; set; }
-
- /// <summary>
- /// 鎬荤敤閲�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鎬荤敤閲�")]
- public decimal TotalUsage { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉ユ簮ID(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鏉ユ簮ID(涓婃父)")]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 閲囪喘闀垮害
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘闀垮害")]
- public decimal ProcurementLength { get; set; }
-
- /// <summary>
- /// 宸插垎閰嶇敤閲�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插垎閰嶇敤閲�")]
- public decimal AssignTotalUsage { get; set; }
-
- /// <summary>
- /// 宸插嚭鐢ㄩ噺
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插嚭鐢ㄩ噺")]
- public decimal OutTotalUsage { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 鍑哄簱鍗曟槑缁嗙姸鎬�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鍗曟槑缁嗙姸鎬�")]
- public int OutBSTOrderDetailStatus { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutLineView.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutLineView.cs"
deleted file mode 100644
index 7f7cdd3..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutLineView.cs"
+++ /dev/null
@@ -1,104 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鑰佸巶鍑哄簱绾夸綋缂撳瓨
- /// </summary>
- [SugarTable(nameof(Dt_OutLineView), "鑰佸巶鍑哄簱绾夸綋缂撳瓨"), ModelValidate]
- public class Dt_OutLineView : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鏄庣粏涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鏄庣粏涓婚敭")]
- public int OrderDetailId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterielCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鏁伴噺")]
- public decimal OrderQuantity { get; set; }
-
- /// <summary>
- /// 鍘熷搴撳瓨閲�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍘熷搴撳瓨閲�")]
- public decimal OriginalQuantity { get; set; }
-
- /// <summary>
- /// 鍒嗛厤鍑哄簱閲�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍒嗛厤鍑哄簱閲�")]
- public decimal AssignQuantity { get; set; }
-
- /// <summary>
- /// 鏉＄爜缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鏉＄爜缂栧彿")]
- public string PalletCode { get; set; }
-
- /// <summary>
- /// 鏈哄彴浣嶇疆
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鏈哄彴浣嶇疆")]
- public string MachineName { get; set; }
-
- /// <summary>
- /// 鐗╂枡骞呭
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡骞呭")]
- public decimal? MaterialWide { get; set; }
-
- /// <summary>
- /// 鐗╂枡閲嶉噺
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡閲嶉噺")]
- public decimal? MaterialWeight { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
-
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟鍙�")]
- public int? TaskNum { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutMESOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutMESOrder.cs"
deleted file mode 100644
index 7f38ba1..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutMESOrder.cs"
+++ /dev/null
@@ -1,140 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// MES棰嗘枡璁″垝鍗�
- /// </summary>
- [SugarTable(nameof(Dt_OutMESOrder), "MES棰嗘枡璁″垝鍗�"), ModelValidate]
- public class Dt_OutMESOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 鍔犲伐涓績鍖哄煙
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍔犲伐涓績鍖哄煙")]
- public int MakeArea { get; set; }
-
- /// <summary>
- /// 鍑哄簱鏉ユ簮鏄庣粏ID
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鏉ユ簮鏄庣粏ID")]
- public int OutDetailId { get; set; }
-
- /// <summary>
- /// WMS鍗曟嵁缂栧彿
- /// </summary>
- [CodeRule(RuleCodeEnum.OutboundOrderRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "WMS鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)]
- public string OutMESOrderNo { get; set; }
-
- /// <summary>
- /// 鐢熶骇璁㈠崟缂栫爜(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐢熶骇璁㈠崟缂栫爜(涓婃父)")]
- public string ProductOrderNo { get; set; }
-
- /// <summary>
- /// 娲惧崟宸ュ崟缂栫爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "娲惧崟宸ュ崟缂栫爜")]
- public string SendOrderNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栫爜")]
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗╂枡鎵规")]
- public string MaterialLot { get; set; }
-
- /// <summary>
- /// 鐗╂枡绛夌骇
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗╂枡绛夌骇")]
- public string GradeCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡闇�姹傛暟閲�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡闇�姹傛暟閲�")]
- public decimal ReqQuantity { get; set; }
-
- /// <summary>
- /// 鍔犲伐涓績缂栫爜(鏈哄彴)
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鍔犲伐涓績缂栫爜(鏈哄彴)")]
- public string MakeCode { get; set; }
-
- /// <summary>
- /// 鐢熶骇璁㈠崟鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐢熶骇璁㈠崟鐘舵��")]
- public int OutMESOrderStatus { get; set; }
-
- /// <summary>
- /// 璁″垝棰嗘枡鏃堕棿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "璁″垝棰嗘枡鏃堕棿")]
- public DateTime PlanDate { get; set; }
-
- /// <summary>
- /// 缁撴潫鏃堕棿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "缁撴潫鏃堕棿")]
- public DateTime EndDate { get; set; }
-
- /// <summary>
- /// 宸插垎閰嶉渶姹傛暟閲�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插垎閰嶉渶姹傛暟閲�")]
- public decimal AssignTotalUsage { get; set; }
-
- /// <summary>
- /// 宸插嚭闇�姹傛暟閲�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插嚭闇�姹傛暟閲�")]
- public decimal OutTotalUsage { get; set; }
-
- /// <summary>
- /// 鍩烘湰鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍩烘湰鍗曚綅")]
- public string MaterielUnit { get; set; }
-
- /// <summary>
- /// 杈呭崟浣�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杈呭崟浣�")]
- public string AssistUnitCode { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutSGOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutSGOrder.cs"
deleted file mode 100644
index 60d83f3..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutSGOrder.cs"
+++ /dev/null
@@ -1,81 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// SG鍑哄簱鎺掔▼鍗�
- /// </summary>
- [SugarTable(nameof(Dt_OutSGOrder), "SG鍑哄簱鎺掔▼鍗�")]
- public class Dt_OutSGOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 鍑哄簱鏉ユ簮ID
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鏉ユ簮ID")]
- public int BoardMpsId { get; set; }
-
- /// <summary>
- /// WMS鍗曟嵁缂栧彿
- /// </summary>
- [CodeRule(RuleCodeEnum.OutboundOrderRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "WMS鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)]
- public string OutSGOrderNo { get; set; }
-
- /// <summary>
- /// 鐢熶骇宸ュ崟鍙�(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐢熶骇宸ュ崟鍙�(涓婃父)")]
- public string OrderId { get; set; }
-
- /// <summary>
- /// 瀹㈡埛绠�绉�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "瀹㈡埛绠�绉�")]
- public string ShortName { get; set; }
-
- /// <summary>
- /// 宸ュ崟鐢ㄧ焊搴忓彿
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "宸ュ崟鐢ㄧ焊搴忓彿")]
- public int Number { get; set; }
-
- /// <summary>
- /// 鍑哄簱鍗曠姸鎬�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鍗曠姸鎬�")]
- public int OutSGOrderStatus { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 閲囪喘鍒楄〃
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_OutSGOrderDetail.OutSGOrderId), nameof(Id))]
- public List<Dt_OutSGOrderDetail> Details { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutSGOrderDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutSGOrderDetail.cs"
deleted file mode 100644
index fa425d3..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutSGOrderDetail.cs"
+++ /dev/null
@@ -1,125 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// SG鍑哄簱鎺掔▼鏄庣粏
- /// </summary>
- [SugarTable(nameof(Dt_OutSGOrderDetail), "SG鍑哄簱鎺掔▼鏄庣粏")]
- public class Dt_OutSGOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鍑哄簱涓昏〃ID
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱涓昏〃ID")]
- public int OutSGOrderId { get; set; }
-
- /// <summary>
- /// 鍏宠仈鐨勪富琛↖D(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍏宠仈鐨勪富琛↖D(涓婃父)")]
- public int BoardMpsId { get; set; }
-
- /// <summary>
- /// 鍏宠仈鐨勬槑缁咺D(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍏宠仈鐨勪富琛↖D(涓婃父)")]
- public int BoardMpsDetailId { get; set; }
-
- /// <summary>
- /// 骞呭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "骞呭")]
- public decimal Width { get; set; }
-
- /// <summary>
- /// 闇�姹傞暱搴�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "闇�姹傞暱搴�")]
- public decimal XqLen { get; set; }
-
- /// <summary>
- /// 鎬荤敤閲�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鎬荤敤閲�")]
- public decimal TotalUsage { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉ユ簮ID(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡鏉ユ簮ID(涓婃父)")]
- public int MaterialId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false,Length =50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 閲囪喘闀垮害
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘闀垮害")]
- public decimal ProcurementLength { get; set; }
- /// <summary>
- /// 妤炲埆
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "妤炲埆")]
- public string BoardFluteNo { get; set; }
-
- /// <summary>
- /// 鏈哄彴浣嶇疆
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鏈哄彴浣嶇疆")]
- public string MachineName { get; set; }
-
- /// <summary>
- /// 鎬婚暱
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鎬婚暱")]
- public decimal TotalLenth { get; set; }
-
- /// <summary>
- /// 宸插垎閰嶇敤閲�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插垎閰嶇敤閲�")]
- public decimal AssignTotalUsage { get; set; }
-
- /// <summary>
- /// 宸插嚭鐢ㄩ噺
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插嚭鐢ㄩ噺")]
- public decimal OutTotalUsage { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterialName { get; set; }
-
- /// <summary>
- /// 澶囨敞(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞(涓婃父)")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 鍑哄簱鍗曟槑缁嗙姸鎬�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鍗曟槑缁嗙姸鎬�")]
- public int OutSGOrderDetailStatus { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutStockLockInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutStockLockInfo.cs"
deleted file mode 100644
index 1e1cc51..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_OutStockLockInfo.cs"
+++ /dev/null
@@ -1,148 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鍑哄簱璇︽儏
- /// </summary>
- [SugarTable(nameof(Dt_OutStockLockInfo), "鍑哄簱璇︽儏")]
- public class Dt_OutStockLockInfo : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁绫诲瀷")]
- public int OrderType { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鏄庣粏涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鏄庣粏涓婚敭")]
- public int OrderDetailId { get; set; }
-
- /// <summary>
- /// 鐗╂枡Id
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡Id")]
- public int MaterielId { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵规鍙�")]
- public string BatchNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterielCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
-
- /// <summary>
- /// 搴撳瓨涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨涓婚敭")]
- public int StockId { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鏁伴噺")]
- public decimal OrderQuantity { get; set; }
-
- /// <summary>
- /// 鍘熷搴撳瓨閲�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍘熷搴撳瓨閲�")]
- public decimal OriginalQuantity { get; set; }
-
- /// <summary>
- /// 鍒嗛厤鍑哄簱閲�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍒嗛厤鍑哄簱閲�")]
- public decimal AssignQuantity { get; set; }
-
- /// <summary>
- /// 璐т綅缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "璐т綅缂栧彿")]
- public string LocationCode { get; set; }
-
- /// <summary>
- /// 鎵樼洏缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
- public string PalletCode { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 杈呭崟浣�
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "杈呭崟浣�")]
- public string AssistUnit { get; set; }
-
- /// <summary>
- /// 鏈哄彴浣嶇疆
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鏈哄彴浣嶇疆")]
- public string MachineName { get; set; }
-
- /// <summary>
- /// 鍔犲伐涓績
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鍔犲伐涓績")]
- public string MakeCode { get; set; }
- /// <summary>
- /// 鐗╂枡骞呭
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡骞呭")]
- public decimal? MaterialWide { get; set; }
- /// <summary>
- /// 鐗╂枡閲嶉噺
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡閲嶉噺")]
- public decimal? MaterialWeight { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟鍙�")]
- public int? TaskNum { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐘舵��")]
- public int Status { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_PickOutOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_PickOutOrder.cs"
deleted file mode 100644
index 4e94942..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_PickOutOrder.cs"
+++ /dev/null
@@ -1,74 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// ERP棰嗘枡鍗�
- /// </summary>
- [SugarTable(nameof(Dt_PickOutOrder), "ERP棰嗘枡鍗�")]
- public class Dt_PickOutOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// WMS鍗曟嵁缂栧彿
- /// </summary>
- [CodeRule(RuleCodeEnum.ERPOutCodeRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "WMS鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)]
- public string OutCodeRule { get; set; }
-
- /// <summary>
- /// 棰嗘枡鍗曞彿(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閿�鍞嚭搴撳彂璐у崟鍙�(涓婃父)")]
- public string PickCode { get; set; }
-
- /// <summary>
- /// 璁㈠崟绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟绫诲瀷")]
- public int OrderType { get; set; }
-
- /// <summary>
- /// 閿�鍞嚭搴撳崟鍒涘缓鍛樺伐
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "閿�鍞嚭搴撳崟鍒涘缓鍛樺伐")]
- public string EmployeeName { get; set; }
-
- /// <summary>
- /// 閿�鍞嚭搴撳崟鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閿�鍞嚭搴撳崟鐘舵��")]
- public int OutOrderStatus { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 閲囪喘鍒楄〃
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_PickOutOrderDetail.PickOutId), nameof(Id))]
- public List<Dt_PickOutOrderDetail> Details { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_PickOutOrderDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_PickOutOrderDetail.cs"
deleted file mode 100644
index dd28742..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_PickOutOrderDetail.cs"
+++ /dev/null
@@ -1,90 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// ERP棰嗘枡鍗曟槑缁�
- /// </summary>
- [SugarTable(nameof(Dt_PickOutOrderDetail), "ERP棰嗘枡鍗曟槑缁�")]
- public class Dt_PickOutOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶磋〃涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "澶磋〃涓婚敭")]
- public int PickOutId { get; set; }
-
- /// <summary>
- /// 涓婃父鍑哄簱鏄庣粏ID
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "涓婃父鍑哄簱鏄庣粏ID")]
- public int DetailId { get; set; }
-
-
- /// <summary>
- /// 鍙戞枡鎸囧畾鏉＄爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍙戞枡鎸囧畾鏉＄爜")]
- public string BarCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鎵规")]
- public string MaterialLot { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏁伴噺")]
- public decimal Quantity { get; set; }
-
- /// <summary>
- /// 棰嗘枡鍗曟槑缁嗙姸鎬�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "棰嗘枡鍗曟槑缁嗙姸鎬�")]
- public int PickOutDetailStatus { get; set; }
-
- /// <summary>
- /// 宸插垎閰嶉渶姹傛暟閲�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插垎閰嶉渶姹傛暟閲�")]
- public decimal AssignTotalUsage { get; set; }
-
- /// <summary>
- /// 宸插嚭闇�姹傛暟閲�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插嚭闇�姹傛暟閲�")]
- public decimal OutTotalUsage { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ProDeliveryOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ProDeliveryOrder.cs"
deleted file mode 100644
index 6033fbd..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ProDeliveryOrder.cs"
+++ /dev/null
@@ -1,82 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 閿�鍞嚭搴撳崟
- /// </summary>
- [SugarTable(nameof(Dt_ProDeliveryOrder), "閿�鍞嚭搴撳崟")]
- public class Dt_ProDeliveryOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// WMS鍗曟嵁缂栧彿
- /// </summary>
- [CodeRule(RuleCodeEnum.ProOutCodeRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "WMS鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)]
- public string ProDeliveryCode { get; set; }
-
- /// <summary>
- /// 閿�鍞嚭搴撳彂璐у崟鍙�(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閿�鍞嚭搴撳彂璐у崟鍙�(涓婃父)")]
- public string DeliveryCode { get; set; }
-
- /// <summary>
- /// 璁㈠崟绫诲瀷
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟绫诲瀷")]
- public int DeliveryType { get; set; }
-
- /// <summary>
- /// 閿�鍞嚭搴撳崟鍒涘缓鍛樺伐
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "閿�鍞嚭搴撳崟鍒涘缓鍛樺伐")]
- public string EmployeeName { get; set; }
-
- /// <summary>
- /// 閿�鍞嚭搴撳崟鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閿�鍞嚭搴撳崟鐘舵��")]
- public int ProDeliveryStatus { get; set; }
-
-
- /// <summary>
- /// 璁″垝棰嗘枡鏃堕棿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "璁″垝棰嗘枡鏃堕棿")]
- public DateTime PlanDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 閲囪喘鍒楄〃
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_ProDeliveryOrderDetail.ProDeliveryId), nameof(Id))]
- public List<Dt_ProDeliveryOrderDetail> Details { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ProDeliveryOrderDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ProDeliveryOrderDetail.cs"
deleted file mode 100644
index 0722179..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ProDeliveryOrderDetail.cs"
+++ /dev/null
@@ -1,99 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 閿�鍞嚭搴撴槑缁�
- /// </summary>
- [SugarTable(nameof(Dt_ProDeliveryOrderDetail), "閿�鍞嚭搴撴槑缁�")]
- public class Dt_ProDeliveryOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶磋〃涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "澶磋〃涓婚敭")]
- public int ProDeliveryId { get; set; }
-
- /// <summary>
- /// 涓婃父鍑哄簱鏄庣粏ID
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "涓婃父鍑哄簱鏄庣粏ID")]
- public int DetailId { get; set; }
-
-
- /// <summary>
- /// 閿�鍞崟鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閿�鍞崟鍙�")]
- public string SaleOrderNo { get; set; }
-
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "瀹㈡埛缂栧彿")]
- public string Customer { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鎵规")]
- public string MaterialLot { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏁伴噺")]
- public decimal Quantity { get; set; }
-
- /// <summary>
- /// 宸插垎閰嶉渶姹傛暟閲�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插垎閰嶉渶姹傛暟閲�")]
- public decimal AssignTotalUsage { get; set; }
-
- /// <summary>
- /// 宸插嚭闇�姹傛暟閲�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插嚭闇�姹傛暟閲�")]
- public decimal OutTotalUsage { get; set; }
-
- /// <summary>
- /// 閿�鍞嚭搴撴槑缁嗙姸鎬�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閿�鍞嚭搴撴槑缁嗙姸鎬�")]
- public int ProDeliveryDetailStatus { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ReturnOutOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ReturnOutOrder.cs"
deleted file mode 100644
index 07bb9e8..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ReturnOutOrder.cs"
+++ /dev/null
@@ -1,69 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// ERP閲囪喘閫�璐у嚭搴撳崟
- /// </summary>
- [SugarTable(nameof(Dt_ReturnOutOrder), "ERP閲囪喘閫�璐у嚭搴撳崟")]
- public class Dt_ReturnOutOrder : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// WMS鍗曟嵁缂栧彿
- /// </summary>
- [CodeRule(RuleCodeEnum.ERPTHCodeRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "WMS閫�璐у崟鎹紪鍙�", IsOnlyIgnoreUpdate = true)]
- public string ReturnOutNo { get; set; }
-
- /// <summary>
- /// 閫�璐у崟缂栧彿(涓婃父)
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閫�璐у崟缂栧彿(涓婃父)")]
- public string ReturnNo { get; set; }
-
- /// <summary>
- /// 閫�璐у憳宸�
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "閫�鏂欏憳宸�")]
- public string EmployeeName { get; set; }
-
- /// <summary>
- /// 閫�璐у崟鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閫�鏂欏崟鍏ュ簱鐘舵��")]
- public int ReturnOrderStatus { get; set; }
-
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 閲囪喘鍒楄〃
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_ReturnOutOrderDetail.ReturnOutId), nameof(Id))]
- public List<Dt_ReturnOutOrderDetail> Details { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ReturnOutOrderDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ReturnOutOrderDetail.cs"
deleted file mode 100644
index 19e8d42..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Outbound/Dt_ReturnOutOrderDetail.cs"
+++ /dev/null
@@ -1,92 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// ERP閲囪喘閫�璐у嚭搴撳崟鏄庣粏
- /// </summary>
- [SugarTable(nameof(Dt_ReturnOutOrderDetail), "ERP閲囪喘閫�璐у嚭搴撳崟鏄庣粏")]
- public class Dt_ReturnOutOrderDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 澶磋〃涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "澶磋〃涓婚敭")]
- public int ReturnOutId { get; set; }
-
- /// <summary>
- /// 閫�璐ф槑缁咺D
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閫�璐ф槑缁咺D")]
- public int DetailId { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鏉＄爜")]
- public string BarCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterialCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鎵规
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鎵规")]
- public string MaterialLot { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏁伴噺")]
- public decimal ReturnQuantity { get; set; }
-
- /// <summary>
- /// 宸插垎閰嶉渶姹傛暟閲�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插垎閰嶉渶姹傛暟閲�")]
- public decimal AssignTotalUsage { get; set; }
-
- /// <summary>
- /// 宸插嚭闇�姹傛暟閲�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "宸插嚭闇�姹傛暟閲�")]
- public decimal OutTotalUsage { get; set; }
-
- /// <summary>
- /// 閫�鏂欏崟鏄庣粏鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閫�鏂欏崟鏄庣粏鐘舵��")]
- public int ReturnOutDetailStatus { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Record/Dt_StockQuantityChangeRecord.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Record/Dt_StockQuantityChangeRecord.cs"
deleted file mode 100644
index 339ae3e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Record/Dt_StockQuantityChangeRecord.cs"
+++ /dev/null
@@ -1,101 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 搴撳瓨鍙樺姩淇℃伅璁板綍
- /// </summary>
- [SugarTable(nameof(Dt_StockQuantityChangeRecord), "搴撳瓨鍙樺姩淇℃伅璁板綍")]
- public class Dt_StockQuantityChangeRecord : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 搴撳瓨涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨涓婚敭")]
- public int StockId { get; set; }
-
- /// <summary>
- /// 鎵樼洏缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
- public string PalleCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterielCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵规鍙�")]
- public string BatchNo { get; set; }
-
- /// <summary>
- /// 搴忓垪鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "搴忓垪鍙�")]
- public string SerilNumber { get; set; }
-
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟鍙�")]
- public int? TaskNum { get; set; }
-
- /// <summary>
- /// 鍙樺姩绫诲瀷锛堝嚭搴撱�佸叆搴撱�佹墜鍔ㄨ皟鏁�...锛�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍙樺姩绫诲瀷锛堝嚭搴撱�佸叆搴撱�佹墜鍔ㄨ皟鏁�...锛�")]
- public int ChangeType { get; set; }
-
- /// <summary>
- /// 鍙樺姩鏁伴噺锛堟鏁拌〃绀哄鍔狅紝璐熸暟琛ㄧず鍑忓皯锛�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍙樺姩鏁伴噺锛堟鏁拌〃绀哄鍔狅紝璐熸暟琛ㄧず鍑忓皯锛�")]
- public decimal ChangeQuantity { get; set; }
-
- /// <summary>
- /// 鍙樺姩鍓嶅簱瀛橀噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍙樺姩鍓嶅簱瀛橀噺", DefaultValue = "0")]
- public decimal BeforeQuantity { get; set; }
-
- /// <summary>
- /// 鍙樺姩鍚庡簱瀛橀噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍙樺姩鍚庡簱瀛橀噺", DefaultValue = "0")]
- public decimal AfterQuantity { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Sort/Dt_SortOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Sort/Dt_SortOrder.cs"
index e2e0e4b..0e75f16 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Sort/Dt_SortOrder.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Sort/Dt_SortOrder.cs"
@@ -1,4 +1,4 @@
-锘縰sing SqlSugar;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_BlankStockInfo_Hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_BlankStockInfo_Hty.cs"
index f38a9e7..56c5137 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_BlankStockInfo_Hty.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_BlankStockInfo_Hty.cs"
@@ -10,7 +10,7 @@
namespace WIDESEA_Model.Models
{
/// <summary>
- /// 搴撳瓨淇℃伅鍘嗗彶
+ /// 鍧枡闅旂儹搴撳瓨淇℃伅鍘嗗彶
/// </summary>
[SugarTable(nameof(Dt_BlankStockInfo_Hty), "搴撳瓨淇℃伅")]
public class Dt_BlankStockInfo_Hty : Dt_BlankStockInfo, IBaseHistoryEntity
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_MouldStockInfo_Hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_MouldStockInfo_Hty.cs"
index 9e6ffe6..b92bbd5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_MouldStockInfo_Hty.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_MouldStockInfo_Hty.cs"
@@ -10,7 +10,7 @@
namespace WIDESEA_Model.Models
{
/// <summary>
- /// 搴撳瓨淇℃伅鍘嗗彶
+ /// 妯″叿搴撳瓨淇℃伅鍘嗗彶
/// </summary>
[SugarTable(nameof(Dt_MouldStockInfo_Hty), "搴撳瓨淇℃伅")]
public class Dt_MouldStockInfo_Hty : Dt_MouldStockInfo, IBaseHistoryEntity
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_ProCache.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_ProCache.cs"
deleted file mode 100644
index 2f61471..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_ProCache.cs"
+++ /dev/null
@@ -1,77 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鎴愬搧鐮佸灈宸ヤ綅
- /// </summary>
- [SugarTable(nameof(Dt_ProCache), "鎴愬搧鐮佸灈宸ヤ綅涓昏〃")]
- public class Dt_ProCache : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鐮佸灈宸ヤ綅鍙�
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐮佸灈宸ヤ綅鍙�")]
- public string MdNo { get; set; }
-
- /// <summary>
- /// 鐮佸灈鐗╂枡<br/>
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐮佸灈鐗╂枡")]
- public string MdMaterial { get; set; }
-
- /// <summary>
- /// 鐮佸灈鐗╂枡绠卞瀷
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐮佸灈鐗╂枡绠卞瀷")]
- public string MdBoxMaterial { get; set; }
-
- /// <summary>
- /// 宸茬爜鍨涚鏁�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "宸茬爜鍨涚鏁�")]
- public string MdQtys { get; set; }
-
- /// <summary>
- /// 鐮佸灈涓暟閲忥紙鍚凡鐮佸灈锛�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐮佸灈涓暟閲�")]
- public string MdingQtys { get; set; }
-
- /// <summary>
- /// 鐮佸灈缁撴墭鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐮佸灈缁撴墭鏁伴噺")]
- public string MdEndQtys { get; set; }
-
- /// <summary>
- /// 鍗曞彿
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "鍗曞彿")]
- public string ShipmentOrder { get; set; }
-
- /// <summary>
- /// 鐮佸灈鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鐮佸灈鐘舵��")]
- public int MdStatus { get; set; }
-
- /// <summary>
- /// 鐮佸灈鏄庣粏
- /// </summary>
- [Navigate(NavigateType.OneToMany, nameof(Dt_ProStockInfoDetail.ProStockId), nameof(Id))]
- public List<Dt_ProStockInfoDetail> proStockInfoDetails { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_ProCacheDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_ProCacheDetail.cs"
deleted file mode 100644
index 742c629..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_ProCacheDetail.cs"
+++ /dev/null
@@ -1,48 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鎴愬搧鐮佸灈宸ヤ綅鏄庣粏
- /// </summary>
- [SugarTable(nameof(Dt_ProCacheDetail), "鎴愬搧鐮佸灈宸ヤ綅鏄庣粏")]
- public class Dt_ProCacheDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鎴愬搧鐮佸灈宸ヤ綅涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鎴愬搧鐮佸灈宸ヤ綅涓婚敭")]
- public int ProCacheId { get; set; }
-
- /// <summary>
- /// 鐮佸灈绠卞彿
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐮佸灈绠卞彿")]
- public string MdBoxCode { get; set; }
-
- /// <summary>
- /// 鍗曠鏁伴噺<br/>
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曠鏁伴噺")]
- public int BoxQtys { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鍗曚綅")]
- public string MaterialUnit { get; set; }
-
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_ProStockInfoDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_ProStockInfoDetail.cs"
deleted file mode 100644
index d22f275..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_ProStockInfoDetail.cs"
+++ /dev/null
@@ -1,89 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鎴愬搧搴撳瓨淇℃伅鏄庣粏
- /// </summary>
- [SugarTable(nameof(Dt_ProStockInfoDetail), "鎴愬搧搴撳瓨淇℃伅鏄庣粏")]
- public class Dt_ProStockInfoDetail : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 搴撳瓨涓婚敭
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鎴愬搧搴撳瓨涓婚敭")]
- public int ProStockId { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栫爜")]
- public string ProductNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栫爜")]
- public string ProductCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string ProductName { get; set; }
-
- /// <summary>
- /// 瑙勬牸
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "瑙勬牸")]
- public string ProductSpec { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曚綅")]
- public string ProductUnit { get; set; }
-
- /// <summary>
- /// 搴撳瓨鏁�
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨鏁�")]
- public decimal StockQty { get; set; }
-
- /// <summary>
- /// 鍑哄簱鏁伴噺
- /// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鍑哄簱鏁伴噺")]
- public decimal OutboundQuantity { get; set; }
-
- /// <summary>
- /// 搴撳瓨鏄庣粏鐘舵��
- /// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨鏄庣粏鐘舵��")]
- public int ProStockDetailStatus { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎵规鍙�")]
- public string LotNumber { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_ProStockInfoDetail_Hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_ProStockInfoDetail_Hty.cs"
deleted file mode 100644
index 1ececf2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_ProStockInfoDetail_Hty.cs"
+++ /dev/null
@@ -1,43 +0,0 @@
-锘縰sing Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鎴愬搧搴撳瓨鍘嗗彶淇℃伅鏄庣粏
- /// </summary>
- [SugarTable(nameof(Dt_ProStockInfoDetail_Hty), "鎴愬搧搴撳瓨鍘嗗彶淇℃伅鏄庣粏")]
- public class Dt_ProStockInfoDetail_Hty:Dt_ProStockInfoDetail, IBaseHistoryEntity
- {
- /// <summary>
- /// 鍘熻〃涓婚敭
- /// </summary>
- [ImporterHeader(Name = "鍘熻〃涓婚敭")]
- [ExporterHeader(DisplayName = "鍘熻〃涓婚敭")]
- [SugarColumn(IsNullable = false, DefaultValue = "0", ColumnDescription = "鍘熻〃涓婚敭")]
- public int SourceId { get; set; }
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- [ImporterHeader(Name = "鎿嶄綔绫诲瀷")]
- [ExporterHeader(DisplayName = "鎿嶄綔绫诲瀷")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔绫诲瀷")]
- public string OperateType { get; set; }
-
- /// <summary>
- /// 绉诲叆鍘嗗彶鏃堕棿
- /// </summary>
- [ImporterHeader(Name = "绉诲叆鍘嗗彶鏃堕棿")]
- [ExporterHeader(DisplayName = "绉诲叆鍘嗗彶鏃堕棿")]
- [SugarColumn(IsNullable = false, ColumnDescription = "绉诲叆鍘嗗彶鏃堕棿")]
- public DateTime InsertTime { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_StockInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_StockInfo.cs"
deleted file mode 100644
index f1430e3..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_StockInfo.cs"
+++ /dev/null
@@ -1,237 +0,0 @@
-锘縰sing Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 鍘熸枡/鍗婃垚鍝佺焊鍗峰簱瀛樹俊鎭�
- /// </summary>
- [SugarTable(nameof(Dt_StockInfo), "鍘熸枡/鍗婃垚鍝佺焊鍗峰簱瀛樹俊鎭�")]
- [SugarIndex("unique_stockinfo_stockcode", nameof(PalletCode), OrderByType.Asc, true)]
- public class Dt_StockInfo : BaseEntity
- {
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [ExporterHeader(DisplayName = "涓婚敭")]
- [ImporterHeader(Name = "涓婚敭")]
- [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
- public int Id { get; set; }
-
- /// <summary>
- /// 鏉＄爜缂栧彿
- /// </summary>
- [ExporterHeader(DisplayName = "鏉＄爜缂栧彿")]
- [ImporterHeader(Name = "鏉＄爜缂栧彿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鏉＄爜缂栧彿")]
- public string PalletCode { get; set; }
-
- /// <summary>
- /// RFID淇℃伅
- /// </summary>
- [ExporterHeader(DisplayName = "RFID淇℃伅")]
- [ImporterHeader(Name = "RFID淇℃伅")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "RFID淇℃伅")]
- public string RfidCode { get; set; }
-
- /// <summary>
- /// 鎵樼洏绫诲瀷
- /// </summary>
- [ExporterHeader(DisplayName = "鎵樼洏绫诲瀷")]
- [ImporterHeader(Name = "鎵樼洏绫诲瀷")]
- [SugarColumn(IsNullable = false, ColumnDescription = "鎵樼洏绫诲瀷")]
- public int PalletType { get; set; }
-
- /// <summary>
- /// 璐т綅缂栧彿
- /// </summary>
- [ExporterHeader(DisplayName = "璐т綅缂栧彿")]
- [ImporterHeader(Name = "璐т綅缂栧彿")]
- [SugarColumn(IsNullable = true, Length = 30, ColumnDescription = "璐т綅缂栧彿")]
- public string LocationCode { get; set; }
-
- /// <summary>
- /// 浠撳簱涓婚敭
- /// </summary>
- [ExporterHeader(DisplayName = "浠撳簱涓婚敭")]
- [ImporterHeader(Name = "浠撳簱涓婚敭")]
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
- public int WarehouseId { get; set; }
-
- /// <summary>
- /// 搴撳瓨缁勭粐
- /// </summary>
- [ExporterHeader(DisplayName = "搴撳瓨缁勭粐")]
- [ImporterHeader(Name = "搴撳瓨缁勭粐")]
- [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨缁勭粐")]
- public int MaterielInvOrgId { get; set; }
-
- /// <summary>
- /// 搴撳瓨灞炴��(鍘熺焊,鍗婃垚...)
- /// </summary>
- [ExporterHeader(DisplayName = "搴撳瓨灞炴��")]
- [ImporterHeader(Name = "搴撳瓨灞炴��")]
- [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨灞炴��")]
- public int StockAttribute { get; set; }
-
- /// <summary>
- /// 搴撳瓨鐘舵��
- /// </summary>
- [ExporterHeader(DisplayName = "搴撳瓨鐘舵��")]
- [ImporterHeader(Name = "搴撳瓨鐘舵��")]
- [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨鐘舵��")]
- public int StockStatus { get; set; }
-
- /// <summary>
- /// 鐗╂枡Id
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡Id")]
- [ImporterHeader(Name = "鐗╂枡Id")]
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡Id")]
- public int MaterielId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡缂栧彿")]
- [ImporterHeader(Name = "鐗╂枡缂栧彿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterielCode { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡鍚嶇О")]
- [ImporterHeader(Name = "鐗╂枡鍚嶇О")]
- [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
- public string MaterielName { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡瑙勬牸")]
- [ImporterHeader(Name = "鐗╂枡瑙勬牸")]
- [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡瑙勬牸")]
- public string MaterielSpec { get; set; }
-
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- [ExporterHeader(DisplayName = "鎵规鍙�")]
- [ImporterHeader(Name = "鎵规鍙�")]
- [SugarColumn(IsNullable = true, Length = 100, ColumnDescription = "鎵规鍙�")]
- public string BatchNo { get; set; }
-
- /// <summary>
- /// 璁㈠崟鍙�
- /// </summary>
- [ExporterHeader(DisplayName = "璁㈠崟鍙�")]
- [ImporterHeader(Name = "璁㈠崟鍙�")]
- [SugarColumn(IsNullable = true, Length = 100, ColumnDescription = "璁㈠崟鍙�")]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 搴撳瓨鐗╂枡鎬婚暱(m)
- /// </summary>
- [ExporterHeader(DisplayName = "搴撳瓨鐗╂枡鎬婚暱")]
- [ImporterHeader(Name = "搴撳瓨鐗╂枡鎬婚暱")]
- [SugarColumn(IsNullable = true, ColumnDescription = "搴撳瓨鐗╂枡鎬婚暱(m)")]
- public decimal StockLength { get; set; }
-
- /// <summary>
- /// 鐗╂枡閲嶉噺
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡閲嶉噺")]
- [ImporterHeader(Name = "鐗╂枡閲嶉噺")]
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡閲嶉噺")]
- public decimal? MaterielWeight { get; set; }
-
- /// <summary>
- /// 妫�娴嬮噸閲�
- /// </summary>
- [ExporterHeader(DisplayName = "妫�娴嬮噸閲�")]
- [ImporterHeader(Name = "妫�娴嬮噸閲�")]
- [SugarColumn(IsNullable = true, ColumnDescription = "妫�娴嬮噸閲�")]
- public decimal? CheckWeight { get; set; }
-
- /// <summary>
- /// 鐗╂枡鐩村緞/楂樺害
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡鐩村緞")]
- [ImporterHeader(Name = "鐗╂枡鐩村緞")]
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡鐩村緞/楂樺害")]
- public decimal? MaterielThickness { get; set; }
-
- /// <summary>
- /// 妫�娴嬬洿寰�
- /// </summary>
- [ExporterHeader(DisplayName = "妫�娴嬬洿寰�")]
- [ImporterHeader(Name = "妫�娴嬬洿寰�")]
- [SugarColumn(IsNullable = true, ColumnDescription = "妫�娴嬬洿寰�")]
- public decimal? CheckThickness { get; set; }
-
- /// <summary>
- /// 鐗╂枡渚ч潰骞呭(m)
- /// </summary>
- [ExporterHeader(DisplayName = "鐗╂枡渚ч潰骞呭")]
- [ImporterHeader(Name = "鐗╂枡渚ч潰骞呭")]
- [SugarColumn(IsNullable = true, ColumnDescription = "鐗╂枡渚ч潰骞呭(m)")]
- public decimal? MaterielWide { get; set; }
-
- /// <summary>
- /// 妫�娴嬪箙瀹�
- /// </summary>
- [ExporterHeader(DisplayName = "妫�娴嬪箙瀹�")]
- [ImporterHeader(Name = "妫�娴嬪箙瀹�")]
- [SugarColumn(IsNullable = true, ColumnDescription = "妫�娴嬪箙瀹�")]
- public decimal? CheckWide { get; set; }
-
- /// <summary>
- /// 鍑哄簱鐗╂枡鏁伴噺
- /// </summary>
- [ExporterHeader(DisplayName = "鍑哄簱鐗╂枡鏁伴噺")]
- [ImporterHeader(Name = "鍑哄簱鐗╂枡鏁伴噺")]
- [SugarColumn(IsNullable = false, ColumnDescription = "鍑哄簱鐗╂枡鏁伴噺", DefaultValue = "0")]
- public decimal StockOutLength { get; set; }
-
- /// <summary>
- /// 鏁村嵎/娈嬪嵎
- /// </summary>
- [ExporterHeader(DisplayName = "鏁村嵎/娈嬪嵎")]
- [ImporterHeader(Name = "鏁村嵎/娈嬪嵎")]
- [SugarColumn(IsNullable = false, ColumnDescription = "鏁村嵎/娈嬪嵎", DefaultValue = "0")]
- public int IsFull { get; set; }
-
- /// <summary>
- /// 鏄惁棰嗘枡<br/>
- /// 0 鍚�<br/>
- /// 1 鏄�<br/>
- /// </summary>
- [ExporterHeader(DisplayName = "鏄惁棰嗘枡(1鏄�0鍚�)")]
- [ImporterHeader(Name = "鏄惁棰嗘枡(1鏄�0鍚�)")]
- [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁棰嗘枡", DefaultValue = "0")]
- public int IsPick { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [ExporterHeader(DisplayName = "鍗曚綅")]
- [ImporterHeader(Name = "鍗曚綅")]
- [SugarColumn(IsNullable = true, ColumnDescription = "鍗曚綅")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [ExporterHeader(DisplayName = "澶囨敞")]
- [ImporterHeader(Name = "澶囨敞")]
- [SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")]
- public string Remark { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_StockInfo_Hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_StockInfo_Hty.cs"
deleted file mode 100644
index 00a0f08..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/Stock/Dt_StockInfo_Hty.cs"
+++ /dev/null
@@ -1,42 +0,0 @@
-锘縰sing Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.DB.Models;
-
-namespace WIDESEA_Model.Models
-{
- /// <summary>
- /// 搴撳瓨淇℃伅鍘嗗彶
- /// </summary>
- [SugarTable(nameof(Dt_StockInfo_Hty), "搴撳瓨淇℃伅")]
- public class Dt_StockInfo_Hty : Dt_StockInfo, IBaseHistoryEntity
- {
- /// <summary>
- /// 鍘熻〃涓婚敭
- /// </summary>
- [ImporterHeader(Name = "鍘熻〃涓婚敭")]
- [ExporterHeader(DisplayName = "鍘熻〃涓婚敭")]
- [SugarColumn(IsNullable = false, DefaultValue = "0", ColumnDescription = "鍘熻〃涓婚敭")]
- public int SourceId { get; set; }
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- [ImporterHeader(Name = "鎿嶄綔绫诲瀷")]
- [ExporterHeader(DisplayName = "鎿嶄綔绫诲瀷")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔绫诲瀷")]
- public string OperateType { get; set; }
-
- /// <summary>
- /// 绉诲叆鍘嗗彶鏃堕棿
- /// </summary>
- [ImporterHeader(Name = "绉诲叆鍘嗗彶鏃堕棿")]
- [ExporterHeader(DisplayName = "绉诲叆鍘嗗彶鏃堕棿")]
- [SugarColumn(IsNullable = false, ColumnDescription = "绉诲叆鍘嗗彶鏃堕棿")]
- public DateTime InsertTime { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
index 2194b23..6a2d8df 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
@@ -1,4 +1,4 @@
-锘縰sing Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Core;
using SqlSugar;
using System;
using System.Collections.Generic;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordRepository/RecordRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordRepository/RecordRepository.cs"
deleted file mode 100644
index 4fd9b12..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordRepository/RecordRepository.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_IRecordRepository;
-
-namespace WIDESEA_RecordRepository
-{
- public class RecordRepository : IRecordRepository
- {
- public ILocationStatusChangeRecordRepository LocationStatusChangeRecordRepository { get; }
-
- public IStockQuantityChangeRecordRepository StockQuantityChangeRecordRepository { get; }
-
- public RecordRepository(ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository, IStockQuantityChangeRecordRepository stockQuantityChangeRecordRepository)
- {
- LocationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
- StockQuantityChangeRecordRepository = stockQuantityChangeRecordRepository;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordRepository/StockQuantityChangeRecordRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordRepository/StockQuantityChangeRecordRepository.cs"
deleted file mode 100644
index 6c00d01..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordRepository/StockQuantityChangeRecordRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IRecordRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_RecordRepository
-{
- public class StockQuantityChangeRecordRepository : RepositoryBase<Dt_StockQuantityChangeRecord>, IStockQuantityChangeRecordRepository
- {
- public StockQuantityChangeRecordRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordService/Base/StockQuantityChangeRecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordService/Base/StockQuantityChangeRecordService.cs"
deleted file mode 100644
index 1a29618..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordService/Base/StockQuantityChangeRecordService.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-锘縰sing AutoMapper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_IRecordRepository;
-using WIDESEA_IRecordService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_RecordService
-{
- public partial class StockQuantityChangeRecordService : ServiceBase<Dt_StockQuantityChangeRecord, IStockQuantityChangeRecordRepository>, IStockQuantityChangeRecordService
- {
- private readonly IMapper _mapper;
- public StockQuantityChangeRecordService(IStockQuantityChangeRecordRepository BaseDal, IMapper mapper) : base(BaseDal)
- {
- _mapper = mapper;
- }
-
- public IStockQuantityChangeRecordRepository Repository => BaseDal;
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordService/RecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordService/RecordService.cs"
deleted file mode 100644
index 5b98765..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordService/RecordService.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_IRecordService;
-
-namespace WIDESEA_RecordService
-{
- public class RecordService : IRecordService
- {
- public ILocationStatusChangeRecordService LocationStatusChangeRecordSetvice { get; }
-
- public IStockQuantityChangeRecordService StockQuantityChangeRecordService { get; }
-
- public RecordService(ILocationStatusChangeRecordService locationStatusChangeRecordSetvice, IStockQuantityChangeRecordService stockQuantityChangeRecordService)
- {
- LocationStatusChangeRecordSetvice = locationStatusChangeRecordSetvice;
- StockQuantityChangeRecordService = stockQuantityChangeRecordService;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs"
deleted file mode 100644
index b3888a8..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs"
+++ /dev/null
@@ -1,94 +0,0 @@
-锘縰sing AutoMapper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.StockEnum;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_IRecordRepository;
-using WIDESEA_IRecordService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_RecordService
-{
- public partial class StockQuantityChangeRecordService : ServiceBase<Dt_StockQuantityChangeRecord, IStockQuantityChangeRecordRepository>, IStockQuantityChangeRecordService
- {
- /// <summary>
- /// 鍗锋枡鍙樺姩搴撳瓨璁板綍
- /// </summary>
- /// <param name="stockInfo">搴撳瓨</param>
- /// <param name="beforeQuantity">鍙樺姩鍓嶅簱瀛�</param>
- /// <param name="changeQuantity">鍙樺姩搴撳瓨</param>
- /// <param name="changeType">鍙樺姩绫诲瀷</param>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="orderNo">鍗曟嵁缂栧彿</param>
- /// <exception cref="Exception"></exception>
- public void AddStockChangeRecord(Dt_StockInfo stockInfo, decimal beforeQuantity, decimal changeQuantity, StockChangeTypeEnum changeType, int? taskNum = 0,string orderNo="")
- {
- try
- {
- Dt_StockQuantityChangeRecord stockQuantityChangeRecord = new Dt_StockQuantityChangeRecord()
- {
- StockId = stockInfo.Id,
- PalleCode = stockInfo.PalletCode,
- MaterielCode=stockInfo.MaterielCode,
- MaterielName=stockInfo.MaterielName,
- BatchNo = "",
- SerilNumber=$"{stockInfo.Id}",
- OrderNo = orderNo,
- TaskNum= taskNum,
- ChangeType=changeType.ObjToInt(),
- ChangeQuantity=changeQuantity,
- BeforeQuantity=beforeQuantity,
- AfterQuantity=beforeQuantity+changeQuantity,
- Creater="System"
- };
- BaseDal.AddData(stockQuantityChangeRecord);
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
- }
- /// <summary>
- /// 鎴愬搧杈呮枡搴撳瓨璁板綍
- /// </summary>
- /// <param name="proStockInfo">搴撳瓨</param>
- /// <param name="beforeQuantity">鍙樺姩鍓嶅簱瀛�</param>
- /// <param name="changeQuantity">鍙樺姩搴撳瓨</param>
- /// <param name="changeType">鍙樺姩绫诲瀷</param>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="orderNo"></param>
- /// <exception cref="Exception"></exception>
- public void AddStockChangeRecord(Dt_ProStockInfo proStockInfo, decimal beforeQuantity, decimal changeQuantity, StockChangeTypeEnum changeType, int? taskNum = null, string orderNo = "")
- {
- try
- {
- Dt_StockQuantityChangeRecord stockQuantityChangeRecord = new Dt_StockQuantityChangeRecord()
- {
- StockId = proStockInfo.Id,
- PalleCode = proStockInfo.PalletCode,
- MaterielCode = proStockInfo.proStockInfoDetails?.FirstOrDefault()?.ProductCode ?? "",
- MaterielName = proStockInfo.proStockInfoDetails?.FirstOrDefault()?.ProductName ?? "",
- BatchNo = "",
- SerilNumber = $"{proStockInfo.Id}",
- OrderNo = orderNo,
- TaskNum = taskNum,
- ChangeType = changeType.ObjToInt(),
- ChangeQuantity = changeQuantity,
- BeforeQuantity = beforeQuantity,
- AfterQuantity = beforeQuantity + changeQuantity,
- Creater = "System"
- };
- BaseDal.AddData(stockQuantityChangeRecord);
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderRepository/SortOrderDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderRepository/SortOrderDetailRepository.cs"
new file mode 100644
index 0000000..0c706f6
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderRepository/SortOrderDetailRepository.cs"
@@ -0,0 +1,17 @@
+锘縰sing WIDESEA_Core.BaseRepository;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_IBasicRepository;
+using WIDESEA_ISortOrderRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_SortOrderRepository
+{
+ public class SortOrderDetailRepository : RepositoryBase<Dt_SortOrder>, ISortOrderRepository
+ {
+ private readonly IBasicRepository _basicRepository;
+ public SortOrderDetailRepository(IUnitOfWorkManage unitOfWorkManage, IBasicRepository basicRepository) : base(unitOfWorkManage)
+ {
+ _basicRepository = basicRepository;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderRepository/SortOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderRepository/SortOrderRepository.cs"
new file mode 100644
index 0000000..38bfb29
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderRepository/SortOrderRepository.cs"
@@ -0,0 +1,17 @@
+锘縰sing WIDESEA_Core.BaseRepository;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_IBasicRepository;
+using WIDESEA_ISortOrderRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_SortOrderRepository
+{
+ public class SortOrderRepository : RepositoryBase<Dt_SortOrder>, ISortOrderRepository
+ {
+ private readonly IBasicRepository _basicRepository;
+ public SortOrderRepository(IUnitOfWorkManage unitOfWorkManage, IBasicRepository basicRepository) : base(unitOfWorkManage)
+ {
+ _basicRepository = basicRepository;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderRepository/WIDESEA_SortOrderRepository.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderRepository/WIDESEA_SortOrderRepository.csproj"
new file mode 100644
index 0000000..a7603ca
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderRepository/WIDESEA_SortOrderRepository.csproj"
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEA_IBasicRepository\WIDESEA_IBasicRepository.csproj" />
+ <ProjectReference Include="..\WIDESEA_ISortOrderRepository\WIDESEA_ISortOrderRepository.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderService/SortOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderService/SortOrderDetailService.cs"
new file mode 100644
index 0000000..fee8e8b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderService/SortOrderDetailService.cs"
@@ -0,0 +1,20 @@
+锘縰sing WIDESEA_Core.BaseServices;
+using WIDESEA_IBasicRepository;
+using WIDESEA_ISortOrderRepository;
+using WIDESEA_ISortOrderService;
+using WIDESEA_Model.Models;
+
+
+namespace WIDESEA_SortOrderService
+{
+ public partial class SortOrderDetailService : ServiceBase<Dt_SortOrderDetail, ISortOrderDetailRepository>, ISortOrderDetailService
+ {
+ public ISortOrderDetailRepository Repository => BaseDal;
+
+ private readonly IBasicRepository _basicRepository;
+ public SortOrderDetailService(ISortOrderDetailRepository BaseDal, IBasicRepository basicRepository) : base(BaseDal)
+ {
+ _basicRepository = basicRepository;
+ }
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderService/SortOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderService/SortOrderService.cs"
new file mode 100644
index 0000000..f762b53
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderService/SortOrderService.cs"
@@ -0,0 +1,20 @@
+锘縰sing WIDESEA_Core.BaseServices;
+using WIDESEA_IBasicRepository;
+using WIDESEA_ISortOrderRepository;
+using WIDESEA_ISortOrderService;
+using WIDESEA_Model.Models;
+
+
+namespace WIDESEA_SortOrderService
+{
+ public partial class SortOrderService : ServiceBase<Dt_SortOrder, ISortOrderRepository>, ISortOrderService
+ {
+ public ISortOrderRepository Repository => BaseDal;
+
+ private readonly IBasicRepository _basicRepository;
+ public SortOrderService(ISortOrderRepository BaseDal, IBasicRepository basicRepository) : base(BaseDal)
+ {
+ _basicRepository = basicRepository;
+ }
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderService/WIDESEA_SortOrderService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderService/WIDESEA_SortOrderService.csproj"
new file mode 100644
index 0000000..191a44d
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortOrderService/WIDESEA_SortOrderService.csproj"
@@ -0,0 +1,15 @@
+锘�<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEA_External\WIDESEA_External.csproj" />
+ <ProjectReference Include="..\WIDESEA_IBasicService\WIDESEA_IBasicService.csproj" />
+ <ProjectReference Include="..\WIDESEA_ISortOrderService\WIDESEA_ISortOrderService.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortRepository/SortOrderDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortRepository/SortOrderDetailRepository.cs"
new file mode 100644
index 0000000..1d4a7d4
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortRepository/SortOrderDetailRepository.cs"
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_IBasicRepository;
+using WIDESEA_ISortRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_SortRepository
+{
+ public class SortOrderDetailRepository : RepositoryBase<Dt_SortOrderDetail>, ISortOrderDetailRepository
+ {
+ private readonly IBasicRepository _basicRepository;
+ public SortOrderDetailRepository(IUnitOfWorkManage unitOfWorkManage, IBasicRepository basicRepository) : base(unitOfWorkManage)
+ {
+ _basicRepository = basicRepository;
+ }
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortRepository/SortOrderRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortRepository/SortOrderRepository.cs"
new file mode 100644
index 0000000..565feb3
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortRepository/SortOrderRepository.cs"
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_IBasicRepository;
+using WIDESEA_ISortRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_SortRepository
+{
+ public class SortOrderRepository : RepositoryBase<Dt_SortOrder>, ISortOrderRepository
+ {
+ private readonly IBasicRepository _basicRepository;
+ public SortOrderRepository(IUnitOfWorkManage unitOfWorkManage, IBasicRepository basicRepository) : base(unitOfWorkManage)
+ {
+ _basicRepository = basicRepository;
+ }
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortRepository/WIDESEA_SortRepository.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortRepository/WIDESEA_SortRepository.csproj"
new file mode 100644
index 0000000..3daed26
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortRepository/WIDESEA_SortRepository.csproj"
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEA_IBasicRepository\WIDESEA_IBasicRepository.csproj" />
+ <ProjectReference Include="..\WIDESEA_ISortRepository\WIDESEA_ISortRepository.csproj" />
+ <ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortService/WIDESEA_SortService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortService/WIDESEA_SortService.csproj"
new file mode 100644
index 0000000..1031d0a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SortService/WIDESEA_SortService.csproj"
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEA_IBasicRepository\WIDESEA_IBasicRepository.csproj" />
+ <ProjectReference Include="..\WIDESEA_ISortRepository\WIDESEA_ISortRepository.csproj" />
+ <ProjectReference Include="..\WIDESEA_ISortService\WIDESEA_ISortService.csproj" />
+ <ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/BlankStockInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/BlankStockInfoRepository.cs"
new file mode 100644
index 0000000..1202882
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/BlankStockInfoRepository.cs"
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_IBasicRepository;
+using WIDESEA_IStockRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_StockRepository
+{
+ public class BlankStockInfoRepository : RepositoryBase<Dt_BlankStockInfo>, IBlankStockInfoRepository
+ {
+ private readonly IBasicRepository _basicRepository;
+ public BlankStockInfoRepository(IUnitOfWorkManage unitOfWorkManage, IBasicRepository basicRepository) : base(unitOfWorkManage)
+ {
+ _basicRepository = basicRepository;
+ }
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/BlankStockInfo_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/BlankStockInfo_HtyRepository.cs"
new file mode 100644
index 0000000..9e65f00
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/BlankStockInfo_HtyRepository.cs"
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_IStockRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_StockRepository
+{
+ public class BlankStockInfo_HtyRepository : RepositoryBase<Dt_BlankStockInfo_Hty>, IBlankStockInfo_HtyRepository
+ {
+ public BlankStockInfo_HtyRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
+ {
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/MouldStockInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/MouldStockInfoRepository.cs"
new file mode 100644
index 0000000..a77300f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/MouldStockInfoRepository.cs"
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_IBasicRepository;
+using WIDESEA_IStockRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_StockRepository
+{
+ public class MouldStockInfoRepository : RepositoryBase<Dt_MouldStockInfo>, IMouldStockInfoRepository
+ {
+ private readonly IBasicRepository _basicRepository;
+ public MouldStockInfoRepository(IUnitOfWorkManage unitOfWorkManage, IBasicRepository basicRepository) : base(unitOfWorkManage)
+ {
+ _basicRepository = basicRepository;
+ }
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/MouldStockInfo_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/MouldStockInfo_HtyRepository.cs"
new file mode 100644
index 0000000..3409be4
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/MouldStockInfo_HtyRepository.cs"
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_IStockRepository;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_StockRepository
+{
+ public class MouldStockInfo_HtyRepository : RepositoryBase<Dt_MouldStockInfo_Hty>, IMouldStockInfo_HtyRepository
+ {
+ public MouldStockInfo_HtyRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
+ {
+ }
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/ProStockInfoDetailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/ProStockInfoDetailRepository.cs"
deleted file mode 100644
index b9fb48c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/ProStockInfoDetailRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IStockRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_StockRepository
-{
- public class ProStockInfoDetailRepository : RepositoryBase<Dt_ProStockInfoDetail>, IProStockInfoDetailRepository
- {
- public ProStockInfoDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/ProStockInfoDetail_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/ProStockInfoDetail_HtyRepository.cs"
deleted file mode 100644
index d2753d3..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/ProStockInfoDetail_HtyRepository.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_IStockRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_StockRepository
-{
- public class ProStockInfoDetail_HtyRepository : RepositoryBase<Dt_ProStockInfoDetail_Hty>, IProStockInfoDetail_HtyRepository
- {
- public ProStockInfoDetail_HtyRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/StockInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/StockInfoRepository.cs"
deleted file mode 100644
index 58a4196..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/StockInfoRepository.cs"
+++ /dev/null
@@ -1,70 +0,0 @@
-锘縰sing Org.BouncyCastle.Crypto;
-using SqlSugar;
-using SqlSugar.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.LocationEnum;
-using WIDESEA_Common.StockEnum;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.Enums;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IStockRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_StockRepository
-{
- public class StockInfoRepository : RepositoryBase<Dt_StockInfo>, IStockInfoRepository
- {
- public StockInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
- public Dt_StockInfo GetStockInfo(string palletCode)
- {
- return Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).First();
- }
-
- public List<Dt_StockInfo> GetStockInfos(string materielCode)
- {
- return Db.Queryable<Dt_StockInfo>().Where(x => x.MaterielCode == materielCode).ToList();
- }
-
- public List<Dt_StockInfo> GetStockInfos(int materielId,decimal width, List<string> locationCodes)
- {
- List<Dt_StockInfo> stockInfos = Db.Queryable<Dt_StockInfo>().Where(x => locationCodes.Contains(x.LocationCode) && x.MaterielId == materielId && x.MaterielWide==width && x.StockOutLength<=0).OrderBy(x=>x.CreateDate).ToList();
- return stockInfos;
- }
- /// <summary>
- /// 鑾峰彇鐢熺鍙娇鐢ㄥ簱瀛�
- /// </summary>
- public List<Dt_StockInfo> GetStockInfos(string materielCode, decimal width, List<string> locationCodes)
- {
- List<Dt_StockInfo> stockInfos = Db.Queryable<Dt_StockInfo>().Where(x => locationCodes.Contains(x.LocationCode) && x.MaterielCode.StartsWith(materielCode) && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.MaterielWide == width && x.StockOutLength <= 0 && x.StockLength > 0).OrderBy(x => x.CreateDate).ToList();
- return stockInfos;
- }
-
- public List<Dt_StockInfo> GetStockInfos(string materielCode, List<string> locationCodes)
- {
- List<Dt_StockInfo> stockInfos = Db.Queryable<Dt_StockInfo>().Where(x => locationCodes.Contains(x.LocationCode) && x.MaterielCode == materielCode && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.StockOutLength <= 0 && x.StockLength > 0).OrderBy(x => x.CreateDate).ToList();
- return stockInfos;
- }
-
- public List<Dt_StockInfo> GetStockInfosByIds(List<int> ids)
- {
- return Db.Queryable<Dt_StockInfo>().Where(x => ids.Contains(x.Id)).ToList();
- }
-
- public List<Dt_StockInfo> GetStockInfosByPalletCodes(List<string> palletCodes)
- {
- return Db.Queryable<Dt_StockInfo>().Where(x => palletCodes.Contains(x.PalletCode)).ToList();
- }
-
- public List<Dt_StockInfo> GetStockInfosExclude(string materielCode, List<string> palletCodes)
- {
- return Db.Queryable<Dt_StockInfo>().Where(x => !palletCodes.Contains(x.PalletCode) && x.MaterielCode == materielCode).ToList();
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/StockInfo_HtyRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/StockInfo_HtyRepository.cs"
deleted file mode 100644
index ea9010e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/StockInfo_HtyRepository.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-锘縰sing Org.BouncyCastle.Crypto;
-using SqlSugar;
-using SqlSugar.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.Enums;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IStockRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_StockRepository
-{
- public class StockInfo_HtyRepository : RepositoryBase<Dt_StockInfo_Hty>, IStockInfo_HtyRepository
- {
- public StockInfo_HtyRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
- {
- }
-
-
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/StockRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/StockRepository.cs"
deleted file mode 100644
index c66fb5b..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockRepository/StockRepository.cs"
+++ /dev/null
@@ -1,29 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_IStockRepository;
-
-namespace WIDESEA_StockRepository
-{
- public class StockRepository : IStockRepository
- {
- public IStockInfoRepository StockInfoRepository { get; }
- public IStockInfo_HtyRepository StockInfo_HtyRepository { get; }
- public IProStockInfoRepository ProStockInfoRepository { get; }
- public IProStockInfoDetailRepository ProStockInfoDetailRepository { get; }
- public IProStockInfo_HtyRepository ProStockInfo_HtyRepository { get; }
- public IProStockInfoDetail_HtyRepository ProStockInfoDetail_HtyRepository { get; }
-
- public StockRepository( IStockInfoRepository stockInfoRepository,IStockInfo_HtyRepository stockInfo_HtyRepository,IProStockInfoRepository proStockInfoRepository,IProStockInfoDetailRepository proStockInfoDetailRepository,IProStockInfo_HtyRepository proStockInfo_HtyRepository,IProStockInfoDetail_HtyRepository proStockInfoDetail_HtyRepository)
- {
- StockInfoRepository = stockInfoRepository;
- StockInfo_HtyRepository = stockInfo_HtyRepository;
- ProStockInfoRepository=proStockInfoRepository;
- ProStockInfoDetailRepository = proStockInfoDetailRepository;
- ProStockInfo_HtyRepository = proStockInfo_HtyRepository;
- ProStockInfoDetail_HtyRepository = proStockInfoDetail_HtyRepository;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/BlankStockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/BlankStockInfoService.cs"
new file mode 100644
index 0000000..0693511
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/BlankStockInfoService.cs"
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_IStockService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_StockService
+{
+ public partial class BlankStockInfoService : ServiceBase<Dt_BlankStockInfo, IRepository<Dt_BlankStockInfo>>, IBlankStockInfoService
+ {
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ public BlankStockInfoService(IRepository<Dt_BlankStockInfo> BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
+ {
+ _unitOfWorkManage = unitOfWorkManage;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/BlankStockInfo_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/BlankStockInfo_HtyService.cs"
new file mode 100644
index 0000000..5c71a5f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/BlankStockInfo_HtyService.cs"
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_IStockRepository;
+using WIDESEA_IStockService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_StockService
+{
+ public partial class BlankStockInfo_HtyService : ServiceBase<Dt_BlankStockInfo_Hty, IBlankStockInfo_HtyRepository>, IBlankStockInfo_HtyService
+ {
+ public IBlankStockInfo_HtyRepository Repository => BaseDal;
+ public BlankStockInfo_HtyService(IBlankStockInfo_HtyRepository BaseDal) : base(BaseDal)
+ {
+ }
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/MouldStockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/MouldStockInfoService.cs"
new file mode 100644
index 0000000..ed3a685
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/MouldStockInfoService.cs"
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_IStockService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_StockService
+{
+ public partial class MouldStockInfoService : ServiceBase<Dt_MouldStockInfo, IRepository<Dt_MouldStockInfo>>, IMouldStockInfoService
+ {
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ public MouldStockInfoService(IRepository<Dt_MouldStockInfo> BaseDal, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
+ {
+ _unitOfWorkManage = unitOfWorkManage;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/MouldStockInfo_Hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/MouldStockInfo_Hty.cs"
new file mode 100644
index 0000000..f72d973
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/MouldStockInfo_Hty.cs"
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_IStockRepository;
+using WIDESEA_IStockService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_StockService
+{
+ public partial class MouldStockInfo_Hty : ServiceBase<Dt_MouldStockInfo_Hty, IMouldStockInfo_HtyRepository>, IMouldStockInfo_HtyService
+ {
+ public IMouldStockInfo_HtyRepository Repository => BaseDal;
+ public MouldStockInfo_Hty(IMouldStockInfo_HtyRepository BaseDal) : base(BaseDal)
+ {
+ }
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/ProStockInfoDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/ProStockInfoDetailService.cs"
deleted file mode 100644
index 6d17a1f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/ProStockInfoDetailService.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IStockRepository;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_StockService
-{
- public partial class ProStockInfoDetailService : ServiceBase<Dt_ProStockInfoDetail, IProStockInfoDetailRepository>, IProStockInfoDetailService
- {
- public IProStockInfoDetailRepository Repository => BaseDal;
- public ProStockInfoDetailService(IProStockInfoDetailRepository BaseDal) : base(BaseDal)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/ProStockInfoDetail_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/ProStockInfoDetail_HtyService.cs"
deleted file mode 100644
index f5c20e3..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/ProStockInfoDetail_HtyService.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_IStockRepository;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_StockService
-{
- public partial class ProStockInfoDetail_HtyService : ServiceBase<Dt_ProStockInfoDetail_Hty, IProStockInfoDetail_HtyRepository>, IProStockInfoDetail_HtyService
- {
- public IProStockInfoDetail_HtyRepository Repository => BaseDal;
- public ProStockInfoDetail_HtyService(IProStockInfoDetail_HtyRepository BaseDal) : base(BaseDal)
- {
-
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/ProStockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/ProStockInfoService.cs"
index aff2f8f..8a01f7b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/ProStockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/ProStockInfoService.cs"
@@ -19,11 +19,9 @@
public partial class ProStockInfoService : ServiceBase<Dt_ProStockInfo, IProStockInfoRepository>, IProStockInfoService
{
public IProStockInfoRepository Repository => BaseDal;
- private readonly IStockRepository _stockRepository;
private readonly IBasicRepository _basicRepository;
- public ProStockInfoService(IProStockInfoRepository BaseDal,IStockRepository stockRepository, IBasicRepository basicRepository) : base(BaseDal)
+ public ProStockInfoService(IProStockInfoRepository BaseDal, IBasicRepository basicRepository) : base(BaseDal)
{
- _stockRepository = stockRepository;
_basicRepository = basicRepository;
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/ProStockViewService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/ProStockViewService.cs"
deleted file mode 100644
index 9255975..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/ProStockViewService.cs"
+++ /dev/null
@@ -1,311 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.Utilities;
-using System.Reflection;
-using System.Dynamic;
-using Magicodes.ExporterAndImporter.Excel;
-using Magicodes.ExporterAndImporter.Core;
-using WIDESEA_Core.HostedService;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_IStockRepository;
-using WIDESEA_Common.StockEnum;
-using WIDESEA_IBasicRepository;
-using WIDESEA_Common.WareHouseEnum;
-
-namespace WIDESEA_StockService
-{
- public partial class ProStockViewService : IProStockViewService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly SqlSugarClient _dbBase;
- private readonly IStockRepository _stockRepository;
- private readonly IBasicRepository _basicRepository;
-
- public ProStockViewService(IUnitOfWorkManage unitOfWorkManage,IStockRepository stockRepository,IBasicRepository basicRepository)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _dbBase = unitOfWorkManage.GetDbClient();
- _stockRepository = stockRepository;
- _basicRepository = basicRepository;
- }
-
- public virtual PageGridData<ProStockViewDTO> GetPageData(PageDataOptions options)
- {
- try
- {
- List<ProStockViewDTO> stockViewDTOs = new List<ProStockViewDTO>();
-
- string where = string.Empty;
- ISugarQueryable<Dt_ProStockInfo> sugarQueryable1 = _dbBase.Queryable<Dt_ProStockInfo>().Includes(x => x.proStockInfoDetails);
- if (!string.IsNullOrEmpty(options.Wheres))
- {
- try
- {
- List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
- if (searchParametersList.Count > 0)
- {
- SearchParameters? searchParameters1 = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_ProStockInfoDetail.ProductCode).FirstLetterToLower());
- if (searchParameters1 != null)
- {
- sugarQueryable1 = sugarQueryable1.Where(x => x.proStockInfoDetails.Any(v => v.ProductCode.Contains(searchParameters1.Value)));
- }
- }
-
- }
- catch { }
- }
- string whereSto = GetDataRole(typeof(Dt_ProStockInfo));
- sugarQueryable1 = sugarQueryable1.Where(whereSto);
- EntityProperties.ValidatePageOptions(options, ref sugarQueryable1);
-
- string whereLo = GetDataRole(typeof(Dt_LocationInfo));
- ISugarQueryable<Dt_LocationInfo> sugarQueryable = _dbBase.Queryable<Dt_LocationInfo>().Where(whereLo);
-
- EntityProperties.ValidatePageOptions(options, ref sugarQueryable);
-
- ISugarQueryable<ProStockViewDTO> list = sugarQueryable1.InnerJoin(sugarQueryable, (b, a) => a.LocationCode == b.LocationCode).OrderByDescending(b=>b.CreateDate).Select((b, a)
- => new ProStockViewDTO
- {
- ProStockAttribute=b.ProStockAttribute,
- LocationCode = b.LocationCode,
- Column = a.Columns,
- WarehouseId = b.WarehouseId,
- CreateDate = b.CreateDate,
- Creater = b.Creater,
- EnalbeStatus = a.EnableStatus,
- Layer = a.Layer,
- LocationName = a.LocationName,
- LocationStatus = a.LocationStatus,
- Modifier = b.Modifier,
- ModifyDate = b.ModifyDate,
- PalletCode = b.PalletCode,
- StockRemark = b.Remark,
- Row = a.Row,
- ProStockId = b.Id,
- StockStatus = b.StockStatus,
- Details = b.proStockInfoDetails,
- SumStocks=b.proStockInfoDetails.Sum(x=>x.StockQty)
- });
-
- int totalCount = 0;
- int pktotalCount = 0;
-
- stockViewDTOs = list.ToPageList(options.Page, options.Rows, ref totalCount);
-
- stockViewDTOs.ForEach(x =>
- {
- x.ProductCode = string.Join(",", x.Details.Select(x => x.ProductCode).Distinct());
- x.ProductName = x.Details.FirstOrDefault()?.ProductName ?? "";
- x.ProductSpec = x.Details.FirstOrDefault()?.ProductSpec ?? "";
- x.ProductUnit = x.Details.FirstOrDefault()?.ProductUnit ?? "";
- }
- );
- return new PageGridData<ProStockViewDTO>(totalCount + pktotalCount, stockViewDTOs.ToList());
- }
- catch (Exception ex)
- {
-
- }
- return new PageGridData<ProStockViewDTO>();
- }
-
- public virtual object GetDetailPage(PageDataOptions pageData)
- {
- Type t = typeof(ProStockViewDTO);
-
- if (pageData.Value == null) return new PageGridData<object>(total: 0, null);
- string keyName = t.GetKeyName();
- ////鐢熸垚鏌ヨ鏉′欢
- //Expression<Func<TEntity, bool>> whereExpression = keyName.CreateExpression<TEntity>(pageData.Value, LinqExpressionType.Equal);
- int totalCount = 0;
- PropertyInfo? propertyInfo = t.GetProperties().FirstOrDefault(x => x.GetCustomAttribute<Navigate>() != null);
- if (propertyInfo != null)
- {
- Type detailType = propertyInfo.PropertyType.GetGenericArguments()[0];
- Navigate? navigate = propertyInfo.GetCustomAttribute<Navigate>();
- if (navigate != null)
- {
- List<ExpandoObject> list = _dbBase.Queryable(detailType.Name, "detail").Where(navigate.GetName(), "=", pageData.Value).ToPageList(pageData.Page, pageData.Rows, ref totalCount);
- return new PageGridData<ExpandoObject>(totalCount, list);
- }
- }
- return new PageGridData<object>(total: 0, null);
- }
- public virtual WebResponseContent Export(PageDataOptions options)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- Type t = typeof(ProStockViewDTO);
-
- string savePath = AppDomain.CurrentDomain.BaseDirectory + $"ExcelExport";
- IExporter exporter = new ExcelExporter();
- options.Page = 1;
- options.Rows = 30;
- options.Order = "desc";
- options.Sort = "proStockId";
- List<ProStockViewDTO> stockViewDTOs = new List<ProStockViewDTO>();
- List<Dt_Warehouse> warehouses = _basicRepository.WarehouseRepository.QueryData(x => x.WarehouseId == WarehouseEnum.LLDCP.ObjToInt());
- string where = string.Empty;
- ISugarQueryable<Dt_ProStockInfo> sugarQueryable1 = _dbBase.Queryable<Dt_ProStockInfo>().Includes(x => x.proStockInfoDetails);
- if (!string.IsNullOrEmpty(options.Wheres))
- {
- try
- {
- List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
- if (searchParametersList.Count > 0)
- {
- {
- SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_ProStockInfoDetail.ProductCode).FirstLetterToLower());
- if (searchParameters != null)
- {
- sugarQueryable1 = sugarQueryable1.Where(x => x.proStockInfoDetails.Any(v => v.ProductCode.Contains(searchParameters.Value)));
- }
- }
-
- }
-
- }
- catch { }
- }
- string whereSto = GetDataRole(typeof(Dt_ProStockInfo));
- sugarQueryable1 = sugarQueryable1.Where(whereSto);
- EntityProperties.ValidatePageOptions(options, ref sugarQueryable1);
-
- string whereLo = GetDataRole(typeof(Dt_LocationInfo));
- ISugarQueryable<Dt_LocationInfo> sugarQueryable = _dbBase.Queryable<Dt_LocationInfo>().Where(whereLo);
-
- EntityProperties.ValidatePageOptions(options, ref sugarQueryable);
-
- ISugarQueryable<ProStockViewDTO> list = sugarQueryable1.InnerJoin(sugarQueryable, (b, a) => a.LocationCode == b.LocationCode).Select((b, a)
- => new ProStockViewDTO
- {
- ProStockAttribute = b.ProStockAttribute,
- LocationCode = b.LocationCode,
- Column = a.Columns,
- WarehouseId = b.WarehouseId,
- CreateDate = b.CreateDate,
- Creater = b.Creater,
- EnalbeStatus = a.EnableStatus,
- Layer = a.Layer,
- LocationName = a.LocationName,
- LocationStatus = a.LocationStatus,
- Modifier = b.Modifier,
- ModifyDate = b.ModifyDate,
- PalletCode = b.PalletCode,
- StockRemark = b.Remark,
- Row = a.Row,
- ProStockId = b.Id,
- StockStatus = b.StockStatus,
- Details = b.proStockInfoDetails,
- SumStocks = b.proStockInfoDetails.Sum(x => x.StockQty),
-
- });
-
- //var pklist = sugarQueryable1.Where(b => b.LocationCode == "骞冲簱浣�").Select(b => new StockViewDTO
- //{
- // LocationCode = b.LocationCode,
- // Column = 0,
- // WarehouseId = b.WarehouseId,
- // CreateDate = b.CreateDate,
- // Creater = b.Creater,
- // Depth = 0,
- // EnalbeStatus = EnableStatusEnum.Normal.ObjToInt(),
- // Layer = 0,
- // LocationName = "骞冲簱浣�",
- // LocationStatus = LocationStatusEnum.InStock.ObjToInt(),
- // LocationType = LocationTypeEnum.Undefined.ObjToInt(),
- // Modifier = b.Modifier,
- // ModifyDate = b.ModifyDate,
- // PalletCode = b.PalletCode,
- // StockRemark = b.Remark,
- // RoadwayNo = "骞冲簱",
- // Row = 0,
- // StockId = b.Id,
- // StockStatus = b.StockStatus,
- // Details = b.Details,
- //});
- stockViewDTOs = list.ToList();
- //stockViewDTOs.AddRange(pklist.ToList());
- stockViewDTOs.ForEach(x =>
- {
- x.ProductCode = string.Join(",", x.Details.Select(x => x.ProductCode).Distinct());
- x.ProductName = x.Details.FirstOrDefault()?.ProductName ?? "";
- x.ProductSpec = x.Details.FirstOrDefault()?.ProductSpec ?? "";
- x.ProductUnit = x.Details.FirstOrDefault()?.ProductUnit ?? "";
- }
- );
-
- byte[] data = exporter.ExportAsByteArray(stockViewDTOs).Result;
-
- string fileName = "鎴愬搧搴撳瓨瑙嗗浘.xlsx";
-
- FileHelper.WriteFile(savePath, fileName, data);
-
- content = WebResponseContent.Instance.OK(data: savePath + "\\" + fileName);
- }
- catch (Exception ex)
- {
- content = WebResponseContent.Instance.Error(ex.Message);
- }
- return content;
- }
- private string GetDataRole(Type type)
- {
- try
- {
- UserRole? userRole = PermissionDataHostService.UserRoles.FirstOrDefault(x => x.UserId == App.User.UserId);
- if (userRole == null)
- throw new Exception($"鏃犳潈闄�");
-
- if (type.IsAssignableFrom(typeof(BaseWarehouseEntity)) || type.GetProperty(nameof(BaseWarehouseEntity.WarehouseId)) != null)
- {
- if (userRole.WarehouseIds.Count > 0)
- {
- return $"{nameof(BaseWarehouseEntity.WarehouseId)} in ({userRole.WarehouseIds.OrderBy(x=>x).Serialize().Replace("[", "").Replace("]", "")})";
- }
-
- else
- return $"1 != 1";
- }
- else
- {
- return "1 = 1";
- }
-
- //UserRole? userRole = PermissionDataHostService.UserRoles.FirstOrDefault(x => x.UserId == App.User.UserId);
- //if (userRole == null)
- // throw new Exception($"鏃犳潈闄�");
-
- //if (userRole.AuthorityScope == (int)AuthorityScopeEnum.CurrentRole)
- //{
- // List<int> userId = PermissionDataHostService.UserRoles.Where(x => x.RoleId == userRole.RoleId).Select(x => x.UserId).ToList();
- // return $"creater in ({userId.Serialize()})";
- //}
- //else if (userRole.AuthorityScope == (int)AuthorityScopeEnum.OnlySelf)
- //{
- // return $"creater = '{userRole.UserName}'";
- //}
- //else if (userRole.AuthorityScope == (int)AuthorityScopeEnum.None)
- //{
- // return $"1 != 1";
- //}
- //return "";
- }
- catch (Exception ex)
- {
- throw new Exception($"鏃犳潈闄愶紝{ex.Message}");
- }
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
deleted file mode 100644
index 247c7aa..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockInfoService.cs"
+++ /dev/null
@@ -1,281 +0,0 @@
-锘縰sing AutoMapper;
-using MailKit.Search;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
-using OfficeOpenXml.FormulaParsing.Excel.Operators;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.MaterielEnum;
-using WIDESEA_Common.StockEnum;
-using WIDESEA_Common.WareHouseEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
-using WIDESEA_DTO.Stock;
-using WIDESEA_External.ERPService;
-using WIDESEA_External.Model;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IRecordRepository;
-using WIDESEA_IRecordService;
-using WIDESEA_IStockRepository;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-using WIDESEA_StockRepository;
-
-namespace WIDESEA_StockService
-{
- public partial class StockInfoService : ServiceBase<Dt_StockInfo, IStockInfoRepository>, IStockInfoService
- {
- private readonly IMapper _mapper;
- private readonly IBasicRepository _basicRepository;
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IInvokeERPService _invokeERPService;
- public IStockInfoRepository Repository => BaseDal;
-
- public StockInfoService(IStockInfoRepository BaseDal, IMapper mapper, IBasicRepository basicRepository, IUnitOfWorkManage unitOfWorkManage,IInvokeERPService invokeERPService) : base(BaseDal)
- {
- _mapper = mapper;
- _basicRepository = basicRepository;
- _unitOfWorkManage = unitOfWorkManage;
- _invokeERPService = invokeERPService;
- }
-
-
-
-
- public WebResponseContent StockQueryData(SaveModel saveModel)
- {
- try
- {
- var barcode = saveModel.MainData["barcode"].ToString();
- var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
- Dt_StockInfo stockInfo = BaseDal.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == barcode && x.WarehouseId == warehouseId).First();
- if (stockInfo == null) throw new Exception("鏈壘鍒版墭鐩樹俊鎭�");
- return WebResponseContent.Instance.OK(data: stockInfo);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- public WebResponseContent ManualMaterielGroup(SaveModel saveModel)
- {
- WebResponseContent content=new WebResponseContent();
- try
- {
- var barcode = saveModel.MainData["palletCode"].ToString();
- var fridcode = saveModel.MainData["fridCode"].ToString();
- var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
- var materSn = saveModel.MainData["materSn"];
- //鐩村緞
- var thickness = saveModel.MainData["thickness"].ObjToInt();
- var weight = saveModel.MainData["weight"].ObjToInt();
- //骞呭
- var wide = saveModel.MainData["wide"].ObjToInt();
- var lengthStock = saveModel.MainData["lengthStock"].ObjToInt();
- Dt_MaterielInfo? materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == materSn);
- if (materielInfo==null)
- {
- return content.Error("鏈壘鍒扮墿鏂欎俊鎭�");
- }
- if (materielInfo.MaterielInvOrgId==MaterielInvOrgEnum.鏂板巶.ObjToInt() && wide<700)
- {
- return content.Error("鐗╂枡骞呭闄愬埗涓�700-2700mm");
- }
- Dt_StockInfo stockInfoOld = BaseDal.QueryFirst(x=>x.PalletCode== barcode || x.RfidCode== fridcode);
-
- if (stockInfoOld != null)
- {
- return content.Error("鏉＄爜淇℃伅鎴朢FID淇℃伅宸插瓨鍦�");
- }
- //鐢熸垚搴撳瓨缁勭洏淇℃伅
- Dt_StockInfo stockInfo = new Dt_StockInfo()
- {
- MaterielInvOrgId=materielInfo.MaterielInvOrgId,
- PalletCode= barcode,
- RfidCode= fridcode,
- LocationCode ="",
- PalletType = 1,
- WarehouseId=warehouseId,
- StockAttribute= materielInfo.MaterielSourceType,
- StockStatus= StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt(),
- MaterielSpec=materielInfo.MaterielSpec,
- Unit=materielInfo.MaterielUnit,
- MaterielThickness=thickness,
- MaterielWide=wide,
- StockLength=lengthStock,
- MaterielWeight=weight,
- MaterielCode = materielInfo.MaterielCode,
- MaterielName=materielInfo.MaterielName,
- };
- if (wide>1200)
- {
- stockInfo.PalletType = 2;
- }
- BaseDal.AddData(stockInfo);
- content.OK("缁勭洏鎴愬姛");
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鏇存柊鑰佸巶绔嬪簱娈嬪嵎搴撳瓨
- /// </summary>
- /// <returns></returns>
- public WebResponseContent UpBSTStock(int operate)
- {
- WebResponseContent content=new WebResponseContent();
- try
- {
- DateTime dateTime = Convert.ToDateTime("2025-11-01 00:00:00");
- //鑾峰彇鎵�鏈夌殑娈嬪嵎绔嬪簱搴撳瓨
- List<Dt_StockInfo> stockInfos = BaseDal.QueryData(x => x.IsFull == WhetherEnum.True.ObjToInt() && x.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.ModifyDate> dateTime);
- if (operate>0)
- {
- //鑾峰彇鎵�鏈夌殑鑰佸巶缂撳瓨鍖哄簱瀛�
- stockInfos = BaseDal.QueryData(x => x.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && x.WarehouseId==WarehouseEnum.LLDOldCache.ObjToInt());
- }
- List<Dt_StockInfo> stockInfosUp = new List<Dt_StockInfo>();
- List<Dt_StockInfo> stockInfosDel = new List<Dt_StockInfo>();
- foreach (var item in stockInfos)
- {
- BSTResponse<BSTStockInfoDTO> bSTResponse = _invokeERPService.BSTStockAsync(item.PalletCode).DeserializeObject<BSTResponse<BSTStockInfoDTO>>();
- if (bSTResponse.Code == 500)
- {
- content.Message += $"鏉＄爜{item.PalletCode}涓�鏈烢RP搴撳瓨涓嶅瓨鍦�,";
- continue;
- }
- BSTStockInfoDTO bSTStockInfoDTO = bSTResponse.Data ?? throw new Exception($"涓�鏈烢RP鏈繑鍥瀧item.PalletCode}鐨勫簱瀛樹俊鎭�");
- if (item.StockLength != bSTStockInfoDTO.StockMeter && bSTStockInfoDTO.StockMeter>0)
- {
- item.MaterielThickness = bSTStockInfoDTO.Thick;
- item.MaterielWeight = bSTStockInfoDTO.Qty;
- item.MaterielWide = bSTStockInfoDTO.W;
- item.Remark = $"{item.StockLength}-{bSTStockInfoDTO.StockMeter}";
- item.StockLength = bSTStockInfoDTO.StockMeter;
- stockInfosUp.Add(item);
- }
- else if(item.StockLength != bSTStockInfoDTO.StockMeter && bSTStockInfoDTO.StockMeter == 0)
- {
- stockInfosDel.Add(item);
- }
- }
- //鏁版嵁搴撴搷浣�
- _unitOfWorkManage.BeginTran();
- BaseDal.UpdateData(stockInfosUp);
- if (stockInfosDel.Count>0)
- {
- BaseDal.DeleteAndMoveIntoHty(stockInfosDel, App.User.UserId > 0 ? OperateTypeEnum.浜哄伐瀹屾垚 : OperateTypeEnum.鑷姩瀹屾垚);
- }
- _unitOfWorkManage.CommitTran();
- content.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
-
- public List<Dt_StockInfo> GetUseableStocks(int materielId,decimal width, int warehoseId)
- {
- List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(warehoseId);
-
- return BaseDal.GetStockInfos(materielId,width, locationCodes);
- }
- /// <summary>
- /// 鑾峰彇鐢熺鍙娇鐢ㄥ簱瀛�
- /// </summary>
- public List<Dt_StockInfo> GetUseableStocks(string materielCode, decimal width, int warehoseId)
- {
- List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(warehoseId);
-
- return BaseDal.GetStockInfos(materielCode, width, locationCodes);
- }
- public List<Dt_StockInfo> GetUseableStocks(string materielCode, int warehoseId)
- {
- List<string> locationCodes = _basicRepository.LocationInfoRepository.GetCanOutLocationCodes(warehoseId);
-
- return BaseDal.GetStockInfos(materielCode, locationCodes);
- }
- /// <summary>
- /// 鍒嗛厤瀹為檯搴撳瓨
- /// </summary>
- /// <returns></returns>
- public List<Dt_StockInfo> GetOutboundStocks(List<Dt_StockInfo> stockInfos, decimal needQuantity)
- {
- List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
- //鑾峰彇搴撳瓨鍙敤鏁伴噺
- decimal stockTotalQuantity = stockInfos.Sum(x => x.StockLength-x.StockOutLength);
- if (stockTotalQuantity >= needQuantity)//搴撳瓨澶�
- {
- int index = 0;
- while (needQuantity > 0)
- {
- Dt_StockInfo stockInfo = stockInfos[index];
- decimal useableStockQuantity = stockInfo.StockLength-stockInfo.StockOutLength;
- if (useableStockQuantity < needQuantity && useableStockQuantity > 0)
- {
- stockInfo.StockOutLength=stockInfo.StockLength;
- needQuantity -= useableStockQuantity;
- }
- else
- {
- stockInfo.StockOutLength += needQuantity;
- needQuantity = 0;
- }
- outStocks.Add(stockInfo);
- index++;
- }
- }
- else
- {
- throw new Exception("搴撳瓨涓嶈冻");
- }
- return outStocks;
- }
- /// <summary>
- /// 鍒嗛厤鑰佸巶搴撳瓨
- /// </summary>
- /// <returns></returns>
- public List<Dt_StockInfo> GetOutOldStocks(List<Dt_StockInfo> stockInfos, decimal needQuantity)
- {
- List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
- //鑾峰彇搴撳瓨鍙敤鏁伴噺
- decimal stockTotalQuantity = stockInfos.Sum(x => x.StockLength - x.StockOutLength);
- int index = 0;
- while (needQuantity > 0 && (index + 1 <= stockInfos.Count))
- {
- Dt_StockInfo stockInfo = stockInfos[index];
- decimal useableStockQuantity = stockInfo.StockLength - stockInfo.StockOutLength;
- if (useableStockQuantity < needQuantity && useableStockQuantity > 0)
- {
- stockInfo.StockOutLength = stockInfo.StockLength;
- needQuantity -= useableStockQuantity;
- }
- else
- {
- stockInfo.StockOutLength += needQuantity;
- needQuantity = 0;
- }
- outStocks.Add(stockInfo);
- index++;
- }
- return outStocks;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockInfo_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockInfo_HtyService.cs"
deleted file mode 100644
index 6194e8d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockInfo_HtyService.cs"
+++ /dev/null
@@ -1,33 +0,0 @@
-锘縰sing AutoMapper;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IRecordRepository;
-using WIDESEA_IRecordService;
-using WIDESEA_IStockRepository;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_StockService
-{
- public partial class StockInfo_HtyService : ServiceBase<Dt_StockInfo_Hty, IStockInfo_HtyRepository>, IStockInfo_HtyService
- {
- private readonly IMapper _mapper;
- public IStockInfo_HtyRepository Repository => BaseDal;
-
- public StockInfo_HtyService(IStockInfo_HtyRepository BaseDal, IMapper mapper) : base(BaseDal)
- {
- _mapper = mapper;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockSerivce.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockSerivce.cs"
deleted file mode 100644
index 45fe8c8..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockSerivce.cs"
+++ /dev/null
@@ -1,29 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_IStockService;
-
-namespace WIDESEA_StockService
-{
- public class StockSerivce:IStockService
- {
- public IStockInfoService StockInfoService { get; }
- public IStockInfo_HtyService StockInfo_HtyService { get; }
- public IProStockInfoService ProStockInfoService { get; }
- public IProStockInfoDetailService ProStockInfoDetailService { get; }
- public IProStockInfo_HtyService ProStockInfo_HtyService { get; }
- public IProStockInfoDetail_HtyService ProStockInfoDetail_HtyService { get; }
-
- public StockSerivce( IStockInfoService stockInfoService, IStockInfo_HtyService stockInfo_HtyService, IProStockInfoService proStockInfoService,IProStockInfoDetailService proStockInfoDetailService,IProStockInfo_HtyService proStockInfo_HtyService,IProStockInfoDetail_HtyService proStockInfoDetail_HtyService)
- {
- StockInfoService = stockInfoService;
- StockInfo_HtyService = stockInfo_HtyService;
- ProStockInfoService= proStockInfoService;
- ProStockInfoDetailService= proStockInfoDetailService;
- ProStockInfo_HtyService = proStockInfo_HtyService;
- ProStockInfoDetail_HtyService = proStockInfoDetail_HtyService;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockViewService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockViewService.cs"
deleted file mode 100644
index 193f9c3..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/StockViewService.cs"
+++ /dev/null
@@ -1,45 +0,0 @@
-锘�
-using HslCommunication.Secs.Types;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
-using Microsoft.AspNetCore.Http;
-using SqlSugar;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Drawing.Printing;
-using System.Dynamic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.LocationEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Const;
-using WIDESEA_Core.DB.Models;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.HostedService;
-using WIDESEA_Core.Utilities;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IStockRepository;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_StockService
-{
- public partial class StockViewService : IStockViewService
- {
- private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly SqlSugarClient _dbBase;
-
- public StockViewService(IUnitOfWorkManage unitOfWorkManage)
- {
- _unitOfWorkManage = unitOfWorkManage;
- _dbBase = unitOfWorkManage.GetDbClient();
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/WIDESEA_StockService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/WIDESEA_StockService.csproj"
index 3fb8fdd..93c590b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/WIDESEA_StockService.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_StockService/WIDESEA_StockService.csproj"
@@ -9,7 +9,6 @@
<ItemGroup>
<ProjectReference Include="..\WIDESEA_External\WIDESEA_External.csproj" />
<ProjectReference Include="..\WIDESEA_IBasicRepository\WIDESEA_IBasicRepository.csproj" />
- <ProjectReference Include="..\WIDESEA_IOutboundRepository\WIDESEA_IOutboundRepository.csproj" />
<ProjectReference Include="..\WIDESEA_IRecordRepository\WIDESEA_IRecordRepository.csproj" />
<ProjectReference Include="..\WIDESEA_IRecordService\WIDESEA_IRecordService.csproj" />
<ProjectReference Include="..\WIDESEA_IStockService\WIDESEA_IStockService.csproj" />
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs"
index f3d1a28..cf13aae 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs"
@@ -176,25 +176,6 @@
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
- case "materials":
- {
- {
- List<object> data = new List<object>();
-
- {
- List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData();
- int index = 0;
- foreach (var item in materielInfos)
- {
- data.Add(new { key = item.MaterielCode, value = item.MaterielCode });
- index++;
- }
- }
-
- result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
- }
- }
- break;
case "taskType":
{
List<object> data = new List<object>();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SystemService/Sys_UserService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SystemService/Sys_UserService.cs"
index b71f4e9..001add6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SystemService/Sys_UserService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_SystemService/Sys_UserService.cs"
@@ -1,4 +1,4 @@
-锘縰sing WIDESEA_Core.Authorization;
+using WIDESEA_Core.Authorization;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Const;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoRepository/TaskRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoRepository/TaskRepository.cs"
index d8bd020..b873729 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoRepository/TaskRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoRepository/TaskRepository.cs"
@@ -50,12 +50,12 @@
public override int AddData(List<Dt_Task> listEntity)
{
- if (listEntity.GroupBy(x => x.PalletCode).Select(x => x.Count()).Any(x => x > 1))
+ if (listEntity.GroupBy(x => x.ContainerNo).Select(x => x.Count()).Any(x => x > 1))
{
throw new Exception("浠诲姟鏁扮粍鏁版嵁鎵樼洏鍙烽噸澶�");
}
- if (QueryFirst(x => listEntity.Select(v => v.PalletCode).Contains(x.PalletCode)) != null)
+ if (QueryFirst(x => listEntity.Select(v => v.ContainerNo).Contains(x.ContainerNo)) != null)
{
throw new Exception("鏈夐噸澶嶄换鍔�");
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/AssignInboundTaskLocation_BC.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/AssignInboundTaskLocation_BC.cs"
deleted file mode 100644
index 5f81491..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/AssignInboundTaskLocation_BC.cs"
+++ /dev/null
@@ -1,30 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.LocationEnum;
-using WIDESEA_Common.OrderEnum;
-using WIDESEA_Common.StockEnum;
-using WIDESEA_Common.TaskEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_TaskInfoService
-{
- public partial class TaskService
- {
-
- }
-
- public class LocationCount
- {
- public string RoadwayNo { get; set; }
-
- public int Count { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/MesProductService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/MesProductService.cs"
deleted file mode 100644
index 2189143..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/MesProductService.cs"
+++ /dev/null
@@ -1,30 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.OrderEnum;
-using WIDESEA_Common.StockEnum;
-using WIDESEA_Common.TaskEnum;
-using WIDESEA_Core;
-using WIDESEA_DTO;
-using WIDESEA_Model.Models;
-using WIDESEA_Core.Helper;
-using WIDESEA_Common.WareHouseEnum;
-using Newtonsoft.Json.Serialization;
-using Newtonsoft.Json;
-using WIDESEA_Common.APIEnum;
-using System.Reflection.Metadata;
-using Microsoft.Extensions.FileSystemGlobbing.Internal;
-using System.Text.RegularExpressions;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Core.CodeConfigEnum;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
-
-namespace WIDESEA_TaskInfoService
-{
- public partial class TaskService
- {
-
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/MesSolderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/MesSolderService.cs"
deleted file mode 100644
index 681d817..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/MesSolderService.cs"
+++ /dev/null
@@ -1,37 +0,0 @@
-锘縰sing Newtonsoft.Json.Serialization;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.APIEnum;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core;
-using WIDESEA_DTO;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_TaskInfoService
-{
- public partial class TaskService
- {
- static object lock_solder = new object();
- public MesResponseContent SolderMaskOutNotice()
- {
- //閿�
- lock (lock_solder)
- {
- MesResponseContent responseContent = new MesResponseContent();
- try
- {
-
- }
- catch (Exception ex)
- {
- responseContent.Error(ex.Message);
- }
- return responseContent;
- }
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
deleted file mode 100644
index 752fc07..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
+++ /dev/null
@@ -1,334 +0,0 @@
-锘�
-using Newtonsoft.Json.Serialization;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.APIEnum;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.LocationEnum;
-using WIDESEA_Common.OtherEnum;
-using WIDESEA_Common.StockEnum;
-using WIDESEA_Common.TaskEnum;
-using WIDESEA_Common.WareHouseEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO;
-using WIDESEA_DTO.ERP;
-using WIDESEA_ITaskInfoRepository;
-using WIDESEA_ITaskInfoService;
-using WIDESEA_Model.Models;
-using WIDESEA_Common.OrderEnum;
-using System.Diagnostics.Metrics;
-using System.Reflection.Metadata;
-using WIDESEA_DTO.Task;
-using WIDESEA_DTO.Stock;
-using SqlSugar;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
-using WIDESEA_DTO.MES;
-using WIDESEA_External.Model;
-using System.Text.Json;
-using System.Text.RegularExpressions;
-using WIDESEA_Common.MaterielEnum;
-using MailKit.Search;
-
-namespace WIDESEA_TaskInfoService
-{
- public partial class TaskService
- {
- static object lock_autoIssue = new object();
- static object lock_manualIssue = new object();
- static object lock_returnIssue = new object();
- /// <summary>
- /// MES鑷姩鍙枡鎺ュ彛
- /// </summary>
- /// <returns></returns>
- public WebResponseContent ReceiveAutoIssue(MESAutoIssueDTO autoIssueDTO)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- lock (lock_autoIssue)
- {
- if (autoIssueDTO == null)
- {
- return content.Error("浼犲叆淇℃伅涓嶈兘涓虹┖");
- }
- //鑾峰彇瀵瑰簲鍗曟嵁
- Dt_OutMESOrder? outMESOrder = _outboundRepository.OutMESOrderRepository.QueryFirst(x => x.OutDetailId == autoIssueDTO.OutDetailId);
- if (outMESOrder == null)
- {
- return content.Error($"棰嗘枡璁″垝{nameof(MESAutoIssueDTO.OutDetailId)}{autoIssueDTO.OutDetailId}涓嶅瓨鍦�");
- }
- if (outMESOrder.OutMESOrderStatus == OutOrderStatusEnum.鍑哄簱瀹屾垚.ObjToInt())
- {
- return content.Error($"棰嗘枡璁″垝{nameof(MESAutoIssueDTO.OutDetailId)}{outMESOrder.ProductOrderNo}宸ュ崟宸插嚭搴撳畬鎴�");
- }
- //鑾峰彇鍛ㄨ浆浣嶇疆缂栧彿
- Dt_AGVStationInfo? stationInfo = _basicRepository.AGVStationInfoRepository.QueryFirst(x => x.MESPointCode == autoIssueDTO.PointCode);
- if (stationInfo == null)
- {
- return content.Error($"棰嗘枡璁″垝鍛ㄨ浆浣峽nameof(MESAutoIssueDTO.PointCode)}{autoIssueDTO.PointCode}涓嶅瓨鍦�");
- }
- if (autoIssueDTO.IsEmptyPallet > 0)
- {
- return content.Error($"棰嗘枡璁″垝鍛ㄨ浆浣峽nameof(MESAutoIssueDTO.PointCode)}{autoIssueDTO.PointCode}瀛樺湪绌烘墭");
- }
- Dt_Task? task = BaseDal.QueryData(x => x.OrderNo == outMESOrder.OutMESOrderNo && x.TaskStatus == TaskStatusEnum.CallPending.ObjToInt()).OrderByDescending(x => x.Grade).ThenBy(x => x.TaskNum).FirstOrDefault();
- //鑾峰彇浠诲姟
- if (task == null)
- {
- return content.Error($"鏈壘鍒伴鏂欒鍒掔紪鍙穥outMESOrder.ProductOrderNo}鍙厤閫佷换鍔�");
- }
- //鑾峰彇浠诲姟鍑哄簱璇︽儏
- Dt_OutStockLockInfo outStockLockInfo = _outboundRepository.OutStockLockInfoRepository.QueryFirst(x => x.TaskNum == task.TaskNum);
- //璋冪敤MES閰嶉�佸嚭鍙戞寚浠�
- PlanDistributionInfo planDistribution = new PlanDistributionInfo()
- {
- DispatchPlanMaterialId = autoIssueDTO.OutDetailId,
- InvItemCode = task.MaterielCode,
- Quantity = outStockLockInfo.AssignQuantity,
- SendOutTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- ArrivalTime = DateTime.Now.AddMinutes(15).ToString("yyyy-MM-dd HH:mm:ss")
- };
- MESDispatchModel dispatchModel = new MESDispatchModel()
- {
- PRO_DispachPlanDistributionInfos = new List<PlanDistributionInfo>() { planDistribution }
- };
- _unitOfWorkManage.BeginTran();
- task.TaskStatus = TaskStatusEnum.New.ObjToInt();
- task.TargetAddress = autoIssueDTO.PointCode.StartsWith("YS") ? stationInfo.AGVStationCode : autoIssueDTO.PointCode;
- BaseDal.UpdateData(task);
- MESResponse mESResponse = _invokeMESService.MESDispatchUp(dispatchModel).DeserializeObject<MESResponse>() ?? throw new Exception("鏈幏鍙栧埌杩斿洖淇℃伅");
- if (!mESResponse.Result)
- {
- throw new Exception($"MES閰嶉�佸嚭鍙戞帴鍙ｈ皟鐢ㄦ姤閿�,MES杩斿洖淇℃伅{DecodeUnicode(mESResponse.Msg)}");
- }
- _unitOfWorkManage.CommitTran();
- PushTasksToWCS(new List<Dt_Task> { task });
- return content.OK("鍙枡鎴愬姛");
- }
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- //灏哢nicode瑙ｆ瀽鎴愪腑鏂�
- public static string DecodeUnicode(string input)
- {
- return Regex.Replace(input, @"\\u([0-9a-fA-F]{4})", match => {
- return ((char)Convert.ToInt32(match.Groups[1].Value, 16)).ToString();
- });
- }
-
- public WebResponseContent ReceiveManualIssue(MESManualIssueDTO manualIssueDTO)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- lock (lock_manualIssue)
- {
- if (manualIssueDTO == null)
- {
- return content.Error("浼犲叆淇℃伅涓嶈兘涓虹┖");
- }
- //鑾峰彇瀵瑰簲鍗曟嵁
- Dt_OutMESOrder? outMESOrder = _outboundRepository.OutMESOrderRepository.QueryFirst(x => x.OutDetailId == manualIssueDTO.OutDetailId);
- if (outMESOrder == null)
- {
- return content.Error($"棰嗘枡璁″垝{nameof(MESAutoIssueDTO.OutDetailId)}{manualIssueDTO.OutDetailId}涓嶅瓨鍦�");
- }
- if (outMESOrder.OutMESOrderStatus == OutOrderStatusEnum.鍏抽棴.ObjToInt())
- {
- return content.Error($"棰嗘枡璁″垝{nameof(MESAutoIssueDTO.OutDetailId)}{outMESOrder.ProductOrderNo}宸ュ崟宸插叧闂�");
- }
- //鑾峰彇鍛ㄨ浆浣嶇疆缂栧彿
- Dt_AGVStationInfo? stationInfo = _basicRepository.AGVStationInfoRepository.QueryFirst(x => x.MESPointCode == manualIssueDTO.PointCode);
- if (stationInfo == null)
- {
- return content.Error($"棰嗘枡璁″垝鍛ㄨ浆浣峽nameof(MESAutoIssueDTO.PointCode)}{manualIssueDTO.PointCode}涓嶅瓨鍦�");
- }
- Dt_Task? task = BaseDal.QueryData(x => x.OrderNo == outMESOrder.OutMESOrderNo && x.TaskStatus == TaskStatusEnum.CallPending.ObjToInt()).OrderByDescending(x => x.Grade).ThenBy(x => x.TaskNum).FirstOrDefault();
- //鑾峰彇浠诲姟
- if (task == null)
- {
- return content.Error($"鏈壘鍒伴鏂欒鍒掔紪鍙穥outMESOrder.ProductOrderNo}鍙厤閫佷换鍔�");
- }
- //鑾峰彇浠诲姟鍑哄簱璇︽儏
- Dt_OutStockLockInfo outStockLockInfo = _outboundRepository.OutStockLockInfoRepository.QueryFirst(x => x.TaskNum == task.TaskNum);
- //璋冪敤MES閰嶉�佸嚭鍙戞寚浠�
- PlanDistributionInfo planDistribution = new PlanDistributionInfo()
- {
- DispatchPlanMaterialId = manualIssueDTO.OutDetailId,
- InvItemCode = task.MaterielCode,
- Quantity = outStockLockInfo.AssignQuantity,
- SendOutTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- ArrivalTime = DateTime.Now.AddMinutes(15).ToString("yyyy-MM-dd HH:mm:ss")
- };
- MESDispatchModel dispatchModel = new MESDispatchModel()
- {
- PRO_DispachPlanDistributionInfos = new List<PlanDistributionInfo>() { planDistribution }
- };
- _unitOfWorkManage.BeginTran();
- task.TaskStatus = TaskStatusEnum.New.ObjToInt();
- task.TargetAddress = manualIssueDTO.PointCode.StartsWith("YS") ? stationInfo.AGVStationCode : manualIssueDTO.PointCode;
- BaseDal.UpdateData(task);
- MESResponse mESResponse = _invokeMESService.MESDispatchUp(dispatchModel).DeserializeObject<MESResponse>() ?? throw new Exception("鏈幏鍙栧埌杩斿洖淇℃伅");
- if (!mESResponse.Result)
- {
- throw new Exception($"MES閰嶉�佸嚭鍙戞帴鍙ｈ皟鐢ㄦ姤閿�,MES杩斿洖淇℃伅{DecodeUnicode(mESResponse.Msg)}");
- }
- _unitOfWorkManage.CommitTran();
- PushTasksToWCS(new List<Dt_Task> { task });
- return content.OK("鍙枡鎴愬姛");
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// MES绌烘墭/浣欐枡鍛煎彨鎺ュ彛
- /// </summary>
- /// <returns></returns>
- public WebResponseContent ReceiveReturnIssue(List<MESReturnIssueDTO> returnIssueDTOs)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- lock (lock_returnIssue)
- {
- if (returnIssueDTOs == null || returnIssueDTOs.Count <= 0)
- {
- return content.Error("浼犲叆淇℃伅涓嶈兘涓虹┖");
- }
- //鑾峰彇鎵�鏈堿GV鐐逛綅
- List<Dt_AGVStationInfo> aGVStationInfos = _basicRepository.AGVStationInfoRepository.QueryData(x => !string.IsNullOrEmpty(x.MESPointCode));
- MESReturnIssueDTO? returnIssueDTO = returnIssueDTOs.FirstOrDefault(x => !aGVStationInfos.Select(x => x.MESPointCode).Contains(x.PointCode));
- if (returnIssueDTO != null)
- {
- return content.Error($"鍛ㄨ浆浣峽nameof(MESReturnIssueDTO.PointCode)}{returnIssueDTO.PointCode}涓嶅瓨鍦�");
- }
- //鑾峰彇鎵�鏈夊簱瀛�
- List<Dt_StockInfo> stockInfosOld = _stockRepository.StockInfoRepository.QueryData();
- ////绌烘墭
- //foreach (var item in returnIssueDTOs.Where(x=>x.ReturnMaterial==null))
- //{
-
- //}
- //閫�鏂�
- List<Dt_StockInfo> stockInfos=new List<Dt_StockInfo>();
- List<Dt_Task> tasksNew = new List<Dt_Task>();
- foreach (var item in returnIssueDTOs.Where(x => x.ReturnMaterial != null))
- {
- MESReturnMaterial? returnMaterial = item.ReturnMaterial;
- if (returnMaterial.BarCode.IsNullOrEmpty())
- {
- return content.Error($"閫�鏂欎紶鍏ユ潯鐮佷笉鑳戒负绌�");
- }
-
- Dt_AGVStationInfo aGVStationInfo = aGVStationInfos.FirstOrDefault(x => x.MESPointCode == item.PointCode);
- Dt_MaterielInfo? materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == returnMaterial.MaterialCode);
- if (materielInfo == null)
- {
- return content.Error($"鏈壘鍒版潯鐮亄returnMaterial.BarCode}鐗╂枡淇℃伅");
- }
- //鍒ゆ柇
- if (returnMaterial.Thickness <= 0 && materielInfo.WarehouseId==WarehouseEnum.LLDYL.ObjToInt())
- {
- return content.Error($"鐗╂枡{returnMaterial.MaterialCode}鏉＄爜{returnMaterial.BarCode}鐩村緞涓嶈兘灏忎簬0");
- }
- if (returnMaterial.Wide <= 0 && materielInfo.WarehouseId == WarehouseEnum.LLDYL.ObjToInt())
- {
- return content.Error($"鐗╂枡{returnMaterial.MaterialCode}鏉＄爜{returnMaterial.BarCode}鐩村緞涓嶈兘灏忎簬0");
- }
- Dt_StockInfo? stockInfoOld = stockInfosOld.FirstOrDefault(x => x.PalletCode == returnMaterial.BarCode);
- if (stockInfoOld != null)
- {
- return content.Error($"鏉＄爜{returnMaterial.BarCode}淇℃伅宸插瓨鍦�");
- }
- //鐢熸垚搴撳瓨缁勭洏淇℃伅
- Dt_StockInfo stockInfo = new Dt_StockInfo()
- {
- MaterielInvOrgId = materielInfo.MaterielInvOrgId,
- PalletCode = returnMaterial.BarCode,
- LocationCode = "",
- PalletType = 1,
- WarehouseId = materielInfo.WarehouseId,
- StockAttribute = materielInfo.MaterielSourceType,
- StockStatus = StockStatusEmun.MES浣欐枡閫�搴�.ObjToInt(),
- MaterielSpec = materielInfo.MaterielSpec,
- BatchNo = returnMaterial.MaterialLot,
- Unit = materielInfo.MaterielUnit,
- MaterielThickness = returnMaterial.Thickness,
- CheckThickness= returnMaterial.Thickness,
- MaterielWide = returnMaterial.Wide,
- MaterielWeight = returnMaterial.Weight,
- MaterielCode = materielInfo.MaterielCode,
- StockLength = returnMaterial.ReturnQuantity,
- OrderNo = returnMaterial.ReturnOrderNo,
- MaterielName = materielInfo.MaterielName,
- IsFull = WhetherEnum.True.ObjToInt(),
- IsPick = returnMaterial.Whether == 0 ? WhetherEnum.True.ObjToInt() : WhetherEnum.False.ObjToInt(),
- Remark = StockStatusEmun.MES浣欐枡閫�搴�.ToString()
- };
- if (stockInfo.MaterielWide > 1200)
- {
- stockInfo.PalletType = 2;
- }
- stockInfos.Add(stockInfo);
- //鐢熸垚浣欐枡閫�鏂欎换鍔�
- Dt_Task newTask = new Dt_Task()
- {
- CurrentAddress = item.PointCode.StartsWith("YS") ? aGVStationInfo.AGVStationCode : item.PointCode,
- Grade = 0,
- NextAddress = "",
- PalletCode = stockInfo.PalletCode,
- Roadway = "",
- SourceAddress = item.PointCode.StartsWith("YS") ? aGVStationInfo.AGVStationCode : item.PointCode,
- TargetAddress = "",
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = materielInfo.WarehouseId,
- PalletType = stockInfo.PalletType,
- MaterielCode=stockInfo.MaterielCode,
- Quantity=stockInfo.StockLength,
- OrderNo=stockInfo.OrderNo,
- TaskLength = (int)stockInfo.MaterielWide,
- GroupId= item.IssueId,
- WorkCentreCode=item.MakeCode
- };
- TaskTypeEnum taskTypeEnum = aGVStationInfo.StationArea switch
- {
- nameof(StationAreaEnum.涓�妤煎嵃鍒�) => TaskTypeEnum.PrintYLBackInbound,
- _ => throw new Exception("鏈壘鍒板搴斾换鍔�")
- };
- newTask.TaskType = taskTypeEnum.ObjToInt();
- tasksNew.Add(newTask);
- }
- _unitOfWorkManage.BeginTran();
- BaseDal.AddData(tasksNew);
- _stockRepository.StockInfoRepository.AddData(stockInfos);
- _unitOfWorkManage.CommitTran();
- //鎺ㄩ�佷换鍔�
- PushTasksToWCS(tasksNew);
- content.OK("鍛煎彨鎴愬姛");
- }
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs"
index 4d075e3..5a1c0cb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService.cs"
@@ -16,44 +16,21 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using AutoMapper;
-using Microsoft.AspNetCore.Mvc.ApiExplorer;
using Newtonsoft.Json;
using SqlSugar;
-using System.Reflection.Emit;
-using System.Threading.Tasks;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.LocationEnum;
-using WIDESEA_Common.OrderEnum;
-using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
-using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
-using WIDESEA_DTO;
-using WIDESEA_DTO.ERP;
-using WIDESEA_DTO.Inbound;
-using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_External.ERPService;
using WIDESEA_External.MESService;
-using WIDESEA_External.Model;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
-using WIDESEA_IInboundRepository;
-using WIDESEA_IInboundService;
-using WIDESEA_InboundRepository;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_IOutboundService;
-using WIDESEA_IRecordService;
-using WIDESEA_IStockRepository;
-using WIDESEA_IStockService;
using WIDESEA_ITaskInfoRepository;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
-using WIDESEA_TaskInfoRepository;
namespace WIDESEA_TaskInfoService
{
@@ -61,19 +38,11 @@
{
private readonly IMapper _mapper;
private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IRecordService _recordService;
- private readonly IStockRepository _stockRepository;
- private readonly IStockService _stockService;
private readonly IBasicRepository _basicRepository;
private readonly IBasicService _basicService;
private readonly IInvokeERPService _invokeERPService;
private readonly IInvokeMESService _invokeMESService;
- private readonly IOutboundRepository _outboundRepository;
- private readonly IOutboundService _outboundService;
- private readonly IInboundRepository _inboundRepository;
- private readonly IInboundService _inboundService;
private readonly IRepository<Dt_BlankStockInfo> _blankStockInfoRepository;
- private readonly IRepository<Dt_PalletCodeInfo> _palletCodeInfoRepository;
private readonly IApiInfoRepository _apiInfoRepository;
public ITaskRepository Repository => BaseDal;
@@ -87,23 +56,15 @@
public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList().Where(x => x >= 100 && x < 500).ToList();
- public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IStockRepository stockRepository, IBasicService basicService, IRecordService recordService, IStockService stockService, IBasicRepository basicRepository, IInvokeERPService invokeERPService, IOutboundRepository outboundRepository, IOutboundService outboundService, IInboundRepository inboundRepository,IInboundService inboundService,IInvokeMESService invokeMESService, IRepository<Dt_BlankStockInfo> blankStockInfoRepository, IRepository<Dt_PalletCodeInfo> palletCodeInfoRepository,IApiInfoRepository _apiInfoRepository) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IBasicRepository basicRepository, IInvokeERPService invokeERPService, IInvokeMESService invokeMESService, IRepository<Dt_BlankStockInfo> blankStockInfoRepository, IApiInfoRepository _apiInfoRepository) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
- _stockRepository = stockRepository;
_basicService = basicService;
- _recordService = recordService;
- _stockService = stockService;
_basicRepository = basicRepository;
_invokeERPService = invokeERPService;
_invokeMESService = invokeMESService;
- _outboundRepository = outboundRepository;
- _outboundService = outboundService;
- _inboundRepository = inboundRepository;
- _inboundService = inboundService;
_blankStockInfoRepository = blankStockInfoRepository;
- _palletCodeInfoRepository = palletCodeInfoRepository;
this._apiInfoRepository = _apiInfoRepository;
}
@@ -115,7 +76,7 @@
{
try
{
- if (tasks==null || tasks.Count == 0)
+ if (tasks == null || tasks.Count == 0)
{
return WebResponseContent.Instance.Error($"浼犲叆浠诲姟涓虹┖");
}
@@ -137,59 +98,6 @@
{
return WebResponseContent.Instance.Error(ex.Message);
}
- }
- /// <summary>
- /// 鏀捐揣瀹屾垚
- /// </summary>
- /// <param name="code"></param>
- /// <returns></returns>
- public WebResponseContent PutFinish(string code, string barCode = "", string taskNum = "")
- {
- try
- {
- string url = AppSettings.Get("WCS");
- if (string.IsNullOrEmpty(url))
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒癢CSAApi鍦板潃,璇锋鏌ラ厤缃枃浠�");
- }
- string response = HttpHelper.Post($"{url}/api/CTU_AGV/PutFinish?code={code}&barCode={barCode}&taskNum={taskNum}" );
-
- return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("杩斿洖閿欒");
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
- private readonly static object lockerAddSG = new object();
- public WebResponseContent AddOutSGOrder(List<SGOutOrderDTO> outOrderDTOs)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- lock (lockerAddSG)
- {
- int outDetailId = _outboundRepository.OutSGOrderDetailRepository.QueryData().OrderByDescending(x=>x.Id).FirstOrDefault()?.Id ?? 0;
- content = _outboundService.OutSGOrderService.AddOutSGOrder(outOrderDTOs);
- if (!content.Status)
- {
- return content;
- }
- List<int> ints = _outboundRepository.OutSGOrderDetailRepository.QueryData(x=>x.Id>outDetailId).Select(x=>x.Id).ToList();
- int[] reseponse= new int[ints.Count];
- for (int i = 0; i < ints.Count; i++)
- {
- reseponse[i] = ints[i];
- }
- content.Message = CreateSGOutboundTasks(reseponse).Message;
- }
-
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Completed.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Completed.cs"
index 26fdebf..fc1493b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Completed.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Completed.cs"
@@ -19,38 +19,6 @@
{
public partial class TaskService
{
- public async Task<WebResponseContent> TaskCompleted(int taskNum)
- {
- try
- {
- Dt_Task task = await Repository.QueryFirstAsync(x => x.TaskNum == taskNum);
- if (task == null)
- {
- return await Task.FromResult(WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔′俊鎭�"));
- }
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
- {
- return await Task.FromResult(InboundTaskCompleted(task));
- }
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
- {
- return await Task.FromResult(OutboundTaskCompleted(task));
- }
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
- {
- return await Task.FromResult(RelocationTaskCompleted(task));
- }
- else
- {
- return await Task.FromResult(WebResponseContent.Instance.Error($"鏈壘鍒拌绫诲瀷浠诲姟,浠诲姟绫诲瀷:{task.TaskType}"));
- }
- }
- catch (Exception ex)
- {
- return await Task.FromResult(WebResponseContent.Instance.Error(ex.Message));
- }
- }
-
/// <summary>
/// 浠诲姟淇℃伅鎺ㄩ�佽嚦WCS
/// </summary>
@@ -98,8 +66,8 @@
Dt_Task wmsTask = BaseDal.QueryFirst(x=>x.TaskNum == task.TaskNum);
if (wmsTask != null)
{
- wmsTask.PalletCode= task.PalletCode;
- wmsTask.Roadway = task.Roadway;
+ wmsTask.ContainerNo= task.PalletCode;
+ wmsTask.RoadwayNo = task.Roadway;
wmsTask.TaskStatus = task.TaskState;
wmsTask.CurrentAddress = task.CurrentAddress;
wmsTask.NextAddress = task.NextAddress;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
deleted file mode 100644
index 5d9e50b..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
+++ /dev/null
@@ -1,1751 +0,0 @@
-锘縰sing Autofac.Core;
-using Microsoft.IdentityModel.Tokens;
-using Newtonsoft.Json;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
-using SqlSugar;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reflection.Metadata;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.LocationEnum;
-using WIDESEA_Common.MaterielEnum;
-using WIDESEA_Common.OrderEnum;
-using WIDESEA_Common.StockEnum;
-using WIDESEA_Common.TaskEnum;
-using WIDESEA_Common.WareHouseEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
-using WIDESEA_DTO.MES;
-using WIDESEA_DTO.Task;
-using WIDESEA_External.Model;
-using WIDESEA_Model.Models;
-using WIDESEA_TaskInfoRepository;
-
-namespace WIDESEA_TaskInfoService
-{
- public partial class TaskService
- {
- /// <summary>
- /// 浠呯敵璇蜂换鍔★紝璁￤CS鏍规嵁璺敱纭畾涓嬩竴鍦板潃
- /// </summary>
- /// <param name="stationCode"></param>
- /// <param name="palletCode"></param>
- /// <returns></returns>
- public WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode)
- {
- try
- {
- Dt_Task task = Repository.QueryFirst(x => x.PalletCode == palletCode);
- if (task != null)
- {
- PushTasksToWCS(new List<Dt_Task> { task });
- return WebResponseContent.Instance.OK($"璇ユ墭鐩樺凡鐢熸垚浠诲姟", _mapper.Map<WMSTaskDTO>(task));
- }
-
- if (Repository.QueryFirst(x => x.SourceAddress == stationCode && x.TaskStatus == TaskStatusEnum.New.ObjToInt()) != null)
- {
- return WebResponseContent.Instance.Error($"璇ョ珯鐐瑰凡鏈夋湭鎵ц鐨勪换鍔�");
- }
-
- Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == palletCode);
- if (stockInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒扮粍鐩樹俊鎭�");
- }
- if (stockInfo.StockStatus != StockStatusEmun.MES浣欐枡閫�搴�.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.MES绌烘墭閫�搴�.ObjToInt())
- {
- return WebResponseContent.Instance.Error($"璇ユ墭鐩樼姸鎬佷笉姝ｇ‘,涓嶅彲鐢宠鍏ュ簱");
- }
- if (!string.IsNullOrEmpty(stockInfo.LocationCode))
- {
- return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡缁戝畾璐т綅");
- }
-
- Dt_Task newTask = new Dt_Task()
- {
- CurrentAddress = stationCode,
- Grade = 0,
- NextAddress = "",
- PalletCode = palletCode,
- Roadway = "",
- SourceAddress = stationCode,
- TargetAddress = "",
- TaskType = TaskTypeEnum.Inbound.ObjToInt(),
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = stockInfo.WarehouseId,
- PalletType = stockInfo.PalletType,
- };
-
-
- if (stockInfo.StockStatus == StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt())
- {
- stockInfo.StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt();
- }
- else
- {
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
- }
-
- _unitOfWorkManage.BeginTran();
- int taskId = BaseDal.AddData(newTask);
- newTask.TaskId = taskId;
- _stockRepository.StockInfoRepository.UpdateData(stockInfo);
- _unitOfWorkManage.CommitTran();
- WMSTaskDTO wMSTaskDTO = _mapper.Map<WMSTaskDTO>(newTask);
-
- PushTasksToWCS(new List<Dt_Task> { newTask });
- if (newTask.WarehouseId == 5) PutFinish(stationCode, newTask.PalletCode, newTask.TaskNum.ToString());
- return WebResponseContent.Instance.OK(data: wMSTaskDTO);
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
- /// <summary>
- /// 鍘熸枡鐢宠鍏ュ簱
- /// </summary>
- /// <param name="stationCode">璧峰绔欑偣</param>
- /// <param name="palletCode">鎵樼洏</param>
- /// <returns></returns>
- public WebResponseContent RequestYLWMSTaskSimple(string stationCode, string palletCode)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.RfidCode == palletCode);
- if (stockInfo == null)
- {
- return content.Error($"鏈壘鍒扮粍鐩樹俊鎭�");
- }
- Dt_Task task = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
- if (task != null)
- {
- PushTasksToWCS(new List<Dt_Task> { task });
- return content.OK($"璇ユ墭鐩樺凡鐢熸垚浠诲姟", _mapper.Map<WMSTaskDTO>(task));
- }
-
- if (Repository.QueryFirst(x => x.SourceAddress == stationCode && x.TaskStatus == TaskStatusEnum.New.ObjToInt()) != null)
- {
- return content.Error($"璇ョ珯鐐瑰凡鏈夋湭鎵ц鐨勪换鍔�");
- }
- if (stockInfo.StockStatus != StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鑰佸巶閫�搴�.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鍗氭�濋�氱粍鐩樻殏瀛�.ObjToInt())
- {
- return content.Error($"璇ユ墭鐩樼姸鎬佷笉姝ｇ‘,涓嶅彲鐢宠鍏ュ簱");
- }
- //鍒嗛厤宸烽亾
- string rowWay = AssignYLRoadwayNo(stockInfo.PalletCode);
- if (string.IsNullOrEmpty(rowWay))
- {
- return content.Error($"鏈壘鍒板彲鍒嗛厤宸烽亾");
- }
- //鐢熸垚浠诲姟
- Dt_Task newTask = new Dt_Task()
- {
- CurrentAddress = stationCode,
- Grade = 0,
- NextAddress = "",
- PalletCode = stockInfo.PalletCode,
- RfidCode=stockInfo.RfidCode,
- Roadway = rowWay,
- SourceAddress = stationCode,
- TargetAddress = "",
- TaskType = stationCode=="307" ? TaskTypeEnum.PaperOldYLBackInbound.ObjToInt() : TaskTypeEnum.Inbound.ObjToInt(),
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = stockInfo.WarehouseId,
- PalletType = stockInfo.PalletType,
- TaskLength = (int)stockInfo.MaterielWide,
- MaterielCode=stockInfo.MaterielCode,
- Quantity=stockInfo.StockLength
- };
- //鏇存柊鐘舵��
- if (stockInfo.StockStatus == StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt())
- {
- stockInfo.StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt();
- }
- else
- {
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
- }
- //鏁版嵁鏇存柊
- _unitOfWorkManage.BeginTran();
- int taskId = BaseDal.AddData(newTask);
- newTask.TaskId = taskId;
- _stockRepository.StockInfoRepository.UpdateData(stockInfo);
- _unitOfWorkManage.CommitTran();
- PushTasksToWCS(new List<Dt_Task> { newTask });
- WMSTaskDTO wMSTaskDTO = _mapper.Map<WMSTaskDTO>(newTask);
- return content.OK(data: wMSTaskDTO);
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- private readonly static object lockerYLBoxing = new object();
- /// <summary>
- /// 鍘熸枡璇锋眰
- /// </summary>
- /// <param name="palletCode">RFID淇℃伅</param>
- /// <returns></returns>
- public WebResponseContent YLPurchaseBoxing(string palletCode, decimal weight = 0, decimal thickness = 0, decimal wide = 0, string stationCode = "")
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- lock (lockerYLBoxing)
- {
- Dt_StockInfo stockInfoOld = _stockRepository.StockInfoRepository.QueryFirst(x => x.RfidCode == palletCode);
- if (stockInfoOld != null && stockInfoOld.StockStatus == StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt())
- {
- UpdateStock(stockInfoOld, weight, thickness, wide);
- return content.OK($"涓存椂鍏ュ簱{stockInfoOld.RfidCode}");
- }
- else if (stockInfoOld != null && stockInfoOld.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && stockInfoOld.StockStatus == StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt() && stockInfoOld.IsPick==WhetherEnum.False.ObjToInt() && stationCode.IsNotEmptyOrNull())
- {
- decimal oldQty = stockInfoOld.StockLength;
- //璋冪敤鏇存柊閫�鏂欏簱瀛�
- stockInfoOld = ReturnStockUp(stockInfoOld, thickness);
- //鏇存柊鏁版嵁
- UpdateStock(stockInfoOld, weight, thickness, wide);
- //璁板綍搴撳瓨鍙樺姩
- _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfoOld, oldQty, oldQty < stockInfoOld.StockLength ? stockInfoOld.StockLength - oldQty : oldQty - stockInfoOld.StockLength, StockChangeTypeEnum.MaterielGroup);
- return content.OK($"鑰佸巶鏈鏂欓��搴揜FID{stockInfoOld.RfidCode}鏉＄爜{stockInfoOld.PalletCode}");
- }
- else if (stockInfoOld != null && stockInfoOld.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && stockInfoOld.StockStatus == StockStatusEmun.鑰佸巶閫�鏂欐殏瀛�.ObjToInt() && stationCode.IsNotEmptyOrNull())
- {
- decimal oldQty = stockInfoOld.StockLength;
- //璋冪敤鏇存柊閫�鏂欏簱瀛�
- stockInfoOld = ReturnStockUp(stockInfoOld, thickness);
- //鏇存柊鏁版嵁
- UpdateStock(stockInfoOld, weight, thickness, wide);
- //璁板綍搴撳瓨鍙樺姩
- _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfoOld, oldQty, oldQty < stockInfoOld.StockLength ? stockInfoOld.StockLength- oldQty: oldQty- stockInfoOld.StockLength, StockChangeTypeEnum.MaterielGroup);
- return content.OK($"鑰佸巶棰嗘枡閫�搴揜FID{stockInfoOld.RfidCode}鏉＄爜{stockInfoOld.PalletCode}");
- }
- else if (stockInfoOld != null)
- {
- throw new Exception($"{palletCode}RFID淇℃伅宸插瓨鍦�");
- }
-
- if (stationCode.IsNullOrEmpty())
- {
- //鏂板巶RFID缁戝畾閫昏緫
- if (palletCode.StartsWith("A"))
- {
- #region 澶勭悊閲囪喘缁戝畾RFID閫昏緫
- Dt_YLInboundCache? yLInboundCache = _inboundRepository.YLInboundCacheRepository.QueryData(x => x.InvOrg == MaterielInvOrgEnum.鏂板巶.ToString()).FirstOrDefault();
- if (yLInboundCache == null)
- {
- return content.Error("鏈壘鍒板師鏂欑紦瀛樻潯鐮佷俊鎭�");
- }
- if (yLInboundCache.BindStatus == WhetherEnum.True.ObjToInt())
- {
- return content.Error($"鍘熸枡缂撳瓨鏉＄爜{yLInboundCache.BarCode}宸茬粦瀹歊FID{yLInboundCache.RfidCode}");
- }
- else
- {
- Dt_StockInfo ExistStockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == yLInboundCache.BarCode);
- if (ExistStockInfo != null && ExistStockInfo.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt() && ExistStockInfo.StockStatus == StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt())
- {
- //鑾峰彇閲囪喘淇℃伅
- yLInboundCache.RfidCode = palletCode;
- yLInboundCache.BindStatus = WhetherEnum.True.ObjToInt();
- ExistStockInfo.RfidCode = palletCode;
- _unitOfWorkManage.BeginTran();
- UpdateStock(ExistStockInfo, weight, thickness, wide);
- _inboundRepository.YLInboundCacheRepository.UpdateData(yLInboundCache);
- _unitOfWorkManage.CommitTran();
- return content.OK($"閲囪喘鍏ュ簱RFID{ExistStockInfo.RfidCode}缁戝畾{ExistStockInfo.PalletCode}");
- }
- else
- {
- throw new Exception("鏈煡閿欒");
- }
- }
- #endregion
- }
- else //鑰佸巶RFID缁戝畾閫昏緫
- {
- #region 澶勭悊閲囪喘缁戝畾RFID閫昏緫
- Dt_YLInboundCache? yLInboundCache = _inboundRepository.YLInboundCacheRepository.QueryData(x => x.InvOrg == MaterielInvOrgEnum.鑰佸巶.ToString()).FirstOrDefault();
- if (yLInboundCache == null)
- {
- return content.Error("鏈壘鍒板師鏂欑紦瀛樻潯鐮佷俊鎭�");
- }
- if (yLInboundCache.BindStatus == WhetherEnum.True.ObjToInt())
- {
- return content.Error($"鍘熸枡缂撳瓨鏉＄爜{yLInboundCache.BarCode}宸茬粦瀹歊FID{yLInboundCache.RfidCode}");
- }
- else
- {
- Dt_StockInfo ExistStockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == yLInboundCache.BarCode);
- if (ExistStockInfo != null && ExistStockInfo.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && ExistStockInfo.StockStatus == StockStatusEmun.鍗氭�濋�氱粍鐩樻殏瀛�.ObjToInt())
- {
- yLInboundCache.RfidCode = palletCode;
- yLInboundCache.BindStatus = WhetherEnum.True.ObjToInt();
- ExistStockInfo.RfidCode = palletCode;
- _unitOfWorkManage.BeginTran();
- //鏇存柊缁勭洏淇℃伅
- UpdateStock(ExistStockInfo, weight, thickness, wide);
- _inboundRepository.YLInboundCacheRepository.UpdateData(yLInboundCache);
- _unitOfWorkManage.CommitTran();
- return content.OK($"鍗氭�濋�氬簱瀛樿浆瀛榹ExistStockInfo.RfidCode}");
- }
- else if (ExistStockInfo != null && ExistStockInfo.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && ExistStockInfo.StockStatus == StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt())
- {
- //鑾峰彇閲囪喘淇℃伅
- Dt_PurchaseBSTOrderDetail purchaseBSTOrderDetail = _inboundRepository.PurchaseBSTOrderDetailRepository.QueryFirst(x => x.Barcode == yLInboundCache.BarCode);
- yLInboundCache.RfidCode = palletCode;
- yLInboundCache.BindStatus = WhetherEnum.True.ObjToInt();
- ExistStockInfo.RfidCode = palletCode;
- purchaseBSTOrderDetail.RfidCode = palletCode;
- _unitOfWorkManage.BeginTran();
- UpdateStock(ExistStockInfo, weight, thickness, wide);
- _inboundRepository.YLInboundCacheRepository.UpdateData(yLInboundCache);
- _inboundRepository.PurchaseBSTOrderDetailRepository.UpdateData(purchaseBSTOrderDetail);
- _unitOfWorkManage.CommitTran();
- return content.OK($"閲囪喘鍏ュ簱{ExistStockInfo.RfidCode}");
- }
- else
- {
- throw new Exception("鏈煡閿欒");
- }
- }
- #endregion
- }
- }
- else if (!stationCode.IsNullOrEmpty() && stockInfoOld == null)
- {
- throw new Exception($"{palletCode}RFID淇℃伅涓嶅瓨鍦�");
- }
- else
- {
- throw new Exception("鏈煡閿欒");
- }
- }
-
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鏇存柊閫�鏂欏簱瀛�
- /// </summary>
- /// <returns></returns>
- public Dt_StockInfo ReturnStockUp(Dt_StockInfo stockInfoOld,decimal thickness)
- {
- BSTResponse<BSTStockInfoDTO> bSTResponse = _invokeERPService.BSTStockAsync(stockInfoOld.PalletCode).DeserializeObject<BSTResponse<BSTStockInfoDTO>>();
- if (bSTResponse.Code == 500)
- {
- throw new Exception($"鏈壘鍒版潯鐮亄stockInfoOld.PalletCode}涓�鏈烢RP搴撳瓨涓嶅瓨鍦�");
- }
-
- BSTStockInfoDTO bSTStockInfoDTO = bSTResponse.Data ?? throw new Exception($"涓�鏈烢RP鏈繑鍥瀧stockInfoOld.PalletCode}鐨勫簱瀛樹俊鎭�");
- if (stockInfoOld.StockStatus == StockStatusEmun.鑰佸巶閫�鏂欐殏瀛�.ObjToInt())
- {
- stockInfoOld.IsPick = WhetherEnum.False.ObjToInt();
- }
- stockInfoOld.StockStatus = StockStatusEmun.鑰佸巶閫�搴�.ObjToInt();
- stockInfoOld.MaterielThickness = bSTStockInfoDTO.Thick;
- stockInfoOld.MaterielWeight = bSTStockInfoDTO.Qty;
- stockInfoOld.MaterielWide = bSTStockInfoDTO.W;
- stockInfoOld.StockLength = bSTStockInfoDTO.StockMeter;
- stockInfoOld.IsFull = WhetherEnum.True.ObjToInt();
- stockInfoOld.StockOutLength = 0;
- stockInfoOld.WarehouseId = WarehouseEnum.LLDYL.ObjToInt();
- if (thickness < 400)
- {
- throw new Exception($"RFID{stockInfoOld.RfidCode}鏉＄爜{stockInfoOld.PalletCode}鐩村緞灏忎簬400mm");
- }
- return stockInfoOld;
- }
- public void UpdateStock(Dt_StockInfo stockInfo, decimal weight = 0, decimal thickness = 0, decimal wide = 0)
- {
- stockInfo.CheckWeight = weight;
- stockInfo.CheckThickness = thickness;
- stockInfo.CheckWide = wide;
- _stockRepository.StockInfoRepository.UpdateData(stockInfo);
- }
- /// <summary>
- /// 鍘熸枡閲囪喘缁戝畾RFID
- /// </summary>
- /// <param name="palletCode">绾稿嵎鏉＄爜</param>
- /// <param name="rfidCode">绾稿嵎RIFD</param>
- /// <returns></returns>
- public WebResponseContent PurchaseBoxing(string palletCode, int orderType = 0)
- {
- WebResponseContent content=new WebResponseContent();
- try
- {
- if (string.IsNullOrEmpty(palletCode))
- {
- throw new Exception("鏉＄爜涓嶈兘涓虹┖");
- }
- Dt_StockInfo stockInfoOld = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == palletCode);
- if (stockInfoOld != null)
- {
- throw new Exception($"鏉＄爜淇℃伅{palletCode}搴撳瓨涓凡瀛樺湪");
- }
- if (orderType>0) //鏂板巶绾稿嵎骞冲彴鍏ュ簱
- {
- //鑾峰彇涓诲崟
- Dt_InboundOrder inboundOrder = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x=>x.OrderType==orderType).Includes(x=>x.Details).Where(x=>x.Details.Any(v=>v.BarCode==palletCode)).First();
- if (inboundOrder==null)
- {
- throw new Exception($"鏈壘鍒版潯鐮亄palletCode}鍏ュ簱鍗曟嵁淇℃伅");
- }
- Dt_InboundOrderDetail inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x=>x.BarCode == palletCode);
- if (inboundOrderDetail==null)
- {
- throw new Exception($"鏈壘鍒板叆搴撳崟鍙蜂负{inboundOrder.UpperOrderNo}鏉＄爜{palletCode}鍗曟嵁淇℃伅");
- }
- if (inboundOrderDetail.MaterialWide < 690)
- {
- return content.Error("鏂板巶鐗╂枡骞呭闄愬埗涓�690-2700mm");
- }
- if (inboundOrderDetail.MaterialThick<=0)
- {
- return content.Error("鐗╂枡鐩村緞闇�瑕佸ぇ浜�0");
- }
- if (inboundOrderDetail.OrderDetailStatus != InOrderStatusEnum.鏈紑濮�.ObjToInt())
- {
- throw new Exception($"鏉＄爜{palletCode}淇℃伅宸插叆搴撴垨鍏ュ簱涓�");
- }
- Dt_YLInboundCache? yLInboundCache = _inboundRepository.YLInboundCacheRepository.QueryData(x => x.InvOrg == MaterielInvOrgEnum.鏂板巶.ToString()).FirstOrDefault();
- if (yLInboundCache == null)
- {
- throw new Exception("鏈壘鍒板師鏂欐潯鐮佺紦瀛樹俊鎭�");
- }
- int Id = yLInboundCache.Id;
- if (yLInboundCache.BarCode == palletCode)
- {
- throw new Exception($"鏉＄爜{palletCode}宸叉壂鐮�");
- }
- else if (yLInboundCache.BarCode != palletCode && yLInboundCache.BindStatus == WhetherEnum.True.ObjToInt())
- {
- yLInboundCache = _mapper.Map<Dt_YLInboundCache>(inboundOrderDetail);
- yLInboundCache.Id = Id;
-
- //鑾峰彇鐗╂枡
- Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == inboundOrderDetail.MaterialCode);
- //鐢熸垚搴撳瓨缁勭洏淇℃伅
- Dt_StockInfo stockInfo = new Dt_StockInfo()
- {
- MaterielInvOrgId = materielInfo.MaterielInvOrgId,
- PalletCode = inboundOrderDetail.BarCode,
- RfidCode = "",
- LocationCode = "",
- PalletType = 1,
- WarehouseId = materielInfo.WarehouseId,
- StockAttribute = materielInfo.MaterielSourceType,
- StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
- MaterielSpec = materielInfo.MaterielSpec,
- Unit = materielInfo.MaterielUnit,
- MaterielThickness = inboundOrderDetail.MaterialThick,
- MaterielWide = inboundOrderDetail.MaterialWide,
- MaterielWeight = inboundOrderDetail.MaterialWeight,
- MaterielCode = materielInfo.MaterielCode,
- MaterielName = materielInfo.MaterielName,
- BatchNo=inboundOrderDetail.MaterialLot,
- StockLength = inboundOrderDetail.OrderQuantity
- };
- if (inboundOrderDetail.MaterialWide > 1200)
- {
- stockInfo.PalletType = 2;
- }
- inboundOrderDetail.OrderDetailStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
- _unitOfWorkManage.BeginTran();
- _inboundRepository.YLInboundCacheRepository.UpdateData(yLInboundCache);
- //鏂板缁勭洏淇℃伅
- _stockRepository.StockInfoRepository.AddData(stockInfo);
- if (inboundOrder.InboundOrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt())
- {
- inboundOrder.InboundOrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
- _inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
- }
- _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetail);
- //鍚姩绾夸綋
- WebResponseContent webResponse = YLPurchasePush();
- if (!webResponse.Status)
- {
- throw new Exception(webResponse.Message);
- }
- _unitOfWorkManage.CommitTran();
- Dt_StockInfo stockInfoAdd = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
- //璁板綍搴撳瓨鍙樺姩
- _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfoAdd, 0, stockInfoAdd.StockLength, StockChangeTypeEnum.MaterielGroup);
- return content.OK("鎴愬姛", yLInboundCache);
- }
- else
- {
- throw new Exception($"涓婂嵎鏉＄爜{yLInboundCache.BarCode}杩樻湭杩涜缁戝畾");
- }
- }
- else //鑰佸巶绾稿嵎骞冲彴鍏ュ簱
- {
- //鑾峰彇閲囪喘淇℃伅
- Dt_PurchaseBSTOrderDetail purchaseBSTOrderDetail = _inboundRepository.PurchaseBSTOrderDetailRepository.QueryFirst(x => x.Barcode == palletCode);
- if (purchaseBSTOrderDetail == null)
- {
- BSTResponse<BSTStockInfoDTO> bSTResponse = _invokeERPService.BSTStockAsync(palletCode).DeserializeObject<BSTResponse<BSTStockInfoDTO>>();
- if (bSTResponse.Code == 500)
- {
- throw new Exception($"鏈壘鍒版潯鐮亄palletCode}閲囪喘淇℃伅骞朵竴鏈烢RP搴撳瓨涔熶笉瀛樺湪");
- }
-
- BSTStockInfoDTO bSTStockInfoDTO = bSTResponse.Data ?? throw new Exception($"涓�鏈烢RP鏈繑鍥瀧palletCode}鐨勫簱瀛樹俊鎭�");
-
- Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterialSourceId == bSTStockInfoDTO.MaterialId) ?? throw new Exception($"鏈壘鍒版潯鐮亄palletCode}鐗╂枡淇℃伅{bSTStockInfoDTO.MaterialNo}");
-
- //鐢熸垚搴撳瓨缁勭洏淇℃伅
- Dt_StockInfo stockInfo = new Dt_StockInfo()
- {
- MaterielInvOrgId = materielInfo.MaterielInvOrgId,
- PalletCode = palletCode,
- RfidCode = "",
- LocationCode = "",
- PalletType = 1,
- WarehouseId = materielInfo.WarehouseId,
- StockAttribute = materielInfo.MaterielSourceType,
- StockStatus = StockStatusEmun.鍗氭�濋�氱粍鐩樻殏瀛�.ObjToInt(),
- MaterielSpec = materielInfo.MaterielSpec,
- Unit = materielInfo.MaterielUnit,
- MaterielThickness = bSTStockInfoDTO.Thick,
- MaterielWide = bSTStockInfoDTO.W,
- MaterielWeight = bSTStockInfoDTO.Qty,
- MaterielCode = materielInfo.MaterielCode,
- MaterielName = materielInfo.MaterielName,
- StockLength = bSTStockInfoDTO.StockMeter,
- MaterielId = materielInfo.MaterialSourceId
- };
- if (bSTStockInfoDTO.W > 1200)
- {
- stockInfo.PalletType = 2;
- }
- Dt_YLInboundCache? yLInboundCache = _inboundRepository.YLInboundCacheRepository.QueryData(x => x.InvOrg == MaterielInvOrgEnum.鑰佸巶.ToString()).FirstOrDefault() ?? throw new Exception("鏈壘鍒板師鏂欐潯鐮佺紦瀛樹俊鎭�");
- int Id = yLInboundCache.Id;
- if (yLInboundCache.BarCode == palletCode)
- {
- throw new Exception($"鏉＄爜{palletCode}宸叉壂鐮�");
- }
- else if (yLInboundCache.BarCode != palletCode && yLInboundCache.BindStatus == WhetherEnum.True.ObjToInt())
- {
- yLInboundCache = _mapper.Map<Dt_YLInboundCache>(stockInfo);
- yLInboundCache.Id = Id;
- _unitOfWorkManage.BeginTran();
- //鏂板缁勭洏淇℃伅
- _stockRepository.StockInfoRepository.AddData(stockInfo);
- _inboundRepository.YLInboundCacheRepository.UpdateData(yLInboundCache);
- //鍚姩绾夸綋
- WebResponseContent webResponse = YLPurchasePush();
- if (!webResponse.Status)
- {
- throw new Exception(webResponse.Message);
- }
- _unitOfWorkManage.CommitTran();
- Dt_StockInfo stockInfoAdd = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
- //璁板綍搴撳瓨鍙樺姩
- _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfoAdd, 0, stockInfoAdd.StockLength, StockChangeTypeEnum.MaterielGroup);
- return content.OK("鎴愬姛", yLInboundCache);
- }
- else
- {
- throw new Exception($"涓婂嵎鏉＄爜{yLInboundCache.BarCode}杩樻湭杩涜缁戝畾");
- }
-
- }
- else
- {
- if (purchaseBSTOrderDetail.PurchaseBSTOrderDetailStatus != InOrderStatusEnum.鏈紑濮�.ObjToInt())
- {
- throw new Exception($"鏉＄爜{palletCode}閲囪喘淇℃伅宸插叆搴撴垨鍏ュ簱涓�");
- }
- Dt_YLInboundCache? yLInboundCache = _inboundRepository.YLInboundCacheRepository.QueryData(x => x.InvOrg == MaterielInvOrgEnum.鑰佸巶.ToString()).FirstOrDefault();
- if (yLInboundCache == null)
- {
- throw new Exception("鏈壘鍒板師鏂欐潯鐮佺紦瀛樹俊鎭�");
- }
- int Id = yLInboundCache.Id;
- if (yLInboundCache.BarCode == palletCode)
- {
- throw new Exception($"鏉＄爜{palletCode}宸叉壂鐮�");
- }
- else if (yLInboundCache.BarCode != palletCode && yLInboundCache.BindStatus == WhetherEnum.True.ObjToInt())
- {
- yLInboundCache = _mapper.Map<Dt_YLInboundCache>(purchaseBSTOrderDetail);
- yLInboundCache.Id = Id;
- //鑾峰彇閲囪喘涓诲崟
- Dt_PurchaseBSTOrder purchaseBSTOrder = _inboundRepository.PurchaseBSTOrderRepository.QueryFirst(x => x.Id == purchaseBSTOrderDetail.PurchaseBSTOrderId);
- //鑾峰彇鐗╂枡
- Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterialSourceId == purchaseBSTOrderDetail.MaterialId);
- //鐢熸垚搴撳瓨缁勭洏淇℃伅
- Dt_StockInfo stockInfo = new Dt_StockInfo()
- {
- MaterielInvOrgId = materielInfo.MaterielInvOrgId,
- PalletCode = purchaseBSTOrderDetail.Barcode,
- RfidCode = "",
- LocationCode = "",
- PalletType = 1,
- WarehouseId = materielInfo.WarehouseId,
- StockAttribute = materielInfo.MaterielSourceType,
- StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
- MaterielSpec = materielInfo.MaterielSpec,
- Unit = materielInfo.MaterielUnit,
- MaterielThickness = purchaseBSTOrderDetail.MaterialThick,
- MaterielWide = purchaseBSTOrderDetail.MaterialWide,
- MaterielWeight = purchaseBSTOrderDetail.DeliveryQty,
- MaterielCode = materielInfo.MaterielCode,
- MaterielName = materielInfo.MaterielName,
- StockLength = purchaseBSTOrderDetail.ProcurementLength,
- MaterielId = purchaseBSTOrderDetail.MaterialId
- };
- if (purchaseBSTOrderDetail.MaterialWide > 1200)
- {
- stockInfo.PalletType = 2;
- }
- purchaseBSTOrderDetail.PurchaseBSTOrderDetailStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
- _unitOfWorkManage.BeginTran();
- _inboundRepository.YLInboundCacheRepository.UpdateData(yLInboundCache);
- //鏂板缁勭洏淇℃伅
- _stockRepository.StockInfoRepository.AddData(stockInfo);
- if (purchaseBSTOrder.PurchaseOrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt())
- {
- purchaseBSTOrder.PurchaseOrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
- _inboundRepository.PurchaseBSTOrderRepository.UpdateData(purchaseBSTOrder);
- }
- _inboundRepository.PurchaseBSTOrderDetailRepository.UpdateData(purchaseBSTOrderDetail);
- //鍚姩绾夸綋
- WebResponseContent webResponse = YLPurchasePush();
- if (!webResponse.Status)
- {
- throw new Exception(webResponse.Message);
- }
- _unitOfWorkManage.CommitTran();
- Dt_StockInfo stockInfoAdd = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
- //璁板綍搴撳瓨鍙樺姩
- _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfoAdd, 0, stockInfoAdd.StockLength, StockChangeTypeEnum.MaterielGroup);
- return content.OK("鎴愬姛", yLInboundCache);
- }
- else
- {
- throw new Exception($"涓婂嵎鏉＄爜{yLInboundCache.BarCode}杩樻湭杩涜缁戝畾");
- }
- }
- }
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
-
- }
- /// <summary>
- /// 鎺ㄩ�佽嚦WCS鍘熸枡绾夸綋鍚姩
- /// </summary>
- /// <returns></returns>
- public WebResponseContent YLPurchasePush()
- {
- try
- {
- string url = AppSettings.Get("WCS");
- if (string.IsNullOrEmpty(url))
- {
- throw new Exception($"鏈壘鍒癢CSAApi鍦板潃,璇锋鏌ラ厤缃枃浠�");
- }
- string response = HttpHelper.Post($"{url}/api/Task/YLPurchasePush?code=406");
-
- return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("杩斿洖閿欒");
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
- /// <summary>
- /// 鍘熸枡鍒嗛厤宸烽亾
- /// </summary>
- /// <param name="palletCode">鏉＄爜鍙�</param>
- /// <returns></returns>
- /// <exception cref="Exception"></exception>
- public string AssignYLRoadwayNo(string palletCode)
- {
- try
- {
- Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == palletCode);
- if (stockInfo==null)
- {
- throw new Exception($"缁勭洏搴撳瓨涓嶅瓨鍦�");
- }
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == stockInfo.WarehouseId);
-
- if (warehouse == null)
- {
- throw new Exception($"鏈壘鍒板贩閬撳搴斾粨搴撲俊鎭�");
- }
-
- string roadwayNo = "";
-
- if (stockInfo.MaterielInvOrgId==MaterielInvOrgEnum.鏂板巶.ObjToInt())
- {
- //闄愬埗鐩村緞
- if (stockInfo.CheckThickness >= 300 && stockInfo.CheckThickness <= 1300 && stockInfo.MaterielWide >= 690 && stockInfo.MaterielWide <= 2700)
- {
- //鑾峰彇鍒嗛厤
- List<LocationCount> locationCounts = Db.Queryable<Dt_LocationInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo.Contains("YLDual") && (stockInfo.PalletType == LocationTypeEnum.MediumPallet.ObjToInt() ? x.LocationType == LocationTypeEnum.MediumPallet.ObjToInt(): x.LocationType == LocationTypeEnum.SmallPallet.ObjToInt())).GroupBy(x => x.RoadwayNo).Select(x => new LocationCount { RoadwayNo = x.RoadwayNo, Count = SqlFunc.AggregateCount(x) }).OrderBy(x => x.RoadwayNo).ToList();
-
- roadwayNo = HandleRoadway(locationCounts, warehouse);
- }
- }
- else
- {
- //闄愬埗
- if (stockInfo.CheckThickness >= 800 && stockInfo.CheckThickness <= 1500 && stockInfo.MaterielWide >= 700 && stockInfo.MaterielWide <= 2500)
- {
- bool LayerLimit = false;
- if (stockInfo.CheckThickness > 1300)
- {
- LayerLimit = true;
- }
- //鑾峰彇鍒嗛厤
- List<LocationCount> locationCounts = Db.Queryable<Dt_LocationInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo.Contains("YL") && !x.RoadwayNo.Contains("YLDual") && (LayerLimit ? x.Columns>=56 : x.Columns<=55)).GroupBy(x => x.RoadwayNo).Select(x => new LocationCount { RoadwayNo = x.RoadwayNo, Count = SqlFunc.AggregateCount(x) }).OrderBy(x => x.RoadwayNo).ToList();
- if (stockInfo.MaterielWide > 2200)
- {
- locationCounts = Db.Queryable<Dt_LocationInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo == "SC02_YL" && (LayerLimit ? x.Columns >= 56 : x.Columns <= 55)).GroupBy(x => x.RoadwayNo).Select(x => new LocationCount { RoadwayNo = x.RoadwayNo, Count = SqlFunc.AggregateCount(x) }).OrderBy(x => x.RoadwayNo).ToList();
- }
-
- roadwayNo = HandleRoadway(locationCounts, warehouse);
- }
- else if (stockInfo.CheckThickness >= 400 && stockInfo.CheckThickness < 800 && stockInfo.MaterielWide >= 700 && stockInfo.MaterielWide <= 2500)
- {
- //鑾峰彇鍒嗛厤
- List<LocationCount> locationCounts = Db.Queryable<Dt_LocationInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo.Contains("YLDual") && (stockInfo.PalletType == LocationTypeEnum.MediumPallet.ObjToInt() ? x.LocationType == LocationTypeEnum.MediumPallet.ObjToInt() : x.LocationType == LocationTypeEnum.SmallPallet.ObjToInt())).GroupBy(x => x.RoadwayNo).Select(x => new LocationCount { RoadwayNo = x.RoadwayNo, Count = SqlFunc.AggregateCount(x) }).OrderBy(x => x.RoadwayNo).ToList();
-
- roadwayNo = HandleRoadway(locationCounts, warehouse);
- }
- }
-
- return !string.IsNullOrEmpty(roadwayNo) ? (roadwayNo) : throw new Exception("鏈壘鍒板彲鍒嗛厤宸烽亾");
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- throw new Exception(ex.Message);
- }
- }
- //澶勭悊鍒嗛厤宸烽亾 浠诲姟鏁伴噺
- public string HandleRoadway(List<LocationCount> locationCounts, Dt_Warehouse warehouse)
- {
- //宸烽亾浠诲姟鍒嗛厤鏁伴噺
- List<LocationCount> useLocationCounts = Db.Queryable<Dt_Task>().Where(x => x.WarehouseId == warehouse.WarehouseId
- && locationCounts.Select(j => j.RoadwayNo).Distinct().Contains(x.Roadway)
- && TaskInboundTypes.Contains(x.TaskType)).GroupBy(x => x.Roadway).Select(x => new LocationCount { RoadwayNo = x.Roadway, Count = SqlFunc.AggregateCount(x) }).ToList();
- foreach (var item in locationCounts)
- {
- LocationCount? count = useLocationCounts.FirstOrDefault(x => x.RoadwayNo == item.RoadwayNo);
- if (count != null)
- {
- item.Count -= count.Count;
- }
- }
- return locationCounts.Where(x => x.Count > 0).OrderByDescending(x => x.Count).FirstOrDefault()?.RoadwayNo ?? "";
- }
- /// <summary>
- /// 鍏ュ簱瀹屾垚
- /// </summary>
- public WebResponseContent InboundTaskCompleted(Dt_Task task)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
- if (warehouse.WarehouseCode == WarehouseEnum.LLDCP.ToString() || warehouse.WarehouseCode == WarehouseEnum.LLDFL.ToString()) //鎴愬搧/杈呮枡瀹屾垚
- {
- Dt_LocationInfo locationInfoEnd = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
- if (locationInfoEnd == null)
- {
- return content.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅");
- }
- Dt_AGVStationInfo agvstation = _basicRepository.AGVStationInfoRepository.QueryFirst(x => x.AGVStationCode == task.SourceAddress && ( x.StationArea == nameof(StationAreaEnum.涓�妤兼湀鍙扮爜澶�) || x.StationArea == nameof(StationAreaEnum.涓�妤兼棤绾虹粐甯�) || x.StationArea == nameof(StationAreaEnum.涓�妤兼棤绾烘穻鑶�) || x.StationArea == nameof(StationAreaEnum.涓�妤兼棤绾烘穻鑶�)));
- if (agvstation != null)
- {
- agvstation.IsOccupied = WhetherEnum.False.ObjToInt();
- }
- Dt_ProStockInfo proStockInfo = _stockRepository.ProStockInfoRepository.Db.Queryable<Dt_ProStockInfo>().Where(x => x.PalletCode == task.PalletCode).Includes(x=>x.proStockInfoDetails).First();
- if (proStockInfo != null && proStockInfo.StockStatus == StockStatusEmun.MES绌烘墭閫�搴�.ObjToInt())
- {
- task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
- _unitOfWorkManage.BeginTran();
- if (agvstation != null)
- {
- _basicRepository.AGVStationInfoRepository.UpdateData(agvstation);
- }
- proStockInfo.LocationCode = locationInfoEnd.LocationCode;
- proStockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
- _stockRepository.ProStockInfoRepository.UpdateData(proStockInfo);
- _basicService.LocationInfoService.UpdateLocationStatus(locationInfoEnd, proStockInfo.PalletType, LocationStatusEnum.InStock, proStockInfo.WarehouseId);
- BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? WIDESEA_Core.Enums.OperateTypeEnum.浜哄伐瀹屾垚 : WIDESEA_Core.Enums.OperateTypeEnum.鑷姩瀹屾垚);
- _unitOfWorkManage.CommitTran();
- }
- else if (proStockInfo != null &&( proStockInfo.StockStatus == StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt() || proStockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt()))
- {
- task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
- proStockInfo.proStockInfoDetails.ForEach(x =>
- {
- x.ProStockDetailStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
- });
- _unitOfWorkManage.BeginTran();
- if (agvstation != null)
- {
- _basicRepository.AGVStationInfoRepository.UpdateData(agvstation);
- }
- proStockInfo.LocationCode = locationInfoEnd.LocationCode;
- proStockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
- _stockRepository.ProStockInfoRepository.UpdateData(proStockInfo);
- _stockRepository.ProStockInfoDetailRepository.UpdateData(proStockInfo.proStockInfoDetails);
- _basicService.LocationInfoService.UpdateLocationStatus(locationInfoEnd, proStockInfo.PalletType, LocationStatusEnum.InStock, proStockInfo.WarehouseId);
- BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? WIDESEA_Core.Enums.OperateTypeEnum.浜哄伐瀹屾垚 : WIDESEA_Core.Enums.OperateTypeEnum.鑷姩瀹屾垚);
- _unitOfWorkManage.CommitTran();
- _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(proStockInfo, 0, proStockInfo.proStockInfoDetails.Sum(x => x.StockQty), StockChangeTypeEnum.Inbound);
- }
- else
- {
- return content.Error($"鏈壘鍒板搴斿簱瀛樹俊鎭�");
- }
- }
- else//鍘熸枡搴撳畬鎴�
- {
- //鑾峰彇搴撳瓨
- Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == task.PalletCode);
- if (stockInfo == null)
- {
- return content.Error($"鏈壘鍒板搴斿簱瀛樹俊鎭�");
- }
- //鑾峰彇璐т綅淇℃伅
- Dt_LocationInfo locationInfoEnd = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
- if (locationInfoEnd == null)
- {
- return content.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅");
- }
- //鏇存柊鐘舵��
- task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
- _unitOfWorkManage.BeginTran();
- if (task.TaskType == TaskTypeEnum.InPick.ObjToInt())
- {
- Dt_LocationInfo locationInfoStart = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
- _basicService.LocationInfoService.UpdateLocationStatus(locationInfoStart, stockInfo.PalletType, LocationStatusEnum.Free, stockInfo.WarehouseId);
- }
- stockInfo.LocationCode = locationInfoEnd.LocationCode;
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
- if (task.TaskType!=TaskTypeEnum.Inbound.ObjToInt())
- {
- stockInfo.IsFull = WhetherEnum.True.ObjToInt();
- }
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
- _basicService.LocationInfoService.UpdateLocationStatus(locationInfoEnd, stockInfo.PalletType, LocationStatusEnum.InStock, stockInfo.WarehouseId);
- BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? WIDESEA_Core.Enums.OperateTypeEnum.浜哄伐瀹屾垚 : WIDESEA_Core.Enums.OperateTypeEnum.鑷姩瀹屾垚);
- _unitOfWorkManage.CommitTran();
- //璁板綍搴撳瓨鍙樺姩
- _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.StockLength, 0, StockChangeTypeEnum.Inbound,taskNum:task.TaskNum);
- //涓婃姤鑰佸巶ERP
- if (stockInfo.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && task.TaskType == TaskTypeEnum.Inbound.ObjToInt())
- {
- int Qty = Convert.ToInt32(stockInfo.MaterielWeight);
- BSTPurchaseUpModel bSTPurchaseUpModel = new BSTPurchaseUpModel()
- {
- Barcode = stockInfo.PalletCode,
- BarcodeQty = Qty,
- Rfid = stockInfo.RfidCode,
- RfidUpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")
- };
- BSTResponse<object> bSTResponse = _invokeERPService.BSTPurchaseUp(bSTPurchaseUpModel).DeserializeObject<BSTResponse<object>>();
- content.Message = bSTResponse?.Msg;
- }
- }
- content.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鍒嗛厤鎴愬搧宸烽亾
- /// </summary>
- /// <returns></returns>
- public string AssignCPRoadwayNo()
- {
- try
- {
- string roadwayNo = "";
- //鑾峰彇宸烽亾鍙垎閰嶇殑璐т綅鏁伴噺
- List<LocationCount> locationCounts = Db.Queryable<Dt_LocationInfo>().Where(x => x.WarehouseId == WarehouseEnum.LLDCP.ObjToInt() && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo.Contains("CP")).GroupBy(x => x.RoadwayNo).Select(x => new LocationCount { RoadwayNo = x.RoadwayNo, Count = SqlFunc.AggregateCount(x) }).ToList();
- //绛涢�夊綋鍓嶅叆搴撲换鍔′腑宸插垎閰嶅贩閬撲换鍔℃暟閲�
- List<LocationCount> useLocationCounts = Db.Queryable<Dt_Task>().Where(x => (x.WarehouseId == WarehouseEnum.LLDCP.ObjToInt()|| x.WarehouseId == WarehouseEnum.LLDFL.ObjToInt())
- && locationCounts.Select(j=>j.RoadwayNo).Distinct().Contains(x.Roadway)
- && TaskInboundTypes.Contains(x.TaskType)).GroupBy(x => x.Roadway).Select(x => new LocationCount { RoadwayNo = x.Roadway, Count = SqlFunc.AggregateCount(x) }).ToList();
- foreach (var item in locationCounts)
- {
- LocationCount? count = useLocationCounts.FirstOrDefault(x => x.RoadwayNo == item.RoadwayNo);
- if (count!=null)
- {
- item.Count -= count.Count;
- }
- }
- //閫氳繃鍙敤璐т綅鏁伴噺鎺掑簭锛屾渶澶氱殑浼樺厛鍒嗛厤
- roadwayNo = locationCounts.Where(x=>x.Count>0).OrderByDescending(x => x.Count).FirstOrDefault()?.RoadwayNo ?? "";
- return !string.IsNullOrEmpty(roadwayNo) ? (roadwayNo) : throw new Exception("鏈壘鍒板彲鍒嗛厤宸烽亾");
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- throw new Exception(ex.Message);
- }
- }
-
- /// <summary>
- /// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="roadwayNo">宸烽亾鍙�</param>
- /// <returns></returns>
- public WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo)
- {
- try
- {
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
- if (task == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒拌鍏ュ簱浠诲姟");
- }
-
- if (_basicRepository.LocationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress) != null)
- {
- return WebResponseContent.Instance.OK(data: task.TargetAddress);
- }
- Dt_StockInfo? stockInfo = null;
- if (roadwayNo.Contains("YL"))
- {
- stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x=>x.PalletCode==task.PalletCode);
- }
- //鍒嗛厤璐т綅
- Dt_LocationInfo? locationInfo = _basicService.LocationInfoService.AssignLocation(roadwayNo, task.PalletType, task.WarehouseId, stockInfo);
- if (locationInfo == null)
- {
- return WebResponseContent.Instance.Error($"璐т綅鍒嗛厤澶辫触,鏈壘鍒板彲鍒嗛厤璐т綅");
- }
-
- task.Roadway = roadwayNo;
- task.TargetAddress = locationInfo.LocationCode;
- if (task.Roadway.Contains("AGV"))
- {
- task.TaskStatus = TaskStatusEnum.AGV_Execute.ObjToInt();
- }
- else
- {
- task.TaskStatus = TaskStatusEnum.SC_Execute.ObjToInt();
- }
-
- LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;
- //鏇存柊閿佸畾璐т綅
- _unitOfWorkManage.BeginTran();
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, lastStatus, LocationStatusEnum.Lock, LocationChangeType.InboundAssignLocation,taskNum: taskNum);
- _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, task.PalletType, LocationStatusEnum.Lock, task.WarehouseId);
- BaseDal.UpdateData(task);
- _unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK(data: locationInfo.LocationCode);
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 鎴愬搧绌烘墭鍥炲簱
- /// </summary>
- public WebResponseContent EmptyBackTask(string barCode, string startPoint)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- //string palletCode = @"^C\d{5}$"; // 姝ｅ垯琛ㄨ揪寮�
- //bool isValid = Regex.IsMatch(barCode, palletCode);
- //if (!isValid)
- //{
- // return content.Error($"妗嗙爜鏍煎紡閿欒{barCode}");
- //}
- Dt_AGVStationInfo agvstation = _basicRepository.AGVStationInfoRepository.QueryFirst(x=>x.AGVStationCode==startPoint);
- if (agvstation==null)
- {
- return content.Error($"璧风偣閿欒{startPoint}");
- }
- //鍒ゆ柇褰撳墠鐐逛綅鏄惁閲嶅
- Dt_Task taskOldPoint = BaseDal.QueryFirst(x => x.SourceAddress == startPoint &&( x.TaskStatus == TaskStatusEnum.New.ObjToInt() || x.TaskStatus==TaskStatusEnum.AGV_Executing.ObjToInt()));
- if (taskOldPoint != null)
- {
- return content.Error($"绔欑偣{startPoint}宸插瓨鍦ㄤ换鍔�");
- }
- Dt_Task taskOld = BaseDal.QueryFirst(x => x.PalletCode == barCode);
- if (taskOld != null)
- {
- return content.Error($"鎵樼洏{barCode}浠诲姟宸插瓨鍦�");
- }
- Dt_ProStockInfo proStockInfoOld = _stockRepository.ProStockInfoRepository.QueryFirst(x => x.PalletCode == barCode);
- if (proStockInfoOld!=null)
- {
- return content.Error($"鎵樼洏{barCode}宸插瓨鍦�");
- }
- //鍒嗛厤宸烽亾
- string roadWay=AssignCPRoadwayNo();
-
- Dt_ProStockInfo proStockInfo = new Dt_ProStockInfo()
- {
- PalletCode=barCode,
- ProStockAttribute=ProStockAttributeEnum.绌烘墭.ObjToInt(),
- PalletType=1,
- LocationCode="",
- WarehouseId= WarehouseEnum.LLDFL.ObjToInt(),
- StockStatus=StockStatusEmun.MES绌烘墭閫�搴�.ObjToInt()
- };
-
- Dt_Task newTask = new Dt_Task()
- {
- CurrentAddress = startPoint,
- Grade = 0,
- NextAddress = "",
- PalletCode = barCode,
- Roadway = roadWay,
- SourceAddress = startPoint,
- TargetAddress = "",
- TaskType = TaskTypeEnum.EmptyProductBack.ObjToInt(),
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = WarehouseEnum.LLDFL.ObjToInt(),
- PalletType = 1
- };
- _unitOfWorkManage.BeginTran();
- int taskId = BaseDal.AddData(newTask);
- _stockRepository.ProStockInfoRepository.AddData(proStockInfo);
- newTask.TaskId = taskId;
- _unitOfWorkManage.CommitTran();
- //鎺ㄩ�佷换鍔�
- PushTasksToWCS(new List<Dt_Task> { newTask },"AGV");
- content.OK("鍙戦�佹垚鍔�");
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- private readonly static object _lockerFLorCP = new object();
- /// <summary>
- /// 杈呮枡/鎴愬搧涓存椂鍏ュ簱
- /// </summary>
- /// <returns></returns>
- public WebResponseContent InboundFLOrCPTask(string barCode, string startPoint,string matCode,int matCount, int oneCount)
- {
- lock (_lockerFLorCP)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (matCount<1 || oneCount < 1)
- {
- return content.Error("鐗╂枡鎬绘暟鎴栧崟涓暟閲忎笉鑳藉皬浜�1");
- }
- //string palletCode = @"^C\d{5}$"; // 姝ｅ垯琛ㄨ揪寮�
- //bool isValid = Regex.IsMatch(barCode, palletCode);
- //if (!isValid)
- //{
- // return content.Error($"妗嗙爜鏍煎紡閿欒{barCode}");
- //}
- //鑾峰彇鐗╂枡
- Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == matCode && x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt() && (x.WarehouseId==WarehouseEnum.LLDCP.ObjToInt() || x.WarehouseId == WarehouseEnum.LLDFL.ObjToInt()));
- if (materielInfo == null)
- {
- return content.Error($"鏈壘鍒扮墿鏂欎俊鎭瘂matCode}");
- }
- Dt_AGVStationInfo agvstation = _basicRepository.AGVStationInfoRepository.QueryFirst(x => x.AGVStationCode == startPoint);
- if (agvstation == null)
- {
- return content.Error($"璧风偣閿欒{startPoint}");
- }
- //鍒ゆ柇褰撳墠鐐逛綅鏄惁閲嶅
- Dt_Task taskOldPoint = BaseDal.QueryFirst(x => x.SourceAddress == startPoint && (x.TaskStatus == TaskStatusEnum.New.ObjToInt() || x.TaskStatus == TaskStatusEnum.AGV_Executing.ObjToInt()));
- if (taskOldPoint != null)
- {
- return content.Error($"绔欑偣{startPoint}宸插瓨鍦ㄤ换鍔�");
- }
- Dt_Task taskOld = BaseDal.QueryFirst(x => x.PalletCode == barCode);
- if (taskOld != null)
- {
- return content.Error($"鎵樼洏{barCode}浠诲姟宸插瓨鍦�");
- }
- Dt_ProStockInfo proStockInfoOld = _stockRepository.ProStockInfoRepository.QueryFirst(x => x.PalletCode == barCode);
- if (proStockInfoOld != null)
- {
- return content.Error($"鎵樼洏{barCode}宸插瓨鍦�");
- }
- //鍒嗛厤宸烽亾
- string roadWay = AssignCPRoadwayNo();
-
- //鑾峰彇鎴愬搧搴�
- WarehouseEnum warehouseEnum = materielInfo.MaterielSourceType == MaterielTypeEnum.鎴愬搧.ObjToInt() ? WarehouseEnum.LLDCP : WarehouseEnum.LLDFL;
- List<Dt_ProStockInfoDetail> proStockInfoDetails = new List<Dt_ProStockInfoDetail>();
- for (int i = 0; i < matCount; i++)
- {
- Dt_ProStockInfoDetail proStockInfoDetail = new Dt_ProStockInfoDetail()
- {
- ProductCode = materielInfo.MaterielCode,
- ProductName = materielInfo.MaterielName,
- ProductSpec = materielInfo.MaterielSpec,
- ProductUnit = materielInfo.MaterielUnit,
- StockQty = oneCount,
- ProStockDetailStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt()
- };
- proStockInfoDetails.Add(proStockInfoDetail);
- }
-
- Dt_ProStockInfo proStockInfo = new Dt_ProStockInfo()
- {
- PalletCode = barCode,
- ProStockAttribute = materielInfo.MaterielSourceType,
- PalletType = 1,
- LocationCode = "",
- WarehouseId = warehouseEnum.ObjToInt(),
- StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt(),
- proStockInfoDetails = proStockInfoDetails
- };
-
- Dt_Task newTask = new Dt_Task()
- {
- CurrentAddress = startPoint,
- Grade = 0,
- NextAddress = "",
- PalletCode = barCode,
- Roadway = roadWay,
- SourceAddress = startPoint,
- TargetAddress = "",
- TaskType = TaskTypeEnum.Inbound.ObjToInt(),
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = warehouseEnum.ObjToInt(),
- PalletType = 1
- };
- _unitOfWorkManage.BeginTran();
- int taskId = BaseDal.AddData(newTask);
- BaseDal.Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand();
- newTask.TaskId = taskId;
- _unitOfWorkManage.CommitTran();
- //鎺ㄩ�佷换鍔�
- PushTasksToWCS(new List<Dt_Task> { newTask }, "AGV");
- content.OK("鍙戦�佹垚鍔�");
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- }
- /// <summary>
- /// 杈呮枡(鎴愬搧)閲囪喘/鏈熷垵鍏ュ簱
- /// </summary>
- /// <returns></returns>
- public WebResponseContent InboundOrderInTask(string bindCode,string barCode,string startPoint, int orderType = 0)
- {
- WebResponseContent content=new WebResponseContent();
- try
- {
- InOrderTypeEnum inOrderTypeEnum = (InOrderTypeEnum)orderType;
- if (inOrderTypeEnum == InOrderTypeEnum.InventoryIn)
- {
- //鑾峰彇涓诲崟
- Dt_InboundOrder inboundOrder = BaseDal.Db.Queryable<Dt_InboundOrder>().Includes(x => x.Details).Where(x => x.Details.Any(v => v.BarCode == bindCode)).First();
-
- if (inboundOrder == null)
- {
- throw new Exception($"鏈壘鍒版潯鐮亄bindCode}鍏ュ簱鍗曟嵁淇℃伅");
- }
- Dt_InboundOrderDetail inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BarCode == bindCode);
- if (inboundOrderDetail == null)
- {
- throw new Exception($"鏈壘鍒板叆搴撳崟鍙蜂负{inboundOrder.UpperOrderNo}鏉＄爜{bindCode}鍗曟嵁淇℃伅");
- }
- if (inboundOrderDetail.OrderDetailStatus != InOrderStatusEnum.鏈紑濮�.ObjToInt())
- {
- throw new Exception($"鏉＄爜{bindCode}淇℃伅宸插叆搴撴垨鍏ュ簱涓�");
- }
- Dt_AGVStationInfo agvstation = _basicRepository.AGVStationInfoRepository.QueryFirst(x => x.AGVStationCode == startPoint);
- if (agvstation == null)
- {
- return content.Error($"璧风偣閿欒{startPoint}");
- }
- //鍒ゆ柇褰撳墠鐐逛綅鏄惁閲嶅
- Dt_Task taskOldPoint = BaseDal.QueryFirst(x => x.SourceAddress == startPoint && (x.TaskStatus == TaskStatusEnum.New.ObjToInt() || x.TaskStatus == TaskStatusEnum.AGV_Executing.ObjToInt()));
- if (taskOldPoint != null)
- {
- return content.Error($"绔欑偣{startPoint}宸插瓨鍦ㄤ换鍔�");
- }
- Dt_Task taskOld = BaseDal.QueryFirst(x => x.PalletCode == barCode);
- if (taskOld != null)
- {
- return content.Error($"鎵樼洏{barCode}浠诲姟宸插瓨鍦�");
- }
- Dt_ProStockInfo proStockInfoOld = _stockRepository.ProStockInfoRepository.QueryFirst(x => x.PalletCode == barCode);
- if (proStockInfoOld != null)
- {
- return content.Error($"鎵樼洏{barCode}宸插瓨鍦�");
- }
- //鍒嗛厤宸烽亾
- string roadWay = AssignCPRoadwayNo();
- //鑾峰彇鐗╂枡
- Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.WarehouseId == inboundOrder.WarehouseId && x.MaterielCode == inboundOrderDetail.MaterialCode);
- Dt_ProStockInfoDetail proStockInfoDetail = new Dt_ProStockInfoDetail()
- {
- ProductCode = materielInfo.MaterielCode,
- ProductNo = bindCode,
- ProductName = materielInfo.MaterielName,
- ProductSpec = materielInfo.MaterielSpec,
- LotNumber = inboundOrderDetail.MaterialLot,
- ProductUnit = materielInfo.MaterielUnit,
- StockQty = inboundOrderDetail.OrderQuantity,
- ProStockDetailStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt()
- };
- Dt_ProStockInfo proStockInfo = new Dt_ProStockInfo()
- {
- PalletCode = barCode,
- ProInOrderNo = inboundOrder.UpperOrderNo,
- ProStockAttribute = materielInfo.MaterielSourceType,
- PalletType = 1,
- LocationCode = "",
- WarehouseId = materielInfo.WarehouseId,
- StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt(),
- proStockInfoDetails = new List<Dt_ProStockInfoDetail> { proStockInfoDetail }
- };
- //鐢熸垚浠诲姟
- Dt_Task newTask = new Dt_Task()
- {
- CurrentAddress = startPoint,
- Grade = 0,
- NextAddress = "",
- PalletCode = barCode,
- Roadway = roadWay,
- SourceAddress = startPoint,
- TargetAddress = "",
- TaskType = TaskTypeEnum.Inbound.ObjToInt(),
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = inboundOrder.WarehouseId,
- OrderNo = inboundOrder.UpperOrderNo,
- MaterielCode = inboundOrderDetail.MaterialCode,
- Quantity = inboundOrderDetail.OrderQuantity,
- PalletType = 1
- };
- inboundOrderDetail.OrderDetailStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
- _unitOfWorkManage.BeginTran();
- if (inboundOrder.InboundOrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt())
- {
- inboundOrder.InboundOrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
- _inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
- }
- _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetail);
- int taskId = BaseDal.AddData(newTask);
- BaseDal.Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand();
- newTask.TaskId = taskId;
- _unitOfWorkManage.CommitTran();
- //鎺ㄩ�佷换鍔�
- PushTasksToWCS(new List<Dt_Task> { newTask }, "AGV");
- }
- else if (inOrderTypeEnum == InOrderTypeEnum.PurchaseIn)
- {
- //鑾峰彇涓诲崟
- Dt_PurchaseOrder inboundOrder = BaseDal.Db.Queryable<Dt_PurchaseOrder>().Includes(x => x.Details).Where(x => x.Details.Any(v => v.BarCode == bindCode)).First();
-
- if (inboundOrder == null)
- {
- throw new Exception($"鏈壘鍒版潯鐮亄bindCode}閲囪喘鍏ュ簱鍗曟嵁淇℃伅");
- }
- Dt_PurchaseOrderDetail inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BarCode == bindCode);
- if (inboundOrderDetail == null)
- {
- throw new Exception($"鏈壘鍒板叆搴撳崟鍙蜂负{inboundOrder.PurchaseOrderNo}鏉＄爜{bindCode}鍗曟嵁淇℃伅");
- }
- if (inboundOrderDetail.PurchaseDetailStatus != InOrderStatusEnum.鏈紑濮�.ObjToInt())
- {
- throw new Exception($"鏉＄爜{bindCode}淇℃伅宸插叆搴撴垨鍏ュ簱涓�");
- }
- Dt_AGVStationInfo agvstation = _basicRepository.AGVStationInfoRepository.QueryFirst(x => x.AGVStationCode == startPoint);
- if (agvstation == null)
- {
- return content.Error($"璧风偣閿欒{startPoint}");
- }
- //鍒ゆ柇褰撳墠鐐逛綅鏄惁閲嶅
- Dt_Task taskOldPoint = BaseDal.QueryFirst(x => x.SourceAddress == startPoint && (x.TaskStatus == TaskStatusEnum.New.ObjToInt() || x.TaskStatus == TaskStatusEnum.AGV_Executing.ObjToInt()));
- if (taskOldPoint != null)
- {
- return content.Error($"绔欑偣{startPoint}宸插瓨鍦ㄤ换鍔�");
- }
- Dt_Task taskOld = BaseDal.QueryFirst(x => x.PalletCode == barCode);
- if (taskOld != null)
- {
- return content.Error($"鎵樼洏{barCode}浠诲姟宸插瓨鍦�");
- }
- Dt_ProStockInfo proStockInfoOld = _stockRepository.ProStockInfoRepository.QueryFirst(x => x.PalletCode == barCode);
- if (proStockInfoOld != null)
- {
- return content.Error($"鎵樼洏{barCode}宸插瓨鍦�");
- }
- //鍒嗛厤宸烽亾
- string roadWay = AssignCPRoadwayNo();
- //鑾峰彇鐗╂枡
- Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.WarehouseId == inboundOrder.WarehouseId && x.MaterielCode == inboundOrderDetail.MaterialCode);
- Dt_ProStockInfoDetail proStockInfoDetail = new Dt_ProStockInfoDetail()
- {
- ProductCode = materielInfo.MaterielCode,
- ProductNo = bindCode,
- ProductName = materielInfo.MaterielName,
- ProductSpec = materielInfo.MaterielSpec,
- LotNumber = inboundOrderDetail.MaterialLot,
- ProductUnit = materielInfo.MaterielUnit,
- StockQty = inboundOrderDetail.PurchaseDetailQuantity,
- ProStockDetailStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt()
- };
- Dt_ProStockInfo proStockInfo = new Dt_ProStockInfo()
- {
- PalletCode = barCode,
- ProInOrderNo = inboundOrder.PurchaseOrderNo,
- ProStockAttribute = materielInfo.MaterielSourceType,
- PalletType = 1,
- LocationCode = "",
- WarehouseId = materielInfo.WarehouseId,
- StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt(),
- proStockInfoDetails = new List<Dt_ProStockInfoDetail> { proStockInfoDetail }
- };
- //鐢熸垚浠诲姟
- Dt_Task newTask = new Dt_Task()
- {
- CurrentAddress = startPoint,
- Grade = 0,
- NextAddress = "",
- PalletCode = barCode,
- Roadway = roadWay,
- SourceAddress = startPoint,
- TargetAddress = "",
- TaskType = TaskTypeEnum.Inbound.ObjToInt(),
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = inboundOrder.WarehouseId,
- OrderNo = inboundOrder.PurchaseOrderNo,
- MaterielCode=inboundOrderDetail.MaterialCode,
- Quantity=inboundOrderDetail.PurchaseDetailQuantity,
- PalletType = 1
- };
- inboundOrderDetail.PurchaseDetailStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
- _unitOfWorkManage.BeginTran();
- if (inboundOrder.PurchaseOrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt())
- {
- inboundOrder.PurchaseOrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
- _inboundRepository.PurchaseOrderRepository.UpdateData(inboundOrder);
- }
- _inboundRepository.PurchaseOrderDetailRepository.UpdateData(inboundOrderDetail);
- int taskId = BaseDal.AddData(newTask);
- BaseDal.Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand();
- newTask.TaskId = taskId;
- _unitOfWorkManage.CommitTran();
- //鎺ㄩ�佷换鍔�
- PushTasksToWCS(new List<Dt_Task> { newTask }, "AGV");
- }
- else
- {
- return content.Error($"鏈壘鍒板搴斿崟鎹被鍨�");
- }
-
- content.OK("鍙戦�佹垚鍔�");
-
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鍗板埛浣欐枡閫�鏂欎换鍔�
- /// </summary>
- public WebResponseContent PrintBackInbound(SaveModel saveModel)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var barcode = saveModel.MainData["palletCode"].ToString();
- var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
- var materSn = saveModel.MainData["materSn"];
- //鐩村緞
- var thickness = saveModel.MainData["thickness"].ObjToInt();
- var weight = saveModel.MainData["weight"].ObjToInt();
- var address = saveModel.MainData["address"].ToString();
- //骞呭
- var wide = saveModel.MainData["wide"].ObjToInt();
- Dt_MaterielInfo? materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == materSn);
- if (materielInfo == null)
- {
- return content.Error("鏈壘鍒扮墿鏂欎俊鎭�");
- }
- if (materielInfo.MaterielSourceType != MaterielTypeEnum.鍘熸潗鏂�.ObjToInt())
- {
- return content.Error($"鐗╂枡淇℃伅涓嶇鍚坽MaterielTypeEnum.鍘熸潗鏂檥");
- }
- Dt_StockInfo stockInfoOld = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == barcode);
- if (stockInfoOld != null)
- {
- return content.Error("鎵樼洏淇℃伅宸插瓨鍦�");
- }
- //鐢熸垚搴撳瓨缁勭洏淇℃伅
- Dt_StockInfo stockInfo = new Dt_StockInfo()
- {
- MaterielInvOrgId = materielInfo.MaterielInvOrgId,
- PalletCode = barcode,
- LocationCode = "",
- PalletType = 1,
- WarehouseId = warehouseId,
- StockAttribute = materielInfo.MaterielSourceType,
- StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt(),
- MaterielSpec = materielInfo.MaterielSpec,
- Unit = materielInfo.MaterielUnit,
- MaterielThickness = thickness,
- MaterielWide = wide,
- MaterielWeight = weight,
- MaterielCode = materielInfo.MaterielCode,
- MaterielName = materielInfo.MaterielName,
- };
- if (wide > 1200)
- {
- stockInfo.PalletType = 2;
- }
-
- //鐢熸垚鍗板埛浣欐枡閫�鏂欎换鍔�
- Dt_Task newTask = new Dt_Task()
- {
- CurrentAddress = address,
- Grade = 0,
- NextAddress = "",
- PalletCode = barcode,
- Roadway = "",
- SourceAddress = address,
- TargetAddress = "",
- TaskType = TaskTypeEnum.PrintYLBackInbound.ObjToInt(),
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = warehouseId,
- PalletType = stockInfo.PalletType,
- TaskLength= wide
- };
- _unitOfWorkManage.BeginTran();
- int taskId = BaseDal.AddData(newTask);
- _stockRepository.StockInfoRepository.AddData(stockInfo);
- newTask.TaskId = taskId;
- _unitOfWorkManage.CommitTran();
- //鎺ㄩ�佷换鍔�
- PushTasksToWCS(new List<Dt_Task> { newTask });
- content.OK("鍙戦�佹垚鍔�");
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鍗板埛涓嬫枡浠诲姟
- /// </summary>
- public WebResponseContent PrintInbound(SaveModel saveModel)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var barcode = saveModel.MainData["palletCode"].ToString();
- var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
- var materSn = saveModel.MainData["materSn"];
- //鐩村緞
- var thickness = saveModel.MainData["thickness"].ObjToInt();
- var weight = saveModel.MainData["weight"].ObjToInt();
- var address = saveModel.MainData["address"].ToString();
- //骞呭
- var wide = saveModel.MainData["wide"].ObjToInt();
- Dt_MaterielInfo? materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == materSn);
- if (materielInfo == null)
- {
- return content.Error("鏈壘鍒扮墿鏂欎俊鎭�");
- }
- if (materielInfo.MaterielSourceType!=MaterielTypeEnum.鍗婃垚鍝�.ObjToInt())
- {
- return content.Error($"鏈壘鍒扮墿鏂檣materielInfo.MaterielCode}鍗婃垚鍝佷俊鎭�");
- }
- Dt_StockInfo stockInfoOld = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == barcode);
- if (stockInfoOld != null)
- {
- return content.Error("鎵樼洏淇℃伅宸插瓨鍦�");
- }
- //鐢熸垚搴撳瓨缁勭洏淇℃伅
- Dt_StockInfo stockInfo = new Dt_StockInfo()
- {
- MaterielInvOrgId = materielInfo.MaterielInvOrgId,
- PalletCode = barcode,
- LocationCode = "",
- PalletType = 1,
- WarehouseId = warehouseId,
- StockAttribute = materielInfo.MaterielSourceType,
- StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt(),
- MaterielSpec = materielInfo.MaterielSpec,
- Unit = materielInfo.MaterielUnit,
- MaterielThickness = thickness,
- MaterielWide = wide,
- MaterielWeight = weight,
- MaterielCode = materielInfo.MaterielCode,
- MaterielName = materielInfo.MaterielName,
- };
- if (wide > 1200)
- {
- stockInfo.PalletType = 2;
- }
-
- //鐢熸垚鍗板埛鍗婃垚鍝佸叆搴撲换鍔�
- Dt_Task newTask = new Dt_Task()
- {
- CurrentAddress = address,
- Grade = 0,
- NextAddress = "",
- PalletCode = barcode,
- Roadway = "",
- SourceAddress = address,
- TargetAddress = "",
- TaskType = TaskTypeEnum.PrintYLInbound.ObjToInt(),
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = warehouseId,
- PalletType = stockInfo.PalletType,
- TaskLength = wide
- };
- _unitOfWorkManage.BeginTran();
- int taskId = BaseDal.AddData(newTask);
- _stockRepository.StockInfoRepository.AddData(stockInfo);
- newTask.TaskId = taskId;
- _unitOfWorkManage.CommitTran();
- //鎺ㄩ�佷换鍔�
- PushTasksToWCS(new List<Dt_Task> { newTask });
- content.OK("鍙戦�佹垚鍔�");
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鎴愬搧/鍗婃垚鍝佷俊鎭悓姝ユ帴鍙�
- /// </summary>
- public WebResponseContent ReceiveProCodeInfo(List<MESProInDTO> proInDTOs)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (proInDTOs == null || proInDTOs.Count <= 0)
- {
- return content.Error("浼犲叆淇℃伅涓虹┖");
- }
- //鑾峰彇鎵�鏈夋垚鍝侊紝鍗婃垚鍝佷俊鎭�
- List<Dt_MESProInOrderInfo> proInOrderInfos = _inboundRepository.MESProInOrderInfoRepository.QueryData();
- //鑾峰彇鎵�鏈夌墿鏂欎俊鎭�
- List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
-
- MESProInDTO? CheckMaterialCode = proInDTOs.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialCode));
- if (CheckMaterialCode != null)
- {
- return content.Error($"鐗╂枡缂栫爜{nameof(MESProInDTO.MaterialCode)}:{CheckMaterialCode.MaterialCode}淇℃伅涓嶅瓨鍦�");
- }
- //鑾峰彇鎵�鏈堿GV鐐逛綅
- List<Dt_AGVStationInfo> aGVStationInfos = _basicRepository.AGVStationInfoRepository.QueryData(x => !string.IsNullOrEmpty(x.MESPointCode));
-
- //鍒ゆ柇鏄惁瀛樺湪閲嶅
- MESProInDTO? proInDTO = proInDTOs.FirstOrDefault(x => x.IsMantissa == false && proInOrderInfos.Select(x => x.BarCode).Contains(x.BarCode));
- if (proInDTO != null)
- {
- return content.Error($"{proInDTO.ProductOrderNo}鐢熶骇宸ュ崟{proInDTO.BarCode}鏉＄爜宸插瓨鍦�");
- }
- Dt_MESProInOrderInfo? proInOrderInfo = proInOrderInfos.FirstOrDefault(x => x.MESProInStatus == InOrderStatusEnum.鍏抽棴.ObjToInt() && proInDTOs.Select(x => x.ProductOrderNo).Distinct().Contains(x.ProductOrderNo));
- if (proInOrderInfo != null)
- {
- return content.Error($"{proInOrderInfo.ProductOrderNo}鐢熶骇宸ュ崟宸插叧闂�");
- }
- List<Dt_MESProInOrderInfo> AddMESProInOrders = new List<Dt_MESProInOrderInfo>();
- foreach (var item in proInDTOs)
- {
- Dt_MaterielInfo materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialCode);
- if (materielInfo.MaterielSourceType != MaterielTypeEnum.鎴愬搧.ObjToInt())
- {
- Dt_AGVStationInfo? CheckPointCode = aGVStationInfos.FirstOrDefault(x => x.MESPointCode == item?.PointCode);
- if (CheckPointCode == null)
- {
- return content.Error($"鍛ㄨ浆浣峽nameof(MESReturnIssueDTO.PointCode)}{item?.PointCode}涓嶅瓨鍦�,浠呮垚鍝佺墿鏂欏彲涓嶄紶");
- }
- }
- if (materielInfo.MaterielSourceType == MaterielTypeEnum.鎴愬搧.ObjToInt() && (item.Length <= 0 || item.Width <= 0 || item.Height<=0))
- {
- return content.Error($"绠辩爜{item.ProPackCode}锛岄暱搴�/瀹藉害/楂樺害涓嶈兘涓�0");
- }
- Dt_MESProInOrderInfo AddproInOrderInfo = _mapper.Map<Dt_MESProInOrderInfo>(item);
- AddproInOrderInfo.WarehouseId = materielInfo.WarehouseId;
- AddproInOrderInfo.MESProOrderType = materielInfo.MaterielSourceType;
- AddMESProInOrders.Add(AddproInOrderInfo);
- }
- List<Dt_Task> tasks = new List<Dt_Task>();
- _unitOfWorkManage.BeginTran();
- _inboundRepository.MESProInOrderInfoRepository.AddData(AddMESProInOrders);
- if (AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鍗婃垚鍝�.ObjToInt()).Count() > 0)
- {
- //鐢熸垚鍗婃垚鍝佸叆搴�
- WebResponseContent webResponse = PrintInbound(AddMESProInOrders.Where(x => x.MESProOrderType == MaterielTypeEnum.鍗婃垚鍝�.ObjToInt()).ToList());
- if (!webResponse.Status)
- {
- throw new Exception(webResponse.Message);
- }
- tasks = webResponse.Data as List<Dt_Task>;
- WebResponseContent taskResponse = PushTasksToWCS(tasks);
- if (taskResponse.Status)
- {
- throw new Exception(taskResponse.Message);
- }
- }
- _unitOfWorkManage.CommitTran();
- content.OK("鎺ユ敹鎴愬姛");
-
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鍗板埛涓嬫枡MES浠诲姟
- /// </summary>
- public WebResponseContent PrintInbound(List<Dt_MESProInOrderInfo> mESProInOrderInfos)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (mESProInOrderInfos.Count <= 0)
- {
- return content.Error("浼犲叆淇℃伅涓虹┖");
- }
-
- List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData();
- List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
- List<Dt_Task> tasks = new List<Dt_Task>();
- //鑾峰彇鎵�鏈堿GV鐐逛綅
- List<Dt_AGVStationInfo> aGVStationInfos = _basicRepository.AGVStationInfoRepository.QueryData(x => !string.IsNullOrEmpty(x.MESPointCode));
- //鏍规嵁鍗婃垚鍝佷俊鎭懠鍙搴斾换鍔�
- foreach (var item in mESProInOrderInfos)
- {
- Dt_AGVStationInfo? CheckPointCode = aGVStationInfos.FirstOrDefault(x => x.MESPointCode == item?.PointCode);
- Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialCode);
- if (materielInfo == null)
- {
- return content.Error("鏈壘鍒扮墿鏂欎俊鎭�");
- }
- if (materielInfo.MaterielSourceType != MaterielTypeEnum.鍗婃垚鍝�.ObjToInt())
- {
- return content.Error($"鏈壘鍒扮墿鏂檣materielInfo.MaterielCode}鍗婃垚鍝佷俊鎭�");
- }
- Dt_StockInfo stockInfoOld = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == item.BarCode);
- if (stockInfoOld != null)
- {
- return content.Error("鎵樼洏淇℃伅宸插瓨鍦�");
- }
- //鐢熸垚搴撳瓨缁勭洏淇℃伅
- Dt_StockInfo stockInfo = new Dt_StockInfo()
- {
- MaterielInvOrgId = materielInfo.MaterielInvOrgId,
- PalletCode = item.BarCode,
- LocationCode = "",
- PalletType = 1,
- WarehouseId = materielInfo.WarehouseId,
- StockAttribute = materielInfo.MaterielSourceType,
- StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt(),
- MaterielSpec = materielInfo.MaterielSpec,
- Unit = materielInfo.MaterielUnit,
- MaterielThickness = item.Thickness,
- MaterielWide = item.Wide,
- MaterielWeight = item.Weight,
- MaterielCode = materielInfo.MaterielCode,
- MaterielName = materielInfo.MaterielName,
- StockLength=item.ProQuantity
- };
- if (item.Wide > 1200)
- {
- stockInfo.PalletType = 2;
- }
-
- //鍗婃垚鍝佸叆搴撲换鍔�
- Dt_Task newTask = new Dt_Task()
- {
- CurrentAddress = CheckPointCode.AGVStationCode,
- Grade = 0,
- NextAddress = "",
- PalletCode = item.BarCode,
- Roadway = "",
- SourceAddress = CheckPointCode.AGVStationCode,
- TargetAddress = "",
- TaskType = 0,
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = materielInfo.WarehouseId,
- PalletType = stockInfo.PalletType,
- TaskLength = (int)item.Wide
- };
- TaskTypeEnum taskTypeEnum = CheckPointCode.StationArea switch
- {
- nameof(StationAreaEnum.涓�妤煎嵃鍒�) => TaskTypeEnum.PrintYLInbound,
- _ => throw new Exception("鏈壘鍒板搴斾换鍔�")
- };
- newTask.TaskType = taskTypeEnum.ObjToInt();
- stockInfos.Add(stockInfo);
- tasks.Add(newTask);
- }
- //鎿嶄綔鍏ュ簱鏁版嵁
- BaseDal.AddData(tasks);
- _stockRepository.StockInfoRepository.AddData(stockInfos);
- //鎺ㄩ�佷换鍔�
- content.OK("鍙戦�佹垚鍔�",data:tasks);
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
deleted file mode 100644
index bc8997a..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
+++ /dev/null
@@ -1,958 +0,0 @@
-锘�
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core;
-using WIDESEA_DTO.Stock;
-using WIDESEA_Model.Models;
-using WIDESEA_Core.Helper;
-using WIDESEA_Common.OtherEnum;
-using WIDESEA_Common.TaskEnum;
-using WIDESEA_Common.OrderEnum;
-using WIDESEA_Common.StockEnum;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.LocationEnum;
-using MailKit.Search;
-using WIDESEA_External.Model;
-using WIDESEA_Core.CodeConfigEnum;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_DTO.ERP;
-using WIDESEA_Common.MaterielEnum;
-using WIDESEA_Common.WareHouseEnum;
-using WIDESEA_DTO.MES;
-using WIDESEA_DTO.Outbound;
-using Microsoft.IdentityModel.Tokens;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
-
-namespace WIDESEA_TaskInfoService
-{
- public partial class TaskService
- {
- /// <summary>
- /// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟
- /// </summary>
- /// <param name="id"></param>
- /// <returns></returns>
- public WebResponseContent Outbound(List<int> ids)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- //鑾峰彇閫夊畾搴撳瓨
- List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => ids.Contains(x.Id) && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt()).ToList();
- if (stockInfos == null || stockInfos.Count != ids.Count)
- {
- return content.Error($"鏈壘鍒板簱瀛�");
- }
- //鑾峰彇搴撳瓨璐т綅
- List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x =>x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt() && stockInfos.Select(x=>x.LocationCode).Contains(x.LocationCode) && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt());
- if (locationInfos == null || locationInfos.Count != stockInfos.Count)
- {
- return content.Error($"璐т綅鍑哄簱鏉′欢涓嶆弧瓒�");
- }
- //浠诲姟鐢熸垚
- List<Dt_Task> tasks = GetTasks(stockInfos, TaskTypeEnum.OldYLOutbound);
- if (tasks == null || tasks.Count <= 0)
- {
- return content.Error($"鐢熸垚浠诲姟澶辫触");
- }
- stockInfos.ForEach(x =>
- {
- x.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- });
- _unitOfWorkManage.BeginTran();
- //鏇存柊搴撳瓨鐘舵��
- _stockRepository.StockInfoRepository.UpdateData(stockInfos);
- //鏇存柊璐т綅鐘舵��
- _basicRepository.LocationInfoRepository.UpdateLocationStatus(locationInfos, LocationStatusEnum.Lock);
- //鍔犲叆璐т綅鍙樺姩璁板綍
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, taskNums: tasks.Select(x => x.TaskNum).ToList());
- //鏂板缓浠诲姟
- BaseDal.AddData(tasks);
- _unitOfWorkManage.CommitTran();
- PushTasksToWCS(tasks);
- content.OK();
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鍚慦MS鐢宠鍑哄簱AGV缁堢偣
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <returns></returns>
- public WebResponseContent AssignOutTargetAddress(int taskNum)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
- if (task == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒拌鍏ュ簱浠诲姟");
- }
- if (_basicRepository.AGVStationInfoRepository.QueryFirst(x => x.AGVStationCode == task.TargetAddress) != null)
- {
- return WebResponseContent.Instance.OK(data: task.TargetAddress);
- }
- Dt_AGVStationInfo? aGVStationInfo = _basicRepository.AGVStationInfoRepository.QueryData(x => x.StationArea == nameof(StationAreaEnum.涓�妤兼湀鍙扮爜澶�) && x.IsOccupied == WhetherEnum.False.ObjToInt()).OrderByDescending(x => x.Depth).FirstOrDefault();
- if (aGVStationInfo==null)
- {
- return content.Error("鏈壘鍒板彲鍒嗛厤鐨勫嚭搴撶珯鐐�");
- }
- aGVStationInfo.IsOccupied = WhetherEnum.True.ObjToInt();
- _basicRepository.AGVStationInfoRepository.UpdateData(aGVStationInfo);
- content.OK("鎴愬姛",data: aGVStationInfo.AGVStationCode);
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鍑哄簱浠诲姟瀹屾垚
- /// </summary>
- public WebResponseContent OutboundTaskCompleted(Dt_Task task)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
- if (warehouse.WarehouseCode == WarehouseEnum.LLDCP.ToString() || warehouse.WarehouseCode == WarehouseEnum.LLDFL.ToString()) //鎴愬搧瀹屾垚
- {
- Dt_LocationInfo locationInfoStart = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
- if (locationInfoStart == null)
- {
- return content.Error($"鏈壘鍒板搴旂殑璧风偣璐т綅淇℃伅");
- }
- Dt_ProStockInfo proStockInfo = _stockRepository.ProStockInfoRepository.Db.Queryable<Dt_ProStockInfo>().Where(x => x.PalletCode == task.PalletCode).Includes(x=>x.proStockInfoDetails).First();
- if (proStockInfo != null && proStockInfo.StockStatus==StockStatusEmun.鍑哄簱閿佸畾.ObjToInt())
- {
- task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
- _unitOfWorkManage.BeginTran();
- proStockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
- _stockRepository.ProStockInfoRepository.DeleteAndMoveIntoHty(proStockInfo,App.User.UserId > 0 ? OperateTypeEnum.浜哄伐瀹屾垚 : OperateTypeEnum.鑷姩瀹屾垚);
- if (proStockInfo.proStockInfoDetails!=null && proStockInfo.proStockInfoDetails.Count>0)
- {
- _stockRepository.ProStockInfoDetailRepository.DeleteAndMoveIntoHty(proStockInfo.proStockInfoDetails, App.User.UserId > 0 ? OperateTypeEnum.浜哄伐瀹屾垚 : OperateTypeEnum.鑷姩瀹屾垚);
- }
- _basicService.LocationInfoService.UpdateLocationStatus(locationInfoStart, proStockInfo.PalletType, LocationStatusEnum.Free, proStockInfo.WarehouseId);
- BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateTypeEnum.浜哄伐瀹屾垚 : OperateTypeEnum.鑷姩瀹屾垚);
- _unitOfWorkManage.CommitTran();
- }
- else
- {
- return content.Error($"鏈壘鍒板搴斿簱瀛樹俊鎭�");
- }
- }
- else//鍘熸枡搴撳畬鎴�
- {
- Dt_LocationInfo locationInfoStart = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
- if (locationInfoStart == null)
- {
- return content.Error($"鏈壘鍒板搴旂殑璧风偣璐т綅淇℃伅");
- }
- if (locationInfoStart.LocationStatus!=LocationStatusEnum.Lock.ObjToInt())
- {
- return content.Error($"璐т綅鐘舵�佷笉姝ｇ‘");
- }
- Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == task.PalletCode);
- if (stockInfo != null && stockInfo.StockStatus == StockStatusEmun.鍑哄簱閿佸畾.ObjToInt())
- {
- task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
- //鑾峰彇鎵�鏈夊嚭搴撹鎯呮暟鎹�
- List<Dt_OutStockLockInfo>? outStockLockInfos = _outboundRepository.OutStockLockInfoRepository.QueryData(x=>x.TaskNum==task.TaskNum);
- _unitOfWorkManage.BeginTran();
- //澶勭悊搴撳瓨鏁版嵁
- if (task.TaskType == TaskTypeEnum.OldYLOutbound.ObjToInt())
- {
- stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
- stockInfo.WarehouseId = WarehouseEnum.LLDOldCache.ObjToInt();
- stockInfo.LocationCode = "";
- _stockRepository.StockInfoRepository.UpdateData(stockInfo);
- }
- else
- {
- stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
- _stockRepository.StockInfoRepository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId > 0 ? OperateTypeEnum.浜哄伐瀹屾垚 : OperateTypeEnum.鑷姩瀹屾垚);
- }
- if (outStockLockInfos!=null && outStockLockInfos.Count>0)
- {
- outStockLockInfos.ForEach(x =>
- {
- x.Status=OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
- });
- _outboundRepository.OutStockLockInfoRepository.UpdateData(outStockLockInfos);
- List<Dt_OutStockLockInfo> outStockLockInfosSG = outStockLockInfos.Where(x => x.OrderType == OutOrderTypeEnum.OutSGPick.ObjToInt()).ToList();
- List<Dt_OutStockLockInfo> outStockLockInfosMES = outStockLockInfos.Where(x => x.OrderType == OutOrderTypeEnum.OutMESPick.ObjToInt()).ToList();
- if (outStockLockInfosSG !=null && outStockLockInfosSG.Count()>0)
- {
- _outboundService.OutLineViewService.SaveLineView(outStockLockInfosSG);
- }
- if (outStockLockInfosMES != null && outStockLockInfosMES.Count() > 0)
- {
- Dt_AGVStationInfo aGVStationInfo = _basicRepository.AGVStationInfoRepository.QueryFirst(x=>x.AGVStationCode==task.TargetAddress);
- MESDeliveryModel mESDeliveryModel = MESDeliveryUp(outStockLockInfosMES, aGVStationInfo.MESPointCode);
- MESResponse response = _invokeMESService.MESDelivery(mESDeliveryModel).DeserializeObject<MESResponse>() ?? throw new Exception("鏈幏鍙栧埌杩斿洖淇℃伅");
- if (!response.Result)
- {
- throw new Exception($"MES閰嶉�佸嚭鍙戞帴鍙ｈ皟鐢ㄦ姤閿�,MES杩斿洖淇℃伅{DecodeUnicode(response.Msg)}");
- }
- }
- }
- _basicService.LocationInfoService.UpdateLocationStatus(locationInfoStart, stockInfo.PalletType, LocationStatusEnum.Free, stockInfo.WarehouseId);
- BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateTypeEnum.浜哄伐瀹屾垚 : OperateTypeEnum.鑷姩瀹屾垚);
- _unitOfWorkManage.CommitTran();
- }
- else
- {
- return content.Error($"鏈壘鍒板搴斿簱瀛樹俊鎭�");
- }
- }
- return content.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error(ex.Message);
- }
- }
- /// <summary>
- /// 閰嶉�侀�佽揪淇℃伅
- /// </summary>
- /// <returns></returns>
- public MESDeliveryModel MESDeliveryUp(List<Dt_OutStockLockInfo> outStockLockInfos,string address)
- {
- MESDeliveryModel mESDeliveryModel = new MESDeliveryModel()
- {
- PRO_DispatchPlanMaterialsInfoNew= new List<MESDeliveryInfo>()
- };
- foreach (var item in outStockLockInfos)
- {
- MESDeliveryInfo mESDeliveryInfo = new MESDeliveryInfo()
- {
- InvItemCode=item.MaterielCode,
- DispatchPlanMaterialId=item.OrderDetailId,
- UnitCode=item.Unit,
- GradeCode="001",
- MainQuantity=item.AssignQuantity,
- AssistUnitCode=item.AssistUnit,
- LocationCode= address,
- LotNumber=item.BatchNo,
- MaterialBarCode=item.PalletCode
- };
- mESDeliveryModel.PRO_DispatchPlanMaterialsInfoNew.Add(mESDeliveryInfo);
- }
- return mESDeliveryModel;
- }
- /// <summary>
- /// 搴撳瓨鏁版嵁杞嚭搴撲换鍔�(鍘熸枡/鍗婃垚鍝�)
- /// </summary>
- /// <param name="stockInfos"></param>
- /// <returns></returns>
- public List<Dt_Task> GetTasks(List<Dt_StockInfo> stockInfos, TaskTypeEnum taskType)
- {
- List<Dt_Task> tasks = new List<Dt_Task>();
- for (int i = 0; i < stockInfos.Count; i++)
- {
- Dt_StockInfo stockInfo = stockInfos[i];
-
- if (stockInfo != null)
- {
- Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
- if (!tasks.Exists(x => x.PalletCode == stockInfo.PalletCode))
- {
- Dt_Task task = new()
- {
- CurrentAddress = stockInfo.LocationCode,
- Grade = 0,
- PalletCode = stockInfo.PalletCode,
- NextAddress = "",
- Roadway = locationInfo.RoadwayNo,
- SourceAddress = stockInfo.LocationCode,
- TargetAddress = "",
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- TaskType = taskType.ObjToInt(),
- TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- PalletType = stockInfo.PalletType,
- WarehouseId = stockInfo.WarehouseId,
- MaterielCode = stockInfo.MaterielCode,
- RfidCode = stockInfo.RfidCode,
- Quantity = stockInfo.StockLength,
- };
- if (stockInfo.MaterielWide>0)
- {
- task.TaskLength = (int)stockInfo.MaterielWide;
- }
- tasks.Add(task);
- }
- }
- }
- return tasks;
- }
- /// <summary>
- /// 搴撳瓨鏁版嵁杞嚭搴撲换鍔�(MES宸ュ崟)
- /// </summary>
- /// <param name="stockInfos"></param>
- /// <returns></returns>
- public List<Dt_Task> GetTasks(List<Dt_StockInfo> stockInfos,List<Dt_OutStockLockInfo> outStockLockInfos, TaskTypeEnum taskType=new TaskTypeEnum())
- {
- List<Dt_Task> tasks = new List<Dt_Task>();
- for (int i = 0; i < stockInfos.Count; i++)
- {
- Dt_StockInfo stockInfo = stockInfos[i];
-
- if (stockInfo != null)
- {
- Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
- if (!tasks.Exists(x => x.PalletCode == stockInfo.PalletCode))
- {
- Dt_OutStockLockInfo outStockLockInfo = outStockLockInfos.FirstOrDefault(x => x.PalletCode == stockInfo.PalletCode);
- taskType = outStockLockInfo.MachineName.ObjToInt() switch
- {
- (int)StationAreaEnum.浜屾ゼ绾歌 => TaskTypeEnum.PaperYLOutZDGL,
- (int)StationAreaEnum.涓�妤煎嵃鍒� => TaskTypeEnum.PrintYLOutbound,
- _ => throw new Exception($"鏈壘鍒板姞宸ヤ腑蹇冧换鍔＄被鍨嬪垎閰�")
- };
- Dt_Task task = new()
- {
- CurrentAddress = stockInfo.LocationCode,
- Grade = 0,
- PalletCode = stockInfo.PalletCode,
- NextAddress = "",
- Roadway = locationInfo.RoadwayNo,
- SourceAddress = stockInfo.LocationCode,
- TargetAddress = "",
- TaskStatus = TaskStatusEnum.CallPending.ObjToInt(),
- TaskType = taskType.ObjToInt(),
- TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- PalletType = stockInfo.PalletType,
- WarehouseId = stockInfo.WarehouseId,
- MaterielCode = stockInfo.MaterielCode,
- RfidCode = stockInfo.RfidCode,
- Quantity = stockInfo.StockLength,
- OrderNo= outStockLockInfo.OrderNo,
- DispatchPlanId=outStockLockInfo.OrderDetailId,
- WorkCentreCode=outStockLockInfo.MakeCode
- };
- if (stockInfo.MaterielWide > 0)
- {
- task.TaskLength = (int)stockInfo.MaterielWide;
- }
- tasks.Add(task);
- }
- }
- }
- return tasks;
- }
- /// <summary>
- /// 搴撳瓨鏁版嵁杞嚭搴撲换鍔�(杈呮枡/鎴愬搧)
- /// </summary>
- public List<Dt_Task> GetTasks(List<Dt_ProStockInfo> stockInfos, TaskTypeEnum taskType,List<Dt_LocationInfo> locationInfos)
- {
- List<Dt_Task> tasks = new List<Dt_Task>();
- for (int i = 0; i < stockInfos.Count; i++)
- {
- Dt_ProStockInfo stockInfo = stockInfos[i];
-
- if (stockInfo != null)
- {
- Dt_LocationInfo locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == stockInfo.LocationCode);
- if (!tasks.Exists(x => x.PalletCode == stockInfo.PalletCode))
- {
- Dt_Task task = new ()
- {
- CurrentAddress = stockInfo.LocationCode,
- Grade = 0,
- PalletCode = stockInfo.PalletCode,
- NextAddress = "",
- Roadway = locationInfo.RoadwayNo,
- SourceAddress = stockInfo.LocationCode,
- TargetAddress = "",
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- TaskType = taskType.ObjToInt(),
- TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- PalletType = stockInfo.PalletType,
- WarehouseId = stockInfo.WarehouseId,
- MaterielCode= stockInfo.proStockInfoDetails?.FirstOrDefault().ProductCode ?? "" ,
- Quantity = 0,
- };
- tasks.Add(task);
- }
- }
- }
- return tasks;
- }
- /// <summary>
- /// 鎴愬搧鍑哄簱
- /// </summary>
- /// <returns></returns>
- public WebResponseContent RequestCPWMSTaskOut(string materialCode,int Count, string targetId)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- List<Dt_AGVStationInfo> aGVStationInfos = _basicRepository.AGVStationInfoRepository.QueryData(x=>x.StationArea == targetId && x.IsOccupied==WhetherEnum.False.ObjToInt());
- int useCount=aGVStationInfos.Count;
- if (targetId == nameof(StationAreaEnum.涓�妤兼湀鍙扮爜澶�))
- {
-
- //鑾峰彇鎵�鏈夋湀鍙板嚭搴撲换鍔�
- List<Dt_Task> _TasksOut = BaseDal.QueryData(x => x.TaskType == TaskTypeEnum.OutProduct.ObjToInt() && x.TargetAddress == nameof(StationAreaEnum.涓�妤兼湀鍙扮爜澶�));
- if (_TasksOut.Count>0)
- {
- useCount -= _TasksOut.Count;
- }
- }
- if (useCount < Count)
- {
- return content.Error($"鍙敤缂撳瓨鏁颁笉瓒�");
- }
- //鑾峰彇璐т綅
- List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x => x.WarehouseId == WarehouseEnum.LLDCP.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt());
- List<Dt_ProStockInfo> stockInfos = new List<Dt_ProStockInfo>();
- if (materialCode=="1")
- {
- stockInfos = BaseDal.Db.Queryable<Dt_ProStockInfo>().Where(x => locationInfos.Select(x => x.LocationCode).Contains(x.LocationCode) && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.ProStockAttribute==ProStockAttributeEnum.绌烘墭.ObjToInt()).Take(Count).OrderBy(x => x.CreateDate).ToList();
- }
- else
- {
- stockInfos = BaseDal.Db.Queryable<Dt_ProStockInfo>().Where(x => locationInfos.Select(x => x.LocationCode).Contains(x.LocationCode) && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt()).Includes(x => x.proStockInfoDetails)
- .Where(x => x.proStockInfoDetails
- .Any(v =>
- v.ProductCode == materialCode)
- ).Take(Count).OrderBy(x=>x.CreateDate).ToList();
- }
-
- if (stockInfos.Count!=Count)
- {
- return content.Error($"搴撳瓨{materialCode}鏁伴噺涓嶈冻");
- }
- List<Dt_LocationInfo> AssignLocations = new List<Dt_LocationInfo>();
- foreach (var item in stockInfos)
- {
- Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == item.LocationCode);
- if (locationInfo != null)
- {
- AssignLocations.Add(locationInfo);
- item.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- }
- }
- TaskTypeEnum typeEnum = targetId switch
- {
- nameof(StationAreaEnum.涓�妤兼湀鍙扮爜澶�) => TaskTypeEnum.OutProduct,
- nameof(StationAreaEnum.涓�妤兼棤绾虹粐甯�) => TaskTypeEnum.OutWFB,
- nameof(StationAreaEnum.涓�妤兼棤绾烘穻鑶�) => TaskTypeEnum.OutWFBLM,
- nameof(StationAreaEnum.涓�妤肩焊寮犳穻鑶�) => TaskTypeEnum.OutPaperLM,
- nameof(StationAreaEnum.涓�妤煎垎鍒�) => TaskTypeEnum.OutFenQie,
- nameof(StationAreaEnum.涓�妤兼ā鍒�) => TaskTypeEnum.OutMoQie,
- nameof(StationAreaEnum.涓�妤煎啿鍒�) => TaskTypeEnum.OutChongQie,
- nameof(StationAreaEnum.浜屾ゼ绾歌) or
- nameof(StationAreaEnum.浜屾ゼ鏃犵汉甯冭) or
- nameof(StationAreaEnum.浜屾ゼ绾告澂) => TaskTypeEnum.OutCarton,
- _ => throw new Exception("鏈壘鍒板搴斾换鍔�")
- };
- if (materialCode == "1" && typeEnum!= TaskTypeEnum.OutCarton)
- {
- typeEnum = TaskTypeEnum.OutEmpty;
- }
- List<Dt_Task> tasks = GetTasks(stockInfos, typeEnum, AssignLocations);
- if (tasks == null || tasks.Count <= 0)
- {
- return content.Error($"鐢熸垚浠诲姟澶辫触");
- }
- //鏈堝彴浠诲姟涓嶇洿鎺ュ垎閰嶇粓鐐�
- if (targetId != nameof(StationAreaEnum.涓�妤兼湀鍙扮爜澶�))
- {
- for (int i = 0; i < tasks.Count; i++)
- {
- aGVStationInfos[i].IsOccupied = WhetherEnum.True.ObjToInt();
- tasks[i].TargetAddress = aGVStationInfos[i].AGVStationCode;
- }
- }
- else
- {
- for (int i = 0; i < tasks.Count; i++)
- {
- tasks[i].TargetAddress = nameof(StationAreaEnum.涓�妤兼湀鍙扮爜澶�);
- }
- }
- //鍒ゆ柇鏄惁鏈夊嚭搴撳崟淇℃伅
- _unitOfWorkManage.BeginTran();
- //鏇存柊搴撳瓨鐘舵��
- _stockRepository.ProStockInfoRepository.UpdateData(stockInfos);
- _basicRepository.AGVStationInfoRepository.UpdateData(aGVStationInfos);
- //鏇存柊璐т綅鐘舵��
- _basicRepository.LocationInfoRepository.UpdateLocationStatus(AssignLocations, LocationStatusEnum.Lock);
- //鍔犲叆璐т綅鍙樺姩璁板綍
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(AssignLocations, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, taskNums: tasks.Select(x => x.TaskNum).ToList());
- //鏂板缓浠诲姟
- BaseDal.AddData(tasks);
- _unitOfWorkManage.CommitTran();
- PushTasksToWCS(tasks);
- content.OK();
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
-
- /// <summary>
- /// 鍘熸枡鍑哄簱浠诲姟
- /// </summary>
- /// <param name="materielCode">鐗╂枡浠ｇ爜</param>
- /// <param name="materielWide">鐗╂枡骞呭</param>
- /// <param name="Count">鍗锋暟</param>
- /// <returns></returns>
- public WebResponseContent RequestYLWMSTaskOut(YLWMSTaskOutDTO yLWMSTaskOutDTO)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (yLWMSTaskOutDTO==null)
- {
- return content.Error("璇峰～鍏ュ嚭搴撲俊鎭�");
- }
- //鑾峰彇璐т綅
- List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x => x.WarehouseId == WarehouseEnum.LLDYL.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.LocationStatus == LocationStatusEnum.InStock.ObjToInt());
- //鑾峰彇瀵瑰簲搴撳瓨
- List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.QueryData(x => locationInfos.Select(x => x.LocationCode).Contains(x.LocationCode) && x.MaterielCode == yLWMSTaskOutDTO.MaterialCode && x.MaterielWide == yLWMSTaskOutDTO.Wide && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt()).OrderByDescending(x => x.CreateDate).Take(yLWMSTaskOutDTO.Count).ToList();
- if (stockInfos.Count< yLWMSTaskOutDTO.Count)
- {
- return content.Error($"搴撳瓨{yLWMSTaskOutDTO.MaterialCode}鏁伴噺涓嶈冻");
- }
- List<Dt_LocationInfo> AssignLocations =new List<Dt_LocationInfo>();
- foreach (var item in stockInfos)
- {
- Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x=>x.LocationCode==item.LocationCode);
- if (locationInfo!=null)
- {
- AssignLocations.Add(locationInfo);
- item.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- }
- }
- List<Dt_Task> tasks = GetTasks(stockInfos, TaskTypeEnum.PrintYLOutbound);
- if (tasks == null || tasks.Count <= 0)
- {
- return content.Error($"鐢熸垚浠诲姟澶辫触");
- }
- if (!string.IsNullOrEmpty(yLWMSTaskOutDTO.Address))
- {
- if (yLWMSTaskOutDTO.Address=="1")
- {
- tasks.ForEach(x =>
- {
- x.TargetAddress = "PNT_1_363";
- });
- }
- else
- {
- tasks.ForEach(x =>
- {
- x.TargetAddress = yLWMSTaskOutDTO.Address;
- });
- }
-
- }
- else
- {
- return content.Error("鍦板潃淇℃伅涓嶈兘涓虹┖");
- }
- //鍒ゆ柇鏄惁鏈夊嚭搴撳崟淇℃伅
- _unitOfWorkManage.BeginTran();
- //鏇存柊搴撳瓨鐘舵��
- _stockRepository.StockInfoRepository.UpdateData(stockInfos);
- //鏇存柊璐т綅鐘舵��
- _basicRepository.LocationInfoRepository.UpdateLocationStatus(AssignLocations, LocationStatusEnum.Lock);
- //鍔犲叆璐т綅鍙樺姩璁板綍
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(AssignLocations, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation,taskNums:tasks.Select(x=>x.TaskNum).ToList());
- //鏂板缓浠诲姟
- BaseDal.AddData(tasks);
- _unitOfWorkManage.CommitTran();
- PushTasksToWCS(tasks);
- content.OK();
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
-
- /// <summary>
- /// 鍒涘缓鍘熺焊鐢熺鎺掔▼鍑哄簱浠诲姟
- /// </summary>
- /// <param name="keys"></param>
- /// <returns></returns>
- public WebResponseContent CreateSGOutboundTasks(int[] keys)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- List<Dt_Task> tasks = new List<Dt_Task>();
- List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
- List<Dt_OutSGOrderDetail> outSGOrderDetails = new List<Dt_OutSGOrderDetail>();
- List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
- List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
- //鐢熸垚浠诲姟銆佸簱瀛樼瓑淇℃伅
- (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutSGOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutSGTaskDataHandle(keys);
- if (result.Item2 != null && result.Item2.Count > 0)
- {
- stockInfos.AddRange(result.Item2);
- }
- if (result.Item3 != null && result.Item3.Count > 0)
- {
- outSGOrderDetails.AddRange(result.Item3);
- }
- if (result.Item4 != null && result.Item4.Count > 0)
- {
- outStockLockInfos.AddRange(result.Item4);
- }
- if (result.Item5 != null && result.Item5.Count > 0)
- {
- locationInfos.AddRange(result.Item5);
- }
- if (result.Item1 != null && result.Item1.Count > 0)
- {
- tasks.AddRange(result.Item1);
- }
- //澶勭悊鍑哄簱鏁版嵁
- return GenerateOutboundTaskDataUpdate(tasks, stockInfos, outSGOrderDetails, outStockLockInfos, locationInfos);
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鍑哄簱浠诲姟鏁版嵁澶勭悊
- /// </summary>
- /// <param name="orderDetailId"></param>
- /// <param name="stockSelectViews"></param>
- /// <returns></returns>
- /// <exception cref="Exception"></exception>
- public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutSGOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) OutSGTaskDataHandle(int[] keys)
- {
- List<Dt_Task> tasks = new List<Dt_Task>();
- List<Dt_OutSGOrderDetail> outSGOrderDetails = _outboundRepository.OutSGOrderDetailRepository.QueryData(x => keys.Contains(x.Id));
-
- if (outSGOrderDetails == null || outSGOrderDetails.Count == 0)
- {
- throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
- }
- Dt_OutSGOrderDetail? outBSTOrderDetail = outSGOrderDetails.FirstOrDefault(x => x.OutSGOrderDetailStatus != OutOrderStatusEnum.鏈紑濮�.ObjToInt());
- if (outBSTOrderDetail != null)
- {
- throw new Exception($"鍑哄簱鏄庣粏{nameof(Dt_OutSGOrderDetail.BoardMpsDetailId)}{outBSTOrderDetail.BoardMpsDetailId}鐗╂枡{outBSTOrderDetail.MaterialNo},鍑哄簱涓垨宸插畬鎴�");
- }
- List<Dt_StockInfo>? stockInfos = null;
- List<Dt_OutSGOrderDetail>? orderDetails = null;
- List<Dt_OutStockLockInfo>? outStockLockInfos = null;
- List<Dt_LocationInfo>? locationInfos = null;
-
- //鍒嗛厤搴撳瓨
- (List<Dt_StockInfo>, List<Dt_OutSGOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutSGOrderDetailService.AssignStockOutbound(outSGOrderDetails);
- if (result.Item1 != null && result.Item1.Count > 0)
- {
- //鑾峰彇浠诲姟
- tasks = GetTasks(result.Item1, TaskTypeEnum.OldYLOutbound);
- result.Item2.ForEach(x =>
- {
- if (result.Item3.FirstOrDefault(t=>t.OrderDetailId==x.Id)!=null)
- {
- x.OutSGOrderDetailStatus = OutOrderStatusEnum.鍑哄簱涓�.ObjToInt();
- }
- });
- result.Item3.ForEach(x =>
- {
- x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
- });
-
- stockInfos = result.Item1;
- orderDetails = result.Item2;
- outStockLockInfos = result.Item3;
- locationInfos = result.Item4;
- }
- else
- {
- throw new Exception("鏃犲簱瀛�");
- }
-
- return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos);
- }
- /// <summary>
- /// 澶勭悊鍑哄簱鏁版嵁
- /// </summary>
- /// <returns></returns>
- public WebResponseContent GenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_OutSGOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
- {
- try
- {
- _unitOfWorkManage.BeginTran();
-
- if (outStockLockInfos != null && outStockLockInfos.Any())
- {
- tasks.ForEach(x =>
- {
- string orderNos = string.Join(",", outStockLockInfos.Where(t => t.PalletCode == x.PalletCode).Select(x => x.OrderNo).Distinct());
- x.OrderNo = orderNos;
- });
- }
- BaseDal.AddData(tasks);
- if (stockInfos != null && stockInfos.Count > 0 && outboundOrderDetails != null && outboundOrderDetails.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
- {
- stockInfos.ForEach(x =>
- {
- x.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- });
- List<Dt_OutSGOrder> outSGOrders = _outboundRepository.OutSGOrderRepository.QueryData(x => outStockLockInfos.Select(x=>x.OrderNo).Distinct().Contains(x.OrderId));
- if (outSGOrders.Count<=0)
- {
- throw new Exception("鏈壘鍒板崟鎹俊鎭�");
- }
- outSGOrders.ForEach(x =>
- {
- x.OutSGOrderStatus = OutOrderStatusEnum.鍑哄簱涓�.ObjToInt();
- });
- _outboundRepository.OutSGOrderRepository.UpdateData(outSGOrders);
- WebResponseContent content = _outboundService.OutSGOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);
- if (!content.Status)
- {
- _unitOfWorkManage.RollbackTran();
- return content;
- }
- }
- _unitOfWorkManage.CommitTran();
- PushTasksToWCS(tasks);
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
-
- }
- /// <summary>
- /// BST棰嗘枡淇℃伅鍚屾
- /// </summary>
- /// <param name="bSTPickInfoDTO"></param>
- /// <returns></returns>
- public WebResponseContent ReceivePicking(List<BSTPickInfoDTO> bSTPickInfoDTOs)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- //鏂板
- List<BSTPickInfoDTO> bSTPickInfosAdd = bSTPickInfoDTOs.Where(x => x.Way == 1).ToList();
- //鑾峰彇鏂板鏄庣粏棰嗘枡
- List<PaperMattakeDetailItem>? paperMattakeDetailItemsAdd = null;
- //淇敼
- List<BSTPickInfoDTO> bSTPickInfosUp = bSTPickInfoDTOs.Where(x => x.Way == 2).ToList();
- //鑾峰彇鏂板鏄庣粏棰嗘枡
- List<PaperMattakeDetailItem>? paperMattakeDetailItemsUp = null;
- if (bSTPickInfosAdd != null && bSTPickInfosAdd.Count > 0)
- {
- paperMattakeDetailItemsAdd = bSTPickInfosAdd.SelectMany(x => x.PaperMattakeDetails).ToList();
- }
- if (bSTPickInfosUp != null && bSTPickInfosUp.Count > 0)
- {
- paperMattakeDetailItemsUp = bSTPickInfosUp.SelectMany(x => x.PaperMattakeDetails).ToList();
- }
- //鑾峰彇鎵�鏈夊緟棰嗘枡鐨勫嚭搴撹鎯�
- List<Dt_OutStockLockInfo> outStockLockInfos = _outboundRepository.OutStockLockInfoRepository.QueryData(x => x.OrderType == OutOrderTypeEnum.OutSGPick.ObjToInt() && x.Status==OutLockStockStatusEnum.鍑哄簱瀹屾垚.ObjToInt());
- #region 棰嗘枡閫昏緫
- if (paperMattakeDetailItemsAdd != null && paperMattakeDetailItemsAdd.Count > 0)
- {
- foreach (var item in paperMattakeDetailItemsAdd)
- {
- //鑾峰彇瀵瑰簲鐨�
- }
- }
-
- if (paperMattakeDetailItemsUp != null && paperMattakeDetailItemsUp.Count > 0)
- {
- foreach (var item in paperMattakeDetailItemsUp)
- {
-
- }
-
- }
- #endregion
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鍒涘缓鐢熺鎵嬪姩鍑哄簱
- /// </summary>
- /// <param name="ids"></param>
- /// <returns></returns>
- public WebResponseContent CreateSGManualTasks(List<int> ids)
- {
- WebResponseContent content=new WebResponseContent();
- try
- {
- //鑾峰彇鎵�鏈夋槑缁�
- List<Dt_OutSGOrder> outSGOrders = BaseDal.Db.Queryable<Dt_OutSGOrder>().Where(x=>ids.Contains(x.Id)).Includes(x=>x.Details).ToList();
- List<Dt_OutSGOrderDetail> outSGOrderDetails = outSGOrders.SelectMany(x=>x.Details.Where(t=>t.OutSGOrderDetailStatus==OutOrderStatusEnum.鏈紑濮�.ObjToInt())).ToList();
- List<int> ints = outSGOrderDetails.Select(x => x.Id).ToList();
- int[] reseponse = new int[ints.Count];
- for (int i = 0; i < ints.Count; i++)
- {
- reseponse[i] = ints[i];
- }
- content = CreateSGOutboundTasks(reseponse);
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- List<string> GradeCodes = new List<string>
- {
- "001"
- };
- /// <summary>
- /// 鎺ユ敹MES棰嗘枡璁″垝
- /// </summary>
- /// <returns></returns>
- public WebResponseContent ReceiveOutBound(List<OutMESOrderDTO> outMESOrderDTOs)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (outMESOrderDTOs == null || outMESOrderDTOs.Count <= 0)
- {
- return content.Error("棰嗘枡璁″垝浼犲叆淇℃伅涓虹┖");
- }
- List<Dt_Warehouse> warehouses = _basicRepository.WarehouseRepository.QueryData();
- OutMESOrderDTO? CheckGradeCode = outMESOrderDTOs.FirstOrDefault(x => !GradeCodes.Contains(x.GradeCode));
- if (CheckGradeCode != null)
- {
- return content.Error($"棰嗘枡璁″垝绛夌骇{nameof(OutMESOrderDTO.GradeCode)}:{CheckGradeCode.GradeCode}涓嶅瓨鍦�");
- }
- OutMESOrderDTO? CheckOutDetailId = outMESOrderDTOs.FirstOrDefault(x => x.OutDetailId <= 0);
- if (CheckOutDetailId != null)
- {
- return content.Error($"棰嗘枡璁″垝ID:{CheckOutDetailId.OutDetailId}闇�澶т簬0");
- }
- OutMESOrderDTO? CheckReqQuantity = outMESOrderDTOs.FirstOrDefault(x => x.ReqQuantity <= 0);
- if (CheckReqQuantity != null)
- {
- return content.Error($"棰嗘枡璁″垝ID:{CheckReqQuantity.OutDetailId},{CheckReqQuantity.ProductOrderNo}鐗╂枡闇�姹傞渶瑕佸ぇ浜�0");
- }
- //鑾峰彇鎵�鏈夌墿鏂欎俊鎭�
- List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
- //鑾峰彇鎵�鏈夐鏂欒鍒�
- List<Dt_OutMESOrder> outMESOrders = _outboundRepository.OutMESOrderRepository.QueryData();
- //鑾峰彇鎵�鏈夊姞宸ヤ腑蹇�
- List<Dt_MakeCenterInfo> makeCenterInfos = _basicRepository.MakeCenterInfoRepository.QueryData();
-
- OutMESOrderDTO? CheckMaterialCode = outMESOrderDTOs.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialCode));
- if (CheckMaterialCode != null)
- {
- return content.Error($"鐗╂枡缂栫爜{nameof(OutMESOrderDTO.MaterialCode)}:{CheckMaterialCode.MaterialCode}淇℃伅涓嶅瓨鍦�");
- }
- OutMESOrderDTO? CheckMakeCenterCode = outMESOrderDTOs.FirstOrDefault(x => !makeCenterInfos.Select(x => x.MakeCode).Contains(x.MakeCode));
- if (CheckMakeCenterCode!=null)
- {
- return content.Error($"鍔犲伐涓績{nameof(OutMESOrderDTO.MakeCode)}:{CheckMakeCenterCode.MakeCode}淇℃伅涓嶅瓨鍦�");
- }
- Dt_OutMESOrder? OldoutMESOrder = outMESOrders.FirstOrDefault(x => outMESOrderDTOs.Select(x => x.OutDetailId).Contains(x.OutDetailId));
- if (OldoutMESOrder != null)
- {
- return content.Error($"棰嗘枡璁″垝{nameof(OutMESOrderDTO.OutDetailId)}:{OldoutMESOrder.OutDetailId}淇℃伅宸插瓨鍦�");
- }
- List<Dt_OutMESOrder> AddoutMESOrders = outMESOrderDTOs.Select(x => _mapper.Map<Dt_OutMESOrder>(x)).ToList();
- foreach (var item in AddoutMESOrders)
- {
- Dt_MaterielInfo materielInfo = materielInfos.FirstOrDefault(x => x.MaterielCode == item.MaterialCode);
- Dt_MakeCenterInfo makeCenterInfo=makeCenterInfos.FirstOrDefault(x => x.MakeCode == item.MakeCode);
- item.MakeArea = makeCenterInfo.MakeArea;
- item.WarehouseId = materielInfo.WarehouseId;
- item.MaterielUnit = materielInfo.MaterielUnit;
- item.AssistUnitCode = materielInfo.AssistUnitCode;
- }
-
- _unitOfWorkManage.BeginTran();
- //鎿嶄綔鏁版嵁锛屽苟鍒嗛厤闇�姹傚簱瀛�
- _outboundRepository.OutMESOrderRepository.AddData(AddoutMESOrders);
- List<Dt_OutMESOrder> mESOrders = _outboundRepository.OutMESOrderRepository.QueryData(x => AddoutMESOrders.Select(x => x.OutDetailId).Contains(x.OutDetailId));
- List<Dt_Task> tasks = new List<Dt_Task>();
- List<Dt_StockInfo>? stockInfos = null;
- List<Dt_OutMESOrder>? Orders = null;
- List<Dt_OutStockLockInfo>? outStockLockInfos = null;
- List<Dt_LocationInfo>? locationInfos = null;
- {
- //鍒嗛厤搴撳瓨
- (List<Dt_StockInfo>, List<Dt_OutMESOrder>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.OutMESOrderService.AssignStockOutbound(mESOrders);
- if (result.Item1 != null && result.Item1.Count > 0)
- {
- //鍒涘缓浠诲姟
- tasks = GetTasks(result.Item1, result.Item3);
- result.Item2.ForEach(x =>
- {
- OutOrderStatusEnum.鍑哄簱涓�.ObjToInt();
- });
- result.Item3.ForEach(x =>
- {
- x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
- });
-
- stockInfos = result.Item1;
- Orders = result.Item2;
- outStockLockInfos = result.Item3;
- locationInfos = result.Item4;
- }
- else
- {
- throw new Exception("鏃犲簱瀛�");
- }
- }
- int id = BaseDal.AddData(tasks);
-
- if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
- {
- stockInfos.ForEach(x =>
- {
- x.StockStatus=StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- });
- WebResponseContent contentResponse = _outboundService.OutMESOrderService.LockOutboundStockDataUpdate(stockInfos, Orders, outStockLockInfos, locationInfos, tasks: tasks);
-
- if (!contentResponse.Status)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error(contentResponse.Message);
- }
- }
-
- _unitOfWorkManage.CommitTran();
-
- return content.OK("鎺ユ敹鎴愬姛");
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- }
-}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Reloaction.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Reloaction.cs"
deleted file mode 100644
index f990f5f..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Reloaction.cs"
+++ /dev/null
@@ -1,378 +0,0 @@
-锘匡豢using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.LocationEnum;
-using WIDESEA_Common.MaterielEnum;
-using WIDESEA_Common.OtherEnum;
-using WIDESEA_Common.StockEnum;
-using WIDESEA_Common.TaskEnum;
-using WIDESEA_Common.WareHouseEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.Task;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_TaskInfoService
-{
- public partial class TaskService
- {
- /// <summary>
- /// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
- /// </summary>
- /// <param name="taskNum"></param>
- /// <param name="locationCode"></param>
- /// <returns></returns>
- //public WebResponseContent IsRelocation(int taskNum, string locationCode)
- //{
- // try
- // {
- // Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == locationCode);
- // if (locationInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑璐т綅淇℃伅");
- // }
-
- // Dt_Task task = Repository.QueryFirst(x => x.TaskNum == taskNum);
- // if (task == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔′俊鎭�");
- // }
-
- // List<Dt_LocationInfo> littleDepthLocations = _basicService.LocationInfoService.GetGroupLocations(locationInfo);
-
- // Dt_LocationInfo? needRelocationItem = littleDepthLocations.Where(x => x.LocationStatus != LocationStatusEnum.Free.ObjToInt() && x.LocationStatus != LocationStatusEnum.FreeLock.ObjToInt() && x.Depth < locationInfo.Depth).OrderBy(x => x.Depth).FirstOrDefault();
-
- // if (needRelocationItem == null)
- // {
- // return WebResponseContent.Instance.OK(data: _mapper.Map<WMSTaskDTO>(task));
- // }
- // else
- // {
- // Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == needRelocationItem.LocationCode);
- // if (stockInfo == null)
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒板搴旇揣浣嶇殑搴撳瓨淇℃伅");
- // }
-
- // Dt_Task taskTemp = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
- // if (taskTemp != null)
- // {
- // return WebResponseContent.Instance.OK(data: _mapper.Map<WMSTaskDTO>(taskTemp));
- // }
-
- // int heightType = 0;
- // if(needRelocationItem.Layer == 5)
- // {
- // heightType = 3;
- // }
- // else if(needRelocationItem.Layer == 4)
- // {
- // heightType = 2;
- // }
- // else if(needRelocationItem.Layer <= 3 && needRelocationItem.Layer >= 1)
- // {
- // heightType = 1;
- // }
-
- // Dt_LocationInfo? newLocation = _basicService.LocationInfoService.AssignLocation(needRelocationItem.RoadwayNo, task.PalletType, task.WarehouseId, needRelocationItem.LocationCode);
- // if (newLocation != null)
- // {
- // Dt_Task newTask = new Dt_Task()
- // {
- // Roadway = task.Roadway,
- // WarehouseId = task.WarehouseId,
- // CurrentAddress = locationCode,
- // Grade = 99,
- // NextAddress = newLocation.LocationCode,
- // OrderNo = "",
- // PalletCode = stockInfo.PalletCode,
- // PalletType = stockInfo.PalletType,
- // SourceAddress = needRelocationItem.LocationCode,
- // TargetAddress = newLocation.LocationCode,
- // TaskNum = Repository.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- // TaskStatus = 0,
- // TaskType = TaskTypeEnum.Relocation.ObjToInt()
- // };
-
- // _unitOfWorkManage.BeginTran();
- // Repository.AddData(newTask);
- // {
- // LocationStatusEnum lastStatus = (LocationStatusEnum)newLocation.LocationStatus;
- // _basicService.LocationInfoService.UpdateLocationStatus(newLocation, task.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
- // _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(newLocation, lastStatus, LocationStatusEnum.Lock, LocationChangeType.RelocationAssignLocation, taskNum: newTask.TaskNum);
- // }
- // {
- // LocationStatusEnum lastStatus = (LocationStatusEnum)needRelocationItem.LocationStatus;
- // _basicService.LocationInfoService.UpdateLocationStatus(needRelocationItem, task.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
- // _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(needRelocationItem, lastStatus, LocationStatusEnum.Lock, LocationChangeType.RelocationAssignLocation, taskNum: newTask.TaskNum);
- // }
- // stockInfo.StockStatus = StockStatusEmun.绉诲簱閿佸畾.ObjToInt();
- // _stockRepository.StockInfoRepository.UpdateData(stockInfo);
-
- // _unitOfWorkManage.CommitTran();
-
- // return WebResponseContent.Instance.OK(data: _mapper.Map<WMSTaskDTO>(newTask));
- // }
- // else
- // {
- // return WebResponseContent.Instance.Error($"鏈壘鍒板彲鍒嗛厤璐т綅,璇锋煡鐪嬭宸烽亾銆恵task.Roadway}銆戞槸鍚﹁繕鏈夌┖闂插彲浣跨敤璐т綅");
- // }
- // }
- // }
- // catch (Exception ex)
- // {
- // _unitOfWorkManage.RollbackTran();
- // return WebResponseContent.Instance.Error(ex.Message);
- // }
- //}
- public WebResponseContent RelocationTaskCompleted(Dt_Task task)
- {
- try
- {
- Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
- if (stockInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板搴旇揣浣嶇殑搴撳瓨淇℃伅");
- }
-
- Dt_LocationInfo locationInfoStart = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
- if (locationInfoStart == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑璧风偣璐т綅淇℃伅");
- }
-
- Dt_LocationInfo locationInfoEnd = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
- if (locationInfoEnd == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅");
- }
- task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
- _unitOfWorkManage.BeginTran();
- stockInfo.LocationCode = locationInfoEnd.LocationCode;
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
- _basicService.LocationInfoService.UpdateLocationStatus(locationInfoStart, stockInfo.PalletType, LocationStatusEnum.Free, stockInfo.WarehouseId);
- _basicService.LocationInfoService.UpdateLocationStatus(locationInfoEnd, stockInfo.PalletType, LocationStatusEnum.InStock, stockInfo.WarehouseId);
- BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? WIDESEA_Core.Enums.OperateTypeEnum.浜哄伐瀹屾垚 : WIDESEA_Core.Enums.OperateTypeEnum.鑷姩瀹屾垚);
- _unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
- public WebResponseContent IsRelocation(string startAddress,string endAddress,string roadWay)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- //鑾峰彇璐т綅
- Dt_LocationInfo startLocationInfo = _basicRepository.LocationInfoRepository.QueryFirst(x => x.LocationCode == startAddress);
- Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.LocationCode == startAddress);
- Dt_LocationInfo endLocationInfo = _basicRepository.LocationInfoRepository.QueryFirst(x => x.LocationCode == endAddress);
- //鍒ゆ柇鏉′欢
- if (startLocationInfo != null && startLocationInfo.LocationStatus==LocationStatusEnum.InStock.ObjToInt() && endLocationInfo != null && endLocationInfo.LocationStatus==LocationStatusEnum.Free.ObjToInt() && endLocationInfo.EnableStatus==EnableStatusEnum.Normal.ObjToInt() && stockInfo!=null)
- {
- //鐢熸垚浠诲姟
- Dt_Task newTask = new Dt_Task()
- {
- Roadway = roadWay,
- WarehouseId = stockInfo.WarehouseId,
- CurrentAddress = startLocationInfo.LocationCode,
- Grade = 99,
- NextAddress = endLocationInfo.LocationCode,
- OrderNo = "",
- PalletCode = stockInfo.PalletCode,
- PalletType = stockInfo.PalletType,
- SourceAddress = startLocationInfo.LocationCode,
- TargetAddress = endLocationInfo.LocationCode,
- TaskNum = Repository.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- TaskStatus = TaskStatusEnum.SC_Execute.ObjToInt(),
- TaskType = TaskTypeEnum.Relocation.ObjToInt()
- };
- stockInfo.StockStatus = StockStatusEmun.绉诲簱閿佸畾.ObjToInt();
- _unitOfWorkManage.BeginTran();
- Repository.AddData(newTask);
- _basicService.LocationInfoService.UpdateLocationStatus(startLocationInfo, stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
- _basicService.LocationInfoService.UpdateLocationStatus(endLocationInfo, stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
- _unitOfWorkManage.CommitTran();
- PushTasksToWCS(new List<Dt_Task> { newTask });
- content.OK("鎴愬姛");
- }
- else
- {
- content.Error("搴撳瓨璐т綅淇℃伅涓虹┖");
- }
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鍘熸枡宸烽亾闂寸Щ搴撲换鍔� todo:涓存椂
- /// </summary>
- public WebResponseContent RelocationRoadWay(string roadWay, int Count)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- //鑾峰彇瀵瑰簲搴撳瓨
- List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.QueryData(x => x.MaterielWide <2200 && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt()).OrderBy(x => x.CreateDate).Take(Count).ToList();
-
- //鑾峰彇璐т綅
- List<Dt_LocationInfo> locationInfos = _basicRepository.LocationInfoRepository.QueryData(x => stockInfos.Select(x => x.LocationCode).Contains(x.LocationCode));
- foreach (var item in stockInfos)
- {
- Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.LocationCode == item.LocationCode);
- if (locationInfo != null && locationInfo.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && locationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
- {
- item.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
- }
- else
- {
- return content.Error($"璐т綅鐘舵�佷笉姝ｇ‘");
- }
- }
-
- List<Dt_Task> tasks = GetTasks(stockInfos, TaskTypeEnum.OutPick);
- if (tasks == null || tasks.Count <= 0)
- {
- return content.Error($"鐢熸垚浠诲姟澶辫触");
- }
- tasks.ForEach(x =>
- {
- x.TargetAddress = roadWay;
- });
- //鍒ゆ柇鏄惁鏈夊嚭搴撳崟淇℃伅
- _unitOfWorkManage.BeginTran();
- //鏇存柊搴撳瓨鐘舵��
- _stockRepository.StockInfoRepository.UpdateData(stockInfos);
- //鏇存柊璐т綅鐘舵��
- _basicRepository.LocationInfoRepository.UpdateLocationStatus(locationInfos, LocationStatusEnum.Lock);
- //鍔犲叆璐т綅鍙樺姩璁板綍
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, taskNums: tasks.Select(x => x.TaskNum).ToList());
- //鏂板缓浠诲姟
- BaseDal.AddData(tasks);
- _unitOfWorkManage.CommitTran();
- PushTasksToWCS(tasks);
- content.OK();
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
-
- /// <summary>
- /// 鏂欐璇锋眰鍏ュ簱
- /// </summary>
- /// <param name="contaionerNo">鏂欐缂栧彿</param>
- /// <param name="originalArea">褰撳墠鎵爜鎵�鍦ㄥ尯鍩�</param>
- /// <param name="originalLocation">褰撳墠鎵弿鎵�鍦ㄧ偣浣�</param>
- /// <returns></returns>
- public WebResponseContent qwe(string contaionerNo, string originalArea, string originalLocation)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- _unitOfWorkManage.BeginTran();
-
- if (string.IsNullOrEmpty(contaionerNo) || string.IsNullOrEmpty(originalArea) || string.IsNullOrEmpty(originalLocation))
- {
- content.Error("鍙傛暟涓嶈兘涓虹┖");
- return content;
- }
-
- // 1. 鏍规嵁瀹瑰櫒缂栧彿鏌ヨ搴撳瓨淇℃伅
- Dt_BlankStockInfo balnkstockInfo = BaseDal.Db.Queryable<Dt_BlankStockInfo>().Where(x => x.ContainerCode == contaionerNo).FirstOrDefault();
- if (balnkstockInfo != null)
- {
- content.Error($"{contaionerNo}搴撳瓨宸插瓨鍦�");
- return content;
- }
-
- // 2. 鏍规嵁鏂欐缂栧彿鏌ヨ浠诲姟淇℃伅
- Dt_Task task = BaseDal.QueryFirst(x => x.ContainerNo == contaionerNo);
- if (task != null)
- {
- content.Error($"{contaionerNo}浠诲姟宸插瓨鍦�");
- return content;
- }
-
- // 3. 鏍规嵁褰撳墠鎵爜鎵�鍦ㄥ尯鍩熷拰鐐逛綅鏌ヨ浣嶇疆淇℃伅
- Dt_LocationInfo originalLocationInfo = _basicRepository.LocationInfoRepository.QueryFirst(x => x.AreaCode == originalArea && x.LocationCode == originalLocation);
- if (originalLocationInfo == null)
- {
- content.Error("鏈壘鍒板綋鍓嶆壂鐮佹墍鍦ㄤ綅缃俊鎭�");
- return content;
- }
-
- // 4. 鍒涘缓缁勭洏淇℃伅
- Dt_BlankStockInfo info = new Dt_BlankStockInfo()
- {
- ContainerCode = contaionerNo,
- LocationCode = "",
- StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt(),
- ContainerType = 1,
- WarehouseId = WarehouseEnum.FLPL.ObjToInt(),
- OrderNo = ""
- };
- BaseDal.Db.Insertable(info).ExecuteReturnIdentity();
-
- // 5. 鍒涘缓鍏ュ簱浠诲姟
- Dt_Task newTask = new Dt_Task()
- {
- Roadway = originalLocationInfo.RoadwayNo,
- WarehouseId = WarehouseEnum.FLPL.ObjToInt(),
- CurrentAddress = originalLocationInfo.LocationCode,
- Grade = 99,
- NextAddress = originalLocationInfo.LocationCode,
- OrderNo = "",
- ContainerNo = contaionerNo,
- SourceAddress = originalLocationInfo.LocationCode,
- TargetAddress = originalLocationInfo.LocationCode,
- TaskNum = Repository.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- TaskStatus = TaskStatusEnum.TaskCreated.ObjToInt(),
- TaskType = (int)TaskTypeEnum.Inbound
- };
- Repository.AddData(newTask);
-
- // 6. 鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
-
- // 7. 杩斿洖鎴愬姛鍝嶅簲
- content.OK("鍏ュ簱璇锋眰鎴愬姛", new
- {
- warehouseId = WarehouseEnum.FLPL.ObjToInt().ToString(),
- roadway = originalLocationInfo.RoadwayNo,
- orderNo = "",
- containerNo = contaionerNo,
- containerType = "1",
- taskNo = newTask.TaskNum.ToString(),
- station = originalLocation,
- locationCode = "",
- stockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt().ToString(),
- orderCode = ""
- });
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/Task_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/Task_HtyService.cs"
index c7ce742..a9d1a1e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/Task_HtyService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/Task_HtyService.cs"
@@ -14,15 +14,6 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO.Inbound;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_IRecordService;
-using WIDESEA_IStockRepository;
-using WIDESEA_IStockService;
using WIDESEA_ITaskInfoRepository;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/WIDESEA_TaskInfoService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/WIDESEA_TaskInfoService.csproj"
index d93a798..e674569 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/WIDESEA_TaskInfoService.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_TaskInfoService/WIDESEA_TaskInfoService.csproj"
@@ -9,9 +9,8 @@
<ItemGroup>
<ProjectReference Include="..\WIDESEA_External\WIDESEA_External.csproj" />
<ProjectReference Include="..\WIDESEA_IBasicService\WIDESEA_IBasicService.csproj" />
- <ProjectReference Include="..\WIDESEA_IInboundService\WIDESEA_IInboundService.csproj" />
- <ProjectReference Include="..\WIDESEA_IOutboundService\WIDESEA_IOutboundService.csproj" />
<ProjectReference Include="..\WIDESEA_IRecordService\WIDESEA_IRecordService.csproj" />
+ <ProjectReference Include="..\WIDESEA_ISortOrderService\WIDESEA_ISortOrderService.csproj" />
<ProjectReference Include="..\WIDESEA_IStockService\WIDESEA_IStockService.csproj" />
<ProjectReference Include="..\WIDESEA_ITaskInfoService\WIDESEA_ITaskInfoService.csproj" />
</ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer.sln" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer.sln"
index d4f7b94..ec231df 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer.sln"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer.sln"
@@ -31,10 +31,6 @@
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Basic", "Basic", "{AE6A12F1-B798-41D3-B3BA-F20F26128130}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Inbound", "Inbound", "{D5501822-A56D-47A1-8B21-80E22562DCD7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Outbound", "Outbound", "{09B8B4CF-7B50-4A94-B340-7EE3AF800E6E}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stock", "Stock", "{590CC6A9-FF87-4C29-AE7E-84270E6339C5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TaskInfo", "TaskInfo", "{810C1728-65DE-45EA-9379-B517C82B70B9}"
@@ -42,10 +38,6 @@
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TaskInfo", "TaskInfo", "{65441FA0-9B61-45F6-AC6F-76E4468617BA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stock", "Stock", "{9F5EEC4F-B525-4527-AA48-404EA6E46FFC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Outbound", "Outbound", "{839D91F1-D8B5-4FA0-8980-DD2ED1012D87}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Inbound", "Inbound", "{A8175EEC-87F8-4560-8D95-1027B33B6301}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Basic", "Basic", "{2228B322-FB4C-49C0-8C1C-0264ED6787FB}"
EndProject
@@ -58,14 +50,6 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_BasicRepository", "WIDESEA_BasicRepository\WIDESEA_BasicRepository.csproj", "{9144117D-3D55-4250-9CF5-C6A8D8A07062}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_IInboundRepository", "WIDESEA_IInboundRepository\WIDESEA_IInboundRepository.csproj", "{7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_InboundRepository", "WIDESEA_InboundRepository\WIDESEA_InboundRepository.csproj", "{00F4B4EB-C9D3-498C-8CA5-D69FEA573394}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_IOutboundRepository", "WIDESEA_IOutboundRepository\WIDESEA_IOutboundRepository.csproj", "{EA22724A-5121-438C-A8F8-EA2B5581493E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_OutboundRepository", "WIDESEA_OutboundRepository\WIDESEA_OutboundRepository.csproj", "{C13E1262-2CC2-45FD-81CA-A539E9A62AF9}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_IStockRepository", "WIDESEA_IStockRepository\WIDESEA_IStockRepository.csproj", "{EAF927BB-D248-4EA3-92B2-36F845E28E9B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_StockRepository", "WIDESEA_StockRepository\WIDESEA_StockRepository.csproj", "{B9E62A73-1270-4FFC-B23C-F75C075D8460}"
@@ -77,14 +61,6 @@
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_IBasicService", "WIDESEA_IBasicService\WIDESEA_IBasicService.csproj", "{5F260E03-095A-4870-8419-5B72CB62929E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_BasicService", "WIDESEA_BasicService\WIDESEA_BasicService.csproj", "{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_IInboundService", "WIDESEA_IInboundService\WIDESEA_IInboundService.csproj", "{3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_InboundService", "WIDESEA_InboundService\WIDESEA_InboundService.csproj", "{9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_IOutboundService", "WIDESEA_IOutboundService\WIDESEA_IOutboundService.csproj", "{69C05DDB-1AA6-4090-9916-029CD0E95B10}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_OutboundService", "WIDESEA_OutboundService\WIDESEA_OutboundService.csproj", "{1B884AD3-7E67-44CD-B182-DEECDD671DD2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_IStockService", "WIDESEA_IStockService\WIDESEA_IStockService.csproj", "{49716D78-720D-475D-948C-0FC6C5F079E5}"
EndProject
@@ -131,6 +107,18 @@
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_ICheckService", "WIDESEA_ICheckService\WIDESEA_ICheckService.csproj", "{82EBBC95-FD6E-4E30-9F21-625DE1991C2C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_CheckService", "WIDESEA_CheckService\WIDESEA_CheckService.csproj", "{C57C16CE-88A7-499A-8CE1-855D55482891}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sort", "Sort", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sort", "Sort", "{B72ECE98-687C-421E-9449-2B7BE17394CC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_SortOrderRepository", "WIDESEA_SortOrderRepository\WIDESEA_SortOrderRepository.csproj", "{4335159A-BFE2-451A-BE32-EE9041F1A09F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_ISortOrderRepository", "WIDESEA_ISortOrderRepository\WIDESEA_ISortOrderRepository.csproj", "{13F44B80-4A3C-47D6-B76B-1845674B697C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_ISortOrderService", "WIDESEA_ISortOrderService\WIDESEA_ISortOrderService.csproj", "{50FA32CF-5239-43D0-9B79-724655412EDC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_SortOrderService", "WIDESEA_SortOrderService\WIDESEA_SortOrderService.csproj", "{3380BD61-CD7C-4E05-A0DF-39EE1249BCAA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -274,54 +262,6 @@
{9144117D-3D55-4250-9CF5-C6A8D8A07062}.Release|Any CPU.Build.0 = Release|Any CPU
{9144117D-3D55-4250-9CF5-C6A8D8A07062}.Release|x86.ActiveCfg = Release|Any CPU
{9144117D-3D55-4250-9CF5-C6A8D8A07062}.Release|x86.Build.0 = Release|Any CPU
- {7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}.Debug|x86.ActiveCfg = Debug|Any CPU
- {7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}.Debug|x86.Build.0 = Debug|Any CPU
- {7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}.Dev|x86.ActiveCfg = Debug|Any CPU
- {7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}.Dev|x86.Build.0 = Debug|Any CPU
- {7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}.Release|Any CPU.Build.0 = Release|Any CPU
- {7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}.Release|x86.ActiveCfg = Release|Any CPU
- {7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7}.Release|x86.Build.0 = Release|Any CPU
- {00F4B4EB-C9D3-498C-8CA5-D69FEA573394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {00F4B4EB-C9D3-498C-8CA5-D69FEA573394}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {00F4B4EB-C9D3-498C-8CA5-D69FEA573394}.Debug|x86.ActiveCfg = Debug|Any CPU
- {00F4B4EB-C9D3-498C-8CA5-D69FEA573394}.Debug|x86.Build.0 = Debug|Any CPU
- {00F4B4EB-C9D3-498C-8CA5-D69FEA573394}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {00F4B4EB-C9D3-498C-8CA5-D69FEA573394}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {00F4B4EB-C9D3-498C-8CA5-D69FEA573394}.Dev|x86.ActiveCfg = Debug|Any CPU
- {00F4B4EB-C9D3-498C-8CA5-D69FEA573394}.Dev|x86.Build.0 = Debug|Any CPU
- {00F4B4EB-C9D3-498C-8CA5-D69FEA573394}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {00F4B4EB-C9D3-498C-8CA5-D69FEA573394}.Release|Any CPU.Build.0 = Release|Any CPU
- {00F4B4EB-C9D3-498C-8CA5-D69FEA573394}.Release|x86.ActiveCfg = Release|Any CPU
- {00F4B4EB-C9D3-498C-8CA5-D69FEA573394}.Release|x86.Build.0 = Release|Any CPU
- {EA22724A-5121-438C-A8F8-EA2B5581493E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EA22724A-5121-438C-A8F8-EA2B5581493E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EA22724A-5121-438C-A8F8-EA2B5581493E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {EA22724A-5121-438C-A8F8-EA2B5581493E}.Debug|x86.Build.0 = Debug|Any CPU
- {EA22724A-5121-438C-A8F8-EA2B5581493E}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {EA22724A-5121-438C-A8F8-EA2B5581493E}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {EA22724A-5121-438C-A8F8-EA2B5581493E}.Dev|x86.ActiveCfg = Debug|Any CPU
- {EA22724A-5121-438C-A8F8-EA2B5581493E}.Dev|x86.Build.0 = Debug|Any CPU
- {EA22724A-5121-438C-A8F8-EA2B5581493E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EA22724A-5121-438C-A8F8-EA2B5581493E}.Release|Any CPU.Build.0 = Release|Any CPU
- {EA22724A-5121-438C-A8F8-EA2B5581493E}.Release|x86.ActiveCfg = Release|Any CPU
- {EA22724A-5121-438C-A8F8-EA2B5581493E}.Release|x86.Build.0 = Release|Any CPU
- {C13E1262-2CC2-45FD-81CA-A539E9A62AF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C13E1262-2CC2-45FD-81CA-A539E9A62AF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C13E1262-2CC2-45FD-81CA-A539E9A62AF9}.Debug|x86.ActiveCfg = Debug|Any CPU
- {C13E1262-2CC2-45FD-81CA-A539E9A62AF9}.Debug|x86.Build.0 = Debug|Any CPU
- {C13E1262-2CC2-45FD-81CA-A539E9A62AF9}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {C13E1262-2CC2-45FD-81CA-A539E9A62AF9}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {C13E1262-2CC2-45FD-81CA-A539E9A62AF9}.Dev|x86.ActiveCfg = Debug|Any CPU
- {C13E1262-2CC2-45FD-81CA-A539E9A62AF9}.Dev|x86.Build.0 = Debug|Any CPU
- {C13E1262-2CC2-45FD-81CA-A539E9A62AF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C13E1262-2CC2-45FD-81CA-A539E9A62AF9}.Release|Any CPU.Build.0 = Release|Any CPU
- {C13E1262-2CC2-45FD-81CA-A539E9A62AF9}.Release|x86.ActiveCfg = Release|Any CPU
- {C13E1262-2CC2-45FD-81CA-A539E9A62AF9}.Release|x86.Build.0 = Release|Any CPU
{EAF927BB-D248-4EA3-92B2-36F845E28E9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EAF927BB-D248-4EA3-92B2-36F845E28E9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EAF927BB-D248-4EA3-92B2-36F845E28E9B}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -394,54 +334,6 @@
{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}.Release|Any CPU.Build.0 = Release|Any CPU
{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}.Release|x86.ActiveCfg = Release|Any CPU
{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}.Release|x86.Build.0 = Release|Any CPU
- {3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}.Debug|x86.ActiveCfg = Debug|Any CPU
- {3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}.Debug|x86.Build.0 = Debug|Any CPU
- {3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}.Dev|x86.ActiveCfg = Debug|Any CPU
- {3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}.Dev|x86.Build.0 = Debug|Any CPU
- {3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}.Release|Any CPU.Build.0 = Release|Any CPU
- {3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}.Release|x86.ActiveCfg = Release|Any CPU
- {3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26}.Release|x86.Build.0 = Release|Any CPU
- {9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}.Debug|x86.ActiveCfg = Debug|Any CPU
- {9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}.Debug|x86.Build.0 = Debug|Any CPU
- {9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}.Dev|x86.ActiveCfg = Debug|Any CPU
- {9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}.Dev|x86.Build.0 = Debug|Any CPU
- {9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}.Release|Any CPU.Build.0 = Release|Any CPU
- {9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}.Release|x86.ActiveCfg = Release|Any CPU
- {9619D9B0-7E5B-42F0-BA2C-B840B3E1C258}.Release|x86.Build.0 = Release|Any CPU
- {69C05DDB-1AA6-4090-9916-029CD0E95B10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {69C05DDB-1AA6-4090-9916-029CD0E95B10}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {69C05DDB-1AA6-4090-9916-029CD0E95B10}.Debug|x86.ActiveCfg = Debug|Any CPU
- {69C05DDB-1AA6-4090-9916-029CD0E95B10}.Debug|x86.Build.0 = Debug|Any CPU
- {69C05DDB-1AA6-4090-9916-029CD0E95B10}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {69C05DDB-1AA6-4090-9916-029CD0E95B10}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {69C05DDB-1AA6-4090-9916-029CD0E95B10}.Dev|x86.ActiveCfg = Debug|Any CPU
- {69C05DDB-1AA6-4090-9916-029CD0E95B10}.Dev|x86.Build.0 = Debug|Any CPU
- {69C05DDB-1AA6-4090-9916-029CD0E95B10}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {69C05DDB-1AA6-4090-9916-029CD0E95B10}.Release|Any CPU.Build.0 = Release|Any CPU
- {69C05DDB-1AA6-4090-9916-029CD0E95B10}.Release|x86.ActiveCfg = Release|Any CPU
- {69C05DDB-1AA6-4090-9916-029CD0E95B10}.Release|x86.Build.0 = Release|Any CPU
- {1B884AD3-7E67-44CD-B182-DEECDD671DD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1B884AD3-7E67-44CD-B182-DEECDD671DD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1B884AD3-7E67-44CD-B182-DEECDD671DD2}.Debug|x86.ActiveCfg = Debug|Any CPU
- {1B884AD3-7E67-44CD-B182-DEECDD671DD2}.Debug|x86.Build.0 = Debug|Any CPU
- {1B884AD3-7E67-44CD-B182-DEECDD671DD2}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
- {1B884AD3-7E67-44CD-B182-DEECDD671DD2}.Dev|Any CPU.Build.0 = Debug|Any CPU
- {1B884AD3-7E67-44CD-B182-DEECDD671DD2}.Dev|x86.ActiveCfg = Debug|Any CPU
- {1B884AD3-7E67-44CD-B182-DEECDD671DD2}.Dev|x86.Build.0 = Debug|Any CPU
- {1B884AD3-7E67-44CD-B182-DEECDD671DD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1B884AD3-7E67-44CD-B182-DEECDD671DD2}.Release|Any CPU.Build.0 = Release|Any CPU
- {1B884AD3-7E67-44CD-B182-DEECDD671DD2}.Release|x86.ActiveCfg = Release|Any CPU
- {1B884AD3-7E67-44CD-B182-DEECDD671DD2}.Release|x86.Build.0 = Release|Any CPU
{49716D78-720D-475D-948C-0FC6C5F079E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{49716D78-720D-475D-948C-0FC6C5F079E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{49716D78-720D-475D-948C-0FC6C5F079E5}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -646,6 +538,54 @@
{C57C16CE-88A7-499A-8CE1-855D55482891}.Release|Any CPU.Build.0 = Release|Any CPU
{C57C16CE-88A7-499A-8CE1-855D55482891}.Release|x86.ActiveCfg = Release|Any CPU
{C57C16CE-88A7-499A-8CE1-855D55482891}.Release|x86.Build.0 = Release|Any CPU
+ {4335159A-BFE2-451A-BE32-EE9041F1A09F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4335159A-BFE2-451A-BE32-EE9041F1A09F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4335159A-BFE2-451A-BE32-EE9041F1A09F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {4335159A-BFE2-451A-BE32-EE9041F1A09F}.Debug|x86.Build.0 = Debug|Any CPU
+ {4335159A-BFE2-451A-BE32-EE9041F1A09F}.Dev|Any CPU.ActiveCfg = Release|Any CPU
+ {4335159A-BFE2-451A-BE32-EE9041F1A09F}.Dev|Any CPU.Build.0 = Release|Any CPU
+ {4335159A-BFE2-451A-BE32-EE9041F1A09F}.Dev|x86.ActiveCfg = Release|Any CPU
+ {4335159A-BFE2-451A-BE32-EE9041F1A09F}.Dev|x86.Build.0 = Release|Any CPU
+ {4335159A-BFE2-451A-BE32-EE9041F1A09F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4335159A-BFE2-451A-BE32-EE9041F1A09F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4335159A-BFE2-451A-BE32-EE9041F1A09F}.Release|x86.ActiveCfg = Release|Any CPU
+ {4335159A-BFE2-451A-BE32-EE9041F1A09F}.Release|x86.Build.0 = Release|Any CPU
+ {13F44B80-4A3C-47D6-B76B-1845674B697C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {13F44B80-4A3C-47D6-B76B-1845674B697C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {13F44B80-4A3C-47D6-B76B-1845674B697C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {13F44B80-4A3C-47D6-B76B-1845674B697C}.Debug|x86.Build.0 = Debug|Any CPU
+ {13F44B80-4A3C-47D6-B76B-1845674B697C}.Dev|Any CPU.ActiveCfg = Release|Any CPU
+ {13F44B80-4A3C-47D6-B76B-1845674B697C}.Dev|Any CPU.Build.0 = Release|Any CPU
+ {13F44B80-4A3C-47D6-B76B-1845674B697C}.Dev|x86.ActiveCfg = Release|Any CPU
+ {13F44B80-4A3C-47D6-B76B-1845674B697C}.Dev|x86.Build.0 = Release|Any CPU
+ {13F44B80-4A3C-47D6-B76B-1845674B697C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {13F44B80-4A3C-47D6-B76B-1845674B697C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {13F44B80-4A3C-47D6-B76B-1845674B697C}.Release|x86.ActiveCfg = Release|Any CPU
+ {13F44B80-4A3C-47D6-B76B-1845674B697C}.Release|x86.Build.0 = Release|Any CPU
+ {50FA32CF-5239-43D0-9B79-724655412EDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {50FA32CF-5239-43D0-9B79-724655412EDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {50FA32CF-5239-43D0-9B79-724655412EDC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {50FA32CF-5239-43D0-9B79-724655412EDC}.Debug|x86.Build.0 = Debug|Any CPU
+ {50FA32CF-5239-43D0-9B79-724655412EDC}.Dev|Any CPU.ActiveCfg = Release|Any CPU
+ {50FA32CF-5239-43D0-9B79-724655412EDC}.Dev|Any CPU.Build.0 = Release|Any CPU
+ {50FA32CF-5239-43D0-9B79-724655412EDC}.Dev|x86.ActiveCfg = Release|Any CPU
+ {50FA32CF-5239-43D0-9B79-724655412EDC}.Dev|x86.Build.0 = Release|Any CPU
+ {50FA32CF-5239-43D0-9B79-724655412EDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {50FA32CF-5239-43D0-9B79-724655412EDC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {50FA32CF-5239-43D0-9B79-724655412EDC}.Release|x86.ActiveCfg = Release|Any CPU
+ {50FA32CF-5239-43D0-9B79-724655412EDC}.Release|x86.Build.0 = Release|Any CPU
+ {3380BD61-CD7C-4E05-A0DF-39EE1249BCAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3380BD61-CD7C-4E05-A0DF-39EE1249BCAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3380BD61-CD7C-4E05-A0DF-39EE1249BCAA}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {3380BD61-CD7C-4E05-A0DF-39EE1249BCAA}.Debug|x86.Build.0 = Debug|Any CPU
+ {3380BD61-CD7C-4E05-A0DF-39EE1249BCAA}.Dev|Any CPU.ActiveCfg = Release|Any CPU
+ {3380BD61-CD7C-4E05-A0DF-39EE1249BCAA}.Dev|Any CPU.Build.0 = Release|Any CPU
+ {3380BD61-CD7C-4E05-A0DF-39EE1249BCAA}.Dev|x86.ActiveCfg = Release|Any CPU
+ {3380BD61-CD7C-4E05-A0DF-39EE1249BCAA}.Dev|x86.Build.0 = Release|Any CPU
+ {3380BD61-CD7C-4E05-A0DF-39EE1249BCAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3380BD61-CD7C-4E05-A0DF-39EE1249BCAA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3380BD61-CD7C-4E05-A0DF-39EE1249BCAA}.Release|x86.ActiveCfg = Release|Any CPU
+ {3380BD61-CD7C-4E05-A0DF-39EE1249BCAA}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -658,31 +598,19 @@
{00A5A08A-8A36-4972-8863-7DCF8DBC7978} = {F40FDE85-110F-4B31-AA62-E2BD432028E0}
{D8C9593B-B31C-4650-8F44-962E9096A0CF} = {F40FDE85-110F-4B31-AA62-E2BD432028E0}
{AE6A12F1-B798-41D3-B3BA-F20F26128130} = {56D014A3-EB8D-4EF5-A751-3BAA084519D0}
- {D5501822-A56D-47A1-8B21-80E22562DCD7} = {56D014A3-EB8D-4EF5-A751-3BAA084519D0}
- {09B8B4CF-7B50-4A94-B340-7EE3AF800E6E} = {56D014A3-EB8D-4EF5-A751-3BAA084519D0}
{590CC6A9-FF87-4C29-AE7E-84270E6339C5} = {56D014A3-EB8D-4EF5-A751-3BAA084519D0}
{810C1728-65DE-45EA-9379-B517C82B70B9} = {56D014A3-EB8D-4EF5-A751-3BAA084519D0}
{65441FA0-9B61-45F6-AC6F-76E4468617BA} = {60DE2920-37C6-4C2B-A053-6B1B2DAF047A}
{9F5EEC4F-B525-4527-AA48-404EA6E46FFC} = {60DE2920-37C6-4C2B-A053-6B1B2DAF047A}
- {839D91F1-D8B5-4FA0-8980-DD2ED1012D87} = {60DE2920-37C6-4C2B-A053-6B1B2DAF047A}
- {A8175EEC-87F8-4560-8D95-1027B33B6301} = {60DE2920-37C6-4C2B-A053-6B1B2DAF047A}
{2228B322-FB4C-49C0-8C1C-0264ED6787FB} = {60DE2920-37C6-4C2B-A053-6B1B2DAF047A}
{4BFC344F-7151-46C9-B2CB-EFA81DFD67D5} = {AE6A12F1-B798-41D3-B3BA-F20F26128130}
{9144117D-3D55-4250-9CF5-C6A8D8A07062} = {AE6A12F1-B798-41D3-B3BA-F20F26128130}
- {7B2FF577-2ED0-4BCD-A48A-AC10C3EBBFC7} = {D5501822-A56D-47A1-8B21-80E22562DCD7}
- {00F4B4EB-C9D3-498C-8CA5-D69FEA573394} = {D5501822-A56D-47A1-8B21-80E22562DCD7}
- {EA22724A-5121-438C-A8F8-EA2B5581493E} = {09B8B4CF-7B50-4A94-B340-7EE3AF800E6E}
- {C13E1262-2CC2-45FD-81CA-A539E9A62AF9} = {09B8B4CF-7B50-4A94-B340-7EE3AF800E6E}
{EAF927BB-D248-4EA3-92B2-36F845E28E9B} = {590CC6A9-FF87-4C29-AE7E-84270E6339C5}
{B9E62A73-1270-4FFC-B23C-F75C075D8460} = {590CC6A9-FF87-4C29-AE7E-84270E6339C5}
{59A70EAE-DACE-4279-BE42-073EE82BA303} = {810C1728-65DE-45EA-9379-B517C82B70B9}
{1FD4B561-B9DE-455E-8D57-78584EF1AE3A} = {810C1728-65DE-45EA-9379-B517C82B70B9}
{5F260E03-095A-4870-8419-5B72CB62929E} = {2228B322-FB4C-49C0-8C1C-0264ED6787FB}
{D11C804C-2FF4-4C18-A3EE-2F0574427BB3} = {2228B322-FB4C-49C0-8C1C-0264ED6787FB}
- {3E1C6F64-6E74-4E76-9E5D-7EE6A7AA1F26} = {A8175EEC-87F8-4560-8D95-1027B33B6301}
- {9619D9B0-7E5B-42F0-BA2C-B840B3E1C258} = {A8175EEC-87F8-4560-8D95-1027B33B6301}
- {69C05DDB-1AA6-4090-9916-029CD0E95B10} = {839D91F1-D8B5-4FA0-8980-DD2ED1012D87}
- {1B884AD3-7E67-44CD-B182-DEECDD671DD2} = {839D91F1-D8B5-4FA0-8980-DD2ED1012D87}
{49716D78-720D-475D-948C-0FC6C5F079E5} = {9F5EEC4F-B525-4527-AA48-404EA6E46FFC}
{7DC26D42-D8EE-46F0-BA66-A13457086885} = {9F5EEC4F-B525-4527-AA48-404EA6E46FFC}
{CE0DB91F-5A68-448E-A419-4C26B5039F51} = {65441FA0-9B61-45F6-AC6F-76E4468617BA}
@@ -705,6 +633,12 @@
{99AD01D6-5942-449E-9E73-10501C570066} = {74ED4D60-A957-45E5-AA8E-D3CEFCA623FF}
{82EBBC95-FD6E-4E30-9F21-625DE1991C2C} = {294A53A4-1311-4B71-A812-378A2BCB8346}
{C57C16CE-88A7-499A-8CE1-855D55482891} = {294A53A4-1311-4B71-A812-378A2BCB8346}
+ {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {60DE2920-37C6-4C2B-A053-6B1B2DAF047A}
+ {B72ECE98-687C-421E-9449-2B7BE17394CC} = {56D014A3-EB8D-4EF5-A751-3BAA084519D0}
+ {4335159A-BFE2-451A-BE32-EE9041F1A09F} = {B72ECE98-687C-421E-9449-2B7BE17394CC}
+ {13F44B80-4A3C-47D6-B76B-1845674B697C} = {B72ECE98-687C-421E-9449-2B7BE17394CC}
+ {50FA32CF-5239-43D0-9B79-724655412EDC} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+ {3380BD61-CD7C-4E05-A0DF-39EE1249BCAA} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {599A7267-7402-4143-84AE-9B407FC2BB69}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/AGVStationInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/AGVStationInfoController.cs"
deleted file mode 100644
index a610660..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/AGVStationInfoController.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Basic
-{
- /// <summary>
- /// AGV绔欑偣淇℃伅
- /// </summary>
- [Route("api/AGVStationInfo")]
- [ApiController]
- public class AGVStationInfoController : ApiBaseController<IAGVStationInfoService, Dt_AGVStationInfo>
- {
- public AGVStationInfoController(IAGVStationInfoService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/CustomerController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/CustomerController.cs"
deleted file mode 100644
index de67264..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/CustomerController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Basic
-{
- /// <summary>
- /// 瀹㈡埛淇℃伅
- /// </summary>
- [Route("api/CustomerInfo")]
- [ApiController]
- public class CustomerInfoController : ApiBaseController<ICustomerInfoService, Dt_CustomerInfo>
- {
- public CustomerInfoController(ICustomerInfoService service) : base(service)
- {
- }
- }
-}
-
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
index a3e3666..72148a3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
@@ -40,18 +40,6 @@
}
/// <summary>
- /// 璐т綅鍒嗛厤
- /// </summary>
- /// <param name="roadwayNo"></param>
- /// <param name="palletType"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("AssignLocation"), AllowAnonymous]
- public Dt_LocationInfo? AssignLocation(string roadwayNo, int palletType, int warehouseId)
- {
- return Service.AssignLocation(roadwayNo, palletType, warehouseId);
- }
-
- /// <summary>
/// 鍚敤璐т綅
/// </summary>
/// <param name="keys"></param>
@@ -73,18 +61,5 @@
return Service.LocationDisableStatus(keys); ;
}
- [HttpPost, Route("UpdateLocationStatus"), AllowAnonymous]
- public WebResponseContent UpdateLocationStatus(string locationCode, int palletType, LocationStatusEnum locationStatus, int warehousId)
- {
- try
- {
- Service.UpdateLocationStatus(locationCode, palletType, locationStatus, warehousId);
- return WebResponseContent.Instance.OK();
- }
- catch (Exception e)
- {
- return WebResponseContent.Instance.Error(e.Message);
- }
- }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/MakeCenterInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/MakeCenterInfoController.cs"
deleted file mode 100644
index 59aedda..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/MakeCenterInfoController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Basic
-{
- /// <summary>
- /// 鍔犲伐涓績淇℃伅
- /// </summary>
- [Route("api/MakeCenterInfo")]
- [ApiController]
- public class MakeCenterInfoController : ApiBaseController<IMakeCenterInfoService, Dt_MakeCenterInfo>
- {
- public MakeCenterInfoController(IMakeCenterInfoService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/MaterielCodeInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/MaterielCodeInfoController.cs"
deleted file mode 100644
index d5c7792..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/MaterielCodeInfoController.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Basic
-{
- [Route("api/[controller]")]
- [ApiController]
- public class MaterielCodeInfoController : ApiBaseController<IMaterielCodeInfoService, Dt_MaterielCodeInfo>
- {
- public MaterielCodeInfoController(IMaterielCodeInfoService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/MaterielInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/MaterielInfoController.cs"
deleted file mode 100644
index 5df2a98..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/MaterielInfoController.cs"
+++ /dev/null
@@ -1,55 +0,0 @@
-锘縰sing Autofac.Core;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.CodeConfigEnum;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO.Basic;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Basic
-{
- /// <summary>
- /// 鐗╂枡
- /// </summary>
- [Route("api/MaterielInfo")]
- [ApiController]
- public class MaterielInfoController : ApiBaseController<IMaterielInfoService, Dt_MaterielInfo>
- {
- public MaterielInfoController(IMaterielInfoService service) : base(service)
- {
- }
-
- /// <summary>
- /// 鐗╂枡鐮佽В鏋�
- /// </summary>
- /// <param name="serNum"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("CodeAnalysis")]
- public WebResponseContent CodeAnalysis(string serNum)
- {
- try
- {
- MatSerNumAnalysisModel model = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serNum);
- return WebResponseContent.Instance.OK(data: model);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
- /// <summary>
- /// 鑾峰彇搴撳尯鐗╂枡淇℃伅
- /// </summary>
- /// <param name="warehouseId"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("GetWarehouseMaterielInfos")]
- public WebResponseContent GetWarehouseMaterielInfos(int warehouseId)
- {
- return Service.GetWarehouseMaterielInfos(warehouseId);
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/PalletCodeInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/PalletCodeInfoController.cs"
deleted file mode 100644
index 3830023..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/PalletCodeInfoController.cs"
+++ /dev/null
@@ -1,42 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Basic
-{
- [Route("api/[controller]")]
- [ApiController]
- public class PalletCodeInfoController : ApiBaseController<IPalletCodeInfoService, Dt_PalletCodeInfo>
- {
- public PalletCodeInfoController(IPalletCodeInfoService service) : base(service)
- {
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="warehouseId"></param>
- /// <param name="count"></param>
- /// <param name="palletTypeId"></param>
- /// <returns></returns>
- [HttpPost, Route("AddPalletCodeData")]
- public WebResponseContent AddData(int warehouseId, int count, int palletTypeId)
- {
- return Service.AddData(warehouseId, count, palletTypeId);
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="printCode"></param>
- /// <returns></returns>
- [HttpPost, Route("PrintStatusUp")]
- public WebResponseContent PrintStatusUp(string printCode)
- {
- return Service.PrintStatusUp(printCode);
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/SupplierInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/SupplierInfoController.cs"
deleted file mode 100644
index a0740ef..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/SupplierInfoController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IBasicService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Basic
-{
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [Route("api/[controller]")]
- [ApiController]
- public class SupplierInfoController : ApiBaseController<ISupplierInfoService, Dt_SupplierInfo>
- {
- public SupplierInfoController(ISupplierInfoService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs"
index 239218e..306be8d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs"
@@ -17,15 +17,5 @@
public WarehouseController(IWarehouseService service) : base(service)
{
}
-
- /// <summary>
- /// 鏍规嵁鐢ㄦ埛鑾峰彇浠撳簱瀛楀吀
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("GetWarehouseDicByUser")]
- public WebResponseContent GetWarehouseDicByUser()
- {
- return Service.GetWarehouseDicByUser();
- }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs"
deleted file mode 100644
index 9a53c52..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs"
+++ /dev/null
@@ -1,130 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.MaterielEnum;
-using WIDESEA_Common.OrderEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
-using WIDESEA_External.ERPService;
-using WIDESEA_External.Model;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_IInboundService;
-using WIDESEA_IOutboundService;
-using WIDESEA_ITaskInfoService;
-using WIDESEA_Model.Models;
-using WIDESEA_OutboundService;
-
-namespace WIDESEA_WMSServer.Controllers.ERP
-{
- /// <summary>
- /// ERP鍗氭�濋�氭帴鍙�
- /// </summary>
- [Route("api/ERPBST")]
- [ApiController]
- public class ErpBSTController : ControllerBase
- {
- private readonly IBasicService _basicService;
- private readonly IInvokeERPService _invokeERPService;
- private readonly IPurchaseBSTOrderService _purchaseBSTOrderService;
- private readonly IOutBSTOrderService _outBSTOrderService;
- private readonly IReturnBSTOrderService _returnBSTOrderService;
- private readonly IOutboundService _outboundService;
- private readonly ITaskService _taskService;
-
- public ErpBSTController(IBasicService basicService, IInvokeERPService invokeERPService,IPurchaseBSTOrderService purchaseBSTOrderService,IOutBSTOrderService outBSTOrderService,IReturnBSTOrderService returnBSTOrderService, IOutboundService outboundService, ITaskService taskService)
- {
- _basicService = basicService;
- _invokeERPService = invokeERPService;
- _purchaseBSTOrderService = purchaseBSTOrderService;
- _outBSTOrderService = outBSTOrderService;
- _returnBSTOrderService = returnBSTOrderService;
- _outboundService = outboundService;
- _taskService = taskService;
- }
- /// <summary>
- /// 娣诲姞鑰佸巶鐗╂枡
- /// </summary>
- /// <returns></returns>
- [HttpPost,HttpGet,Route("ReceiveMaterial"),AllowAnonymous]
- public WebResponseContent AddMaterial([FromBody]List<BSTMaterialDTO> bSTMaterialDTOs)
- {
- return _basicService.MaterielInfoService.AddMaterial(bSTMaterialDTOs);
- }
-
- /// <summary>
- /// 鎺ユ敹鑰佸巶渚涘簲鍟嗕俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveSupplier"), AllowAnonymous]
- public WebResponseContent AddSupplier([FromBody] List<BSTSupplierDTO> bSTSupplierDTOs)
- {
- return _basicService.SupplierInfoService.AddSupplier(bSTSupplierDTOs);
- }
-
- /// <summary>
- /// 鎺ユ敹鑰佸巶閲囪喘鍗曚俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("ReceivePurchaseOrder"), AllowAnonymous]
- public WebResponseContent AddPurchaseBSTOrder([FromBody] List<BSTPurchaseOrderDTO> bSTPurchaseOrderDTOs)
- {
- return _purchaseBSTOrderService.AddPurchaseBSTOrder(bSTPurchaseOrderDTOs);
- }
- /// <summary>
- /// 鎺ユ敹涓�鏈熺敓绠℃帓绋嬩俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveOutOrder"), AllowAnonymous]
- public WebResponseContent AddOutSGOrder([FromBody] List<SGOutOrderDTO> outOrderDTOs)
- {
- return _taskService.AddOutSGOrder(outOrderDTOs);
- }
-
- /// <summary>
- /// 鎺ユ敹鍗氭�濋�氶鏂欎俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("ReceivePicking"), AllowAnonymous]
- public WebResponseContent ReceivePicking([FromBody] List<BSTPickInfoDTO> bSTPickInfoDTOs)
- {
- return _taskService.ReceivePicking(bSTPickInfoDTOs);
- }
-
- /// <summary>
- /// 鎺ユ敹鍗氭�濋�氶��鏂欎俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveReturnOrder"), AllowAnonymous]
- public WebResponseContent ReceiveReturnOrder([FromBody] List<BSTReturnOrderDTO> bSTReturnOrderDTOs)
- {
- return _returnBSTOrderService.ReceiveReturnOrder(bSTReturnOrderDTOs);
- }
-
- /// <summary>
- /// 鎺ユ敹鍗氭�濋�氱洏鐐逛俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveStockCheckOrder"), AllowAnonymous]
- public WebResponseContent ReceiveStockCheckOrder([FromBody] List<BSTOutOrderDTO> bSTOutOrderDTOs)
- {
- return WebResponseContent.Instance.Error("鏈壘鍒板簱瀛�") ;
- }
-
- /// <summary>
- /// 璋冪敤鍗氭�濋�欵RP搴撳瓨
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("BSTStockAsync"), AllowAnonymous]
- public string BSTStockAsync(string barCode)
- {
- return _invokeERPService.BSTStockAsync(barCode);
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
deleted file mode 100644
index 1fd1298..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
+++ /dev/null
@@ -1,186 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.MaterielEnum;
-using WIDESEA_Common.OrderEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
-using WIDESEA_External.ERPService;
-using WIDESEA_External.Model;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_IInboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.ERP
-{
- /// <summary>
- /// ERP鎺ュ彛
- /// </summary>
- [Route("api/Erp")]
- [ApiController]
- public class ErpController : ControllerBase
- {
- private readonly IBasicService _basicService;
- private readonly IInvokeERPService _invokeERPService;
- private readonly IInboundService _inboundService;
-
- public ErpController(IBasicService basicService,IInvokeERPService invokeERPService, IInboundService inboundService)
- {
- _basicService = basicService;
- _invokeERPService = invokeERPService;
- _inboundService = inboundService;
- }
- /// <summary>
- /// 娣诲姞浜屾湡鐗╂枡
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("ReceiveMaterial"), AllowAnonymous]
-
- public WebResponseContent ReceiveMaterial([FromBody] ERPRoot<ERPMaterialDTO> eRPRoot)
- {
- return _basicService.MaterielInfoService.ReceiveMaterial(eRPRoot.Content);
- }
-
- /// <summary>
- /// 娣诲姞浜屾湡渚涘簲鍟�
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("ReceiveSupplier"), AllowAnonymous]
-
- public WebResponseContent ReceiveSupplier([FromBody] ERPRoot<ERPSupplierDTO> eRPRoot)
- {
- return _basicService.SupplierInfoService.ReceiveSupplier(eRPRoot.Content);
- }
-
- /// <summary>
- /// 娣诲姞浜屾湡瀹㈡埛
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("ReceiveCustomer"), AllowAnonymous]
-
- public WebResponseContent ReceiveCustomer([FromBody] ERPRoot<ERPCustomerDTO> eRPRoot)
- {
- return _basicService.CustomerInfoService.ReceiveCustomer(eRPRoot.Content);
- }
-
- /// <summary>
- /// 娣诲姞浜屾湡鍛樺伐
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("ReceiveStaff"), AllowAnonymous]
-
- public WebResponseContent ReceiveStaff([FromBody] ERPRoot<ERPUserInfoDTO> eRPRoot)
- {
- return _basicService.UserInfoService.ReceiveStaff(eRPRoot.Content);
- }
-
- /// <summary>
- /// 娣诲姞浜屾湡閲囪喘鍏ュ簱淇℃伅
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("PurchaseInboundInfo"), AllowAnonymous]
-
- public WebResponseContent PurchaseInboundInfo([FromBody] ERPRoot<ERPPurchaseOrderDTO> eRPRoot)
- {
- return _inboundService.PurchaseOrderService.ReceivePurchaseOrder(eRPRoot.Content);
- }
- /// <summary>
- /// 娣诲姞浜屾湡閲囪喘閫�璐т俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("PurchaseReturn"), AllowAnonymous]
-
- public WebResponseContent PurchaseReturn([FromBody] ERPRoot<ERPReturnOrderDTO> eRPRoot)
- {
- return _inboundService.PurchaseOrderService.ReceivePurchaseReturn(eRPRoot.Content);
- }
- /// <summary>
- /// 娣诲姞浜屾湡閿�鍞嚭搴撲俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("ProDeliveryOrder"), AllowAnonymous]
-
- public WebResponseContent ProDeliveryOrder([FromBody] ERPRoot<ERPProDeliveryDTO> eRPRoot)
- {
- return _inboundService.PurchaseOrderService.ReceiveProDeliveryOrder(eRPRoot.Content);
- }
-
- /// <summary>
- /// 娣诲姞闈炵敓浜ч鏂欎俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("ReceiveOut"), AllowAnonymous]
-
- public WebResponseContent ReceiveOut([FromBody] ERPRoot<ERPPickOutOrderDTO> eRPRoot)
- {
- return _inboundService.PurchaseOrderService.ReceiveOutOrder(eRPRoot.Content);
- }
-
- /// <summary>
- /// 娣诲姞闈為噰璐敓浜у叆搴撳崟淇℃伅
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("ReceiveInbound"), AllowAnonymous]
-
- public WebResponseContent ReceiveInbound([FromBody] ERPRoot<ERPInboundOrderDTO> eRPRoot)
- {
- return _inboundService.InboundOrderService.ReceiveInbound(eRPRoot.Content);
- }
-
- /// <summary>
- /// 娣诲姞閿�鍞��璐т俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("ProDeliveryBack"), AllowAnonymous]
- public WebResponseContent ProDeliveryBack([FromBody] ERPRoot<ERPProDeliverBackDTO> eRPRoot)
- {
- return _inboundService.PurchaseOrderService.ReceiveProDeliveryBackOrder(eRPRoot.Content);
- }
-
- /// <summary>
- /// ERP涓婁紶閲囪喘淇℃伅
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("ERPPurchaseUp"), AllowAnonymous]
- public string ERPPurchaseUp([FromBody] ERPPurchaseUpModel eRPPurchaseUpModel)
- {
- return _invokeERPService.ERPPurchaseUp(eRPPurchaseUpModel);
- }
-
- /// <summary>
- /// ERP鎴愬搧閿�鍞嚭搴撲笂浼犱俊鎭�
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("ERPProOutUp"), AllowAnonymous]
- public string ERPProOutUp([FromBody] ERPProOutUpModel eRPProOutUpModel)
- {
- return _invokeERPService.ERPProOutUp(eRPProOutUpModel);
- }
-
- /// <summary>
- /// ERP涓婁紶鎴愬搧鍏ュ簱淇℃伅
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("ERPProInUp"), AllowAnonymous]
- public string ERPProInUp([FromBody] ERPProInUpModel eRPProInUpModel)
- {
- return _invokeERPService.ERPProInUp(eRPProInUpModel);
- }
- /// <summary>
- /// ERP涓婁紶鍗�-鎴愬搧鍏ュ簱淇℃伅
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("ERPSemiProInUp"), AllowAnonymous]
- public string ERPSemiProInUp([FromBody] ERPProInUpModel eRPProInUpModel)
- {
- return _invokeERPService.ERPSemiProInUp(eRPProInUpModel);
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
deleted file mode 100644
index 0afdd79..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Inbound
-{
- /// <summary>
- /// 鍏ュ簱鍗�
- /// </summary>
- [Route("api/InboundOrder")]
- [ApiController]
- public class InboundOrderController : ApiBaseController<IInboundOrderService, Dt_InboundOrder>
- {
- public InboundOrderController(IInboundOrderService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderDetailController.cs"
deleted file mode 100644
index d9eabe9..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderDetailController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Inbound
-{
- /// <summary>
- /// 鍏ュ簱鍗曟槑缁�
- /// </summary>
- [Route("api/InboundOrderDetail")]
- [ApiController]
- public class InboundOrderDetailController : ApiBaseController<IInboundOrderDetailService, Dt_InboundOrderDetail>
- {
- public InboundOrderDetailController(IInboundOrderDetailService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/MESProInOrderInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/MESProInOrderInfoController.cs"
deleted file mode 100644
index f4d88d0..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/MESProInOrderInfoController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Inbound
-{
- /// <summary>
- /// MES鎴愬搧/鍗婃垚鍝�
- /// </summary>
- [Route("api/MESProInOrderInfo")]
- [ApiController]
- public class MESProInOrderInfoController : ApiBaseController<IMESProInOrderInfoService, Dt_MESProInOrderInfo>
- {
- public MESProInOrderInfoController(IMESProInOrderInfoService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/ProDeliverBackOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/ProDeliverBackOrderController.cs"
deleted file mode 100644
index f984a1b..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/ProDeliverBackOrderController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Inbound
-{
- /// <summary>
- /// 鎴愬搧閫�璐�
- /// </summary>
- [Route("api/ProDeliverBackOrder")]
- [ApiController]
- public class ProDeliverBackOrderController : ApiBaseController<IProDeliverBackOrderService, Dt_ProDeliverBackOrder>
- {
- public ProDeliverBackOrderController(IProDeliverBackOrderService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/ProDeliverBackOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/ProDeliverBackOrderDetailController.cs"
deleted file mode 100644
index f38b63d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/ProDeliverBackOrderDetailController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Inbound
-{
- /// <summary>
- /// 鎴愬搧閫�璐ф槑缁�
- /// </summary>
- [Route("api/ProDeliverBackOrderDetail")]
- [ApiController]
- public class ProDeliverBackOrderDetailController : ApiBaseController<IProDeliverBackOrderDetailService, Dt_ProDeliverBackOrderDetail>
- {
- public ProDeliverBackOrderDetailController(IProDeliverBackOrderDetailService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/PurchaseBSTOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/PurchaseBSTOrderController.cs"
deleted file mode 100644
index 46f03c9..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/PurchaseBSTOrderController.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Inbound
-{
- /// <summary>
- /// BST閲囪喘鍗�
- /// </summary>
- [Route("api/PurchaseBSTOrder")]
- [ApiController]
- public class PurchaseBSTOrderController : ApiBaseController<IPurchaseBSTOrderService, Dt_PurchaseBSTOrder>
- {
- public PurchaseBSTOrderController(IPurchaseBSTOrderService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/PurchaseBSTOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/PurchaseBSTOrderDetailController.cs"
deleted file mode 100644
index 39294b4..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/PurchaseBSTOrderDetailController.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Inbound
-{
- /// <summary>
- /// BST閲囪喘鍗曟槑缁�
- /// </summary>
- [Route("api/PurchaseBSTOrderDetail")]
- [ApiController]
- public class PurchaseBSTOrderDetailController : ApiBaseController<IPurchaseBSTOrderDetailService, Dt_PurchaseBSTOrderDetail>
- {
- public PurchaseBSTOrderDetailController(IPurchaseBSTOrderDetailService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs"
deleted file mode 100644
index 0ec46ff..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Inbound
-{
- /// <summary>
- /// 閲囪喘鍗�
- /// </summary>
- [Route("api/PurchaseOrder")]
- [ApiController]
- public class PurchaseOrderController : ApiBaseController<IPurchaseOrderService, Dt_PurchaseOrder>
- {
- public PurchaseOrderController(IPurchaseOrderService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderDetailController.cs"
deleted file mode 100644
index ee5c974..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderDetailController.cs"
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Inbound
-{
- /// <summary>
- /// 閲囪喘鍗曟槑缁�
- /// </summary>
- [Route("api/PurchaseOrderDetail")]
- [ApiController]
- public class PurchaseOrderDetailController : ApiBaseController<IPurchaseOrderDetailService, Dt_PurchaseOrderDetail>
- {
- public PurchaseOrderDetailController(IPurchaseOrderDetailService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/ReturnBSTOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/ReturnBSTOrderController.cs"
deleted file mode 100644
index e01a496..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/ReturnBSTOrderController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Inbound
-{
- /// <summary>
- /// BST閫�鏂欏崟
- /// </summary>
- [Route("api/ReturnBSTOrder")]
- [ApiController]
- public class ReturnBSTOrderController : ApiBaseController<IReturnBSTOrderService, Dt_ReturnBSTOrder>
- {
- public ReturnBSTOrderController(IReturnBSTOrderService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/ReturnBSTOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/ReturnBSTOrderDetailController.cs"
deleted file mode 100644
index 43f76d8..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Inbound/ReturnBSTOrderDetailController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Inbound
-{
- /// <summary>
- /// BST閫�鏂欏崟鏄庣粏
- /// </summary>
- [Route("api/ReturnBSTOrderDetail")]
- [ApiController]
- public class ReturnBSTOrderDetailController : ApiBaseController<IReturnBSTOrderDetailService, Dt_ReturnBSTOrderDetail>
- {
- public ReturnBSTOrderDetailController(IReturnBSTOrderDetailService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/LargeScreen/LargeController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/LargeScreen/LargeController.cs"
deleted file mode 100644
index 9267e56..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/LargeScreen/LargeController.cs"
+++ /dev/null
@@ -1,59 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core;
-using WIDESEA_DTO;
-using WIDESEA_IBasicService;
-using WIDESEA_ITaskInfoService;
-using WIDESEA_TaskInfoService;
-using WIDESEA_DTO.ERP;
-using WIDESEA_Core.Helper;
-using Autofac.Core;
-using WIDESEA_DTO.Stock;
-using WIDESEA_Common.TaskEnum;
-using WIDESEA_Common.LocationEnum;
-using System.Collections.Generic;
-using WIDESEA_Model.Models;
-using SqlSugar;
-using WIDESEA_IStockService;
-using WIDESEA_Common.StockEnum;
-using HslCommunication.WebSocket;
-
-namespace WIDESEA_WMSServer.Controllers.LargeScreen
-{
- [Route("api/Large")]
- [ApiController]
- public class LargeController : ControllerBase
- {
- private readonly ITaskService _taskService;
- private readonly ITask_HtyService _task_HtyService;
- private readonly IBasicService _basicService;
- private readonly WebSocketServer _webSocketServer;
- private readonly IProStockInfoDetailService _proStockInfoDetailService;
- private readonly IProStockInfoService _proStockInfoService;
-
- public LargeController( ITaskService taskService, ITask_HtyService task_HtyService, IBasicService basicService, IProStockInfoDetailService proStockInfoDetailService, IProStockInfoService proStockInfoService, WebSocketServer webSocketServer)
- {
- _taskService = taskService;
- _task_HtyService = task_HtyService;
- _basicService = basicService;
- _proStockInfoDetailService = proStockInfoDetailService;
- _proStockInfoService = proStockInfoService;
- _webSocketServer = webSocketServer;
- }
- /// <summary>
- /// 娴嬭瘯
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("PushInfoSocket"), AllowAnonymous]
- public WebResponseContent ProMonthTaskStatistics(string info)
- {
- WebSocketSession[] webSocketSession = _webSocketServer.OnlineSessions;
- if (webSocketSession != null)
- {
- _webSocketServer.SendClientPayload(webSocketSession[0], "鍚屾剰");
- }
- return WebResponseContent.Instance.OK(_webSocketServer.OnlineSessions.Select(x=>x.Url).Serialize());
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
deleted file mode 100644
index e7d6612..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
+++ /dev/null
@@ -1,152 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.Attributes;
-using WIDESEA_Core;
-using WIDESEA_DTO;
-using WIDESEA_IBasicService;
-using WIDESEA_ITaskInfoService;
-using WIDESEA_TaskInfoService;
-using WIDESEA_DTO.ERP;
-using WIDESEA_Core.Helper;
-using Autofac.Core;
-using WIDESEA_DTO.Stock;
-using WIDESEA_BasicService;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.MES;
-using WIDESEA_IOutboundService;
-using WIDESEA_IInboundService;
-using WIDESEA_External.MESService;
-using WIDESEA_External.Model;
-
-namespace WIDESEA_WMSServer.Controllers.MES
-{
- /// <summary>
- /// MES鎺ュ彛
- /// </summary>
- [Route("api/Mes")]
- [ApiController]
- public class MesController : ControllerBase
- {
- private readonly ITaskService _taskService;
- private readonly IOutMESOrderService _outMESOrderService;
- private readonly IMESProInOrderInfoService _proInOrderInfoService;
- private readonly IInvokeMESService _invokeMESService;
-
- public MesController(ITaskService taskService,IOutMESOrderService outMESOrderService,IMESProInOrderInfoService proInOrderInfoService, IInvokeMESService invokeMESService)
- {
- _taskService = taskService;
- _outMESOrderService = outMESOrderService;
- _proInOrderInfoService=proInOrderInfoService;
- _invokeMESService = invokeMESService;
- }
- /// <summary>
- /// 鎺ユ敹MES棰嗘枡璁″垝
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveOutBound"), AllowAnonymous]
-
- public WebResponseContent ReceiveOutBound([FromBody] List<OutMESOrderDTO> outMESOrderDTOs)
- {
- return _taskService.ReceiveOutBound(outMESOrderDTOs);
- }
- /// <summary>
- /// MES鑷姩鍙枡鎺ュ彛
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveAutoIssue"), AllowAnonymous]
- public WebResponseContent ReceiveAutoIssue([FromBody] MESAutoIssueDTO autoIssueDTO)
- {
- return _taskService.ReceiveAutoIssue(autoIssueDTO);
- }
-
- /// <summary>
- /// MES鎵嬪姩鍙枡鎺ュ彛
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveManualIssue"), AllowAnonymous]
- public WebResponseContent ReceiveManualIssue([FromBody] MESManualIssueDTO manualIssueDTO)
- {
- return _taskService.ReceiveManualIssue(manualIssueDTO);
- }
-
- /// <summary>
- /// MES绌烘墭/浣欐枡鍛煎彨鎺ュ彛
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveReturnIssue"), AllowAnonymous]
- public WebResponseContent ReceiveReturnIssue([FromBody] List<MESReturnIssueDTO> returnIssueDTOs)
- {
- return _taskService.ReceiveReturnIssue(returnIssueDTOs);
- }
-
- /// <summary>
- /// 鎴愬搧/鍗婃垚鍝佷俊鎭悓姝ユ帴鍙�
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveProCodeInfo"), AllowAnonymous]
- public WebResponseContent ReceiveProCodeInfo([FromBody] List<MESProInDTO> proInDTOs)
- {
- return _taskService.ReceiveProCodeInfo(proInDTOs);
- }
-
- /// <summary>
- /// MES宸ュ崟鍋滄鎺ュ彛
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveProOrderStop"), AllowAnonymous]
- public WebResponseContent ReceiveProOrderStop([FromBody] MESOrderStopDTO orderStopDTO)
- {
- return _proInOrderInfoService.ReceiveProOrderStop(orderStopDTO);
- }
-
- /// <summary>
- /// MES閰嶉�佸嚭鍙戦�氱煡
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("MESDispatchUp"), AllowAnonymous]
- public string MESDispatchUp([FromBody] MESDispatchModel mESDispatchModel)
- {
- return _invokeMESService.MESDispatchUp(mESDispatchModel);
- }
- /// <summary>
- /// MES閰嶉�佸埌杈鹃�氱煡
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("MESDelivery"), AllowAnonymous]
- public string MESDelivery([FromBody] MESDeliveryModel mESDeliveryModel)
- {
- return _invokeMESService.MESDelivery(mESDeliveryModel);
- }
-
- /// <summary>
- /// MES閫�鏂欑┖鎵樻帴鏀堕�氱煡
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("MESRecepNotice"), AllowAnonymous]
- public string MESRecepNotice([FromBody] MESRecepNoticeModel mESRecepNoticeModel)
- {
- return _invokeMESService.MESRecepNotice(mESRecepNoticeModel);
- }
-
- /// <summary>
- /// MES灏忚溅鍒拌揪閫氱煡
- /// </summary>
- /// <param name="mESAvgArriveNoticeModel"></param>
- /// <returns></returns>
- [HttpPost, Route("MESAvgArriveNotice"), AllowAnonymous]
- public string MESAvgArriveNotice([FromBody] MESAvgArriveNoticeModel mESAvgArriveNoticeModel)
- {
- return _invokeMESService.MESAvgArriveNotice(mESAvgArriveNoticeModel);
- }
- /// <summary>
- /// MES浜ч噺鍥炰紶
- /// </summary>
- /// <param name="boxCode"></param>
- /// <returns></returns>
- [HttpPost,HttpGet, Route("MESBoxCodeNotice"), AllowAnonymous]
- public WebResponseContent MESBoxCodeNotice(string boxCode)
- {
- return _proInOrderInfoService.MESBoxCode(boxCode);
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutBSTOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutBSTOrderController.cs"
deleted file mode 100644
index fb70e74..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutBSTOrderController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// BST鐢熶骇鎺掔▼鍗�
- /// </summary>
- [Route("api/OutBSTOrder")]
- [ApiController]
- public class OutBSTOrderController : ApiBaseController<IOutBSTOrderService, Dt_OutBSTOrder>
- {
- public OutBSTOrderController(IOutBSTOrderService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutBSTOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutBSTOrderDetailController.cs"
deleted file mode 100644
index 4227b8d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutBSTOrderDetailController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// BST鐢熶骇鎺掔▼鏄庣粏
- /// </summary>
- [Route("api/OutBSTOrderDetail")]
- [ApiController]
- public class OutBSTOrderDetailController : ApiBaseController<IOutBSTOrderDetailService, Dt_OutBSTOrderDetail>
- {
- public OutBSTOrderDetailController(IOutBSTOrderDetailService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutBSTPickInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutBSTPickInfoController.cs"
deleted file mode 100644
index 92fce11..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutBSTPickInfoController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// 鍗氭�濋�氶鏂欎俊鎭�
- /// </summary>
- [Route("api/OutBSTPickInfo")]
- [ApiController]
- public class OutBSTPickInfoController : ApiBaseController<IOutBSTPickInfoService, Dt_OutBSTPickInfo>
- {
- public OutBSTPickInfoController(IOutBSTPickInfoService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutLineViewController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutLineViewController.cs"
deleted file mode 100644
index 8d68782..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutLineViewController.cs"
+++ /dev/null
@@ -1,30 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// 鍑哄簱绾夸綋缂撳瓨
- /// </summary>
- [Route("api/OutLineView")]
- [ApiController]
- public class OutLineViewController : ApiBaseController<IOutLineViewService, Dt_OutLineView>
- {
- public OutLineViewController(IOutLineViewService service) : base(service)
- {
- }
- /// <summary>
- /// 鑾峰彇绾夸綋鍘熺焊
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("GetOutLineView"), AllowAnonymous]
- public WebResponseContent GetOutLineView()
- {
- return Service.GetOutLineView();
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutMESOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutMESOrderController.cs"
deleted file mode 100644
index c48a510..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutMESOrderController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// MES棰嗘枡璁″垝鍗�
- /// </summary>
- [Route("api/OutMESOrder")]
- [ApiController]
- public class OutMESOrderController : ApiBaseController<IOutMESOrderService, Dt_OutMESOrder>
- {
- public OutMESOrderController(IOutMESOrderService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutSGOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutSGOrderController.cs"
deleted file mode 100644
index 07c2dd7..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutSGOrderController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// 鑰佸巶鐢熺鎺掔▼鍗�
- /// </summary>
- [Route("api/OutSGOrder")]
- [ApiController]
- public class OutSGOrderController : ApiBaseController<IOutSGOrderService, Dt_OutSGOrder>
- {
- public OutSGOrderController(IOutSGOrderService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutSGOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutSGOrderDetailController.cs"
deleted file mode 100644
index 01b4fe7..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutSGOrderDetailController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// 鑰佸巶鐢熺鎺掔▼鍗曟槑缁�
- /// </summary>
- [Route("api/OutSGOrderDetail")]
- [ApiController]
- public class OutSGOrderDetailController : ApiBaseController<IOutSGOrderDetailService, Dt_OutSGOrderDetail>
- {
- public OutSGOrderDetailController(IOutSGOrderDetailService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
deleted file mode 100644
index 6936e6e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
+++ /dev/null
@@ -1,30 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// 鍑哄簱璇︽儏
- /// </summary>
- [Route("api/OutStockLockInfo")]
- [ApiController]
- public class OutStockLockInfoController : ApiBaseController<IOutStockLockInfoService, Dt_OutStockLockInfo>
- {
- public OutStockLockInfoController(IOutStockLockInfoService service) : base(service)
- {
- }
- /// <summary>
- /// 鑾峰彇鍑哄簱璇︽儏
- /// </summary>
- [HttpPost, HttpGet, Route("GetByOrderDetailId"), AllowAnonymous]
- public List<Dt_OutStockLockInfo> GetByOrderDetailId(string orderNo,int orderDetailId)
- {
- return Service.GetByOrderDetailId(orderNo,orderDetailId, null);
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/ProDeliveryOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/ProDeliveryOrderController.cs"
deleted file mode 100644
index 92aee92..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/ProDeliveryOrderController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IInboundService;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// 鎴愬搧閿�鍞嚭搴�
- /// </summary>
- [Route("api/ProDeliveryOrder")]
- [ApiController]
- public class ProDeliveryOrderController : ApiBaseController<IProDeliveryOrderService, Dt_ProDeliveryOrder>
- {
- public ProDeliveryOrderController(IProDeliveryOrderService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/ProDeliveryOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/ProDeliveryOrderDetailController.cs"
deleted file mode 100644
index 6eeea99..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Outbound/ProDeliveryOrderDetailController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Outbound
-{
- /// <summary>
- /// 鎴愬搧閿�鍞嚭搴撴槑缁�
- /// </summary>
- [Route("api/ProDeliveryOrderDetail")]
- [ApiController]
- public class ProDeliveryOrderDetailController : ApiBaseController<IProDeliveryOrderDetailService, Dt_ProDeliveryOrderDetail>
- {
- public ProDeliveryOrderDetailController(IProDeliveryOrderDetailService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/PDAController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/PDAController.cs"
index 16dbc3b..00b2d49 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/PDAController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/PDAController.cs"
@@ -1,14 +1,8 @@
锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
using WIDESEA_Core.Helper;
-using WIDESEA_DTO.Inbound;
using WIDESEA_ITaskInfoService;
-using System.IO;
-using WIDESEA_Model.Models;
-using System;
namespace WIDESEA_WMSServer.Controllers
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Record/StockQuantityChangeRecordController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Record/StockQuantityChangeRecordController.cs"
deleted file mode 100644
index 2973d77..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Record/StockQuantityChangeRecordController.cs"
+++ /dev/null
@@ -1,20 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IRecordService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Record
-{
- /// <summary>
- /// 搴撳瓨鏁伴噺鍙樺姩璁板綍
- /// </summary>
- [Route("api/StockQuantityChangeRecord")]
- [ApiController]
- public class StockQuantityChangeRecordController : ApiBaseController<IStockQuantityChangeRecordService, Dt_StockQuantityChangeRecord>
- {
- public StockQuantityChangeRecordController(IStockQuantityChangeRecordService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Sort/SortOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Sort/SortOrderController.cs"
new file mode 100644
index 0000000..1de215c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Sort/SortOrderController.cs"
@@ -0,0 +1,19 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
+using WIDESEA_ISortOrderService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMSServer.Controllers.Sort
+{
+ /// <summary>
+ /// 鍒嗘嫞鍗曟嵁
+ /// </summary>
+ [Route("api/SortOrder")]
+ [ApiController]
+ public class SortOrderController : ApiBaseController<ISortOrderDetailService, Dt_SortOrder>
+ {
+ public SortOrderController(ISortOrderDetailService service) : base(service)
+ {
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Sort/SortOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Sort/SortOrderDetailController.cs"
new file mode 100644
index 0000000..6d48014
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Sort/SortOrderDetailController.cs"
@@ -0,0 +1,19 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
+using WIDESEA_ISortOrderService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMSServer.Controllers.Sort
+{
+ /// <summary>
+ /// 鍒嗘嫞鍗曟嵁
+ /// </summary>
+ [Route("api/SortOrderDetail")]
+ [ApiController]
+ public class SortOrderDetailController : ApiBaseController<ISortOrderDetailService, Dt_SortOrderDetail>
+ {
+ public SortOrderDetailController(ISortOrderDetailService service) : base(service)
+ {
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/BlankStockController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/BlankStockController.cs"
new file mode 100644
index 0000000..7dee68c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/BlankStockController.cs"
@@ -0,0 +1,20 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
+using WIDESEA_IStockService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMSServer.Controllers.Stock
+{
+ /// <summary>
+ /// 鍧枡闅旂儹搴撳瓨淇℃伅
+ /// </summary>
+ [Route("api/BlankStockInfo")]
+ [ApiController]
+ public class BlankStockController : ApiBaseController<IBlankStockInfoService, Dt_BlankStockInfo>
+ {
+ public BlankStockController(IBlankStockInfoService service) : base(service)
+ {
+ }
+
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/BlankStockInfo_HtyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/BlankStockInfo_HtyController.cs"
new file mode 100644
index 0000000..bc90777
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/BlankStockInfo_HtyController.cs"
@@ -0,0 +1,19 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
+using WIDESEA_IStockService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMSServer.Controllers.Stock
+{
+ /// <summary>
+ /// 鍧枡闅旂儹搴撳瓨鍘嗗彶
+ /// </summary>
+ [Route("api/BlankStockInfo_Hty")]
+ [ApiController]
+ public class BlankStockInfo_HtyController : ApiBaseController<IBlankStockInfo_HtyService, Dt_BlankStockInfo_Hty>
+ {
+ public BlankStockInfo_HtyController(IBlankStockInfo_HtyService service) : base(service)
+ {
+ }
+ }
+}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/MouldStockController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/MouldStockController.cs"
new file mode 100644
index 0000000..c78026b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/MouldStockController.cs"
@@ -0,0 +1,20 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
+using WIDESEA_IStockService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMSServer.Controllers.Stock
+{
+ /// <summary>
+ /// 妯″叿搴撳瓨淇℃伅
+ /// </summary>
+ [Route("api/MouldStockInfo")]
+ [ApiController]
+ public class MouldStockController : ApiBaseController<IMouldStockInfoService, Dt_MouldStockInfo>
+ {
+ public MouldStockController(IMouldStockInfoService service) : base(service)
+ {
+ }
+
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/MouldStockInfo_HtyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/MouldStockInfo_HtyController.cs"
new file mode 100644
index 0000000..0f33b80
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/MouldStockInfo_HtyController.cs"
@@ -0,0 +1,19 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
+using WIDESEA_IStockService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_WMSServer.Controllers.Stock
+{
+ /// <summary>
+ /// 妯″叿搴撳瓨鍘嗗彶
+ /// </summary>
+ [Route("api/MouldStockInfo_Hty")]
+ [ApiController]
+ public class MouldStockInfo_HtyController : ApiBaseController<IMouldStockInfo_HtyService, Dt_MouldStockInfo_Hty>
+ {
+ public MouldStockInfo_HtyController(IMouldStockInfo_HtyService service) : base(service)
+ {
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/ProStockInfoDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/ProStockInfoDetailController.cs"
deleted file mode 100644
index 9bdb52d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/ProStockInfoDetailController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Stock
-{
- /// <summary>
- /// 鎴愬搧搴撳瓨鏄庣粏
- /// </summary>
- [Route("api/ProStockInfoDetail")]
- [ApiController]
- public class ProStockInfoDetailController : ApiBaseController<IProStockInfoDetailService, Dt_ProStockInfoDetail>
- {
- public ProStockInfoDetailController(IProStockInfoDetailService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/ProStockInfoDetail_HtyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/ProStockInfoDetail_HtyController.cs"
deleted file mode 100644
index 817ddb8..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/ProStockInfoDetail_HtyController.cs"
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Stock
-{
- /// <summary>
- /// 鎴愬搧搴撳瓨鍘嗗彶
- /// </summary>
- [Route("api/ProStockInfoDetail_Hty")]
- [ApiController]
- public class ProStockInfoDetail_HtyController : ApiBaseController<IProStockInfoDetail_HtyService, Dt_ProStockInfoDetail_Hty>
- {
- public ProStockInfoDetail_HtyController(IProStockInfoDetail_HtyService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/ProStockViewController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/ProStockViewController.cs"
deleted file mode 100644
index 2baf0bf..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/ProStockViewController.cs"
+++ /dev/null
@@ -1,64 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System.Reflection;
-using WIDESEA_Core;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IStockService;
-
-namespace WIDESEA_WMSServer.Controllers.Stock
-{
- /// <summary>
- /// 搴撳瓨瑙嗗浘
- /// </summary>
- [Route("api/ProStockView")]
- [Authorize, ApiController]
- public class ProStockViewController : Controller
- {
- private readonly IProStockViewService _stockViewService;
- public ProStockViewController(IProStockViewService stockViewService)
- {
- _stockViewService = stockViewService;
- }
-
- [HttpPost, Route("GetPageData")]
- public PageGridData<ProStockViewDTO> GetPageData([FromBody] PageDataOptions options)
- {
- return _stockViewService.GetPageData(options);
- }
-
- [HttpPost, Route("GetDetailPage")]
- public object GetDetailPage([FromBody] PageDataOptions pageData)
- {
- return _stockViewService.GetDetailPage(pageData);
- }
-
- /// <summary>
- /// 瀵煎嚭鏁版嵁
- /// </summary>
- /// <param name="loadData"></param>
- /// <returns></returns>
- [HttpPost, Route("Export")]
- public virtual ActionResult Export([FromBody] PageDataOptions loadData)
- {
- WebResponseContent result = InvokeService("Export", new object[] { loadData }) as WebResponseContent;
- if (result.Status)
- return File(
- System.IO.File.ReadAllBytes(result.Data.ToString()),
- System.Net.Mime.MediaTypeNames.Application.Octet,
- Path.GetFileName(result.Data.ToString())
- );
- return Json(result);
- }
- private object InvokeService(string methodName, object[] parameters)
- {
- Type t = _stockViewService.GetType();
- List<Type> types = new List<Type>();
- foreach (var param in parameters)
- {
- types.Add(param.GetType());
- }
- MethodInfo method = t.GetMethod(methodName, types.ToArray());
- return method.Invoke(_stockViewService, parameters);
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
deleted file mode 100644
index f9f9bc5..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
+++ /dev/null
@@ -1,54 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IStockRepository;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Stock
-{
- /// <summary>
- /// 搴撳瓨
- /// </summary>
- [Route("api/StockInfo")]
- [ApiController]
- public class StockInfoController : ApiBaseController<IStockInfoService, Dt_StockInfo>
- {
- public StockInfoController(IStockInfoService service) : base(service)
- {
- }
- /// <summary>
- /// 鏍规嵁鎵樼洏鍜屽簱鍖烘煡璇㈠簱瀛樹俊鎭�
- /// </summary>
- /// <param name="saveModel"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("StockQueryData")]
- public WebResponseContent StockQueryData([FromBody] SaveModel saveModel)
- {
- return Service.StockQueryData(saveModel);
- }
- /// <summary>
- /// 鎵嬪姩缁勭洏
- /// </summary>
- /// <param name="saveModel"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("ManualMaterielGroup")]
- public WebResponseContent ManualMaterielGroup([FromBody] SaveModel saveModel)
- {
- return Service.ManualMaterielGroup(saveModel);
- }
- /// <summary>
- /// 鏇存柊鑰佸巶娈嬪嵎搴撳瓨
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("UpBSTStock"),AllowAnonymous]
- public WebResponseContent UpBSTStock(int operate)
- {
- return Service.UpBSTStock(operate);
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockInfo_HtyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockInfo_HtyController.cs"
deleted file mode 100644
index f9b8a0b..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockInfo_HtyController.cs"
+++ /dev/null
@@ -1,24 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IStockRepository;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Stock
-{
- /// <summary>
- /// 搴撳瓨鍘嗗彶
- /// </summary>
- [Route("api/StockInfo_Hty")]
- [ApiController]
- public class StockInfo_HtyController : ApiBaseController<IStockInfo_HtyService, Dt_StockInfo_Hty>
- {
- public StockInfo_HtyController(IStockInfo_HtyService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockViewController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockViewController.cs"
deleted file mode 100644
index fa5acd9..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/Stock/StockViewController.cs"
+++ /dev/null
@@ -1,29 +0,0 @@
-锘縰sing Autofac.Core;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using SqlSugar;
-using System.Reflection;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseController;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Stock
-{
- /// <summary>
- /// 搴撳瓨瑙嗗浘
- /// </summary>
- [Route("api/StockView")]
- [Authorize, ApiController]
- public class StockViewController : Controller
- {
- private readonly IStockViewService _stockViewService;
- public StockViewController(IStockViewService stockViewService)
- {
- _stockViewService = stockViewService;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
index 6b27ca9..1f03a25 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
@@ -1,14 +1,7 @@
锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System.Diagnostics.CodeAnalysis;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.MaterielEnum;
-using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
-using WIDESEA_DTO.Outbound;
-using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
@@ -27,97 +20,6 @@
}
/// <summary>
- /// WCS鐢宠鍏ュ簱浠诲姟(涓嶅垎閰嶈揣浣�)
- /// </summary>
- /// <param name="stationCode"></param>
- /// <param name="palletCode"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("DeviceRequestInboundTaskSimple"), AllowAnonymous]
- public WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode)
- {
- return Service.DeviceRequestInboundTaskSimple(stationCode, palletCode);
- }
-
- /// <summary>
- /// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="roadwayNo">宸烽亾鍙�</param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("AssignInboundTaskLocation"), AllowAnonymous]
- public WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo)
- {
- return Service.AssignInboundTaskLocation(taskNum, roadwayNo);
- }
-
- /// <summary>
- /// 鍚慦MS鐢宠鍑哄簱AGV缁堢偣
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("AssignOutTargetAddress"), AllowAnonymous]
- public WebResponseContent AssignOutTargetAddress(int taskNum)
- {
- return Service.AssignOutTargetAddress(taskNum);
- }
-
- /// <summary>
- /// 鎴愬搧绌烘墭鍥炲簱
- /// </summary>
- /// <param name="barCode"></param>
- /// <param name="startPoint"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("EmptyBackTask"), AllowAnonymous]
- public WebResponseContent EmptyBackTask(string barCode, string startPoint,int target)
- {
- return Service.EmptyBackTask(barCode, startPoint);
- }
-
- /// <summary>
- /// 杈呮枡/鎴愬搧涓存椂鍏ュ簱
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("InboundFLTask"), AllowAnonymous]
- public WebResponseContent InboundFLOrCPTask(string barCode, string startPoint, string matCode, int matCount, int oneCount)
- {
- return Service.InboundFLOrCPTask(barCode, startPoint, matCode, matCount,oneCount);
- }
-
- /// <summary>
- /// 杈呮枡(鎴愬搧)閲囪喘/鏈熷垵鍏ュ簱
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("InboundOrderInTask"), AllowAnonymous]
- public WebResponseContent InboundOrderInTask([NotNull] string bindCode, [NotNull] string barCode, [NotNull] string startPoint, int orderType = 0)
- {
- return Service.InboundOrderInTask(bindCode, barCode, startPoint, orderType);
- }
-
-
- /// <summary>
- /// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="locationCode"></param>
- /// <returns></returns>
- //[HttpPost, HttpGet, Route("IsRelocation"), AllowAnonymous]
- //public WebResponseContent IsRelocation(int taskNum, string locationCode)
- //{
- // return Service.IsRelocation(taskNum, locationCode);
- //}
-
- /// <summary>
- /// 浠诲姟瀹屾垚
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("TaskCompleted"), AllowAnonymous]
- public async Task<WebResponseContent> TaskCompleted(int taskNum)
- {
- return await Service.TaskCompleted(taskNum);
- }
-
- /// <summary>
/// 鍗曚釜浠诲姟鎺ㄩ�佽嚦WCS
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
@@ -130,27 +32,6 @@
}
/// <summary>
- /// 閫夋嫨搴撳瓨鐢熸垚鑰佸巶鍑哄簱浠诲姟
- /// </summary>
- /// <returns></returns>
- [HttpPost, Route("OldYLOutbound"), AllowAnonymous]
- public WebResponseContent Outbound([FromBody] List<int> ids)
- {
- return Service.Outbound(ids);
- }
-
- /// <summary>
- /// 鍒涘缓鐢熺鎵嬪姩鍑哄簱
- /// </summary>
- /// <param name="ids"></param>
- /// <returns></returns>
- [HttpPost, Route("CreateSGManualTasks"), AllowAnonymous]
- public WebResponseContent CreateSGManualTasks([FromBody] List<int> ids)
- {
- return Service.CreateSGManualTasks(ids);
- }
-
- /// <summary>
/// 淇敼浠诲姟鐘舵��
/// </summary>
/// <param name="task"></param>
@@ -159,146 +40,6 @@
public WebResponseContent UpdateTaskInfo([FromBody] WCSTaskDTO task)
{
return Service.UpdateTaskInfo(task);
- }
-
- /// <summary>
- /// 鍘熸枡鍏ュ簱浠诲姟璇锋眰
- /// </summary>
- /// <param name="stationCode">璧风偣</param>
- /// <param name="palletCode">鎵樼洏</param>
- /// <returns></returns>
- [HttpPost,HttpGet, Route("RequestYLWMSTaskSimple"), AllowAnonymous]
- public WebResponseContent RequestYLWMSTaskSimple(string stationCode, string palletCode)
- {
- return Service.RequestYLWMSTaskSimple(stationCode,palletCode);
- }
-
- /// <summary>
- /// 鍘熸枡鍏ュ簱鐢宠(骞冲彴/鑰佸巶鍖�)
- /// </summary>
- /// <param name="palletCode">鏉＄爜</param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("YLPurchaseBoxing"), AllowAnonymous]
- public WebResponseContent YLPurchaseBoxing(string palletCode,decimal weight=0,decimal thickness = 0, decimal wide = 0, string stationCode = "")
- {
- return Service.YLPurchaseBoxing(palletCode,weight,thickness,wide,stationCode);
- }
-
- /// <summary>
- /// 鍘熸枡閲囪喘缁戝畾RFID
- /// </summary>
- /// <param name="palletCode">绾稿嵎鏉＄爜</param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("PurchaseBoxing"), AllowAnonymous]
- public WebResponseContent PurchaseBoxing(string palletCode, int orderType=0)
- {
- return Service.PurchaseBoxing(palletCode, orderType);
- }
-
- /// <summary>
- /// 鍒嗛厤鍘熸枡鍏ュ簱宸烽亾
- /// </summary>
- /// <param name="palletCode"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("AssignYLRoadwayNo"), AllowAnonymous]
- public WebResponseContent AssignYLRoadwayNo(string palletCode)
- {
- string roadWay= Service.AssignYLRoadwayNo(palletCode);
- if (string.IsNullOrEmpty(roadWay))
- {
- return WebResponseContent.Instance.Error("鏈壘鍒板彲鍒嗛厤宸烽亾");
- }
- return WebResponseContent.Instance.OK(data: roadWay);
- }
-
- /// <summary>
- /// 鎴愬搧鍑哄簱浠诲姟璇锋眰
- /// <param name="targetId">
- ///涓�妤兼湀鍙扮爜澶� = 1,
- ///涓�妤兼棤绾虹粐甯� = 2,
- ///涓�妤兼棤绾烘穻鑶� = 3,
- ///涓�妤兼棤绾虹紦瀛� = 4,
- ///涓�妤肩焊寮犳穻鑶� = 5,
- ///涓�妤煎嵃鍒� = 6,
- ///涓�妤煎垎鍒� = 7,
- ///涓�妤兼ā鍒� = 8,
- ///涓�妤煎啿鍒� = 9,
- ///涓�妤煎師鏂� = 10,
- ///涓�妤兼垚鍝� = 11,
- ///浜屾ゼ鍘熸枡 = 12,
- ///浜屾ゼ鎴愬搧 = 13,
- ///浜屾ゼ鏃犵汉甯冭 = 14,
- ///浜屾ゼ绾歌 = 15,
- ///浜屾ゼ绾告澂 = 16,
- ///浜屾ゼ闆惧寲 = 17
- /// </param>
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("RequestCPWMSTaskOut"), AllowAnonymous]
- public WebResponseContent RequestCPWMSTaskOut(string materialCode,int outCount, string targetId)
- {
- return Service.RequestCPWMSTaskOut(materialCode, outCount, targetId);
- }
-
- /// <summary>
- /// 鍘熸枡鍑哄簱浠诲姟
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("RequestYLWMSTaskOut"), AllowAnonymous]
- public WebResponseContent RequestYLWMSTaskOut([FromBody] YLWMSTaskOutDTO yLWMSTaskOutDTO)
- {
- return Service.RequestYLWMSTaskOut(yLWMSTaskOutDTO);
- }
-
- /// <summary>
- /// 鍘熸枡绉诲簱浠诲姟
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("Relocation"), AllowAnonymous]
- public WebResponseContent IsRelocation(string startAddress, string endAddress, string roadWay)
- {
- return Service.IsRelocation(startAddress, endAddress, roadWay);
- }
- /// <summary>
- /// 鍘熸枡宸烽亾闂寸Щ搴撲换鍔�
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("RelocationRoadWay"), AllowAnonymous]
- public WebResponseContent RelocationRoadWay(string roadWay,int Count)
- {
- return Service.RelocationRoadWay(roadWay, Count);
- }
-
- /// <summary>
- /// 鍒嗛厤鎴愬搧宸烽亾
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("AssignCPRoadwayNo"), AllowAnonymous]
- public string AssignCPRoadwayNo()
- {
- return Service.AssignCPRoadwayNo();
- }
-
- /// <summary>
- /// 鍗板埛浣欐枡閫�鏂欎换鍔�
- /// </summary>
- /// <param name="saveModel"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("PrintBackInbound"), AllowAnonymous]
- public WebResponseContent PrintBackInbound([FromBody]SaveModel saveModel)
- {
- return Service.PrintBackInbound(saveModel);
- }
-
- /// <summary>
- /// 鍗板埛涓嬫枡浠诲姟
- /// </summary>
- /// <param name="saveModel"></param>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("PrintInbound"), AllowAnonymous]
- public WebResponseContent PrintInbound([FromBody] SaveModel saveModel)
- {
- return Service.PrintInbound(saveModel);
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/Task_HtyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/Task_HtyController.cs"
index 16f12a7..3552c0d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/Task_HtyController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Controllers/TaskInfo/Task_HtyController.cs"
@@ -1,9 +1,5 @@
-锘縰sing Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core;
+锘縰sing Microsoft.AspNetCore.Mvc;
using WIDESEA_Core.BaseController;
-using WIDESEA_DTO.Stock;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Filter/CustomProfile.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Filter/CustomProfile.cs"
index 17c5bec..4b20a64 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Filter/CustomProfile.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/Filter/CustomProfile.cs"
@@ -1,21 +1,4 @@
-锘縰sing Autofac.Builder;
-using AutoMapper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.CommonEnum;
-using WIDESEA_Common.MaterielEnum;
-using WIDESEA_Common.OrderEnum;
-using WIDESEA_Common.StockEnum;
-using WIDESEA_Common.WareHouseEnum;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
-using WIDESEA_DTO.Inbound;
-using WIDESEA_DTO.MES;
+锘縰sing AutoMapper;
using WIDESEA_DTO.System;
using WIDESEA_DTO.Task;
using WIDESEA_Model.Models;
@@ -31,60 +14,6 @@
{
CreateMap<Sys_Menu, MenuDTO>();
CreateMap<Dt_Task, WMSTaskDTO>();
- //鐗╂枡瀹炰綋BST杞崲
- CreateMap<BSTMaterialDTO, Dt_MaterielInfo>().ForMember(x => x.MaterialSourceId, b => b.MapFrom(b => b.MaterialId)).ForMember(x => x.WarehouseId, b => b.MapFrom(b => WarehouseEnum.LLDYL.ObjToInt())).ForMember(x => x.MaterielCode, b => b.MapFrom(b => b.MaterialNo)).ForMember(x => x.MaterielName, b => b.MapFrom(b => b.Name)).ForMember(x => x.MaterielSourceType, b => b.MapFrom(b => b.MaterielType)).ForMember(x => x.MaterielInvOrgId, b => b.MapFrom(b => b.InvOrgId)).ForMember(x => x.MaterielUnit, b => b.MapFrom(b => b.Unit)).ForMember(x => x.MaterielUnit, b => b.MapFrom(b => b.Unit)).ForMember(x => x.MaterielState, b => b.MapFrom(b => b.Status)).ForMember(x => x.IsCheck, b => b.MapFrom(b => WhetherEnum.False.ObjToInt())).ForMember(x => x.MaterielSpec, b => b.MapFrom(b => b.Spec)).ForMember(x => x.MaterielWeight, b => b.MapFrom(b => b.Weight));
- //鐗╂枡瀹炰綋杞崲
- CreateMap<BSTSupplierDTO, Dt_SupplierInfo>().ForMember(x => x.SupplierSourceId, b => b.MapFrom(b => b.VendId)).ForMember(x => x.SupplierCode, b => b.MapFrom(b => b.VendNo)).ForMember(x => x.SupplierName, b => b.MapFrom(b => b.ShortName)).ForMember(x => x.SupplierShortName, b => b.MapFrom(b => b.ShortName)).ForMember(x => x.Contacts, b => b.MapFrom(b => b.BusinessContact)).ForMember(x => x.ContactNumber, b => b.MapFrom(b => b.Tel)).ForMember(x => x.ContactAddress, b => b.MapFrom(b => b.Address)).ForMember(x => x.InvOrgId, b => b.MapFrom(b => MaterielInvOrgEnum.鑰佸巶.ObjToInt()));
- //閲囪喘瀹炰綋杞崲
- CreateMap<BSTPurchaseOrderDTO, Dt_PurchaseBSTOrder>().ForMember(x => x.ReceiptDate, b => b.MapFrom(b => DateTimeOffset.FromUnixTimeMilliseconds(b.ReceiptDate).DateTime));
- CreateMap<PaperReceiptDetailsItem, Dt_PurchaseBSTOrderDetail>().ForMember(x => x.MaterialWide, b => b.MapFrom(b => b.W)).ForMember(x => x.MaterialThick, b => b.MapFrom(b => b.Thick)).ForMember(x => x.PurchaseBSTOrderDetailStatus, b => b.MapFrom(b => InOrderStatusEnum.鏈紑濮�.ObjToInt()));
- //BST鍑哄簱鎺掔▼瀹炰綋杞崲
- CreateMap<BSTOutOrderDTO, Dt_OutBSTOrder>().ForMember(x => x.OutBSTOrderStatus, b => b.MapFrom(b => OutOrderStatusEnum.鏈紑濮�.ObjToInt())).ForMember(x => x.ProductionDate, b => b.MapFrom(b => DateTimeOffset.FromUnixTimeMilliseconds(b.ProductionDate).DateTime)).ForMember(x => x.WarehouseId, b => b.MapFrom(b => WarehouseEnum.LLDYL.ObjToInt()));
- CreateMap<BstBoardMpsDetailItem, Dt_OutBSTOrderDetail>().ForMember(x => x.OutBSTOrderDetailStatus, b => b.MapFrom(b => OutOrderStatusEnum.鏈紑濮�.ObjToInt()));
- //BST閫�鏂欏崟瀹炰綋杞崲
- CreateMap<BSTReturnOrderDTO, Dt_ReturnBSTOrder>().ForMember(x => x.ReturnOrderStatus, b => b.MapFrom(b => InOrderStatusEnum.鏈紑濮�.ObjToInt())).ForMember(x => x.WreturnDate, b => b.MapFrom(b => DateTimeOffset.FromUnixTimeMilliseconds(b.WreturnDate).DateTime)).ForMember(x => x.WarehouseId, b => b.MapFrom(b => WarehouseEnum.LLDYL.ObjToInt()));
- CreateMap<BSTReturnOrderDTOItem, Dt_ReturnBSTOrderDetail>().ForMember(x => x.ReturnBSTOrderDetailStatus, b => b.MapFrom(b => OutOrderStatusEnum.鏈紑濮�.ObjToInt())).ForMember(x => x.MaterialWide, b => b.MapFrom(b => b.W)).ForMember(x => x.MaterialThick, b => b.MapFrom(b => b.Thick));
- //MES棰嗘枡璁″垝瀹炰綋杞崲
- CreateMap<OutMESOrderDTO, Dt_OutMESOrder>().ForMember(x => x.OutMESOrderStatus, b => b.MapFrom(b => OutOrderStatusEnum.鏈紑濮�.ObjToInt()));
- //鐢熺鎺掔▼瀹炰綋杞崲
- CreateMap<SGOutOrderDTO, Dt_OutSGOrder>().ForMember(x => x.OutSGOrderStatus, b => b.MapFrom(b => OutOrderStatusEnum.鏈紑濮�.ObjToInt())).ForMember(x => x.WarehouseId, b => b.MapFrom(b => WarehouseEnum.LLDYL.ObjToInt()));
- CreateMap<SGOutOrderDTO, Dt_OutSGOrderDetail>().ForMember(x => x.OutSGOrderDetailStatus, b => b.MapFrom(b => OutOrderStatusEnum.鏈紑濮�.ObjToInt()));
- //鎴愬搧鍗婃垚鍝佸疄浣撹浆鎹�
- CreateMap<MESProInDTO, Dt_MESProInOrderInfo>().ForMember(x => x.MESProInStatus, b => b.MapFrom(b => InOrderStatusEnum.鏈紑濮�.ObjToInt()));
- //浜屾湡ERP鐗╂枡鎺ユ敹瀹炰綋杞崲
- CreateMap<ERPMaterialDTO, Dt_MaterielInfo>().ForMember(x => x.MaterielInvOrgId, b => b.MapFrom(b => MaterielInvOrgEnum.鏂板巶.ObjToInt())).ForMember(x => x.MaterielCode, b => b.MapFrom(b => b.MaterielNo)).ForMember(x => x.MaterielSourceType, b => b.MapFrom(b => b.MaterielType)).ForMember(x => x.MaterielWide, b => b.MapFrom(b => b.MaterielWidth)).ForMember(x => x.MaterielWeight, b => b.MapFrom(b => b.Weight)).ForMember(x => x.MaterielState, b => b.MapFrom(b => b.State)).ForMember(x => x.MaterielUnit, b => b.MapFrom(b => b.Unit)).ForMember(x => x.MaterielSpec, b => b.MapFrom(b => b.MaterielSpec));
- //鍗氭�濋�氱紦瀛橀噰璐浆鎹�
- CreateMap<Dt_PurchaseBSTOrderDetail, Dt_YLInboundCache>().ForMember(x => x.Id, b => b.MapFrom(b => 0)).ForMember(x => x.BindStatus, b => b.MapFrom(b => WhetherEnum.False.ObjToInt())).ForMember(x => x.RfidCode, b => b.MapFrom(b => "")).ForMember(x => x.InvOrg, b => b.MapFrom(b => MaterielInvOrgEnum.鑰佸巶.ToString()));
- //浜屾湡ERP渚涘簲鍟嗚浆鎹�
- CreateMap<ERPSupplierDTO, Dt_SupplierInfo>().ForMember(x => x.SupplierSourceId, b => b.MapFrom(b => 0)).ForMember(x => x.SupplierShortName, b => b.MapFrom(b => b.ShortName)).ForMember(x => x.Status, b => b.MapFrom(b => b.State)).ForMember(x => x.InvOrgId, b => b.MapFrom(b => MaterielInvOrgEnum.鏂板巶.ObjToInt()));
- //浜屾湡ERP瀹㈡埛杞崲
- CreateMap<ERPCustomerDTO, Dt_CustomerInfo>().ForMember(x => x.OutRule, b => b.MapFrom(b => 0)).ForMember(x => x.Status, b => b.MapFrom(b => b.State));
- //浜屾湡ERP瀹㈡埛杞崲
- CreateMap<ERPUserInfoDTO, Dt_UserInfo>().ForMember(x => x.Code, b => b.MapFrom(b => b.StaffCode)).ForMember(x => x.Name, b => b.MapFrom(b => b.StaffName));
- //鍗氭�濋�氱紦瀛樺簱瀛樿浆鎹�
- CreateMap<Dt_StockInfo, Dt_YLInboundCache>().ForMember(x => x.Id, b => b.MapFrom(b => 0)).ForMember(x => x.BindStatus, b => b.MapFrom(b => WhetherEnum.False.ObjToInt())).ForMember(x => x.RfidCode, b => b.MapFrom(b => "")).ForMember(x => x.InvOrg, b => b.MapFrom(b => MaterielInvOrgEnum.鑰佸巶.ToString())).ForMember(x => x.BarCode, b => b.MapFrom(b => b.PalletCode)).ForMember(x => x.MaterialNo, b => b.MapFrom(b => b.MaterielCode)).ForMember(x => x.DeliveryQty, b => b.MapFrom(b => b.MaterielWeight)).ForMember(x => x.MaterialThick, b => b.MapFrom(b => b.MaterielThickness)).ForMember(x => x.ProcurementLength, b => b.MapFrom(b => b.StockLength)).ForMember(x => x.MaterialWide, b => b.MapFrom(b => b.MaterielWide));
- //閲囪喘瀹炰綋杞崲
- CreateMap<ERPPurchaseOrderDTO, Dt_PurchaseOrder>().ForMember(x => x.PurchaseOrderNo, b => b.MapFrom(b =>b.PurchaseInCode)).ForMember(x => x.OrderQuantity, b => b.MapFrom(b => b.SumQty));
- CreateMap<PurchaseInDetailItem, Dt_PurchaseOrderDetail>().ForMember(x => x.DetailId, b => b.MapFrom(b => b.DetailId)).ForMember(x => x.PurchaseDetailWeight, b => b.MapFrom(b => b.Weight)).ForMember(x => x.PurchaseDetailWide, b => b.MapFrom(b => b.Wide)).ForMember(x => x.PurchaseDetailThickness, b => b.MapFrom(b => b.Thickness)).ForMember(x => x.PurchaseDetailStatus, b => b.MapFrom(b => InOrderStatusEnum.鏈紑濮�.ObjToInt())).ForMember(x => x.PurchaseDetailInboundQty, b => b.MapFrom(b => 0)).ForMember(x => x.PurchaseDetailQuantity, b => b.MapFrom(b => b.MaterialQty)).ForMember(x => x.MaterialCode, b => b.MapFrom(b => b.MaterialCode)).ForMember(x => x.BarCode, b => b.MapFrom(b => b.Barcode)).ForMember(x => x.MaterialLot, b => b.MapFrom(b => b.MaterialLot));
- //閫�璐у疄浣撹浆鎹�
- CreateMap<ERPReturnOrderDTO, Dt_ReturnOutOrder>().ForMember(x => x.ReturnNo, b => b.MapFrom(b => b.ReturnCode)).ForMember(x => x.EmployeeName, b => b.MapFrom(b => b.Creater)).ForMember(x => x.ReturnOrderStatus, b => b.MapFrom(b => InOrderStatusEnum.鏈紑濮�.ObjToInt()));
- CreateMap<ReturnDetailItem, Dt_ReturnOutOrderDetail>().ForMember(x => x.DetailId, b => b.MapFrom(b => b.DetailId)).ForMember(x => x.BarCode, b => b.MapFrom(b => b.BarCode)).ForMember(x => x.ReturnQuantity, b => b.MapFrom(b => b.MaterialQty)).ForMember(x => x.ReturnOutDetailStatus, b => b.MapFrom(b => InOrderStatusEnum.鏈紑濮�.ObjToInt()));
- //閿�鍞疄浣撹浆鎹�
- CreateMap<ERPProDeliveryDTO, Dt_ProDeliveryOrder>().ForMember(x => x.DeliveryType, b => b.MapFrom(b => 1)).ForMember(x => x.EmployeeName, b => b.MapFrom(b => b.Creater)).ForMember(x => x.ProDeliveryStatus, b => b.MapFrom(b => OutOrderStatusEnum.鏈紑濮�.ObjToInt()));
- CreateMap<DeliveryDetailItem, Dt_ProDeliveryOrderDetail>().ForMember(x => x.DetailId, b => b.MapFrom(b => b.DetailId)).ForMember(x => x.Quantity, b => b.MapFrom(b => b.MaterialQty)).ForMember(x => x.ProDeliveryDetailStatus, b => b.MapFrom(b => OutOrderStatusEnum.鏈紑濮�.ObjToInt()));
- //闈炵敓浜ч鏂欒浆鎹�
- CreateMap<ERPPickOutOrderDTO, Dt_PickOutOrder>().ForMember(x => x.EmployeeName, b => b.MapFrom(b => b.Creater)).ForMember(x => x.OutOrderStatus, b => b.MapFrom(b => OutOrderStatusEnum.鏈紑濮�.ObjToInt()));
- CreateMap<PickDetailItem, Dt_PickOutOrderDetail>().ForMember(x => x.DetailId, b => b.MapFrom(b => b.DetailId)).ForMember(x => x.Quantity, b => b.MapFrom(b => b.MaterialQty)).ForMember(x => x.PickOutDetailStatus, b => b.MapFrom(b => OutOrderStatusEnum.鏈紑濮�.ObjToInt()));
- //閿�鍞��璐у疄浣撹浆鎹�
- CreateMap<ERPProDeliverBackDTO, Dt_ProDeliverBackOrder>().ForMember(x => x.EmployeeName, b => b.MapFrom(b => b.Creater)).ForMember(x => x.DeliveryBackStatus, b => b.MapFrom(b => InOrderStatusEnum.鏈紑濮�.ObjToInt())).ForMember(x => x.OrderType, b => b.MapFrom(b => b.DeliveryType));
- CreateMap<DeliveryBackDetailItem, Dt_ProDeliverBackOrderDetail>().ForMember(x => x.DeliverCode, b => b.MapFrom(b => b)).ForMember(x => x.Quantity, b => b.MapFrom(b => b.MaterialQty)).ForMember(x => x.DeliverBackDetailStatus, b => b.MapFrom(b => InOrderStatusEnum.鏈紑濮�.ObjToInt()));
- //闈為噰璐敓浜у叆搴撳疄浣撹浆鎹�
- CreateMap<ERPInboundOrderDTO, Dt_InboundOrder>().ForMember(x => x.InboundOrderStatus, b => b.MapFrom(b => InOrderStatusEnum.鏈紑濮�.ObjToInt())).ForMember(x => x.UpperOrderNo, b => b.MapFrom(b => b.InboundCode));
- CreateMap<InboundDetailItem, Dt_InboundOrderDetail>().ForMember(x => x.OrderQuantity, b => b.MapFrom(b => b.MaterialQty)).ForMember(x => x.OrderDetailStatus, b => b.MapFrom(b => InOrderStatusEnum.鏈紑濮�.ObjToInt())).ForMember(x => x.MaterialThick, b => b.MapFrom(b => b.Thickness)).ForMember(x => x.MaterialWide, b => b.MapFrom(b => b.Wide)).ForMember(x => x.MaterialWeight, b => b.MapFrom(b => b.Weight)).ForMember(x => x.OrderQuantity, b => b.MapFrom(b => b.MaterialQty));
- //鍗氭�濋�氱紦瀛橀噰璐浆鎹�
- CreateMap<Dt_InboundOrderDetail, Dt_YLInboundCache>().ForMember(x => x.Id, b => b.MapFrom(b => 0)).ForMember(x => x.BindStatus, b => b.MapFrom(b => WhetherEnum.False.ObjToInt())).ForMember(x => x.RfidCode, b => b.MapFrom(b => "")).ForMember(x => x.MaterialNo, b => b.MapFrom(b => b.MaterialCode)).ForMember(x => x.InvOrg, b => b.MapFrom(b => MaterielInvOrgEnum.鏂板巶.ToString()));
- //鍗氭�濋�氬嚭搴撹鎯呰�佸巶鍑哄簱绾夸綋缂撳瓨杞崲
- CreateMap<Dt_OutStockLockInfo, Dt_OutLineView>().ForMember(x => x.Id, b => b.MapFrom(b => 0));
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj"
index 7904fd2..e312e4a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj"
@@ -59,9 +59,8 @@
<ProjectReference Include="..\WIDESEA_BasicService\WIDESEA_BasicService.csproj" />
<ProjectReference Include="..\WIDESEA_CheckService\WIDESEA_CheckService.csproj" />
<ProjectReference Include="..\WIDESEA_External\WIDESEA_External.csproj" />
- <ProjectReference Include="..\WIDESEA_InboundService\WIDESEA_InboundService.csproj" />
- <ProjectReference Include="..\WIDESEA_OutboundService\WIDESEA_OutboundService.csproj" />
<ProjectReference Include="..\WIDESEA_RecordService\WIDESEA_RecordService.csproj" />
+ <ProjectReference Include="..\WIDESEA_SortOrderService\WIDESEA_SortOrderService.csproj" />
<ProjectReference Include="..\WIDESEA_StockService\WIDESEA_StockService.csproj" />
<ProjectReference Include="..\WIDESEA_SystemService\WIDESEA_SystemService.csproj" />
<ProjectReference Include="..\WIDESEA_TaskInfoService\WIDESEA_TaskInfoService.csproj" />
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json"
index 1df1ee1..0c638a9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMSServices/WIDESEA_WMSServer/appsettings.json"
@@ -13,7 +13,7 @@
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
//"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_HUAIAN;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
-"ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSFL;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+"ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSFengLv;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=192.168.35.3;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=Sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//鏃MS鏁版嵁搴撹繛鎺�
//"TeConnectionString": "Data Source=10.30.4.92;Initial Catalog=TeChuang;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
@@ -26,9 +26,8 @@
"IPs": "http://127.0.0.1:8080,http://localhost:8080,http://127.0.0.1:8081,http://localhost:8081"
},
"WCS": "http://localhost:9291",
- "MESLoginToken": "1_3048943f-9175-4727-8c3d-f80784d0b7ef",
"LogAopEnable": false,
- "PrintSql": true, //鎵撳嵃SQL璇彞
+ "PrintSql": false, //鎵撳嵃SQL璇彞
"ApiName": "WIDESEA",
"ExpMinutes": 360,
"QuartzJobAutoStart": true,
--
Gitblit v1.9.3