From 89051aef8a2c1a85d457914cf6317fe70e0e321c Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期日, 29 十二月 2024 04:33:10 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/测试架仓/GroundStationJob_CSJ.cs | 30 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/LocationStatusChangeRecordController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7d106012-debf-45da-af92-3040d723f8a8.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/WMSTaskDTO.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 8
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SqlsugarSetup.cs | 9
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs | 36 -
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetail_HtyController.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs | 12
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs | 3
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/2fb78268-22d5-49b6-a616-9b2ce8001792.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderController.cs | 3
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs | 8
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderDetailController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/MaterielInfoController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/WIDESEA_IInboundService.csproj | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 84 +---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs | 11
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockViewController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrder_HtyController.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrder_HtyController.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_CSJ.cs | 10
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderDetailController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs | 3
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVExtend.cs | 4
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/82835ef7-7fbf-4f8d-820f-864028c498bd.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/SupplierInfoController.cs | 3
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/油墨仓/StackerCraneJob_YM.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderDetailController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderDetail_HtyController.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/StockQuantityChangeRecordController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 8
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/UserInfoController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs | 7
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_TenantController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfo_HtyController.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGVController.cs | 16
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/油墨仓/CommonHoisterJob.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs | 3
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 12
项目资料/设备协议/~$阻焊仓堆垛机通信协议.xlsx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7cbecfdf-aa8f-477e-97c5-c98d196bc584.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/Logger.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_MenuController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs | 8
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs | 11
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/Task_HtyController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 92 ++++-
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService2.cs | 399 ++++++++++++++++++++++++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs | 23
/dev/null | 17 -
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_LogController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetailController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetail_HtyController.cs | 2
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9497be76-23d9-4711-8cd9-ce4560cabb6e.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ce31cc25-eb57-4d5c-84f0-523faa1628bd.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/CustomerInfoController.cs | 3
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/测试架仓/StackerCraneJob_CSJ.cs | 19
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs | 3
75 files changed, 748 insertions(+), 205 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/2fb78268-22d5-49b6-a616-9b2ce8001792.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/2fb78268-22d5-49b6-a616-9b2ce8001792.vsidx"
new file mode 100644
index 0000000..b00b547
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/2fb78268-22d5-49b6-a616-9b2ce8001792.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/4a20dff1-21c1-4155-a046-64d2b9450c27.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/4a20dff1-21c1-4155-a046-64d2b9450c27.vsidx"
deleted file mode 100644
index 7617cfa..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/4a20dff1-21c1-4155-a046-64d2b9450c27.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/9e5bb932-a2ae-42b5-8ed0-09de9b346dc6.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/9e5bb932-a2ae-42b5-8ed0-09de9b346dc6.vsidx"
deleted file mode 100644
index 859b039..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/9e5bb932-a2ae-42b5-8ed0-09de9b346dc6.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/read.lock" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock"
deleted file mode 100644
index e69de29..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock"
+++ /dev/null
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs"
index 5ce53ea..15ffa48 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs"
@@ -56,5 +56,7 @@
public int WarehouseId { get; set; }
public string AGVArea { get; set; }
+
+ public int PalletType { get; set; }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGVController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGVController.cs"
index 27f8999..9b15909 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGVController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGVController.cs"
@@ -46,12 +46,18 @@
if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
{
var content = TakeRequest(task.CurrentAddress);
- if (!content.Status) throw new Exception(content.Message);
+ if (!content.Status)
+ {
+ throw new Exception(content.Message);
+ }
}
else
{
var content = PutRequest(task.NextAddress, task.PalletType);
- if (!content.Status) throw new Exception(content.Message);
+ if (!content.Status)
+ {
+ throw new Exception(content.Message);
+ }
}
task.TaskState = TaskStatusEnum.AGV_WaitToExecute.ObjToInt();
var up = _taskRepository.UpdateData(task);
@@ -92,6 +98,7 @@
if (!content.Status) throw new Exception(content.Message);
task.TaskState = TaskStatusEnum.AGV_Finish.ObjToInt();
var up = _taskRepository.DeleteAndMoveIntoHty(task, OperateTypeEnum.鑷姩瀹屾垚);
+ _taskService.TaskCompleted(task.TaskNum);
agvResponseContent.Code = up ? "0" : "1";
agvResponseContent.Message = up ? "鎴愬姛" : "澶辫触";
return agvResponseContent;
@@ -100,8 +107,10 @@
case "end"://鍏ュ簱鏍规嵁杩欎釜淇″彿鍒ゆ柇鏀捐揣瀹屾垚
if (task.TaskType != TaskTypeEnum.Outbound.ObjToInt())
{
- var content = PutFinish(task.CurrentAddress);
+ var content = PutFinish(task.NextAddress);
if (!content.Status) throw new Exception(content.Message);
+ task.CurrentAddress = task.NextAddress;
+ task.NextAddress = "";
task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
var up = _taskRepository.UpdateData(task);
agvResponseContent.Code = up ? "0" : "1";
@@ -160,7 +169,6 @@
else
{
otherDevice.SetValue(GroundStationDBName.W_PutRequest, true, stationManger.StationCode);
- otherDevice.SetValue(GroundStationDBName.W_PutPalletType, (short)palletType, stationManger.StationCode);
Thread.Sleep(1000);
canPut = otherDevice.GetValue<GroundStationDBName, bool>(GroundStationDBName.R_IsCanPut, stationManger.StationCode);
if (canPut)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
index 6f5ab5c..f36a589 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs"
@@ -24,7 +24,9 @@
WebResponseContent content = new WebResponseContent();
try
{
- string apiAddress = "http://10.30.4.29:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask";// AppSettings.Get(APIEnum.AgvSendTask.ToString());
+ string? apiAddress = apiInfos.FirstOrDefault(x => x.ApiCode == APIEnum.AgvSendTask.ToString())?.ApiAddress;
+ if (string.IsNullOrEmpty(apiAddress))
+ return WebResponseContent.Instance.Error($"鏈壘鍒板彂閫丄GV浠诲姟鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�"); // AppSettings.Get(APIEnum.AgvSendTask.ToString());
string response = HttpHelper.Post(apiAddress, taskModel.Serialize());
AgvResponseContent agvContent = response.DeserializeObject<AgvResponseContent>();
if (agvContent.Code == "0")
@@ -59,7 +61,9 @@
WebResponseContent content = new WebResponseContent();
try
{
- string apiAddress = "http://10.30.4.29:8182/rcms/services/rest/hikRpcService/continueTask";// AppSettings.Get(APIEnum.AgvSecureReply.ToString());
+ string? apiAddress = apiInfos.FirstOrDefault(x => x.ApiCode == APIEnum.AgvSecureReply.ToString())?.ApiAddress;
+ if (string.IsNullOrEmpty(apiAddress))
+ return WebResponseContent.Instance.Error($"鏈壘鍒板彂閫丄GV浠诲姟鎺ュ彛,璇锋鏌ユ帴鍙ｉ厤缃�"); // AppSettings.Get(APIEnum.AgvSendTask.ToString());// AppSettings.Get(APIEnum.AgvSecureReply.ToString());
string response = HttpHelper.Post(apiAddress, secureReplyModel.Serialize());
AgvResponseContent agvContent = response.DeserializeObject<AgvResponseContent>();
if (agvContent.Code == "0")
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 f7e3c24..f5ec2dd 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"
@@ -186,7 +186,7 @@
}
else
{
- if(item.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+ if (item.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
List<Dt_Router> routers = _routerRepository.QueryData(x => x.InOutType == item.TaskType && item.AGVArea == x.NextPosi);
if (routers.FirstOrDefault() == null)
@@ -197,6 +197,7 @@
task.NextAddress = router?.StartPosi ?? "";
task.DeviceCode = item.RoadWay;
+ task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
}
else
{
@@ -206,9 +207,16 @@
return WebResponseContent.Instance.Error($"鏈壘鍒拌矾鐢遍厤缃俊鎭�");
}
router = routers.FirstOrDefault();
+ string stationCode = router?.NextPosi ?? "";
+ Dt_StationManger? stationManger = _stationMangerRepository.QueryFirst(x => x.StationCode == stationCode);
+ if (stationManger == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒扮珯鍙伴厤缃俊鎭�");
+ }
- task.NextAddress = router?.NextPosi ?? "";
+ task.NextAddress = stationManger?.AGVStationCode ?? "";
task.DeviceCode = "AGV";
+ task.TaskState = TaskStatusEnum.AGV_Execute.ObjToInt();
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVExtend.cs"
index 7d4b8c3..5c19b97 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVExtend.cs"
@@ -101,11 +101,11 @@
{
switch (DeviceCode)
{
- case "SC01_CSJ":
+ case "AGV_CSJ":
{
return TaskType == TaskTypeEnum.ProductionReturn.ObjToInt() ? "23" : "24";
}
- case "SC01_ZH":
+ case "AGV_ZH":
{
if (TaskType == TaskTypeEnum.InboundXB.ObjToInt())
return "20";
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\262\271\345\242\250\344\273\223/CommonHoisterJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\262\271\345\242\250\344\273\223/CommonHoisterJob.cs"
index 1be248c..c12061d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\262\271\345\242\250\344\273\223/CommonHoisterJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\262\271\345\242\250\344\273\223/CommonHoisterJob.cs"
@@ -129,7 +129,7 @@
task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
_taskRepository.UpdateData(task);
- bool isWrite = hoister.SetValue(HoisterDBName.RequestIn, false, deviceChildCode);
+ bool isWrite = hoister.SetValue(HoisterDBName.RequestOut, false, deviceChildCode);
}
else
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\262\271\345\242\250\344\273\223/StackerCraneJob_YM.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\262\271\345\242\250\344\273\223/StackerCraneJob_YM.cs"
index 1e8b0df..15e2e45 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\262\271\345\242\250\344\273\223/StackerCraneJob_YM.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\262\271\345\242\250\344\273\223/StackerCraneJob_YM.cs"
@@ -88,6 +88,7 @@
int oldState = task.TaskState;
task.TaskState = TaskStatusEnum.SC_Executing.ObjToInt();
task.ExceptionMessage = "";
+ task.Dispatchertime = DateTime.Now;
_taskRepository.UpdateData(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldState}銆戣浆鍒般�恵task.TaskState}銆�");
}
@@ -115,9 +116,9 @@
{
if (commonStackerCrane != null)
{
- WriteInfo(commonStackerCrane.DeviceName, $"璇诲彇鍒颁换鍔″畬鎴愪俊鍙�,{e.TaskNum}");
if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
{
+ WriteInfo(commonStackerCrane.DeviceName, $"璇诲彇鍒颁换鍔″畬鎴愪俊鍙�,{e.TaskNum}");
Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == e.TaskNum);
if (task != null)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\265\213\350\257\225\346\236\266\344\273\223/GroundStationJob_CSJ.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\265\213\350\257\225\346\236\266\344\273\223/GroundStationJob_CSJ.cs"
index 80a52fe..6409cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\265\213\350\257\225\346\236\266\344\273\223/GroundStationJob_CSJ.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\265\213\350\257\225\346\236\266\344\273\223/GroundStationJob_CSJ.cs"
@@ -61,7 +61,7 @@
if (item.StationType == StationTypeEnum.StationType_OnlyOutbound.ObjToInt())
{
- Dt_Task task = _taskRepository.QueryFirst(x => x.DeviceCode == item.StackerCraneCode && x.TaskState == TaskStatusEnum.New.ObjToInt() && string.IsNullOrEmpty(x.NextAddress));
+ Dt_Task task = _taskRepository.QueryFirst(x => x.DeviceCode == item.StackerCraneCode && x.TaskState == TaskStatusEnum.SC_Execute.ObjToInt() && string.IsNullOrEmpty(x.NextAddress));
if (task != null && isCanPut && !isCanTake && !putRequest && !putFinish && !takeRequest && !takeFinish)
{
string oldAddress = task.NextAddress;
@@ -74,13 +74,27 @@
}
if (item.StationType == StationTypeEnum.StationType_OnlyInbound.ObjToInt())
{
- Dt_Task task = _taskRepository.QueryFirst(x => x.TargetAddress == item.StackerCraneCode && x.TaskState == TaskStatusEnum.New.ObjToInt() && string.IsNullOrEmpty(x.NextAddress));
- if (task != null && isCanPut && !isCanTake && !putRequest && !putFinish && !takeRequest && !takeFinish)
+ Dt_Task task = _taskRepository.QueryFirst(x => (x.TargetAddress == item.StackerCraneCode || string.IsNullOrEmpty(x.TargetAddress) || x.NextAddress == item.StackerCraneCode || string.IsNullOrEmpty(x.NextAddress)) && (x.TaskState == TaskStatusEnum.New.ObjToInt() || x.TaskState == TaskStatusEnum.SC_Execute.ObjToInt()) && x.SourceAddress == item.StationCode);
+ if (task != null)
{
string oldAddress = task.NextAddress;
int oldStatus = task.TaskState;
- task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
- task.NextAddress = item.StationCode;
+ Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x => x.StationCode == item.StationCode);
+ if (stationManger == null)
+ {
+ WriteInfo(item.StationName, $"鏈壘鍒板搴旂珯鍙颁俊鎭�,璁惧缂栧彿:{item.StationCode},浠诲姟鍙�:{task.TaskNum}");
+ break;
+ }
+ string? locationCode = _taskService.RequestAssignLocation(task.TaskNum, stationManger.StackerCraneCode);
+ if (string.IsNullOrEmpty(locationCode))
+ {
+ WriteInfo(item.StationName, $"璇锋眰鍒嗛厤璐т綅杩斿洖淇℃伅閿欒,璁惧缂栧彿:{item.StationCode},浠诲姟鍙�:{task.TaskNum}");
+ break;
+ }
+ task.CurrentAddress = stationManger.StackerCraneStationCode;
+ task.TargetAddress = locationCode;
+ task.NextAddress = locationCode;
+ task.DeviceCode = stationManger.StackerCraneCode;
_taskRepository.UpdateData(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskNum, $"绯荤粺鑷姩娴佺▼,鐩爣鍦板潃鐢眥oldAddress}鍙樻洿涓簕task.NextAddress},浠诲姟鐘舵�佺敱{oldStatus}鍙樻洿涓簕task.TaskState}");
}
@@ -111,15 +125,19 @@
WriteInfo(item.StationName, $"璇锋眰鍒嗛厤璐т綅杩斿洖淇℃伅閿欒,璁惧缂栧彿:{item.StationCode},浠诲姟鍙�:{task.TaskNum}");
break;
}
+ string oldAddress = task.NextAddress;
+ int oldStatus = task.TaskState;
task.CurrentAddress = stationManger.StackerCraneStationCode;
task.TargetAddress = locationCode;
task.NextAddress = locationCode;
task.DeviceCode = stationManger.StackerCraneCode;
task.TaskState = TaskStatusEnum.SC_Execute.ObjToInt();
_taskRepository.UpdateData(task);
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskNum, $"绯荤粺鑷姩娴佺▼,鐩爣鍦板潃鐢眥oldAddress}鍙樻洿涓簕task.NextAddress},浠诲姟鐘舵�佺敱{oldStatus}鍙樻洿涓簕task.TaskState}");
}
}
- catch(Exception ex)
+ catch (Exception ex)
{
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\265\213\350\257\225\346\236\266\344\273\223/StackerCraneJob_CSJ.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\265\213\350\257\225\346\236\266\344\273\223/StackerCraneJob_CSJ.cs"
index 3cd1f34..7a42656 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\265\213\350\257\225\346\236\266\344\273\223/StackerCraneJob_CSJ.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\346\265\213\350\257\225\346\236\266\344\273\223/StackerCraneJob_CSJ.cs"
@@ -89,6 +89,8 @@
commonStackerCrane.LastTaskType = task.TaskType;
int oldState = task.TaskState;
task.TaskState = TaskStatusEnum.SC_Executing.ObjToInt();
+ task.Dispatchertime = DateTime.Now;
+ task.ExceptionMessage = "";
_taskRepository.UpdateData(task);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldState}銆戣浆鍒般�恵task.TaskState}銆�");
}
@@ -131,10 +133,17 @@
{
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
+ Dt_StationManger stationManger = _stationMangerRepository.QueryFirst(x => x.StackerCraneStationCode == task.NextAddress);
+ if(stationManger == null)
+ {
+ _taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"AGV绔欑偣鏈厤缃�,{task.NextAddress}");
+ _taskService.UpdateTaskExceptionMessage(taskNum, $"AGV绔欑偣鏈厤缃�,{task.NextAddress}");
+ return WebResponseContent.Instance.Error($"AGV绔欑偣鏈厤缃�,{task.NextAddress}");
+ }
int oldStatus = task.TaskState;
- task.DeviceCode = "AGV";
+ task.DeviceCode = "AGV_CSJ";
task.TaskState = TaskStatusEnum.AGV_Execute.ObjToInt();
- task.CurrentAddress = task.NextAddress;
+ task.CurrentAddress = stationManger.AGVStationCode;
task.NextAddress = task.TargetAddress;
_taskRepository.UpdateData(task);
_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"绯荤粺鑷姩娴佺▼,锛屼换鍔＄姸鎬佷粠銆恵oldStatus}銆戣浆鍒般�恵task.TaskState}銆�");
@@ -199,7 +208,7 @@
if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
- if (OutTaskStationIsOccupied(task) != null || true)
+ if (OutTaskStationIsOccupied(task) != null)
{
return task;
}
@@ -328,8 +337,8 @@
else
{
//鏁版嵁閰嶇疆閿欒
- _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鍑哄簱浠诲姟缁堢偣閿欒锛岃捣鐐癸細銆恵task.NextAddress}銆�");
- WriteInfo(task.DeviceCode, $"鍑哄簱浠诲姟缁堢偣閿欒锛岃捣鐐癸細銆恵task.NextAddress}銆�");
+ _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"鍑哄簱浠诲姟缁堢偣閿欒锛岀粓鐐癸細銆恵task.NextAddress}銆�");
+ WriteInfo(task.DeviceCode, $"鍑哄簱浠诲姟缁堢偣閿欒锛岀粓鐐癸細銆恵task.NextAddress}銆�");
return null;
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7cbecfdf-aa8f-477e-97c5-c98d196bc584.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7cbecfdf-aa8f-477e-97c5-c98d196bc584.vsidx"
new file mode 100644
index 0000000..15a03d3
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7cbecfdf-aa8f-477e-97c5-c98d196bc584.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7d106012-debf-45da-af92-3040d723f8a8.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7d106012-debf-45da-af92-3040d723f8a8.vsidx"
new file mode 100644
index 0000000..70aef67
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7d106012-debf-45da-af92-3040d723f8a8.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/82835ef7-7fbf-4f8d-820f-864028c498bd.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/82835ef7-7fbf-4f8d-820f-864028c498bd.vsidx"
new file mode 100644
index 0000000..95624bd
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/82835ef7-7fbf-4f8d-820f-864028c498bd.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9497be76-23d9-4711-8cd9-ce4560cabb6e.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9497be76-23d9-4711-8cd9-ce4560cabb6e.vsidx"
new file mode 100644
index 0000000..70aef67
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9497be76-23d9-4711-8cd9-ce4560cabb6e.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/996cb05a-4002-49d6-b075-bdc5451f77c7.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/996cb05a-4002-49d6-b075-bdc5451f77c7.vsidx"
deleted file mode 100644
index d13af6c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/996cb05a-4002-49d6-b075-bdc5451f77c7.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/ce31cc25-eb57-4d5c-84f0-523faa1628bd.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ce31cc25-eb57-4d5c-84f0-523faa1628bd.vsidx"
new file mode 100644
index 0000000..767693b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ce31cc25-eb57-4d5c-84f0-523faa1628bd.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/cefa9c6e-65e6-4f5e-8814-550d3e8d3f27.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/cefa9c6e-65e6-4f5e-8814-550d3e8d3f27.vsidx"
deleted file mode 100644
index bc11c4e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/cefa9c6e-65e6-4f5e-8814-550d3e8d3f27.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock"
deleted file mode 100644
index e69de29..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock"
+++ /dev/null
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_CSJ.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_CSJ.cs"
index c04414c..7ec54d5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_CSJ.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/AssignLocation/LocationInfoService_CSJ.cs"
@@ -190,23 +190,25 @@
case PalletTypeEnum.LargePallet:
{
List<Dt_LocationInfo> moreDepth = locations.Where(x => x.Depth > emptyLocation.Depth).ToList();
- moreDepthFlag = moreDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.InStock.ObjToInt() && x.LocationStatus != LocationStatusEnum.PalletLock.ObjToInt() && x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt()) == null;//鏌ヨ澶т簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓烘湁璐х殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娣辫揣浣嶆湁鏈浣跨敤鐨勬儏鍐�
+ moreDepthFlag = moreDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.InStock.ObjToInt() && x.LocationStatus != LocationStatusEnum.PalletLock.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt())) == null;//鏌ヨ澶т簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓烘湁璐х殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娣辫揣浣嶆湁鏈浣跨敤鐨勬儏鍐�
List<Dt_LocationInfo> littleDepth = locations.Where(x => x.Depth <= emptyLocation.Depth).ToList();
- littleDepthFlag = littleDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.Free.ObjToInt() && x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt()) == null; //鏌ヨ灏忎簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓虹┖锛屼笖绂佺敤鐘舵�佷笉涓虹鐢ㄤ互鍙婂彧鍏ョ殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娴呰揣浣嶈浣跨敤鎴栬�呰绂佺敤鐨勬儏鍐�
+ littleDepthFlag = littleDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt())) == null; //鏌ヨ灏忎簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓虹┖锛屼笖绂佺敤鐘舵�佷笉涓虹鐢ㄤ互鍙婂彧鍏ョ殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娴呰揣浣嶈浣跨敤鎴栬�呰绂佺敤鐨勬儏鍐�
}
break;
case PalletTypeEnum.MediumPallet:
case PalletTypeEnum.SmallPallet:
{
List<Dt_LocationInfo> moreDepth = locations.Where(x => x.Depth > emptyLocation.Depth).ToList();
- moreDepthFlag = moreDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.InStock.ObjToInt() && x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt()) == null;//鏌ヨ澶т簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓烘湁璐х殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娣辫揣浣嶆湁鏈浣跨敤鐨勬儏鍐�
+ moreDepthFlag = moreDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.InStock.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt())) == null;//鏌ヨ澶т簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓烘湁璐х殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娣辫揣浣嶆湁鏈浣跨敤鐨勬儏鍐�
List<Dt_LocationInfo> littleDepth = locations.Where(x => x.Depth <= emptyLocation.Depth).ToList();
- littleDepthFlag = littleDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.Free.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) == null; //鏌ヨ灏忎簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓虹┖锛屼笖绂佺敤鐘舵�佷笉涓虹鐢ㄤ互鍙婂彧鍏ョ殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娴呰揣浣嶈浣跨敤鎴栬�呰绂佺敤鐨勬儏鍐�
+ littleDepthFlag = littleDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt())) == null; //鏌ヨ灏忎簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓虹┖锛屼笖绂佺敤鐘舵�佷笉涓虹鐢ㄤ互鍙婂彧鍏ョ殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娴呰揣浣嶈浣跨敤鎴栬�呰绂佺敤鐨勬儏鍐�
}
break;
+ default:
+ throw new Exception($"鎵樼洏绫诲瀷閿欒");
}
if (moreDepthFlag && littleDepthFlag)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs"
index 863b7da..86bbdf2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs"
@@ -12,8 +12,7 @@
/// 1锛岀粍鐩樻殏瀛�<br/>
/// 2锛岀粍鐩樻挙閿�<br/>
/// 3锛屽叆搴撶‘璁�<br/>
- /// 4锛屽叆搴撴挙閿�<br/>
- /// 5锛屽凡鍏ュ簱<br/>
+ /// 4锛屽叆搴撴挙閿�<br/>
/// 6锛屽叆搴撳畬鎴�<br/>
/// 7锛屽嚭搴撻攣瀹�<br/>
/// 8锛屽嚭搴撳畬鎴�<br/>
@@ -33,9 +32,6 @@
[Description("鍏ュ簱鎾ら攢")]
鍏ュ簱鎾ら攢 = 4,
- [Description("宸插叆搴�")]
- 宸插叆搴� = 5,
-
[Description("鍏ュ簱瀹屾垚")]
鍏ュ簱瀹屾垚 = 6,
@@ -49,6 +45,9 @@
绉诲簱閿佸畾 = 9,
[Description("鍏ュ簱瀹屾垚鏈缓鍑哄簱鍗�")]
- 鍏ュ簱瀹屾垚鏈缓鍑哄簱鍗� = 10
+ 鍏ュ簱瀹屾垚鏈缓鍑哄簱鍗� = 10,
+
+ [Description("閫�搴�")]
+ 閫�搴� = 11,
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SqlsugarSetup.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SqlsugarSetup.cs"
index ebc105e..f2bb02c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SqlsugarSetup.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SqlsugarSetup.cs"
@@ -51,9 +51,14 @@
Parallel.For(0, 1, e =>
{
MiniProfiler.Current.CustomTiming("SQL锛�", GetParas(p) + "銆怱QL璇彞銆戯細" + sql);
- Console.Out.WriteLine(sql);
- Console.Out.WriteLine();
+
});
+ if(AppSettings.GetValue("PrintSql").ObjToBool())
+ {
+ Console.Out.WriteLine(GetParas(p));
+ Console.Out.WriteLine(sql);
+ Console.Out.WriteLine();
+ }
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/Logger.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/Logger.cs"
index 627af8b..d833379 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/Logger.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/Logger.cs"
@@ -84,9 +84,9 @@
}
// row["Id"] = log.Id;
// 灏哛equestParam涓殑鎹㈣绗︽浛鎹负绌哄瓧绗︿覆
- row["RequestParam"] = log.RequestParam?.Replace("\r\n", "");
+ row["RequestParam"] = log.RequestParam?.Replace("\r\n", "").Replace("\n", "");
// 灏哛esponseParam涓殑鎹㈣绗︽浛鎹负绌哄瓧绗︿覆
- row["ResponseParam"] = log.ResponseParam?.Replace("\r\n", "");
+ row["ResponseParam"] = log.ResponseParam?.Replace("\r\n", "").Replace("\n", "");
//row["Success"] = log.Success ?? -1;
// 灏咮eginDate璁剧疆涓簂og鐨凚eginDate
row["BeginDate"] = log.BeginDate;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/WMSTaskDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/WMSTaskDTO.cs"
index 7c613da..bde6341 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/WMSTaskDTO.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Task/WMSTaskDTO.cs"
@@ -57,5 +57,7 @@
public string AGVArea { get; set; }
+ public int PalletType { get; set; }
+
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs"
index 6d43109..ad4a66d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs"
@@ -7,6 +7,7 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO;
using WIDESEA_DTO.Inbound;
+using WIDESEA_External.Model;
using WIDESEA_IInboundRepository;
using WIDESEA_Model.Models;
@@ -28,6 +29,6 @@
/// 鍏ュ簱瀹屾垚涓婃姤
/// </summary>
/// <returns></returns>
- WebResponseContent FeedbackInboundOrder(Dt_StockInfo stockInfo,Dt_InboundOrder inboundOrder);
+ WebResponseContent FeedbackInboundOrder(Dt_StockInfo stockInfo,Dt_InboundOrder inboundOrder, List<ERPInboundDetailModel> detailModels);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/WIDESEA_IInboundService.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/WIDESEA_IInboundService.csproj"
index 08adcc2..5e7b648 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/WIDESEA_IInboundService.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/WIDESEA_IInboundService.csproj"
@@ -7,6 +7,7 @@
</PropertyGroup>
<ItemGroup>
+ <ProjectReference Include="..\WIDESEA_External\WIDESEA_External.csproj" />
<ProjectReference Include="..\WIDESEA_InboundRepository\WIDESEA_InboundRepository.csproj" />
</ItemGroup>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index 6f1f954..319ec37 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -73,21 +73,21 @@
try
{
//鑾峰彇浠撳簱淇℃伅
- Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x=>x.WarehouseCode==erpInOrder.WaId);
- if (warehouse==null)
+ Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseCode == erpInOrder.WaId);
+ if (warehouse == null)
{
return content.Error("鏈壘鍒颁粨搴撲俊鎭�");
}
//鑾峰彇鏄惁瀛樺湪璁㈠崟
- Dt_InboundOrder inboundOrder = BaseDal.QueryFirst(x=>x.InboundOrderNo== erpInOrder.OrderNo);
- if (erpInOrder.Way==1)
+ Dt_InboundOrder inboundOrder = BaseDal.QueryFirst(x => x.InboundOrderNo == erpInOrder.OrderNo);
+ if (erpInOrder.Way == 1)
{
- if (inboundOrder!=null)
+ if (inboundOrder != null)
{
}
}
- else if(erpInOrder.Way==2)
+ else if (erpInOrder.Way == 2)
{
}
@@ -145,7 +145,7 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟淇℃伅");
}
- if (inboundOrder.OrderStatus>=InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
+ if (inboundOrder.OrderStatus >= InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
{
return WebResponseContent.Instance.Error($"鍏ュ簱鍗曞凡缁撴潫");
}
@@ -187,11 +187,11 @@
{
return WebResponseContent.Instance.Error($"鏈湪鍏ュ簱鍗曟槑缁嗕腑鎵惧埌璇ョ墿鏂欎俊鎭�");
}
- if (inboundOrderDetail.OrderDetailStatus>OrderDetailStatusEnum.GroupAndInbound.ObjToInt())
+ if (inboundOrderDetail.OrderDetailStatus > OrderDetailStatusEnum.GroupAndInbound.ObjToInt())
{
return WebResponseContent.Instance.Error($"瀵瑰簲鍏ュ簱鍗曟槑缁嗗凡缁撴潫");
}
- float inboundDetailSum = inboundOrderDetail.OverInQuantity + inboundOrderDetail.ReceiptQuantity ;
+ float inboundDetailSum = inboundOrderDetail.OverInQuantity + inboundOrderDetail.ReceiptQuantity;
if (inboundDetailSum == inboundOrderDetail.OrderQuantity)
{
return WebResponseContent.Instance.Error($"璇ョ墿鏂欏叆搴撳崟鏄庣粏宸插叏閮ㄧ粍鐩樺畬鎴�");
@@ -201,7 +201,7 @@
return WebResponseContent.Instance.Error($"涓庤鏀惰揣鍗曟槑缁嗘敹璐ф暟閲忎笉涓�鑷�");
}
Dt_StockInfo oldStockinfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == palletCode);
- if(oldStockinfo!=null)
+ if (oldStockinfo != null)
{
return WebResponseContent.Instance.Error($"鎵樼洏閲嶅");
}
@@ -225,11 +225,11 @@
PalletCode = palletCode,
StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
WarehouseId = inboundOrder.WarehouseId,
- Details=new List<Dt_StockInfoDetail> { stockInfoDetail }
+ Details = new List<Dt_StockInfoDetail> { stockInfoDetail }
};
inboundOrderDetail.ReceiptQuantity += model.Quantity;
_unitOfWorkManage.BeginTran();
- if (inboundOrderDetail.OrderDetailStatus==OrderDetailStatusEnum.New.ObjToInt())
+ if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
{
inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
}
@@ -562,9 +562,9 @@
/// 鍏ュ簱瀹屾垚涓婃姤ERP
/// </summary>
/// <returns></returns>
- public WebResponseContent FeedbackInboundOrder(Dt_StockInfo stockInfo,Dt_InboundOrder inboundOrder)
+ public WebResponseContent FeedbackInboundOrder(Dt_StockInfo stockInfo, Dt_InboundOrder inboundOrder, List<ERPInboundDetailModel> detailModels)
{
- WebResponseContent content=new WebResponseContent();
+ WebResponseContent content = new WebResponseContent();
try
{
if (inboundOrder.Details.Count == 0)
@@ -575,44 +575,17 @@
{
return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟嵁宸插畬鎴�");
}
- List<ERPInboundDetailModel> detailModels = new List<ERPInboundDetailModel>();
+
Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == stockInfo.WarehouseId);
if (warehouse == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
}
- List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();
- foreach (var item in stockInfo.Details)
- {
- Dt_InboundOrderDetail? inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x=>x.RowNo==item.InboundOrderRowNo);
- if (inboundOrderDetail == null)
- {
- continue;
- }
- ERPInboundDetailModel detailModel = new ERPInboundDetailModel()
- {
- ExpiryDate = item.EffectiveDate ?? "",
- LocationCode = warehouse.WarehouseCode,
- MaterialsCode = item.MaterielCode,
- MfgDate = item.ProductionDate ?? "",
- QtyCustoms = "0",
- Quantity = item.StockQuantity.ToString(),
- Rack = stockInfo.LocationCode,
- ReceiptCode = inboundOrder.UpperOrderNo,
- ReceiptSerNo = item.InboundOrderRowNo.ToString()
- };
- inboundOrderDetail.OverInQuantity += detailModel.Quantity.ObjToInt();
- if (inboundOrderDetail.OverInQuantity== inboundOrderDetail.OrderQuantity)
- {
- inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- }
- inboundOrderDetails.Add(inboundOrderDetail);
- detailModels.Add(detailModel);
- }
+
ERPInboundModel model = new ERPInboundModel()
{
Code = inboundOrder.InboundOrderNo,
- CreatorCode = "TC20082",//娴嬭瘯
+ CreatorCode = inboundOrder.Creater,//娴嬭瘯
EntDate = inboundOrder.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
StockDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
SuppliersId = inboundOrder.SupplierId,
@@ -622,40 +595,27 @@
Way = 1,
Details = detailModels
};
- //鍏ュ簱鏄庣粏鏂板瀹屾垚鏁伴噺
- int newCount = inboundOrderDetails.Select(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count;
- //鍏ュ簱鏄庣粏鍘熷畬鎴愭暟閲�
- int oldCount = inboundOrder.Details.Select(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count;
string response = _invokeERPService.InvokeInboundOrderApi(model);
- ErpRequestContent requestContent = JsonConvert.DeserializeObject<ErpRequestContent>(response);
- if (requestContent==null)
+ ErpRequestContent? requestContent = JsonConvert.DeserializeObject<ErpRequestContent>(response);
+ if (requestContent == null)
{
return WebResponseContent.Instance.Error();
}
- if (requestContent.res==0)
+ if (requestContent.res == 0)
{
return WebResponseContent.Instance.Error(requestContent.Data);
}
- _unitOfWorkManage.BeginTran();
- _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetails);
- if (inboundOrder.Details.Count == (newCount + oldCount))
- {
- inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
- _inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
- }
- _unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
content.Error(ex.Message);
}
return content;
}
/// <summary>
- /// 鍏ュ簱瀹屾垚鍥炰紶鍒癊RP 娴嬭瘯
+ /// 鍏ュ簱瀹屾垚鍥炰紶鍒癊RP
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
@@ -717,7 +677,7 @@
ERPInboundModel model = new ERPInboundModel()
{
Code = inboundOrder.InboundOrderNo,
- CreatorCode = "TC20082",//娴嬭瘯
+ CreatorCode = inboundOrder.Creater,//娴嬭瘯
EntDate = inboundOrder.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
StockDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
SuppliersId = inboundOrder.SupplierId,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs"
index 76ab96e..ab94fc4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs"
@@ -49,7 +49,7 @@
{
try
{
- Dt_ReceiveOrder receiveOrder = _inboundRepository.ReceiveOrderRepository.Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderNo == orderNo).Includes(x=>x.Details).First();
+ Dt_ReceiveOrder receiveOrder = _inboundRepository.ReceiveOrderRepository.Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderNo == orderNo).Includes(x => x.Details).First();
if (receiveOrder == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌鏀惰揣鍗�");
@@ -68,11 +68,11 @@
return WebResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡鐨勪俊鎭�");
}
//璇ユ敹璐у崟浠撳簱鏄惁鏈夎鐗╂枡
- if (materielInfo.WarehouseId!= receiveOrder.WarehouseId)
+ if (materielInfo.WarehouseId != receiveOrder.WarehouseId)
{
return WebResponseContent.Instance.Error($"璇ョ墿鏂欎笉灞炰簬璇ヤ粨搴�");
}
- Dt_PurchaseOrder purchaseOrder = _inboundRepository.PurchaseOrderRepository.Db.Queryable<Dt_PurchaseOrder>().Where(x => x.PurchaseOrderNo == model.PurchaseOrderNo).Includes(x=>x.Details).First();
+ Dt_PurchaseOrder purchaseOrder = _inboundRepository.PurchaseOrderRepository.Db.Queryable<Dt_PurchaseOrder>().Where(x => x.PurchaseOrderNo == model.PurchaseOrderNo).Includes(x => x.Details).First();
if (purchaseOrder == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌閲囪喘鍗�");
@@ -92,10 +92,7 @@
Dt_PurchaseOrderDetail? purchaseOrderDetail = purchaseOrder.Details.FirstOrDefault(x => x.MaterielCode == model.MaterielCode && (x.PurchaseDetailStatus == PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt() || x.PurchaseDetailStatus == PurchaseOrderDetailStatusEnum.Receiving.ObjToInt()));
if (purchaseOrderDetail == null)
{
- if (purchaseOrder.Details.Count > 0)
- {
- return WebResponseContent.Instance.Error($"璇ユ槑缁嗘敹璐у凡瀹屾垚");
- }
+ return WebResponseContent.Instance.Error($"璇ユ槑缁嗘敹璐у凡瀹屾垚");
}
//鍒ゆ柇鏄惁瀛樺湪瀵瑰簲閲囪喘鏄庣粏鐨勬敹璐ф槑缁�
Dt_ReceiveOrderDetail? detail = receiveOrder.Details.FirstOrDefault(x => x.PurchaseOrderNo == model.PurchaseOrderNo && x.PurchaseOrderDetailRowNo == purchaseOrderDetail.RowNo);
@@ -106,7 +103,7 @@
lock (_rowNoLocker)
{
- if (detail!=null)
+ if (detail != null)
{
//鍘熸湁鏀惰揣鏄庣粏澧炲姞鏀惰揣鏁伴噺
detail.ReceivedQuantity += model.Quantity;
@@ -115,7 +112,7 @@
{
return WebResponseContent.Instance.Error($"閲囪喘鍗曡鐗╂枡鏁伴噺鍜屾敹璐ф暟閲忎笉涓�鑷�");
}
- if(purchaseOrderDetail.PurchaseDetailReceiveQty ==purchaseOrderDetail.PurchaseDetailQuantity)
+ if (purchaseOrderDetail.PurchaseDetailReceiveQty == purchaseOrderDetail.PurchaseDetailQuantity)
{
purchaseOrderDetail.PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.Received.ObjToInt();
}
@@ -157,11 +154,11 @@
receiveOrder.ReceiveOrderStatus = ReceiveOrderStatusEnum.Receiving.ObjToInt();
}
//鍒ゆ柇閲囪喘鏄庣粏鏁伴噺
- if (purchaseOrderDetail.PurchaseDetailQuantity<model.Quantity)
+ if (purchaseOrderDetail.PurchaseDetailQuantity < model.Quantity)
{
return WebResponseContent.Instance.Error($"璇锋牳瀵归噰璐崟璇ョ墿鏂欐暟閲�");
}
- if (purchaseOrderDetail.PurchaseDetailReceiveQty>0)
+ if (purchaseOrderDetail.PurchaseDetailReceiveQty > 0)
{
purchaseOrderDetail.PurchaseDetailReceiveQty += model.Quantity;
}
@@ -169,7 +166,7 @@
{
purchaseOrderDetail.PurchaseDetailReceiveQty = model.Quantity;
}
- if (purchaseOrderDetail.PurchaseDetailReceiveQty> purchaseOrderDetail.PurchaseDetailQuantity)
+ if (purchaseOrderDetail.PurchaseDetailReceiveQty > purchaseOrderDetail.PurchaseDetailQuantity)
{
return WebResponseContent.Instance.Error($"閲囪喘鍗曡鐗╂枡鏁伴噺鍜屾敹璐ф暟閲忎笉涓�鑷�");
}
@@ -201,7 +198,7 @@
#endregion
_unitOfWorkManage.CommitTran();
}
-
+
return WebResponseContent.Instance.OK();
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
index 2165c8c..f78eaf6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderService.cs"
@@ -134,15 +134,13 @@
ERPReceiveModel receiveModel = new ERPReceiveModel()
{
Code = receiveOrder.ReceiveOrderNo,
- CompanyId = "HATC",
DeliveryCode = receiveOrder.DeliveryCode,
CustomerId = receiveOrder.CustomerId,
- CreatorId = "TC20082",//娴嬭瘯 receiveOrder.Creater
+ CreatorId = receiveOrder.Creater,
EntDate = receiveOrder.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
ReceiveDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- PlantsId = "HA02",
SuppliersId = receiveOrder.SuppliersId,
- Type = Enum.GetName(typeof(ReceiveOrderTypeEnum), receiveOrder.ReceiveOrderType),
+ Type = Enum.GetName(typeof(ReceiveOrderTypeEnum), receiveOrder.ReceiveOrderType) ?? throw new Exception($"閲囪喘鍗曠被鍨嬮敊璇�"),
UniqueTag = receiveOrder.ReceiveOrderId.ToString(),
WarehouseCode = warehouse.WarehouseCode,
Way = 1,
@@ -231,7 +229,6 @@
Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
{
- InboundOrderNo="IN"+DateTime.Now.ToString("yyyyMMddHHmmss"),//娴嬭瘯
UpperOrderNo = receiveOrder.ReceiveOrderNo,
CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
@@ -353,7 +350,6 @@
}
receiveOrder = new Dt_ReceiveOrder()
{
- ReceiveOrderNo= "RE"+DateTime.Now.ToString("yyyyMMddHHmmss"),//娴嬭瘯
ReceiveOrderStatus = ReceiveOrderStatusEnum.Receiving.ObjToInt(),
CustomerId = "",
DeliveryCode = "/",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
index 213cd49..7db7c96 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
@@ -212,13 +212,13 @@
issueModel = new ERPIssueModel()
{
UniqueTag = id.ToString(),
- Code = "OT" + DateTime.Now.ToString("yyyyMMddHHmmss"),//娴嬭瘯
+ Code = outboundOrder.OrderNo,//娴嬭瘯
WarehouseCode = warehouse.WarehouseCode,
Docremark = "",
Deptno = outboundOrder.DepartmentCode,
Deptname = outboundOrder.DepartmentName,
Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Createuser = "TC20082",
+ Createuser = outboundOrder.Creater,
Issitem = new List<ERPIssueItemModel>() { issueItemModel },
};
}
@@ -247,13 +247,13 @@
issueModel = new ERPIssueModel()
{
UniqueTag = id.ToString(),
- Code = "OT" + DateTime.Now.ToString("yyyyMMddHHmmss"),//娴嬭瘯
+ Code = outboundOrder.OrderNo,//娴嬭瘯
WarehouseCode = warehouse.WarehouseCode,
Docremark = "",
Deptno = outboundOrder.DepartmentCode,
Deptname = outboundOrder.DepartmentName,
Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Createuser = "TC20082",
+ Createuser = outboundOrder.Creater,
Issitem = new List<ERPIssueItemModel>() { issueItemModel },
};
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService2.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService2.cs"
new file mode 100644
index 0000000..ca693e1
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService2.cs"
@@ -0,0 +1,399 @@
+锘�/*using AutoMapper;
+using MailKit.Search;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Common.OrderEnum;
+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_Core.Utilities;
+using WIDESEA_DTO.ERP;
+using WIDESEA_DTO.Inbound;
+using WIDESEA_DTO.Outbound;
+using WIDESEA_External.ERPService;
+using WIDESEA_External.Model;
+using WIDESEA_IBasicService;
+using WIDESEA_IOutboundRepository;
+using WIDESEA_IOutboundService;
+using WIDESEA_IStockRepository;
+using WIDESEA_IStockService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_OutboundService
+{
+ public class OutboundOrderService : ServiceBase<Dt_OutboundOrder, IOutboundOrderRepository>, IOutboundOrderService
+ {
+ private readonly IMapper _mapper;
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IBasicService _basicService;
+ private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;
+ private readonly IStockInfoService _stockInfoService;
+ private readonly IStockInfoRepository _stockInfoRepository;
+ public IOutboundOrderRepository Repository => BaseDal;
+ private readonly IInvokeERPService _invokeERPService;
+ private readonly IOutStockLockInfoService _outStockLockInfoService;
+
+ public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IBasicService basicService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IStockInfoService stockInfoService,
+ IStockInfoRepository stockInfoRepository, IInvokeERPService invokeERPService, IOutStockLockInfoService outStockLockInfoService) : base(BaseDal)
+ {
+ _mapper = mapper;
+ _unitOfWorkManage = unitOfWorkManage;
+ _basicService = basicService;
+ _outboundOrderDetailRepository = outboundOrderDetailRepository;
+ _stockInfoService = stockInfoService;
+ _stockInfoRepository = stockInfoRepository;
+ _invokeERPService = invokeERPService;
+ _outStockLockInfoService = outStockLockInfoService;
+ }
+
+ public WebResponseContent ReceiveOutOrder(ErpOutOrderDTO model)
+ {
+ try
+ {
+ Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == model.MCode);
+ if (materielInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡淇℃伅");
+ }
+
+ Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == model.WaId);
+ if (warehouse == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
+ }
+
+ Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == model.OrderNo).Includes(x => x.Details).First();
+
+ if (model.Way == 1)
+ {
+ if (oldOutboundOrder != null)
+ {
+ if (oldOutboundOrder.Details.FirstOrDefault(x => x.RowNo == Convert.ToInt32(model.RowNo)) != null)
+ {
+ return WebResponseContent.Instance.Error($"璇ユ槑缁嗚鍙峰凡瀛樺湪");
+ }
+ if (oldOutboundOrder.WarehouseId != warehouse.WarehouseId)
+ {
+ return WebResponseContent.Instance.Error($"浠撳簱涓嶄竴鑷�");
+ }
+ else
+ {
+ Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail()
+ {
+ RowNo = Convert.ToInt32(model.RowNo),
+ BatchNo = model.MLot,
+ MaterielCode = model.MCode,
+ MaterielName = materielInfo.MaterielName,
+ OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
+ OrderQuantity = model.Qty,
+ OrderId = oldOutboundOrder.Id
+ };
+
+ if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
+ {
+ Dt_StockInfo stockInfo = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).Where(x => x.Details.Any(v => v.BatchNo == model.MLot)).First();
+ if (stockInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"搴撳瓨涓嶈冻");
+ }
+ //鏇存敼鐘舵��
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ stockInfo.Details.ForEach(x => { x.Remark = oldOutboundOrder.OrderNo; });
+
+ Db.Updateable(stockInfo.Details);
+ _stockInfoRepository.UpdateData(stockInfo);
+ }
+ _outboundOrderDetailRepository.AddData(outboundOrderDetail);
+ }
+ }
+ else
+ {
+ Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail()
+ {
+ RowNo = Convert.ToInt32(model.RowNo),
+ BatchNo = model.MLot,
+ MaterielCode = model.MCode,
+ MaterielName = materielInfo.MaterielName,
+ OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
+ OrderQuantity = model.Qty,
+ };
+ Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder()
+ {
+ OrderNo = model.OrderNo,
+ UpperOrderNo = model.OrderNo,
+ OrderStatus = OutOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ OrderType = OutOrderTypeEnum.Issue.ObjToInt(),
+ CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
+ WarehouseId = warehouse.WarehouseId,
+ DepartmentCode = model.DepartmentCode,
+ DepartmentName = model.DepartmentName,
+ Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
+ };
+
+ _unitOfWorkManage.BeginTran();
+ Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
+
+ if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
+ {
+ Dt_StockInfo stockInfo = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).Where(x => x.Details.Any(v => v.BatchNo == model.MLot)).First();
+ if (stockInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"搴撳瓨涓嶈冻");
+ }
+
+ //鏇存敼鐘舵��
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ stockInfo.Details.ForEach(x => { x.Remark = outboundOrder.OrderNo; });
+ _stockInfoRepository.UpdateData(stockInfo);
+ Db.Updateable(stockInfo.Details);
+ }
+ _unitOfWorkManage.CommitTran();
+ }
+ }
+ else if (model.Way == 2)
+ {
+ if (oldOutboundOrder == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌鍑哄簱鍗�");
+ }
+ Dt_OutboundOrderDetail? outboundOrderDetail = oldOutboundOrder.Details.FirstOrDefault(x => x.RowNo == Convert.ToInt32(model.RowNo));
+ if (outboundOrderDetail == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌鏄庣粏琛屽彿淇℃伅");
+ }
+ if (outboundOrderDetail.OrderDetailStatus != OrderDetailStatusEnum.New.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"璇ユ槑缁嗕笉鍙慨鏀�");
+ }
+ outboundOrderDetail = new Dt_OutboundOrderDetail()
+ {
+ RowNo = Convert.ToInt32(model.RowNo),
+ BatchNo = model.MLot,
+ MaterielCode = model.MCode,
+ MaterielName = materielInfo.MaterielName,
+ OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
+ OrderQuantity = model.Qty,
+ };
+
+ _outboundOrderDetailRepository.UpdateData(outboundOrderDetail);
+ }
+ else if (model.Way == 3)
+ {
+ if (oldOutboundOrder == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌鍑哄簱鍗�");
+ }
+ }
+
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ public WebResponseContent TestOutUpload(Dt_OutboundOrder outboundOrder, Dt_StockInfo stockInfo, string warehouseCode)
+ {
+ try
+ {
+ List<ERPPickItemModel> eRPOutPick = new List<ERPPickItemModel>();
+ ERPPickItemModel pickItemModel = new ERPPickItemModel()
+ {
+ Lotno = stockInfo.Details[0].BatchNo,
+ Qty = stockInfo.Details[0].StockQuantity.ObjToInt().ToString(),
+ Location = warehouseCode
+ };
+ eRPOutPick.Add(pickItemModel);
+
+ ERPPickModel pickModel = new ERPPickModel()
+ {
+ Rowindex = outboundOrder.Details[0].RowNo,
+ Material = outboundOrder.Details[0].MaterielCode,
+ Qty = (outboundOrder.Details[0].OrderQuantity.ObjToInt()).ToString(),
+ Dataitem = eRPOutPick
+ };
+
+ ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
+ {
+ Pickcode = outboundOrder.UpperOrderNo,
+ PickList = new List<ERPPickModel>() { pickModel }
+ };
+ ERPIssueModel issueModel = new ERPIssueModel()
+ {
+ UniqueTag = outboundOrder.Id.ToString(),
+ Code = outboundOrder.OrderNo,//娴嬭瘯
+ WarehouseCode = warehouseCode,
+ Docremark = "",
+ Deptno = outboundOrder.DepartmentCode,
+ Deptname = outboundOrder.DepartmentName,
+ Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Createuser = outboundOrder.Creater,
+ Issitem = new List<ERPIssueItemModel>() { issueItemModel },
+ };
+
+ string response = _invokeERPService.InvokeOutStandardsApi(issueModel);
+ ErpRequestContent requestContent = response.DeserializeObject<ErpRequestContent>();
+ if (requestContent.res == 1)
+ {
+ return WebResponseContent.Instance.OK();
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error(requestContent.Data);
+ }
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ //涓婃姤鍑哄簱瀹屾垚
+ public WebResponseContent TestOutUpload(int id, Dt_StockInfo stockInfo)
+ {
+ try
+ {
+ Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == id).Includes(x => x.Details).First();
+ Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == outboundOrder.WarehouseId);
+ //娴嬭瘯鏋跺簱缁橢RP涓婃姤鍑哄簱瀹屾垚
+ ERPIssueModel issueModel = new ERPIssueModel();
+ List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
+ if (stockInfo == null)
+ {
+ stockInfos = TestOutStocksUpdate(warehouse).Data as List<Dt_StockInfo> ?? new List<Dt_StockInfo>();
+ List<ERPPickItemModel> eRPOutPick = new List<ERPPickItemModel>();
+ for (int i = 0; i < stockInfos.Count; i++)
+ {
+ ERPPickItemModel pickItemModel = new ERPPickItemModel()
+ {
+ Lotno = stockInfos[i].Details[0].BatchNo,
+ Qty = stockInfos[i].Details[0].StockQuantity.ObjToInt().ToString(),
+ Location = warehouse.WarehouseCode
+ };
+ eRPOutPick.Add(pickItemModel);
+ }
+
+ ERPPickModel pickModel = new ERPPickModel()
+ {
+ Rowindex = outboundOrder.Details[0].RowNo,
+ Material = outboundOrder.Details[0].MaterielCode,
+ Qty = (outboundOrder.Details[0].OrderQuantity.ObjToInt()).ToString(),
+ Dataitem = eRPOutPick
+ };
+
+ ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
+ {
+ Pickcode = outboundOrder.UpperOrderNo,
+ PickList = new List<ERPPickModel>() { pickModel }
+ };
+ issueModel = new ERPIssueModel()
+ {
+ UniqueTag = id.ToString(),
+ WarehouseCode = warehouse.WarehouseCode,
+ Docremark = "",
+ Deptno = outboundOrder.DepartmentCode,
+ Deptname = outboundOrder.DepartmentName,
+ Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Createuser = outboundOrder.Creater,
+ Issitem = new List<ERPIssueItemModel>() { issueItemModel },
+ };
+ }
+ else
+ {
+ Dt_OutboundOrderDetail orderDetail = outboundOrder.Details.FirstOrDefault(x => x.MaterielCode == stockInfo.Details[0].MaterielCode);
+
+ ERPPickItemModel pickItemModel = new ERPPickItemModel()
+ {
+ Lotno = stockInfo.Details[0].BatchNo,
+ Qty = stockInfo.Details[0].StockQuantity.ObjToInt().ToString(),
+ Location = stockInfo.LocationCode
+ };
+ ERPPickModel pickModel = new ERPPickModel()
+ {
+ Rowindex = outboundOrder.Details[0].RowNo,
+ Material = outboundOrder.Details[0].MaterielCode,
+ Qty = (outboundOrder.Details[0].OrderQuantity.ObjToInt()).ToString(),
+ Dataitem = new List<ERPPickItemModel> { pickItemModel }
+ };
+ ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
+ {
+ Pickcode = outboundOrder.UpperOrderNo,
+ PickList = new List<ERPPickModel>() { pickModel }
+ };
+ issueModel = new ERPIssueModel()
+ {
+ UniqueTag = id.ToString(),
+ Code = outboundOrder.OrderNo,//娴嬭瘯
+ WarehouseCode = warehouse.WarehouseCode,
+ Docremark = "",
+ Deptno = outboundOrder.DepartmentCode,
+ Deptname = outboundOrder.DepartmentName,
+ Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Createuser = outboundOrder.Creater,
+ Issitem = new List<ERPIssueItemModel>() { issueItemModel },
+ };
+ }
+
+ string response = _invokeERPService.InvokeOutStandardsApi(issueModel);
+ ErpRequestContent requestContent = response.DeserializeObject<ErpRequestContent>();
+ if (requestContent.res == 1)
+ {
+ if (stockInfos.Count > 0)
+ {
+ _stockInfoRepository.UpdateData(stockInfos);
+ }
+ return WebResponseContent.Instance.OK(requestContent.Data);
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error(requestContent.Data);
+ }
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鏇存敼鍑哄簱鍗曞簱瀛樼姸鎬�
+ /// </summary>
+ /// <param name="warehouse"></param>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public WebResponseContent TestOutStocksUpdate(Dt_Warehouse warehouse)
+ {
+ try
+ {
+ //鑾峰彇鍑哄簱鍗曞簱瀛�
+ List<Dt_StockInfo> stockInfos = _stockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).ToList();
+ if (stockInfos.Count <= 0)
+ {
+ return WebResponseContent.Instance.Error($"搴撳瓨涓嶈冻");
+ }
+ //鏇存敼鐘舵��
+ stockInfos.ForEach(x =>
+ {
+ x.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ });
+ return WebResponseContent.Instance.OK("鎴愬姛", stockInfos);
+ }
+ 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/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
index ddda47e..562fae5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
@@ -26,7 +26,7 @@
namespace WIDESEA_TaskInfoService
{
- public partial class TaskService
+ public partial class TaskService
{
/// <summary>
/// 娴嬭瘯鏋跺嚭浠�
@@ -38,12 +38,12 @@
MesResponseContent responseContent = new MesResponseContent();
try
{
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode==WarehouseEnum.HA64.ToString());
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA64.ToString());
//鑾峰彇搴撳瓨璁板綍
- List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
- x.WarehouseId == warehouse.WarehouseId &&
- x.StockStatus==(int)StockStatusEmun.鍏ュ簱瀹屾垚).Includes(x=>x.Details).ToList();
- Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x=>x.Details.Any(x=>x.BatchNo==model.ToolCode));
+ List<Dt_StockInfo> stockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x =>
+ x.WarehouseId == warehouse.WarehouseId &&
+ x.StockStatus == (int)StockStatusEmun.鍏ュ簱瀹屾垚).Includes(x => x.Details).ToList();
+ Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(x => x.BatchNo == model.ToolCode));
if (stockInfo == null)
{
return responseContent.Error($"娴嬭瘯鏋�:{model.ToolCode}鏃犲彲鐢ㄥ簱瀛�");
@@ -52,7 +52,7 @@
x.WarehouseId == stockInfo.WarehouseId &&
x.LocationStatus == (int)LocationStatusEnum.InStock &&
(x.EnableStatus == (int)EnableStatusEnum.Normal || x.EnableStatus == (int)EnableStatusEnum.OnlyOut));
- if (locationInfo==null)
+ if (locationInfo == null)
{
return responseContent.Error($"娴嬭瘯鏋惰揣浣�:{stockInfo.LocationCode}鍑哄簱鏉′欢涓嶆弧瓒�");
}
@@ -75,12 +75,6 @@
stockInfo.StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾;
LocationStatusEnum locationStatus = (LocationStatusEnum)locationInfo.LocationStatus;
locationInfo.LocationStatus = (int)LocationStatusEnum.Lock;
- //灏嗕换鍔℃帹閫佸埌WCS
- WebResponseContent content = PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV");
- if (!content.Status)
- {
- return responseContent.Error();
- }
//鍒ゆ柇鏄惁鏈夊嚭搴撳崟淇℃伅
_unitOfWorkManage.BeginTran();
//鏇存柊搴撳瓨鐘舵��
@@ -91,9 +85,9 @@
BaseDal.AddData(taskOut);
//鍔犲叆璐т綅鍙樺姩璁板綍
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, locationStatus, LocationChangeType.OutboundAssignLocation, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", taskOut.TaskNum);
- //鍔犲叆搴撳瓨鍙樺姩璁板綍
- //_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfoDetails, beforeQuantity, totalQuantity, StockChangeTypeEnum.StockLock);
_unitOfWorkManage.CommitTran();
+ //灏嗕换鍔℃帹閫佸埌WCS
+ WebResponseContent content = PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV");
responseContent.OK();
}
catch (Exception ex)
@@ -119,7 +113,7 @@
x.WarehouseId == warehouse.WarehouseId &&
x.StockStatus == (int)StockStatusEmun.鍑哄簱瀹屾垚).Includes(x => x.Details).ToList();
Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(x => x.BatchNo == backModel.TestToolCode));
- if (stockInfo==null)
+ if (stockInfo == null)
{
return responseContent.Error($"{backModel.TestToolCode}搴撳瓨淇℃伅涓嶅瓨鍦�");
}
@@ -140,7 +134,7 @@
WarehouseId = stockInfo.WarehouseId,
};
//鏇存敼搴撳瓨鐘舵��
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
+ stockInfo.StockStatus = StockStatusEmun.閫�搴�.ObjToInt();
BaseDal.AddData(taskIn);
_stockRepository.StockInfoRepository.UpdateData(stockInfo);
//灏嗕换鍔℃帹閫佸埌WCS
@@ -204,15 +198,15 @@
/// <returns></returns>
public WebResponseContent TestSynStock(TestToolSynInfo toolSynInfo)
{
- WebResponseContent content= new WebResponseContent();
+ WebResponseContent content = new WebResponseContent();
try
{
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x=>x.ApiCode==APIEnum.WMS_MES_TestToolSync.ToString());
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_TestToolSync.ToString());
MESRoot<TestToolSynInfo> root = new MESRoot<TestToolSynInfo>()
{
From = "WMS",
DateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Content=toolSynInfo
+ Content = toolSynInfo
};
JsonSerializerSettings settings = new JsonSerializerSettings
{
@@ -222,7 +216,7 @@
string response = HttpMesHelper.Post(apiInfo.ApiAddress, request);
MesResponseContent mesResponseContent = response.DeserializeObject<MesResponseContent>();
//璋冪敤鎺ュ彛
- if (mesResponseContent.BSucc==true)
+ if (mesResponseContent.BSucc == true)
{
content.OK(mesResponseContent.StrMsg);
}
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 a5bbf26..bdf4c84 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"
@@ -35,6 +35,7 @@
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_External.ERPService;
+using WIDESEA_External.Model;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_IInboundRepository;
@@ -132,12 +133,7 @@
return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅");
}
- //if (task.TaskType != TaskTypeEnum.Inbound.ObjToInt())
- //{
- // return WebResponseContent.Instance.Error($"浠诲姟绫诲瀷閿欒");
- //}
-
- Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode && x.WarehouseId==task.WarehouseId).Includes(x => x.Details).First();
+ Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).Includes(x => x.Details).First();
if (stockInfo == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺搴旂殑缁勭洏淇℃伅");
@@ -166,32 +162,76 @@
LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;
locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseId== task.WarehouseId);
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
+
+ stockInfo.LocationCode = locationInfo.LocationCode;
+ Dt_InboundOrder? inboundOrder = _inboundRepository.InboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == stockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
+ List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();
+ if (stockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt())
+ {
+ //鎺ㄩ�佸叆搴撳畬鎴愮粰Erp
+ if (inboundOrder == null)
+ {
+ return WebResponseContent.Instance.Error($"瀵瑰簲鍏ュ簱鍗曚笉瀛樺湪");
+ }
+
+ List<ERPInboundDetailModel> detailModels = new List<ERPInboundDetailModel>();
+
+ foreach (var item in stockInfo.Details)
+ {
+ Dt_InboundOrderDetail? inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.RowNo == item.InboundOrderRowNo);
+ if (inboundOrderDetail == null)
+ {
+ continue;
+ }
+ ERPInboundDetailModel detailModel = new ERPInboundDetailModel()
+ {
+ ExpiryDate = item.EffectiveDate ?? "",
+ LocationCode = warehouse.WarehouseCode,
+ MaterialsCode = item.MaterielCode,
+ MfgDate = item.ProductionDate ?? "",
+ QtyCustoms = "0",
+ Quantity = item.StockQuantity.ToString(),
+ Rack = stockInfo.LocationCode,
+ ReceiptCode = inboundOrder.UpperOrderNo,
+ ReceiptSerNo = item.InboundOrderRowNo.ToString()
+ };
+ inboundOrderDetail.OverInQuantity += detailModel.Quantity.ObjToInt();
+ if (inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity)
+ {
+ inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ }
+ inboundOrderDetails.Add(inboundOrderDetail);
+ detailModels.Add(detailModel);
+ }
+
+ //鍏ュ簱鏄庣粏鏂板瀹屾垚鏁伴噺
+ int newCount = inboundOrderDetails.Select(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count;
+ //鍏ュ簱鏄庣粏鍘熷畬鎴愭暟閲�
+ int oldCount = inboundOrder.Details.Select(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count;
+ if (inboundOrder.Details.Count == (newCount + oldCount))
+ {
+ inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ if (!_inboundOrderService.FeedbackInboundOrder(stockInfo, inboundOrder, detailModels).Status)
+ {
+ return WebResponseContent.Instance.Error($"鍏ュ簱鍚屾Erp澶辫触");
+ }
+ }
//娴嬭瘯鏋跺叆搴撳簱瀛樼姸鎬�
- if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt() && warehouse.WarehouseCode==WarehouseEnum.HA64.ToString())
+ if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt() && warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
{
stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚鏈缓鍑哄簱鍗�.ObjToInt();
}
else
{
stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
-
+
}
stockInfo.Details.ForEach(x =>
{
x.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
});
- stockInfo.LocationCode = locationInfo.LocationCode;
- //鎺ㄩ�佸叆搴撳畬鎴愮粰Erp
- Dt_InboundOrder? inboundOrder = _inboundRepository.InboundOrderRepository.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == stockInfo.Details.FirstOrDefault().OrderNo).Includes(x=>x.Details).First();
- if (inboundOrder == null)
- {
- return WebResponseContent.Instance.Error($"瀵瑰簲鍏ュ簱鍗曚笉瀛樺湪");
- }
- if (!_inboundOrderService.FeedbackInboundOrder(stockInfo, inboundOrder).Status)
- {
- return WebResponseContent.Instance.Error($"鍏ュ簱鍚屾Erp澶辫触");
- }
_unitOfWorkManage.BeginTran();
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateTypeEnum.浜哄伐瀹屾垚 : OperateTypeEnum.鑷姩瀹屾垚);
_basicService.LocationInfoService.UpdateLocationStatus(locationInfo, (PalletTypeEnum)stockInfo.PalletType, LocationStatusEnum.InStock, stockInfo.WarehouseId);
@@ -199,6 +239,8 @@
_stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, lastStatus, LocationChangeType.InboundCompleted);
_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, stockInfo.Details.Sum(x => x.StockQuantity), stockInfo.Details.Sum(x => x.StockQuantity), StockChangeTypeEnum.Inbound, taskNum);
+ _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetails);
+ _inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
}
@@ -235,7 +277,7 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌揣浣嶄俊鎭�");
}
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseId== task.WarehouseId);
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
List<Dt_OutStockLockInfo> outStockLockInfos = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.TaskNum == taskNum);
if ((outStockLockInfos == null || outStockLockInfos.Count == 0) && warehouse.WarehouseCode != WarehouseEnum.HA64.ToString())
@@ -260,18 +302,18 @@
if (warehouse.WarehouseCode != WarehouseEnum.HA64.ToString())
{
//鎺ㄩ�佸嚭搴撳畬鎴�
- WebResponseContent webResponse = _outboundService.OutboundOrderService.TestOutUpload(outboundOrderDetails.FirstOrDefault().Id,stockInfo);
+ WebResponseContent webResponse = _outboundService.OutboundOrderService.TestOutUpload(outboundOrderDetails.FirstOrDefault().Id, stockInfo);
if (!webResponse.Status)
{
return webResponse;
}
}
_unitOfWorkManage.BeginTran();
- if (outboundOrderDetails.Count>0)
+ if (outboundOrderDetails.Count > 0)
{
_outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
}
- stockInfo.LocationCode = locationInfo.LocationCode;
+ stockInfo.LocationCode = "";
stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
_stockService.StockInfoService.Repository.UpdateData(stockInfo);
int beforeStatus = locationInfo.LocationStatus;
@@ -281,7 +323,7 @@
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, (LocationStatusEnum)beforeStatus, LocationChangeType.OutboundCompleted, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
_unitOfWorkManage.CommitTran();
-
+
return WebResponseContent.Instance.OK();
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
index 699e6ea..a872ab6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
@@ -52,6 +52,10 @@
{
return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡缁戝畾璐т綅");
}
+ if(warehouseId != stockInfo.WarehouseId)
+ {
+ return WebResponseContent.Instance.Error($"浠撳簱涓嶆纭�");
+ }
Dt_Task newTask = new Dt_Task()
{
@@ -64,7 +68,8 @@
TargetAddress = "",
TaskType = TaskTypeEnum.Inbound.ObjToInt(),
TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = warehouseId
+ WarehouseId = stockInfo.WarehouseId,
+ PalletType = stockInfo.PalletType
};
stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
@@ -100,6 +105,11 @@
return WebResponseContent.Instance.Error($"鏈壘鍒拌鍏ュ簱浠诲姟");
}
+ if(_basicRepository.LocationInfoRepository.QueryFirst(x=>x.LocationCode == task.TargetAddress) != null)
+ {
+ return WebResponseContent.Instance.OK(data: task.TargetAddress);
+ }
+
Dt_LocationInfo? locationInfo = _basicService.LocationInfoService.AssignLocation(roadwayNo, (PalletTypeEnum)task.PalletType, task.WarehouseId);
if (locationInfo == null)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
index a6dd362..ec9afa0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
@@ -219,15 +219,11 @@
{
WebResponseContent content = _outboundService.OutboundOrderDetailService.LockOutboundStockDataUpdate(stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos, tasks: tasks);
- if (content.Status)
- {
- _unitOfWorkManage.CommitTran();
- }
- else
+ if (!content.Status)
{
_unitOfWorkManage.RollbackTran();
+ return content;
}
- return content;
}
else if (outboundOrderDetails != null && outboundOrderDetails.Count > 0)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGV/AgvController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGV/AgvController.cs"
deleted file mode 100644
index e3a6553..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/AGV/AgvController.cs"
+++ /dev/null
@@ -1,69 +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.AGV;
-using WIDESEA_DTO.Basic;
-using WIDESEA_DTO.ERP;
-using WIDESEA_External.AGVService;
-using WIDESEA_External.ERPService;
-using WIDESEA_External.Model;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_IInboundRepository;
-using WIDESEA_IInboundService;
-using WIDESEA_IOutboundService;
-using WIDESEA_Model.Models;
-using static WIDESEA_DTO.ErpResponseContent;
-
-namespace WIDESEA_WMSServer.Controllers.ERP
-{
- #region 寮冪敤
- /// <summary>
- /// 鐗瑰垱AGV鎺ュ彛
- /// </summary>
- [Route("api/Agv")]
- [ApiController]
- public class AgvController : ControllerBase
- {
- /// <summary>
- /// 鍙戦�丄GV浠诲姟
- /// </summary>
- /// <param name="taskModel"></param>
- /// <returns></returns>
- [HttpPost,Route("AgvSendTask"),AllowAnonymous]
- public WebResponseContent AgvSendTask([FromBody] AgvTaskModel taskModel)
- {
- return InvokeAGVService.Intance.AgvSendTask(taskModel);
- }
- /// <summary>
- /// AGV瀹夊叏淇″彿鐢宠
- /// </summary>
- /// <param name="secureApplyModel"></param>
- /// <returns></returns>
- [HttpPost,Route("AgvSecureApply"),AllowAnonymous]
- public AgvResponseContent AgvSecureApply(AgvSecureApplyModel secureApplyModel)
- {
- return InvokeAGVService.Intance.AgvSecureApply(secureApplyModel);
- }
- /// <summary>
- /// AGV浠诲姟鐘舵�佸埛鏂�
- /// </summary>
- /// <param name="agvUpdateModel"></param>
- /// <returns></returns>
- [HttpPost, Route("AgvUpdateTask"), AllowAnonymous]
- public AgvResponseContent AgvUpdateTask(AgvUpdateModel agvUpdateModel)
- {
- return InvokeAGVService.Intance.AgvUpdateTask(agvUpdateModel);
- }
-
- }
- #endregion
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalFlowController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalFlowController.cs"
deleted file mode 100644
index 647acf8..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalFlowController.cs"
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_IApprovalService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers.Approval
-{
- [Route("api/ApprovalFlow")]
- [ApiController]
- public class ApprovalFlowController : ApiBaseController<IApprovalFlowService, Dt_ApprovalFlow>
- {
- public ApprovalFlowController(IApprovalFlowService service) : base(service)
- {
-
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs"
index 2433006..df78d7d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs"
@@ -12,6 +12,9 @@
namespace WIDESEA_WMSServer.Controllers.Approval
{
+ /// <summary>
+ /// 瀹℃壒浠诲姟
+ /// </summary>
[Route("api/[controller]")]
[ApiController]
public class ApprovalTaskController : ApiBaseController<IApprovalTaskService, Dt_ApprovalTask>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/CustomerInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/CustomerInfoController.cs"
index 6e95df8..4970a95 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/CustomerInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/CustomerInfoController.cs"
@@ -6,6 +6,9 @@
namespace WIDESEA_WMSServer.Controllers.Basic
{
+ /// <summary>
+ /// 瀹㈡埛
+ /// </summary>
[Route("api/[controller]")]
[ApiController]
public class CustomerInfoController : ApiBaseController<ICustomerInfoService, Dt_CustomerInfo>
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 97aa6e5..b46552d 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"
@@ -15,6 +15,9 @@
namespace WIDESEA_WMSServer.Controllers.Basic
{
+ /// <summary>
+ /// 璐т綅
+ /// </summary>
[Route("api/LocationInfo")]
[ApiController]
public class LocationInfoController : ApiBaseController<ILocationInfoService, Dt_LocationInfo>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/MaterielInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/MaterielInfoController.cs"
index 6478e00..ab0925f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/MaterielInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/MaterielInfoController.cs"
@@ -10,6 +10,9 @@
namespace WIDESEA_WMSServer.Controllers.Basic
{
+ /// <summary>
+ /// 鐗╂枡
+ /// </summary>
[Route("api/MaterielInfo")]
[ApiController]
public class MaterielInfoController : ApiBaseController<IMaterielInfoService, Dt_MaterielInfo>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/SupplierInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/SupplierInfoController.cs"
index cf7d994..a0740ef 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/SupplierInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/SupplierInfoController.cs"
@@ -6,6 +6,9 @@
namespace WIDESEA_WMSServer.Controllers.Basic
{
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
[Route("api/[controller]")]
[ApiController]
public class SupplierInfoController : ApiBaseController<ISupplierInfoService, Dt_SupplierInfo>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/UserInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/UserInfoController.cs"
index 9efe667..e27b24d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/UserInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/UserInfoController.cs"
@@ -5,6 +5,9 @@
namespace WIDESEA_WMSServer.Controllers.Basic
{
+ /// <summary>
+ /// 鐢ㄦ埛
+ /// </summary>
[Route("api/[controller]")]
[ApiController]
public class UserInfoController : ApiBaseController<IUserInfoService, Dt_UserInfo>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs"
index 014dba4..a6659dc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/WarehouseController.cs"
@@ -6,6 +6,9 @@
namespace WIDESEA_WMSServer.Controllers.Basic
{
+ /// <summary>
+ /// 浠撳簱
+ /// </summary>
[Route("api/Warehouse")]
[ApiController]
public class WarehouseController : ApiBaseController<IWarehouseService, Dt_Warehouse>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderController.cs"
index fbc4f46..6a4cee4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderController.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_WMSServer.Controllers.Check
{
+ /// <summary>
+ /// 璐ㄦ鍗�
+ /// </summary>
[Route("api/[controller]")]
[ApiController]
public class CheckOrderController : ApiBaseController<ICheckOrderService, Dt_CheckOrder>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs"
index f3ae49a..010d8ab 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs"
@@ -7,6 +7,9 @@
namespace WIDESEA_WMSServer.Controllers.Check
{
+ /// <summary>
+ /// 璐ㄦ缁撴灉
+ /// </summary>
[Route("api/[controller]")]
[ApiController]
public class CheckOrderResultController : ApiBaseController<ICheckOrderResultService, Dt_CheckOrderResult>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
index dad1e55..660d379 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
@@ -22,6 +22,9 @@
namespace WIDESEA_WMSServer.Controllers.ERP
{
+ /// <summary>
+ /// ERP鎺ュ彛
+ /// </summary>
[Route("api/Erp")]
[ApiController]
public class ErpController : ControllerBase
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
index 2aeafe8..b95b45d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_WMSServer.Controllers.Inbound
{
+ /// <summary>
+ /// 鍏ュ簱鍗�
+ /// </summary>
[Route("api/InboundOrder")]
[ApiController]
public class InboundOrderController : ApiBaseController<IInboundOrderService, Dt_InboundOrder>
@@ -33,7 +36,7 @@
/// <param name="palletCode"></param>
/// <param name="serNum"></param>
/// <returns></returns>
- [HttpPost, HttpGet, Route("MaterielGroupSingle"),AllowAnonymous]
+ [HttpPost, HttpGet, Route("MaterielGroupSingle")]
public WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, string serNum)
{
return Service.MaterielGroup(inboundOrderId, palletCode, serNum);
@@ -67,7 +70,7 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- [HttpPost, HttpGet, Route("FeedbackInboundOrder"),AllowAnonymous]
+ [HttpPost, HttpGet, Route("FeedbackInboundOrder")]
public WebResponseContent FeedbackInboundOrder(int id)
{
return Service.FeedbackInboundOrder(id);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderDetailController.cs"
index d4740ee..2d7a25e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderDetailController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderDetailController.cs"
@@ -7,6 +7,9 @@
namespace WIDESEA_WMSServer.Controllers.Inbound
{
+ /// <summary>
+ /// 鍏ュ簱鍗曟槑缁�
+ /// </summary>
[Route("api/InboundOrderDetail")]
[ApiController]
public class InboundOrderDetailController : ApiBaseController<IInboundOrderDetailService, Dt_InboundOrderDetail>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderDetail_HtyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderDetail_HtyController.cs"
index 30af25f..bdcac48 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderDetail_HtyController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderDetail_HtyController.cs"
@@ -10,7 +10,7 @@
namespace WIDESEA_WMSServer.Controllers.Inbound
{
/// <summary>
- /// 鍘嗗彶鍏ュ簱鍗曟槑缁�
+ /// 鍏ュ簱鍗曟槑缁嗗巻鍙�
/// </summary>
[Route("api/InboundOrderDetail_Hty")]
[ApiController]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrder_HtyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrder_HtyController.cs"
index cc39a1b..efb312c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrder_HtyController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrder_HtyController.cs"
@@ -10,7 +10,7 @@
namespace WIDESEA_WMSServer.Controllers.Inbound
{
/// <summary>
- /// 鍘嗗彶鍏ュ簱鍗�
+ /// 鍏ュ簱鍗曞巻鍙�
/// </summary>
[Route("api/InboundOrder_Hty")]
[ApiController]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs"
index abdabac..cf735cb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs"
@@ -6,6 +6,9 @@
namespace WIDESEA_WMSServer.Controllers.Inbound
{
+ /// <summary>
+ /// 閲囪喘鍗�
+ /// </summary>
[Route("api/PurchaseOrder")]
[ApiController]
public class PurchaseOrderController : ApiBaseController<IPurchaseOrderService, Dt_PurchaseOrder>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderDetailController.cs"
index a3a7c08..7c1a91f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderDetailController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderDetailController.cs"
@@ -6,6 +6,9 @@
namespace WIDESEA_WMSServer.Controllers.Inbound
{
+ /// <summary>
+ /// 閲囪喘鍗曟槑缁�
+ /// </summary>
[Route("api/PurchaseOrderDetail")]
[ApiController]
public class PurchaseOrderDetailController : ApiBaseController<IPurchaseOrderDetailService, Dt_PurchaseOrderDetail>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs"
index 027ad82..bc33da4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_WMSServer.Controllers.Inbound
{
+ /// <summary>
+ /// 鏀惰揣鍗�
+ /// </summary>
[Route("api/[controller]")]
[ApiController]
public class ReceiveOrderController : ApiBaseController<IReceiveOrderService, Dt_ReceiveOrder>
@@ -21,7 +24,7 @@
/// </summary>
/// <param name="receiveOrderId">鏀惰揣鍗曠紪鍙�</param>
/// <returns></returns>
- [HttpPost, HttpGet, Route("CreateInboundOrder"),AllowAnonymous]
+ [HttpPost, HttpGet, Route("CreateInboundOrder")]
public WebResponseContent CreateInboundOrder(int receiveOrderId)
{
return Service.CreateInboundOrder(receiveOrderId);
@@ -32,7 +35,7 @@
/// </summary>
/// <param name="orderId"></param>
/// <returns></returns>
- [HttpPost, HttpGet, Route("FeedbackReceiveOrder"),AllowAnonymous]
+ [HttpPost, HttpGet, Route("FeedbackReceiveOrder")]
public WebResponseContent FeedbackReceiveOrder(int orderId)
{
return Service.FeedbackReceiveOrder(orderId);
@@ -42,7 +45,7 @@
/// </summary>
/// <returns></returns>
[HttpPost, HttpGet, Route("GetReceiveOrders")]
- public WebResponseContent GetReceiveOrders([FromBody]SaveModel saveModel)
+ public WebResponseContent GetReceiveOrders([FromBody] SaveModel saveModel)
{
return Service.GetReceiveOrders(saveModel);
}
@@ -53,7 +56,7 @@
/// <param name="purchaseOrderId"></param>
/// <param name="lotNo"></param>
/// <returns></returns>
- [HttpPost, HttpGet, Route("ReceiveAllOrder"),AllowAnonymous]
+ [HttpPost, HttpGet, Route("ReceiveAllOrder")]
public WebResponseContent ReceiveAllOrder(int purchaseOrderId, string lotNo)
{
return Service.ReceiveAllOrder(purchaseOrderId, lotNo);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderDetailController.cs"
index 2ac1a52..52bb802 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderDetailController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderDetailController.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_WMSServer.Controllers.Inbound
{
+ /// <summary>
+ /// 鏀惰揣鍗曟槑缁�
+ /// </summary>
[Route("api/[controller]")]
[ApiController]
public class ReceiveOrderDetailController : ApiBaseController<IReceiveOrderDetailService, Dt_ReceiveOrderDetail>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
index 6809ade..8e39f2d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs"
@@ -15,6 +15,9 @@
namespace WIDESEA_WMSServer.Controllers.MES
{
+ /// <summary>
+ /// MES鎺ュ彛
+ /// </summary>
[Route("api/Mes")]
[ApiController]
public class MesController : ControllerBase
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
index b207da1..77615e3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_WMSServer.Controllers.Outbound
{
+ /// <summary>
+ /// 鍑哄簱璇︽儏
+ /// </summary>
[Route("api/OutStockLockInfo")]
[ApiController]
public class OutStockLockInfoController : ApiBaseController<IOutStockLockInfoService, Dt_OutStockLockInfo>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderController.cs"
index 07f9ee7..c34fdbc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderController.cs"
@@ -11,6 +11,9 @@
namespace WIDESEA_WMSServer.Controllers.Outbound
{
+ /// <summary>
+ /// 鍑哄簱鍗�
+ /// </summary>
[Route("api/OutboundOrder")]
[ApiController]
public class OutboundOrderController : ApiBaseController<IOutboundOrderService, Dt_OutboundOrder>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetailController.cs"
index b9fb5df..a61e949 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetailController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetailController.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_WMSServer.Controllers.Outbound
{
+ /// <summary>
+ /// 鍑哄簱鍗曟槑缁�
+ /// </summary>
[Route("api/OutboundOrderDetail")]
[ApiController]
public class OutboundOrderDetailController : ApiBaseController<IOutboundOrderDetailService, Dt_OutboundOrderDetail>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetail_HtyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetail_HtyController.cs"
index 5dcfec3..9efe889 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetail_HtyController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderDetail_HtyController.cs"
@@ -11,7 +11,7 @@
namespace WIDESEA_WMSServer.Controllers.Inbound
{
/// <summary>
- /// 鍘嗗彶鍑哄簱鍗曟槑缁�
+ /// 鍑哄簱鍗曟槑缁嗗巻鍙�
/// </summary>
[Route("api/OutboundOrderDetail_Hty")]
[ApiController]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrder_HtyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrder_HtyController.cs"
index 45f597f..7d40d61 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrder_HtyController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrder_HtyController.cs"
@@ -11,7 +11,7 @@
namespace WIDESEA_WMSServer.Controllers.Inbound
{
/// <summary>
- /// 鍘嗗彶鍑哄簱鍗�
+ /// 鍑哄簱鍗曞巻鍙�
/// </summary>
[Route("api/OutboundOrder_Hty")]
[ApiController]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
index ad7c944..68a3577 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
@@ -14,6 +14,9 @@
namespace WIDESEA_WMSServer.Controllers
{
+ /// <summary>
+ /// PDA
+ /// </summary>
[Route("api/PDA")]
[Authorize, ApiController]
public class PDAController : Controller
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/LocationStatusChangeRecordController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/LocationStatusChangeRecordController.cs"
index 595d7bb..b5dfe4d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/LocationStatusChangeRecordController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/LocationStatusChangeRecordController.cs"
@@ -8,6 +8,9 @@
namespace WIDESEA_WMSServer.Controllers.Record
{
+ /// <summary>
+ /// 璐т綅鐘舵�佸彉鍔ㄨ褰�
+ /// </summary>
[Route("api/LocationStatusChangeRecord")]
[ApiController]
public class LocationStatusChangeRecordController : ApiBaseController<ILocationStatusChangeRecordService, Dt_LocationStatusChangeRecord>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/StockQuantityChangeRecordController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/StockQuantityChangeRecordController.cs"
index 7649bd8..2973d77 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/StockQuantityChangeRecordController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Record/StockQuantityChangeRecordController.cs"
@@ -6,6 +6,9 @@
namespace WIDESEA_WMSServer.Controllers.Record
{
+ /// <summary>
+ /// 搴撳瓨鏁伴噺鍙樺姩璁板綍
+ /// </summary>
[Route("api/StockQuantityChangeRecord")]
[ApiController]
public class StockQuantityChangeRecordController : ApiBaseController<IStockQuantityChangeRecordService, Dt_StockQuantityChangeRecord>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
index 7c94e72..530fa23 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
@@ -11,6 +11,9 @@
namespace WIDESEA_WMSServer.Controllers.Stock
{
+ /// <summary>
+ /// 搴撳瓨
+ /// </summary>
[Route("api/StockInfo")]
[ApiController]
public class StockInfoController : ApiBaseController<IStockInfoService, Dt_StockInfo>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs"
index 7c679d2..5ff0f67 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetailController.cs"
@@ -6,6 +6,9 @@
namespace WIDESEA_WMSServer.Controllers.Stock
{
+ /// <summary>
+ /// 搴撳瓨鏄庣粏
+ /// </summary>
[Route("api/StockInfoDetail")]
[ApiController]
public class StockInfoDetailController : ApiBaseController<IStockInfoDetailService, Dt_StockInfoDetail>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetail_HtyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetail_HtyController.cs"
index 3e135da..5773dfe 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetail_HtyController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoDetail_HtyController.cs"
@@ -11,7 +11,7 @@
namespace WIDESEA_WMSServer.Controllers.Stock
{
/// <summary>
- /// 鍘嗗彶搴撳瓨鏄庣粏
+ /// 搴撳瓨鏄庣粏鍘嗗彶
/// </summary>
[Route("api/StockInfoDetail_Hty")]
[ApiController]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfo_HtyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfo_HtyController.cs"
index c8341cc..f9b8a0b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfo_HtyController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfo_HtyController.cs"
@@ -11,7 +11,7 @@
namespace WIDESEA_WMSServer.Controllers.Stock
{
/// <summary>
- /// 鍘嗗彶搴撳瓨淇℃伅
+ /// 搴撳瓨鍘嗗彶
/// </summary>
[Route("api/StockInfo_Hty")]
[ApiController]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockViewController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockViewController.cs"
index bbd9d96..69857e1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockViewController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockViewController.cs"
@@ -10,6 +10,9 @@
namespace WIDESEA_WMSServer.Controllers.Stock
{
+ /// <summary>
+ /// 搴撳瓨瑙嗗浘
+ /// </summary>
[Route("api/StockView")]
[Authorize, ApiController]
public class StockViewController : Controller
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs"
index 76b8535..ac11540 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_WMSServer.Controllers
{
+ /// <summary>
+ /// 瀛楀吀
+ /// </summary>
[Route("api/Sys_Dictionary")]
[ApiController]
public class Sys_DictionaryController : ApiBaseController<ISys_DictionaryService, Sys_Dictionary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs"
index 29e40a2..26a8597 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs"
@@ -5,6 +5,9 @@
namespace WIDESEA_WMSServer.Controllers
{
+ /// <summary>
+ /// 瀛楀吀鏄庣粏
+ /// </summary>
[Route("api/Sys_DictionaryList")]
[ApiController]
public class Sys_DictionaryListController : ApiBaseController<ISys_DictionaryListService, Sys_DictionaryList>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_LogController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_LogController.cs"
index 9c1a931..2f5cd74 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_LogController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_LogController.cs"
@@ -6,6 +6,9 @@
namespace WIDESEA_WMSServer.Controllers
{
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
[Route("api/[controller]")]
[ApiController]
public class Sys_LogController : ApiBaseController<ISys_LogService, Sys_Log>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_MenuController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_MenuController.cs"
index b86710c..d6dcb2f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_MenuController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_MenuController.cs"
@@ -6,6 +6,9 @@
namespace WIDESEA_WMSServer.Controllers
{
+ /// <summary>
+ /// 鑿滃崟
+ /// </summary>
[Route("api/Sys_Menu")]
[ApiController]
public class Sys_MenuController : ApiBaseController<ISys_MenuService, Sys_Menu>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleAuthController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleAuthController.cs"
deleted file mode 100644
index 561db83..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleAuthController.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using WIDESEA_Core.BaseController;
-using WIDESEA_ISystemService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_WMSServer.Controllers
-{
- [Route("api/Sys_RoleAuth")]
- [ApiController]
- public class Sys_RoleAuthController : ApiBaseController<ISys_RoleAuthService, Sys_RoleAuth>
- {
- public Sys_RoleAuthController(ISys_RoleAuthService service) : base(service)
- {
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs"
index 1671985..0318a13 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs"
@@ -11,6 +11,9 @@
namespace WIDESEA_WMSServer.Controllers
{
+ /// <summary>
+ /// 瑙掕壊
+ /// </summary>
[Route("api/Sys_Role")]
[ApiController]
public class Sys_RoleController : ApiBaseController<ISys_RoleService, Sys_Role>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_TenantController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_TenantController.cs"
index b0effc6..d64cd8d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_TenantController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_TenantController.cs"
@@ -13,6 +13,9 @@
namespace WIDESEA_WMSServer.Controllers
{
+ /// <summary>
+ /// 绉熸埛
+ /// </summary>
[Route("api/tenant")]
[ApiController]
public class Sys_TenantController : ApiBaseController<ISys_TenantService, Sys_Tenant>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs"
index 47d63c8..d9033aa 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs"
@@ -17,6 +17,9 @@
namespace WIDESEA_WMSServer.Controllers
{
+ /// <summary>
+ /// 鐢ㄦ埛
+ /// </summary>
[Route("api/User")]
[ApiController]
public class Sys_UserController : ApiBaseController<ISys_UserService, Sys_User>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
index 2f7fd80..33ab334 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
@@ -10,6 +10,9 @@
namespace WIDESEA_WMSServer.Controllers.TaskInfo
{
+ /// <summary>
+ /// 浠诲姟
+ /// </summary>
[Route("api/Task")]
[ApiController]
public class TaskController : ApiBaseController<ITaskService, Dt_Task>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/Task_HtyController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/Task_HtyController.cs"
index ed012f5..16f12a7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/Task_HtyController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/Task_HtyController.cs"
@@ -9,6 +9,9 @@
namespace WIDESEA_WMSServer.Controllers.TaskInfo
{
+ /// <summary>
+ /// 浠诲姟鍘嗗彶
+ /// </summary>
[Route("api/Task_Hty")]
[ApiController]
public class Task_HtyController : ApiBaseController<ITask_HtyService, Dt_Task_Hty>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
index 9390217..51a9264 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
@@ -24,6 +24,7 @@
"WCS": "http://localhost:9291/api/Task/",
"LogAopEnable": false,
+ "PrintSql": true, //鎵撳嵃SQL璇彞
"ApiName": "WIDESEA",
"ExpMinutes": 120,
"QuartzJobAutoStart": true,
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\350\256\276\345\244\207\345\215\217\350\256\256/~$\351\230\273\347\204\212\344\273\223\345\240\206\345\236\233\346\234\272\351\200\232\344\277\241\345\215\217\350\256\256.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\350\256\276\345\244\207\345\215\217\350\256\256/~$\351\230\273\347\204\212\344\273\223\345\240\206\345\236\233\346\234\272\351\200\232\344\277\241\345\215\217\350\256\256.xlsx"
new file mode 100644
index 0000000..c5ee44d
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\350\256\276\345\244\207\345\215\217\350\256\256/~$\351\230\273\347\204\212\344\273\223\345\240\206\345\236\233\346\234\272\351\200\232\344\277\241\345\215\217\350\256\256.xlsx"
Binary files differ
--
Gitblit v1.9.3