From f51582d5b4b498f28513f215f91828ef181df4a1 Mon Sep 17 00:00:00 2001
From: Huangxiaoqiang-03 <1247017146@qq.com>
Date: 星期三, 06 十一月 2024 17:16:09 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs | 4
代码管理/WMS/WIDESEA_WMSClient/src/extension/basic/locationInfo.js | 17
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs | 4
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/roadwayInfo.vue | 35 +-
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue | 13
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs | 15
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/LocationStatusChangeRecordSetvice.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs | 4
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue | 25 -
代码管理/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue | 30 -
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 8
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs | 55 ++--
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/areaRouter.vue | 12
代码管理/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 4
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 29 +-
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/AreaInfoController.cs | 4
代码管理/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_hty.vue | 4
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs | 123 ++++++---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 6
代码管理/WMS/WIDESEA_WMSClient/src/extension/basic/extend/GetLocationStatus.vue | 46 ++-
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue | 7
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 4
代码管理/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue | 39 +-
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue | 59 ----
代码管理/WMS/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneTaskCommand.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 117 ++++++---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs | 1
/dev/null | 0
代码管理/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue | 2
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue | 16
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs | 4
34 files changed, 353 insertions(+), 348 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue"
index 976c064..d82dbd0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue"
@@ -85,14 +85,14 @@
field: "taskNum",
title: "浠诲姟鍙�",
type: "int",
- width: 90,
+ width: 80,
align: "left",
},
{
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
- width: 200,
+ width: 150,
align: "left",
},
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_hty.vue"
index 768f508..e09a75d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_hty.vue"
@@ -85,14 +85,14 @@
field: "taskNum",
title: "浠诲姟鍙�",
type: "int",
- width: 90,
+ width: 80,
align: "left",
},
{
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
- width: 200,
+ width: 150,
align: "left",
},
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/82242488-18b2-4b8c-8e8a-7a4fdd15fb8d.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/82242488-18b2-4b8c-8e8a-7a4fdd15fb8d.vsidx"
deleted file mode 100644
index 5494217..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/82242488-18b2-4b8c-8e8a-7a4fdd15fb8d.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/af58cea9-a26d-4385-bef3-6624f0803a43.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/af58cea9-a26d-4385-bef3-6624f0803a43.vsidx"
deleted file mode 100644
index 4dce131..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/af58cea9-a26d-4385-bef3-6624f0803a43.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d616aa61-dca5-4e9c-a56b-6e4beb5c2afb.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d616aa61-dca5-4e9c-a56b-6e4beb5c2afb.vsidx"
deleted file mode 100644
index 6009c67..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d616aa61-dca5-4e9c-a56b-6e4beb5c2afb.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/e5043e1a-f8b6-46b3-a047-7f231afbd3a8.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/e5043e1a-f8b6-46b3-a047-7f231afbd3a8.vsidx"
deleted file mode 100644
index c9bea16..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/e5043e1a-f8b6-46b3-a047-7f231afbd3a8.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/System/API\350\257\267\346\261\202/2024-11-04/\344\273\273\345\212\241\345\217\226\346\266\210241104.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/System/API\350\257\267\346\261\202/2024-11-04/\344\273\273\345\212\241\345\217\226\346\266\210241104.txt"
deleted file mode 100644
index 87c3170..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/System/API\350\257\267\346\261\202/2024-11-04/\344\273\273\345\212\241\345\217\226\346\266\210241104.txt"
+++ /dev/null
@@ -1,5 +0,0 @@
-2024/11/4 16:11:06.462
-璇锋眰寮傚父
-{"璇锋眰鎶ユ枃":468,"鎺ユ敹鎶ユ枃":"","閿欒":"The operation has timed out."}
--------------------------------
-
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/System/API\350\257\267\346\261\202/2024-11-04/\344\273\273\345\212\241\345\256\214\346\210\220241104.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/System/API\350\257\267\346\261\202/2024-11-04/\344\273\273\345\212\241\345\256\214\346\210\220241104.txt"
deleted file mode 100644
index f460e05..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/System/API\350\257\267\346\261\202/2024-11-04/\344\273\273\345\212\241\345\256\214\346\210\220241104.txt"
+++ /dev/null
@@ -1,30 +0,0 @@
-2024/11/4 16:01:24.644
-璇锋眰寮傚父
-{"璇锋眰鎶ユ枃":468,"鎺ユ敹鎶ユ枃":"","閿欒":"The remote server returned an error: (404) Not Found."}
--------------------------------
-
-2024/11/4 16:02:28.243
-璇锋眰寮傚父
-{"璇锋眰鎶ユ枃":468,"鎺ユ敹鎶ユ枃":"","閿欒":"The remote server returned an error: (404) Not Found."}
--------------------------------
-
-2024/11/4 16:06:59.981
-璇锋眰寮傚父
-{"璇锋眰鎶ユ枃":468,"鎺ユ敹鎶ユ枃":"","閿欒":"The remote server returned an error: (404) Not Found."}
--------------------------------
-
-2024/11/4 16:10:01.759
-璇锋眰寮傚父
-{"璇锋眰鎶ユ枃":468,"鎺ユ敹鎶ユ枃":"","閿欒":"The remote server returned an error: (404) Not Found."}
--------------------------------
-
-2024/11/4 16:22:28.173
-璇锋眰寮傚父
-{"璇锋眰鎶ユ枃":"","鎺ユ敹鎶ユ枃":"","閿欒":"The operation has timed out."}
--------------------------------
-
-2024/11/4 16:32:07.425
-璇锋眰寮傚父
-{"璇锋眰鎶ユ枃":"","鎺ユ敹鎶ユ枃":"","閿欒":"The operation has timed out."}
--------------------------------
-
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index b7ab9a6..565201e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -400,7 +400,7 @@
try
{
Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
- if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
+ if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�!");
return UpdateTaskStatusToNext(task);
}
catch (Exception ex)
@@ -602,7 +602,7 @@
}
finally
{
- WriteLog.GetLog("瀹屾垚浠诲姟").Write(JsonConvert.SerializeObject(content), "瀹屾垚浠诲姟");
+ WriteLog.GetLog("瀹屾垚浠诲姟").Write($"鎿嶄綔浜猴細{(App.User.UserId > 0 ? App.User.UserName : "")}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "瀹屾垚浠诲姟");
}
return content;
}
@@ -705,7 +705,7 @@
}
finally
{
- WriteLog.GetLog("鍙栨秷浠诲姟").Write(JsonConvert.SerializeObject(content), "鍙栨秷浠诲姟");
+ WriteLog.GetLog("鍙栨秷浠诲姟").Write($"鎿嶄綔浜猴細{(App.User.UserId > 0 ? App.User.UserName : "")}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "鍙栨秷浠诲姟");
}
}
/// <summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 6900e9a..de73de8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -1,5 +1,6 @@
锘縰sing HslCommunication;
using Microsoft.AspNetCore.Components.Routing;
+using Newtonsoft.Json;
using Quartz;
using SqlSugar.Extensions;
using System;
@@ -7,8 +8,10 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Net;
+using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.Log;
using WIDESEA_Core.Enums;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_ITaskInfoRepository;
@@ -97,6 +100,7 @@
catch (Exception ex)
{
//Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
+ WriteLog.GetLog("鍫嗗灈鏈哄紓甯�").Write($"{nameof(CommonStackerCraneJob)}:{ex.Message}", "鍫嗗灈鏈哄紓甯�");
}
return Task.CompletedTask;
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs"
index c4b537f..4dd2e42 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs"
@@ -114,7 +114,6 @@
for (int i = 0; i < devicePros.Count; i++)
{
object readStatus = speStackerCrane.Communicator.ReadAsObj(devicePros[i].DeviceProAddress, devicePros[i].DeviceDataType);
- //todo 鍗忚鏄庣粏淇℃伅鏈幏鍙栧埌鏃舵姏鍑哄紓甯�
DeviceProtocolDetailDTO? deviceProtocolDetail = speStackerCrane.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == devicePros[i].DeviceProParamName) ?? throw new Exception();
deviceProtocolDetail = speStackerCrane.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == devicePros[i].DeviceProParamType && x.ProtocalDetailValue.Equals(readStatus.ToString()));
if (deviceProtocolDetail != null)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneTaskCommand.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneTaskCommand.cs"
index bcdd8c1..468fd74 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneTaskCommand.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneTaskCommand.cs"
@@ -76,7 +76,7 @@
/// <summary>
/// 鎵樼洏鍙�
/// </summary>
- [DataLength(25)]
+ [DataLength(30)]
public string Barcode { get; set; }
#endregion <Public Menber>
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient.zip" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient.zip"
deleted file mode 100644
index 8ccc7a0..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient.zip"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/extend/GetLocationStatus.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/extend/GetLocationStatus.vue"
index 84c031e..9e14d8e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/extend/GetLocationStatus.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/extend/GetLocationStatus.vue"
@@ -120,6 +120,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "modifier",
@@ -136,6 +137,7 @@
width: 160,
align: "left",
hidden: true,
+ sort: true,
},
{
field: "remark",
@@ -146,6 +148,18 @@
hidden: true,
},
],
+ paginations: {
+ sort: "CreateDate",
+ order: "desc",
+ Foots: "",
+ total: 0,
+ // 2020.08.29澧炲姞鑷畾涔夊垎椤垫潯澶у皬
+ sizes: [30, 60, 100, 120],
+ size: 30, // 榛樿鍒嗛〉澶у皬
+ Wheres: [],
+ page: 1,
+ rows: 30,
+ },
dictionaryList: null,
};
},
@@ -187,22 +201,22 @@
});
},
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.field]);
- console.log(dicItem);
- if (dicItem) {
- return dicItem.value;
- }
- else {
- return row[column.field];
- }
- } else {
- return row[column.field];
- }
- }
- },
+ 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.field]);
+ console.log(dicItem);
+ if (dicItem) {
+ return dicItem.value;
+ }
+ else {
+ return row[column.field];
+ }
+ } else {
+ return row[column.field];
+ }
+ }
+ },
},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/locationInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/locationInfo.js"
index 33a4ed0..d805115 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/locationInfo.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/locationInfo.js"
@@ -20,31 +20,30 @@
let EnableBtn = this.buttons.find(x => x.value == 'Enable');
if (EnableBtn) {
EnableBtn.onClick = function () {
- if (this.selection.length === 0) {
- return this.$message.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
- }
- var keys = this.selection.map((item) => item.id); // 鑾峰彇閫変腑琛岀殑id
-
+ let rows = this.$refs.table.getSelected();
+ if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
+ var keys = rows.map(x => { return x.id });
this.http
.post("api/LocationInfo/LocationEnableStatus", keys, "鏁版嵁澶勭悊涓�")
.then((x) => {
if (!x.status) return this.$message.error(x.message);
this.$message.success("鎿嶄綔鎴愬姛");
+ this.refresh();
});
}
}
let DisableBtn = this.buttons.find(x => x.value == 'Disable');
if (DisableBtn) {
DisableBtn.onClick = function () {
- if (this.selection.length === 0) {
- return this.$message.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
- }
- var keys = this.selection.map((item) => item.id); // 鑾峰彇閫変腑琛岀殑id
+ let rows = this.$refs.table.getSelected();
+ if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
+ var keys = rows.map(x => { return x.id });
this.http
.post("api/LocationInfo/LocationDisableStatus", keys, "鏁版嵁澶勭悊涓�")
.then((x) => {
if (!x.status) return this.$message.error(x.message);
this.$message.success("鎿嶄綔鎴愬姛");
+ this.refresh();
});
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue"
index 6772d31..a69db19 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue"
@@ -111,19 +111,19 @@
align: "left",
},
{
+ field: "areaCode",
+ title: "鍖哄煙缂栧彿",
+ type: "string",
+ width: 80,
+ align: "left",
+ },
+ {
field: "warehouseId",
title: "浠撳簱涓婚敭",
type: "string",
width: 90,
align: "left",
bind:{ key: "warehouse", data: [] },
- },
- {
- field: "areaCode",
- title: "鍖哄煙缂栧彿",
- type: "string",
- width: 150,
- align: "left",
},
{
field: "areaName",
@@ -167,6 +167,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "modifier",
@@ -181,6 +182,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "remark",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaRouter.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaRouter.vue"
index 9dd18a6..3d3cbf1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaRouter.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaRouter.vue"
@@ -36,11 +36,11 @@
const editFormOptions = ref([
[
{title: "璧风偣",required: true,field: "startArea",type: "string",},
- {title: "缁堢偣鍖哄煙ID",required: true,field: "nextArea",type: "string",},
+ {title: "缁堢偣鍖哄煙ID",required: true,field: "nextArea",type: "select",dataKey: "areainfo",data: [],},
],
[
- {title: "璺敱绫诲瀷",field: "routerType",type: "select",dataKey: "locationStatusEnum",data: [],},
+ {title: "璺敱绫诲瀷",field: "routerType",type: "like"},
{title: "鏄惁涓虹粓鐐�",field: "isEnd",type: "select",dataKey: "enable",data: [],}
],
]);
@@ -54,10 +54,11 @@
const searchFormOptions = ref([
[
{title: "璧风偣",required: true,field: "startArea",type: "string",},
- {title: "缁堢偣鍖哄煙ID",required: true,field: "nextArea",type: "string",},
+ {title: "缁堢偣鍖哄煙ID",field: "nextArea",type: "select",dataKey: "areainfo",data: [],},
+ // {title: "缁堢偣鍖哄煙ID",required: true,field: "nextArea",type: "string",},
],
[
- {title: "璺敱绫诲瀷",field: "routerType",type: "select",dataKey: "locationStatusEnum",data: [],},
+ {title: "璺敱绫诲瀷",field: "routerType",type: "like"},
{title: "鏄惁涓虹粓鐐�",field: "isEnd",type: "select",dataKey: "enable",data: [],}
],
]);
@@ -85,6 +86,7 @@
type: "string",
width: 150,
align: "left",
+ bind:{ key: "areainfo", data: [] },
},
{
field: "routerType",
@@ -122,6 +124,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "modifier",
@@ -136,6 +139,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "remark",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
index acca645..f59fabe 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
@@ -38,10 +38,10 @@
});
const editFormOptions = ref([
[
- {title: "鍖哄煙涓婚敭",required: true,field: "areaId",type: "string",},
{title: "缂撳瓨鐐圭紪鍙�",required: true,field: "pointCode",type: "string",},
+ {title: "鍖哄煙涓婚敭",required: true,field: "areaId",type: "string",},
{title: "缂撳瓨鐐圭姸鎬�",field: "pointStatus",type: "select",dataKey: "locationStatusEnum",data: [],},
- {title: "鏄惁绂佺敤",field: "enableStatus",type: "select",dataKey: "enableEnum",data: [],},
+ {title: "鏄惁绂佺敤",field: "enableStatus",type: "select",dataKey: "enableStatusEnum",data: [],},
],[
{ title: "琛�", field: "row", type: "string" },
{ title: "鍒�", field: "column", type: "string" },
@@ -61,10 +61,10 @@
});
const searchFormOptions = ref([
[
- {title: "鍖哄煙涓婚敭",field: "areaId",type: "string",},
{title: "缂撳瓨鐐圭紪鍙�",field: "pointCode",type: "string",},
+ {title: "鍖哄煙涓婚敭",field: "areaId",type: "select",dataKey: "areainfo",data: [],},
{title: "缂撳瓨鐐圭姸鎬�",field: "pointStatus",type: "select",dataKey: "locationStatusEnum",data: [],},
- {title: "鏄惁绂佺敤",field: "enableStatus",type: "select",dataKey: "enableEnum",data: [],},
+ {title: "鏄惁绂佺敤",field: "enableStatus",type: "select",dataKey: "enableStatusEnum",data: [],},
],[
{ title: "琛�", field: "row", type: "string" },
{ title: "鍒�", field: "column", type: "string" },
@@ -89,6 +89,7 @@
type: "int",
width: 90,
align: "left",
+ bind:{ key: "areainfo", data: [] },
},
{
field: "pointCode",
@@ -111,7 +112,7 @@
type: "decimal",
width: 90,
align: "left",
- bind: { key: "enableEnum", data: [] },
+ bind: { key: "enableStatusEnum", data: [] },
},
{
field: "row",
@@ -161,6 +162,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "modifier",
@@ -175,6 +177,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "remark",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
index 6bc9995..138c4ac 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
@@ -66,10 +66,7 @@
type: "string",
width: 90,
align: "left",
- bind: {
- key: "areainfo",
- data: []
- }
+ bind: {key: "areainfo",data: []}
},
{
field: "locationCode",
@@ -161,6 +158,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "modifier",
@@ -175,6 +173,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "remark",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/roadwayInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/roadwayInfo.vue"
index 332e099..4ecdf4a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/roadwayInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/roadwayInfo.vue"
@@ -62,7 +62,9 @@
field: "enalbeStatus",
type: "string",
readonly: true,
- },
+ dataKey: "enableStatusEnum",
+ data: [],
+ },
],
[
{
@@ -100,20 +102,19 @@
const searchFormOptions = ref([
[
{ title: "宸烽亾缂栧彿", field: "roadwayNo", type: "like" },
- { title: "浠撳簱涓婚敭", field: "warehouseId", type: "like" },
- { title: "绂佺敤鐘舵��", field: "enalbeStatus", type: "like" },
+ // { title: "浠撳簱涓婚敭", field: "warehouseId", type: "like" },
+ { title: "绂佺敤鐘舵��", field: "enableStatus",type: "select",dataKey: "enableStatusEnum",data: [],},
{ title: "璁惧缂栧彿", field: "deviceNo", type: "like" },
],
[
{ title: "鍏ュ簱绔欏彴缂栧彿", field: "inStationCode", type: "like" },
{ title: "鍫嗗灈鏈哄叆搴撶珯鍙扮紪鍙�", field: "inSCStationCode", type: "like" },
- { title: "鍑哄簱绔欏彴缂栧彿", field: "outStationCode", type: "like" },
- {
- title: "鍫嗗灈鏈哄嚭搴撶珯鍙扮紪鍙�",
- field: "outSCStationCode",
- type: "like",
- },
+
],
+ [
+ { title: "鍑哄簱绔欏彴缂栧彿", field: "outStationCode", type: "like" },
+ { title: "鍫嗗灈鏈哄嚭搴撶珯鍙扮紪鍙�",field: "outSCStationCode",type: "like",},
+ ]
]);
const columns = ref([
{
@@ -133,17 +134,17 @@
width: 90,
align: "left",
},
- {
- field: "warehouseId",
- title: "浠撳簱涓婚敭",
- type: "string",
- width: 150,
- align: "left",
- },
+ // {
+ // field: "warehouseId",
+ // title: "浠撳簱涓婚敭",
+ // type: "string",
+ // width: 150,
+ // align: "left",
+ // },
{
field: "enableStatus",
title: "绂佺敤鐘舵��",
- type: "string",
+ type: "select",
width: 150,
align: "left",
bind: { key: "enableStatusEnum", data: [] },
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index 3569acc..ca9d5bd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -24,7 +24,7 @@
cnName: "鍏ュ簱鍗�",
name: "inboundOrder",
url: "/InboundOrder/",
- sortName: "id",
+ sortName: "CreateDate",
});
const editFormFields = ref({
orderType: "",
@@ -96,7 +96,7 @@
data: [],
},
{ title: "鍒涘缓鑰�", field: "creater", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datatime" },
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
const columns = ref([
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
index 9405c8b..0a1977b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
@@ -24,7 +24,7 @@
cnName: "鍑哄簱鍗�",
name: "outboundOrder",
url: "/OutboundOrder/",
- sortName: "id",
+ sortName: "CreateDate",
});
const editFormFields = ref({
orderType: "",
@@ -105,7 +105,7 @@
data: [],
},
{ title: "鍒涘缓鑰�", field: "creater", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datatime" },
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
const columns = ref([
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue"
index f5a4fce..fdda8c0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue"
@@ -24,7 +24,7 @@
cnName: "璐т綅鐘舵�佸彉鍔ㄨ褰�",
name: "locationStatusChangeRecord",
url: "/LocationStatusChangeRecord/",
- sortName: "id",
+ sortName: "CreateDate",
});
const editFormFields = ref({
deviceCode: "",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
index 118f9bf..ea40703 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue"
@@ -24,7 +24,7 @@
cnName: "搴撳瓨鍙樺姩淇℃伅璁板綍",
name: "stockQuantityChangeRecord",
url: "/StockQuantityChangeRecord/",
- sortName: "id",
+ sortName: "CreateDate",
});
const editFormFields = ref({
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
index 0adaf93..eed82b6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
@@ -24,7 +24,7 @@
cnName: "搴撳瓨淇℃伅",
name: "stockInfo",
url: "/StockInfo/",
- sortName: "id",
+ sortName: "CreateDate",
});
const editFormFields = ref({
deviceCode: "",
@@ -37,63 +37,16 @@
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: "",
+ palletCode: "",
+ locationCode: "",
});
const searchFormOptions = ref([
[
- { title: "璁惧缂栧彿", field: "deviceCode" },
- { title: "璁惧绫诲瀷", field: "deviceType" },
- { title: "璁惧鐘舵��", field: "deviceStatus" },
+ { title: "鎵樼洏缂栧彿", field: "palletCode" },
+ { title: "璐т綅缂栧彿", field: "locationCode" },
],
]);
const columns = ref([
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
index 26d463e..eb1d413 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue"
@@ -24,7 +24,7 @@
cnName: "搴撳瓨瑙嗗浘",
name: "stockView",
url: "/stockView/",
- sortName: "stockId",
+ sortName: "CreateDate",
});
const editFormFields = ref({
palletCode: "",
@@ -32,26 +32,7 @@
locationName: "",
});
const editFormOptions = ref([
- [
- {
- title: "鎵樼洏缂栧彿",
- required: true,
- field: "palletCode",
- type: "string",
- },
- {
- title: "璐т綅缂栧彿",
- required: true,
- field: "locationCode",
- type: "string",
- },
- {
- title: "璐т綅鍚嶇О",
- required: true,
- field: "locationName",
- type: "string",
- },
- ],
+
]);
const searchFormFields = ref({
palletCode: "",
@@ -61,6 +42,8 @@
[
{ title: "鎵樼洏缂栧彿", field: "palletCode" },
{ title: "璐т綅缂栧彿", field: "locationCode" },
+ { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
+ { title: "搴撳瓨鐘舵��", field: "stockStatus" ,type: "selectList",dataKey: "stockStatusEmun",data: [],},
],
]);
const columns = ref([
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
index 819f5f2..b684958 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
@@ -45,30 +45,16 @@
[
{ title: "浠诲姟鍙�", field: "taskNum", type: "int" },
{ title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
- {
- title: "浠诲姟绫诲瀷",
- field: "taskType",
- type: "selectList",
- dataKey: "taskTypeEnum",
- data: [],
- },
- {
- title: "浠诲姟鐘舵��",
- field: "taskStatus",
- type: "selectList",
- dataKey: "taskStatusEnum",
- data: [],
- },
+ { title: "鍒涘缓浜�", field: "creater", type: "like" },
+ ],
+ [
+ { title: "浠诲姟绫诲瀷",field: "taskType",type: "selectList",dataKey: "taskTypeEnum",data: [],},
+ { title: "浠诲姟鐘舵��",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
+ { title: "宸烽亾鍙�", field: "roadway", type: "like" },
],
[
{ title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
{ title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
- { title: "褰撳墠浣嶇疆", field: "currentAddress", type: "like" },
- { title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "like" },
- ],
- [
- { title: "宸烽亾鍙�", field: "roadway", type: "like" },
- { title: "鍒涘缓浜�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
@@ -87,14 +73,14 @@
field: "taskNum",
title: "浠诲姟鍙�",
type: "int",
- width: 90,
+ width: 80,
align: "left",
},
{
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
- width: 200,
+ width: 150,
align: "left",
},
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
index da21a07..d24a17b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
@@ -42,33 +42,19 @@
createDate: "",
});
const searchFormOptions = ref([
- [
+ [
{ title: "浠诲姟鍙�", field: "taskNum", type: "int" },
{ title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
- {
- title: "浠诲姟绫诲瀷",
- field: "taskType",
- type: "selectList",
- dataKey: "taskTypeEnum",
- data: [],
- },
- {
- title: "浠诲姟鐘舵��",
- field: "taskStatus",
- type: "selectList",
- dataKey: "taskStatusEnum",
- data: [],
- },
+ { title: "鍒涘缓浜�", field: "creater", type: "like" },
+ ],
+ [
+ { title: "浠诲姟绫诲瀷",field: "taskType",type: "selectList",dataKey: "taskTypeEnum",data: [],},
+ { title: "浠诲姟鐘舵��",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
+ { title: "宸烽亾鍙�", field: "roadway", type: "like" },
],
[
{ title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
{ title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
- { title: "褰撳墠浣嶇疆", field: "currentAddress", type: "like" },
- { title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "like" },
- ],
- [
- { title: "宸烽亾鍙�", field: "roadway", type: "like" },
- { title: "鍒涘缓浜�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
@@ -87,14 +73,14 @@
field: "taskNum",
title: "浠诲姟鍙�",
type: "int",
- width: 90,
+ width: 80,
align: "left",
},
{
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
- width: 200,
+ width: 150,
align: "left",
},
{
@@ -164,6 +150,13 @@
align: "left",
},
{
+ field: "depth",
+ title: "娣卞害",
+ type: "int",
+ width: 80,
+ align: "left",
+ },
+ {
field: "dispatchertime",
title: "浠诲姟涓嬪彂鏃堕棿",
type: "datetime",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/00ab07ce-7bba-41c6-b253-e738d0e18292.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/00ab07ce-7bba-41c6-b253-e738d0e18292.vsidx"
deleted file mode 100644
index b71958d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/00ab07ce-7bba-41c6-b253-e738d0e18292.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2fd3f4bb-dd88-4d45-8bb4-44ba1e161435.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2fd3f4bb-dd88-4d45-8bb4-44ba1e161435.vsidx"
deleted file mode 100644
index 7636958..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2fd3f4bb-dd88-4d45-8bb4-44ba1e161435.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/53c83226-20bf-47f8-9fd2-174b5f2870f8.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/53c83226-20bf-47f8-9fd2-174b5f2870f8.vsidx"
deleted file mode 100644
index 5b27906..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/53c83226-20bf-47f8-9fd2-174b5f2870f8.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/71c2dff7-d30c-413a-bdc7-223613afcd73.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/71c2dff7-d30c-413a-bdc7-223613afcd73.vsidx"
deleted file mode 100644
index c97d5a4..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/71c2dff7-d30c-413a-bdc7-223613afcd73.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/cf988643-dd5c-4993-87df-dfdde268200d.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/cf988643-dd5c-4993-87df-dfdde268200d.vsidx"
deleted file mode 100644
index 758b52c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/cf988643-dd5c-4993-87df-dfdde268200d.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs"
index 6f58879..f071b2d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs"
@@ -47,7 +47,7 @@
List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => keys.Contains(x.Id));
locationInfos.ForEach(x =>
{
- x.EnableStatus = EnableEnum.Enable.ObjToInt();
+ x.EnableStatus = EnableStatusEnum.Normal.ObjToInt();
});
Repository.UpdateData(locationInfos);
@@ -59,7 +59,7 @@
List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => keys.Contains(x.Id));
locationInfos.ForEach(x =>
{
- x.EnableStatus = EnableEnum.Disable.ObjToInt();
+ x.EnableStatus = EnableStatusEnum.Disable.ObjToInt();
});
Repository.UpdateData(locationInfos);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
index 2e875d6..f473d5d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
@@ -39,17 +39,17 @@
{
try
{
- Dt_RoadwayInfo roadwayInfo = _basicRepository.RoadwayInfoRepository.QueryFirst(x => x.InStationCode == stationCode) ?? throw new Exception("鏈壘鍒拌绔欏彴瀵瑰簲鐨勫贩閬擄紝璇锋鏌ュ熀纭�閰嶇疆淇℃伅");
+ Dt_RoadwayInfo roadwayInfo = _basicRepository.RoadwayInfoRepository.QueryFirst(x => x.InStationCode == stationCode) ?? throw new Exception("鏈壘鍒拌绔欏彴瀵瑰簲鐨勫贩閬擄紝璇锋鏌ュ熀纭�閰嶇疆淇℃伅!");
if (roadwayInfo.EnableStatus != EnableStatusEnum.Normal.ObjToInt() && roadwayInfo.EnableStatus != EnableStatusEnum.OnlyIn.ObjToInt())
{
- throw new Exception("璇ュ贩閬撲笉鍙叆搴擄紝璇锋鏌ュ贩閬撶鐢ㄤ俊鎭�");
+ throw new Exception("璇ュ贩閬撲笉鍙叆搴擄紝璇锋鏌ュ贩閬撶鐢ㄤ俊鎭�!");
}
if (roadwayInfo.AreaId > 0)
{
Dt_AreaInfo areaInfo = _basicRepository.AreaInfoRepository.QueryFirst(x => x.Id == roadwayInfo.AreaId);
if (areaInfo != null && areaInfo.AreaStatus == EnableEnum.Disable.ObjToInt())
{
- throw new Exception("鍖哄煙琚鐢紝涓嶅彲鍏ュ簱");
+ throw new Exception("鍖哄煙琚鐢紝涓嶅彲鍏ュ簱!");
}
}
if (inboundType == TaskTypeEnum.PalletInbound.ObjToInt())//绌虹洏鍏ュ簱鍒嗛厤閫昏緫
@@ -63,7 +63,7 @@
}
catch (Exception ex)
{
-
+ throw new Exception(ex.Message);
}
return null;
@@ -78,19 +78,19 @@
List<LocationGroupDTO> locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.Pallet);
if (locationGroups != null && locationGroups.Count > 0)
{
- LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusA == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt());
+ LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt()|| x.EnableStatusA == EnableStatusEnum.OnlyIn.ObjToInt());
int id = locationGroup?.IdA ?? 0;
return BaseDal.QueryFirst(x => x.Id == id);
}
locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.Free);
if (locationGroups != null && locationGroups.Count > 0)
{
- LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusB == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt());
+ LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt()||x.EnableStatusB == EnableStatusEnum.OnlyIn.ObjToInt());
int id = locationGroup?.IdB ?? 0;
return BaseDal.QueryFirst(x => x.Id == id);
}
- return BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo == roadway), _emptyAssignOrderBy);
+ return BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()||x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() && x.RoadwayNo == roadway), _emptyAssignOrderBy);
}
private Dt_LocationInfo StoredAssignLocation(string roadway)
@@ -115,13 +115,12 @@
public Dt_LocationInfo AdjacentDepthLocation(string locationCode)
{
- Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationCode == locationCode);
- return AdjacentDepthLocation(locationInfo);
+ return AdjacentDepthLocation(BaseDal.QueryFirst(x => x.LocationCode == locationCode));
}
public Dt_LocationInfo AdjacentDepthLocation(Dt_LocationInfo locationInfo)
{
- return BaseDal.QueryFirst(x => x.RoadwayNo == locationInfo.RoadwayNo && x.Column == locationInfo.Column && x.Layer == locationInfo.Layer && x.Depth != locationInfo.Depth && x.Row != locationInfo.Row && (SqlFunc.Abs(x.Row - locationInfo.Row) == 1));
+ return BaseDal.QueryFirst(x => x.Column == locationInfo.Column && x.RoadwayNo == locationInfo.RoadwayNo && x.Layer == locationInfo.Layer && x.Depth != locationInfo.Depth && x.Row != locationInfo.Row && (SqlFunc.Abs(x.Row - locationInfo.Row) == 1));
}
public void UpdateLocationLock(Dt_LocationInfo locations, int TaskNum,int changType,bool black)
{
@@ -159,7 +158,7 @@
}
catch (Exception ex)
{
- throw ex;
+ throw new Exception(ex.Message);
}
}
@@ -181,65 +180,99 @@
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(result, beforeStatusEnd, changType, "", TaskNum);
}
}
+ else
+ {
+ if (result != null&&(result.LocationStatus== LocationStatusEnum.Lock.ObjToInt()|| result.LocationStatus==LocationStatusEnum.PalletLock.ObjToInt()))
+ {
+ int beforeStatusEnd = result.LocationStatus;
+
+ result.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+
+ BaseDal.UpdateData(result);
+
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(result, beforeStatusEnd, changType, "", TaskNum);
+ }
+ }
}
catch (Exception ex)
{
- throw ex;
+ throw new Exception(ex.Message);
}
}
public Dt_LocationInfo isDepth(Dt_LocationInfo locationInfo)
{
- if (locationInfo.Depth == 2)
+ try
{
- return AdjacentDepthLocation(locationInfo.LocationCode);
+ if (locationInfo.Depth == 2)
+ {
+ return AdjacentDepthLocation(locationInfo.LocationCode);
+ }
+ else
+ {
+ return null;
+ }
}
- else
+ catch (Exception ex)
{
- return null;
+ throw new Exception(ex.Message);
}
}
public void RelocationLock(Dt_LocationInfo locationInfo, Dt_LocationInfo locationInfos, int TaskNum)
{
- int beforeStartStatus = locationInfo.LocationStatus;
- int beforeEndStatus = locationInfos.LocationStatus;
-
- locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
-
- if (beforeStartStatus == LocationStatusEnum.Pallet.ObjToInt())
+ try
{
- locationInfos.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
- locationInfo.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
- }
- else
- {
- locationInfos.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
+ int beforeStartStatus = locationInfo.LocationStatus;
+ int beforeEndStatus = locationInfos.LocationStatus;
+
locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
+
+ if (beforeStartStatus == LocationStatusEnum.Pallet.ObjToInt())
+ {
+ locationInfos.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
+ locationInfo.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
+ }
+ else
+ {
+ locationInfos.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
+ locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
+ }
+
+ BaseDal.UpdateData(locationInfo);
+ BaseDal.UpdateData(locationInfos);
+
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStartStatus, StockChangeType.Relocation.ObjToInt(), "", TaskNum);
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, beforeEndStatus, StockChangeType.Relocation.ObjToInt(), "", TaskNum);
}
-
- BaseDal.UpdateData(locationInfo);
- BaseDal.UpdateData(locationInfos);
-
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStartStatus, StockChangeType.Relocation.ObjToInt(), "", TaskNum);
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, beforeEndStatus, StockChangeType.Relocation.ObjToInt(), "", TaskNum);
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
}
public void RelocationFree(Dt_LocationInfo locations, int TaskNum)
{
- int beforeEndStatus = locations.LocationStatus;
-
- if(locations.LocationStatus== LocationStatusEnum.Lock.ObjToInt())
+ try
{
- locations.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ int beforeEndStatus = locations.LocationStatus;
+
+ if (locations.LocationStatus == LocationStatusEnum.Lock.ObjToInt())
+ {
+ locations.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ }
+ else
+ {
+ locations.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
+ }
+
+
+ BaseDal.UpdateData(locations);
+
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locations, beforeEndStatus, StockChangeType.Relocation.ObjToInt(), "", TaskNum);
}
- else
+ catch (Exception ex)
{
- locations.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
+ throw new Exception(ex.Message);
}
-
-
- BaseDal.UpdateData(locations);
-
- _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locations, beforeEndStatus, StockChangeType.Relocation.ObjToInt(), "", TaskNum);
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
index 681b8e3..e974d51 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
@@ -891,7 +891,7 @@
{
if (propertyInfo.Name == nameof(BaseEntity.Modifier))
{
- propertyInfo.SetValue(obj, App.User.UserId > 0 ? App.User.UserName : App.User.UserId.ToString());
+ propertyInfo.SetValue(obj, App.User.UserId > 0 ? App.User.UserName : "System");
}
else if (propertyInfo.Name == nameof(BaseEntity.ModifyDate))
{
@@ -940,7 +940,7 @@
{
if (propertyInfo.Name == nameof(BaseEntity.Modifier))
{
- propertyInfo.SetValue(obj, App.User.UserId > 0 ? App.User.UserName : App.User.UserId.ToString());
+ propertyInfo.SetValue(obj, App.User.UserId > 0 ? App.User.UserName : "System");
}
else if (propertyInfo.Name == nameof(BaseEntity.ModifyDate))
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
index 4cd9c3e..a8c5962 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
@@ -102,10 +102,6 @@
else if (inboundOrder.OrderStatus == InboundStatusEnum.鏈紑濮�.ObjToInt())
{
inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱涓�.ObjToInt();
- for (int i = 0; i < inboundOrderDetails.Count; i++)
- {
- _inboundOrderDetailService.Repository.DeleteAndMoveIntoHty(inboundOrderDetails[i], App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- }
}
content = MaterielGroupUpdateData(inboundOrder, inboundOrderDetails, stockInfo);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/LocationStatusChangeRecordSetvice.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/LocationStatusChangeRecordSetvice.cs"
index 7c98f6b..219a70a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/LocationStatusChangeRecordSetvice.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/LocationStatusChangeRecordSetvice.cs"
@@ -78,7 +78,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- List<Dt_LocationStatusChangeRecord> location=BaseDal.QueryData(x=>x.LocationId== id).ToList();
+ List<Dt_LocationStatusChangeRecord> location=BaseDal.QueryData(x=>x.LocationId== id).OrderByDescending(x=>x.CreateDate).ToList();
return content = WebResponseContent.Instance.OK(data: location);
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs"
index 6980e7a..8f2f430 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs"
@@ -17,32 +17,39 @@
{
public void AddStockChangeRecord(Dt_StockInfo stockInfo, List<Dt_StockInfoDetail> stockInfoDetails, decimal beforeQuantity, decimal totalQuantity, StockChangeType changeType,int taskNum)
{
- List<Dt_StockQuantityChangeRecord> stockQuantityChangeRecords = new List<Dt_StockQuantityChangeRecord>();
- stockQuantityChangeRecords = _mapper.Map<List<Dt_StockQuantityChangeRecord>>(stockInfoDetails);
- int index = 0;
- decimal currentQuantity = 0;
- stockQuantityChangeRecords.ForEach(x =>
- {
- x.PalleCode = stockInfo.PalletCode;
- x.BeforeQuantity = beforeQuantity;
- if (totalQuantity > beforeQuantity)
+ try
+ {
+ List<Dt_StockQuantityChangeRecord> stockQuantityChangeRecords = new List<Dt_StockQuantityChangeRecord>();
+ stockQuantityChangeRecords = _mapper.Map<List<Dt_StockQuantityChangeRecord>>(stockInfoDetails);
+ int index = 0;
+ decimal currentQuantity = 0;
+ stockQuantityChangeRecords.ForEach(x =>
{
- x.ChangeQuantity = stockInfoDetails[index].StockQuantity;
- currentQuantity += stockInfoDetails[index].StockQuantity;
- x.AfterQuantity = stockInfoDetails[index].StockQuantity + beforeQuantity;
- }
- else
- {
- x.ChangeQuantity = -stockInfoDetails[index].StockQuantity;
- currentQuantity -= stockInfoDetails[index].StockQuantity;
- x.AfterQuantity = beforeQuantity - stockInfoDetails[index].StockQuantity;
- }
+ x.PalleCode = stockInfo.PalletCode;
+ x.BeforeQuantity = beforeQuantity;
+ if (totalQuantity > beforeQuantity)
+ {
+ x.ChangeQuantity = stockInfoDetails[index].StockQuantity;
+ currentQuantity += stockInfoDetails[index].StockQuantity;
+ x.AfterQuantity = stockInfoDetails[index].StockQuantity + beforeQuantity;
+ }
+ else
+ {
+ x.ChangeQuantity = -stockInfoDetails[index].StockQuantity;
+ currentQuantity -= stockInfoDetails[index].StockQuantity;
+ x.AfterQuantity = beforeQuantity - stockInfoDetails[index].StockQuantity;
+ }
- x.ChangeType = changeType.ObjToInt();
- beforeQuantity += x.ChangeQuantity;
- x.TaskNum = taskNum;
- });
- BaseDal.AddData(stockQuantityChangeRecords);
+ x.ChangeType = changeType.ObjToInt();
+ beforeQuantity += x.ChangeQuantity;
+ x.TaskNum = taskNum;
+ });
+ BaseDal.AddData(stockQuantityChangeRecords);
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
index b244f87..74a7584 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
@@ -33,7 +33,6 @@
SourceAddress = outTask.TargetAddress,
TargetAddress = cachePoint.PointCode,
SourceKey = outTask.TaskId,
- //TaskNum = outTask.TaskNum,
TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
TaskStatus = AGVTaskStatusEnum.AGV_New.ObjToInt(),
TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
@@ -129,18 +128,18 @@
Dt_AreaRouter areaRouter = _basicService.AreaRouterService.Repository.QueryFirst(x => x.StartArea == startPoint);
if (areaRouter == null)
{
- throw new Exception("鏈壘鍒拌矾鐢变俊鎭�");
+ throw new Exception("鏈壘鍒拌矾鐢变俊鎭�!");
}
Dt_AreaInfo areaInfo = _basicService.AreaInfoService.Repository.QueryFirst(x => x.AreaCode == areaRouter.NextArea);
if (areaInfo == null)
{
- throw new Exception("鏈壘鍒颁笅涓�鍖哄煙淇℃伅");
+ throw new Exception("鏈壘鍒颁笅涓�鍖哄煙淇℃伅!");
}
Dt_CachePoint? cachePoint = _basicService.CachePointService.AssignCachePoint(areaInfo.Id);
if (cachePoint == null)
{
- throw new Exception("鏈壘鍒扮┖闂茬紦瀛樼偣");
+ throw new Exception("鏈壘鍒扮┖闂茬紦瀛樼偣!");
}
return cachePoint;
@@ -151,18 +150,18 @@
Dt_AreaRouter areaRouter = _basicService.AreaRouterService.Repository.QueryFirst(x => x.NextArea == endPoint);
if (areaRouter == null)
{
- throw new Exception("鏈壘鍒拌矾鐢变俊鎭�");
+ throw new Exception("鏈壘鍒拌矾鐢变俊鎭�!");
}
Dt_AreaInfo areaInfo = _basicService.AreaInfoService.Repository.QueryFirst(x => x.AreaCode == areaRouter.StartArea);
if (areaInfo == null)
{
- throw new Exception("鏈壘鍒拌捣鐐圭紦瀛樺尯鍩熶俊鎭�");
+ throw new Exception("鏈壘鍒拌捣鐐圭紦瀛樺尯鍩熶俊鎭�!");
}
Dt_CachePoint? cachePoint = _basicService.CachePointService.GetIbStockCachePoint(areaInfo.Id);
if (cachePoint == null)
{
- throw new Exception("鏈壘鍒版湁璐х紦瀛樼偣");
+ throw new Exception("鏈壘鍒版湁璐х紦瀛樼偣!");
}
return cachePoint;
}
@@ -172,7 +171,7 @@
Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == Convert.ToInt32(model.Task_id));
if (task == null)
{
- return new { code = 404, message = "鏈壘鍒拌浠诲姟" };
+ return new { code = 404, message = "鏈壘鍒拌浠诲姟!" };
}
Dt_CachePoint startCachePoint = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == task.SourceAddress);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
index fee17ac..f297e69 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
@@ -41,7 +41,7 @@
{
return WebResponseContent.Instance.Error("鏈壘鍒拌浠诲姟绫诲瀷涓氬姟");
}
- return WebResponseContent.Instance.Error("閿欒");
+ return WebResponseContent.Instance.Error($"閿欒");
}
/// <summary>
@@ -61,7 +61,7 @@
}
catch (Exception ex)
{
- content = WebResponseContent.Instance.Error(ex.Message);
+ content = WebResponseContent.Instance.Error($"{ex.Message}");
}
return content;
}
@@ -84,7 +84,7 @@
}
catch (Exception ex)
{
- content = WebResponseContent.Instance.Error(ex.Message);
+ content = WebResponseContent.Instance.Error($"{ex.Message}");
}
return content;
}
@@ -106,9 +106,9 @@
{
_unitOfWorkManage.BeginTran();
Dt_LocationInfo? locationInfo = _basicService.LocationInfoService.AssignLocation(stationCode, taskType);
- //Dt_LocationInfo dt_LocationInfo = null;
if (locationInfo != null)
{
+ List<Dt_Task> tasks = new List<Dt_Task>();
Dt_Task task = new()
{
CurrentAddress = stationCode,
@@ -125,8 +125,6 @@
BaseDal.AddData(task);
int beforeStatus = locationInfo.LocationStatus;
-
-
if (isUpdateStock)
{
locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
@@ -156,9 +154,10 @@
}
}
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
- List<Dt_Task> tasks = new List<Dt_Task>();
+
tasks.Add(task);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), orderNo, task.TaskNum);
+
var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", tasks, "鍏ュ簱浠诲姟涓嬪彂");
if (!response.Status)
{
@@ -190,40 +189,40 @@
{
if (BaseDal.QueryFirst(x => x.PalletCode == palletCode) != null)
{
- return (false, "璇ユ墭鐩樺彿宸叉湁浠诲姟");
+ return (false, "璇ユ墭鐩樺彿宸叉湁浠诲姟!");
}
if (BaseDal.QueryFirst(x => (x.SourceAddress == stationCode || x.CurrentAddress == stationCode) && x.TaskStatus == InTaskStatusEnum.InNew.ObjToInt()) != null)
{
- return (false, "褰撳墠鍏ュ簱绔欏彴宸叉湁涓�鏉℃柊寤轰换鍔�");
+ return (false, "褰撳墠鍏ュ簱绔欏彴宸叉湁涓�鏉℃柊寤轰换鍔�!");
}
if (isCheckStock)
{
if (stockInfo == null)
{
- return (false, "鏈壘鍒扮粍鐩樹俊鎭�");
+ return (false, "鏈壘鍒扮粍鐩樹俊鎭�!");
}
if (stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt())
{
- return (false, "璇ョ粍鐩樼姸鎬佷笉鍙叆搴�");
+ return (false, "璇ョ粍鐩樼姸鎬佷笉鍙叆搴�!");
}
if (!string.IsNullOrEmpty(stockInfo.LocationCode))
{
- return (false, "璇ユ墭鐩樺凡缁戝畾璐т綅");
+ return (false, "璇ユ墭鐩樺凡缁戝畾璐т綅!");
}
if (stockInfo.Details == null || stockInfo.Details.Count == 0)
{
- return (false, "娌℃湁搴撳瓨鏄庣粏淇℃伅");
+ return (false, "娌℃湁搴撳瓨鏄庣粏淇℃伅!");
}
}
else
{
if (_stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == palletCode) != null)
{
- return (false, "璇ユ墭鐩樺凡瀛樺湪搴撳唴");
+ return (false, "璇ユ墭鐩樺凡瀛樺湪搴撳唴!");
}
}
- return (true, "鎴愬姛");
+ return (true, "鎴愬姛!");
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
index e21b334..e2f1ba4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
@@ -74,12 +74,12 @@
if (outboundOrderDetail == null)
{
- throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
+ throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅!");
}
if (stockSelectViews.Sum(x => x.UseableQuantity) > outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity)
{
- throw new Exception("閫夋嫨鏁伴噺瓒呭嚭鍗曟嵁鏁伴噺");
+ throw new Exception("閫夋嫨鏁伴噺瓒呭嚭鍗曟嵁鏁伴噺!");
}
List<Dt_StockInfo>? stockInfos = null;
Dt_OutboundOrderDetail? orderDetail = null;
@@ -104,7 +104,7 @@
}
else
{
- throw new Exception("鏃犲簱瀛�");
+ throw new Exception("鏃犲簱瀛�!");
}
}
else
@@ -138,7 +138,7 @@
}
catch (Exception ex)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ return WebResponseContent.Instance.Error($"{ex.Message}");
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index e9b04ca..41f4c02 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -113,22 +113,22 @@
return WebResponseContent.Instance.Error(response.Message);
}
_unitOfWorkManage.CommitTran();
- return content=responseContent;
+ return content = responseContent;
}
_unitOfWorkManage.CommitTran();
- return content=responseContent;
+ return content = responseContent;
}
}
- return content=WebResponseContent.Instance.Error("鏈壘鍒颁换鍔＄被鍨嬪搴斾笟鍔″鐞嗛�昏緫");
+ return content = WebResponseContent.Instance.Error("鏈壘鍒颁换鍔＄被鍨嬪搴斾笟鍔″鐞嗛�昏緫");
}
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- return content=WebResponseContent.Instance.Error(ex.Message);
+ return content = WebResponseContent.Instance.Error(ex.Message);
}
finally
{
- WriteLog.GetLog("浠诲姟瀹屾垚").Write(JsonConvert.SerializeObject(content), "浠诲姟瀹屾垚");
+ WriteLog.GetLog("浠诲姟瀹屾垚").Write($"鎿嶄綔浜猴細{(App.User.UserId>0? App.User.UserName: "System")}{ Environment.NewLine}{ JsonConvert.SerializeObject(content)}", "浠诲姟瀹屾垚");
}
}
public WebResponseContent TaskCancel(int taskNum)
@@ -175,12 +175,13 @@
}
finally
{
- WriteLog.GetLog("浠诲姟鍙栨秷").Write(JsonConvert.SerializeObject(content), "浠诲姟鍙栨秷");
+ WriteLog.GetLog("浠诲姟鍙栨秷").Write($"鎿嶄綔浜猴細{(App.User.UserId > 0 ? App.User.UserName : "System")}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "浠诲姟鍙栨秷");
}
}
public WebResponseContent UpdateTaskStatus(int taskNum)
{
+ WebResponseContent content = new WebResponseContent();
try
{
Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
@@ -204,10 +205,17 @@
{
throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
}
- return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔＄被鍨嬪搴斾笟鍔″鐞嗛�昏緫");
+ _unitOfWorkManage.BeginTran();
+ task.Dispatchertime = DateTime.Now;
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+ BaseDal.UpdateData(task);
+ _unitOfWorkManage.CommitTran();
+ return content = WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -268,13 +276,12 @@
PalletCode = task.PalletCode,
LocationCode = task.TargetAddress,
StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt(),
- Creater = App.User.UserId > 0 ? "" : "System",
+ Creater = App.User.UserId > 0 ? App.User.UserName : "System",
CreateDate = App.User.UserId > 0 ? DateTime.Now : DateTime.Now,
};
Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
CheckCompleted(stockInfo, locationInfo);
-
_stockService.StockInfoService.Repository.AddData(stockInfo);
@@ -340,21 +347,16 @@
stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
_stockService.StockInfoService.Repository.UpdateData(stockInfo);
int beforeStatus = locationInfo.LocationStatus;
- if (task.Depth != 1)
+ if (locationInfo.Depth == 2)
{
- if (!DepthTask(task))
- {
- locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ if (DepthTask(locationInfo) == false)
+ {
_basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
- _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
+
}
}
- else
- {
- locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- //_basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
- _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
- }
+ locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
task.TaskStatus = OutTaskStatusEnum.OutFinish.ObjToInt();
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
@@ -364,10 +366,11 @@
beforeQuantity = stockInfo.Details.Where(x => x.Id != 0).Sum(x => x.StockQuantity);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
- _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) - beforeQuantity, StockChangeType.Outbound,task.TaskNum);
+ _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) - beforeQuantity, StockChangeType.Outbound, task.TaskNum);
_unitOfWorkManage.CommitTran();
return OnOutboundTaskCompleted?.Invoke(task) ?? WebResponseContent.Instance.OK();
+
}
catch (Exception ex)
{
@@ -389,10 +392,15 @@
int beforeStatus = locationInfo.LocationStatus;
+ if (locationInfo.Depth == 2)
+ {
+ if (DepthTask(locationInfo) == false)
+ {
+ _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
+ }
+ }
locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
-
task.TaskStatus = OutTaskStatusEnum.OutFinish.ObjToInt();
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
@@ -418,12 +426,28 @@
Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
Dt_LocationInfo locationEnd = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
+ Dt_LocationInfo locationStart = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
CheckCompleted(stockInfo, locationEnd);
stockInfo.LocationCode = locationEnd.LocationCode;
stockInfo.StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt();
_stockService.StockInfoService.Repository.UpdateData(stockInfo);
+
+ if (locationStart.Depth == 1)
+ {
+ if (DepthTask(locationStart) == false)
+ {
+ locationStart.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.LocationInfoService.RelocationFree(locationEnd, task.TaskNum);
+ _basicService.LocationInfoService.Repository.UpdateData(locationStart);
+ }
+ else
+ {
+ locationStart.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.LocationInfoService.Repository.UpdateData(locationStart);
+ }
+ }
_basicService.LocationInfoService.RelocationFree(locationEnd, task.TaskNum);
@@ -460,7 +484,10 @@
int beforeStatus = locationInfo.LocationStatus;
locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Inbound.ObjToInt(), false);
+ if (locationInfo.Depth == 2)
+ {
+ _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
+ }
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
task.TaskStatus = InTaskStatusEnum.InCancel.ObjToInt();
@@ -490,7 +517,10 @@
int beforeStatus = locationInfo.LocationStatus;
locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
+ if (locationInfo.Depth == 2)
+ {
+ _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
+ }
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
task.TaskStatus = InTaskStatusEnum.InCancel.ObjToInt();
@@ -530,6 +560,13 @@
_stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
int beforeStatus = locationInfo.LocationStatus;
+ if (locationInfo.Depth == 2)
+ {
+ if (DepthTask(locationInfo) == false)
+ {
+ _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), true);
+ }
+ }
locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
@@ -565,8 +602,14 @@
int beforeStatus = locationInfo.LocationStatus;
+ if (locationInfo.Depth == 2)
+ {
+ if (DepthTask(locationInfo) == false)
+ {
+ _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), true);
+ }
+ }
locationInfo.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
- //_basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), true);
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
stockInfo.StockStatus = StockStatusEmun.宸插叆搴�.ObjToInt();
@@ -616,31 +659,19 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
- public bool DepthTask(Dt_Task task)
+ public bool DepthTask(Dt_LocationInfo location)
{
- Dt_LocationInfo location=_locationInfoService.Repository.QueryFirst(x=>x.LocationCode == task.SourceAddress);
- if(location != null)
+ if (location != null )
{
- if(location.Row%2==0)
+ Dt_LocationInfo locations = _locationInfoService.Repository.QueryFirst(x => x.RoadwayNo == location.RoadwayNo && x.Column == location.Column && x.Layer == location.Layer && x.Depth != location.Depth && x.Row != location.Row && (SqlFunc.Abs(x.Row - location.Row) == 1));
+ if (locations != null)
{
- Dt_LocationInfo locations = _locationInfoService.Repository.QueryFirst(x => x.Row == location.Row - 1 && x.Layer == location.Layer && x.Column == location.Column && x.RoadwayNo == location.RoadwayNo);
- Dt_Task tasks=BaseDal.QueryFirst(x=>x.SourceAddress == locations.LocationCode);
- return tasks != null ? true : false;
- }
- else
- {
- Dt_LocationInfo locations = _locationInfoService.Repository.QueryFirst(x => x.Row == location.Row + 1 && x.Layer == location.Layer && x.Column == location.Column && x.RoadwayNo == location.RoadwayNo);
Dt_Task tasks = BaseDal.QueryFirst(x => x.SourceAddress == locations.LocationCode);
return tasks != null ? true : false;
}
}
- else
- {
- return false;
- }
-
+ return false;
}
-
public WebResponseContent GetTaskInfo()
{
WebResponseContent content = new WebResponseContent();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/AreaInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/AreaInfoController.cs"
index 8ac6eb5..abd7296 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/AreaInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/AreaInfoController.cs"
@@ -34,13 +34,13 @@
}
[HttpGet(), Route("AreaEnableStatus")]
- public WebResponseContent AreaEnableStatus(int key)
+ public WebResponseContent AreaEnableStatus([FromBody] int key)
{
return Service.AreaEnableStatus(key);
}
[HttpGet, Route("AreaDisableStatus")]
- public WebResponseContent AreaDisableStatus(int key)
+ public WebResponseContent AreaDisableStatus([FromBody] int key)
{
return Service.AreaDisableStatus(key);
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
index df466ee..2d0a5ee 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
@@ -48,12 +48,12 @@
return locations;
}
[HttpPost, Route("LocationEnableStatus")]
- public WebResponseContent LocationEnableStatus(int[] keys)
+ public WebResponseContent LocationEnableStatus([FromBody] int[] keys)
{
return Service.LocationEnableStatus(keys); ;
}
[HttpPost, Route("LocationDisableStatus")]
- public WebResponseContent LocationDisableStatus(int[] keys)
+ public WebResponseContent LocationDisableStatus([FromBody] int[] keys)
{
return Service.LocationDisableStatus(keys); ;
}
--
Gitblit v1.9.3