From 32420f572c9e4d2f0c424214bc92f75e7dfe56f1 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期二, 14 一月 2025 09:01:37 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
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 36030d6..a654e01 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"
@@ -112,12 +112,12 @@
{
x.AGVArea = agvDescription;
});
- string address = AppSettings.Get("WCSApiAddress");
- if (string.IsNullOrEmpty(address))
+ string url = AppSettings.Get("WCS");
+ if (string.IsNullOrEmpty(url))
{
- return WebResponseContent.Instance.Error($"鏈壘鍒癢CSApi鍦板潃");
+ return WebResponseContent.Instance.Error($"鏈壘鍒癢CSApi鍦板潃,璇锋鏌ラ厤缃枃浠�");
}
- string response = HttpHelper.Post($"{address}/api/Task/ReceiveTask", taskDTOs.Serialize());
+ string response = HttpHelper.Post($"{url}/api/Task/ReceiveTask", taskDTOs.Serialize());
return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("杩斿洖閿欒");
}
@@ -135,12 +135,12 @@
{
try
{
- string address = AppSettings.Get("WCSApiAddress");
- if (string.IsNullOrEmpty(address))
+ string url = AppSettings.Get("WCS");
+ if (string.IsNullOrEmpty(url))
{
- return WebResponseContent.Instance.Error($"鏈壘鍒癢CSApi鍦板潃");
+ return WebResponseContent.Instance.Error($"鏈壘鍒癢CSAApi鍦板潃,璇锋鏌ラ厤缃枃浠�");
}
- string response = HttpHelper.Post($"{address}/api/CTU_AGV/PutFinish?code=" + code);
+ string response = HttpHelper.Post($"{url}/api/CTU_AGV/PutFinish", code);
return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("杩斿洖閿欒");
}
@@ -198,8 +198,8 @@
stockInfo.LocationCode = locationInfo.LocationCode;
- #region 绌虹鍏ュ簱
- if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
+ #region 绌虹鍏ュ簱/鎷ｉ�夊洖搴�
+ if (task.TaskType == TaskTypeEnum.InEmpty.ObjToInt() || task.TaskType == TaskTypeEnum.InPick.ObjToInt())
{
stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
@@ -258,14 +258,14 @@
{
inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
}
-
+
}
if ((stockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt() || stockInfo.StockStatus == StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt()) && warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
{
foreach (var model in stockInfo.Details)
{
- TestSynStock(new TestToolSynInfo() { ToolCode = model.BatchNo, /*MaterialName = model.MaterielName,*/ Life = int.TryParse(model.Remark, out int val) ? val : 1000 });
+ TestSynStock(new TestToolSynInfo() { ToolCode = model.BatchNo, MaterialName = model.MaterielName, Life = int.TryParse(model.Remark, out int val) ? val : 1000 });
}
}
@@ -352,7 +352,7 @@
{
if (task.TaskType == TaskTypeEnum.MesOutbound.ObjToInt())
{
- Dt_MesOutboundOrder mesOutboundOrder = _outboundService.MesOutboundOrderService.Repository.QueryFirst(x => x.Id == item.OrderDetailId);
+ Dt_MesOutboundOrder mesOutboundOrder = _outboundService.MesOutboundOrderService.Repository.QueryFirst(x => x.TaskNo == item.OrderNo);
if (mesOutboundOrder != null)
{
mesOutboundOrder.OverOutQuantity = item.AssignQuantity;
@@ -423,7 +423,7 @@
if (task.TaskType == TaskTypeEnum.MesOutbound.ObjToInt())
{
MesMaterialLotaAceptModel model = GetMesMaterialLotaAceptModel(stockInfo, stockInfo.Details.FirstOrDefault(), mesOutboundOrders.FirstOrDefault().TaskNo, warehouse.WarehouseCode, mesOutboundOrders.FirstOrDefault().OrderQuantity);
- UploadMesMaterialLotaAcept(model);
+ UploadMesMaterialLotaAcept(model);
}
return WebResponseContent.Instance.OK();
}
--
Gitblit v1.9.3