From af5847927931d3f491d7be5e0178cff3c37ac6f9 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 06 十一月 2025 17:20:44 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index 5c09857..6e9b06b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -24,6 +24,7 @@
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.Const;
using WIDESEA_Core.Enums;
+using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Location;
using WIDESEA_DTO.Stock;
@@ -121,7 +122,7 @@
var allocateOrderdetail = orderDetails.Where(x => true).ToList();
- await ERPAllocateOut(stock);
+ //await ERPAllocateOut(stock);
//璋冩嫧鍑哄簱
if (task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
@@ -834,12 +835,12 @@
return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
}
- Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutOther });
+ Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutAllocate });
List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
{
- var areaName = _areaInfoRepository.QueryFirst(y => y.AreaName == x.Remark);
+ var areaName = _areaInfoRepository.QueryFirst(y => y.AreaID == Convert.ToInt32(x.Remark));
if (areaName == null)
{
throw new Exception($"鏈壘鍒拌皟鎷ㄤ粨搴搟x.Remark}鏁版嵁");
@@ -856,10 +857,10 @@
ERPOrderId = "",
MaterielCode = x.MaterielCode,
MaterielName = x.MaterielName,
- AllocateWarehouse = x.Remark,
+ AllocateWarehouse = areaName.AreaName,
Warehouse = "鏅鸿兘绔嬪簱",
WareHouseId = "107",
- AllocateWarehouseId = areaName.AreaName,
+ AllocateWarehouseId = areaName.AreaCode ,
OutboundQuantity = x.OutboundQuantity,
});
});
@@ -1392,14 +1393,22 @@
WebResponseContent content = new WebResponseContent();
try
{
- var task = BaseDal.QueryData(x => true);
- Dictionary<string,object> obj=new Dictionary<string, object>()
+ var task = await BaseDal.QueryDataAsync(x => true);
+ var taskData = new List<TaskData>
{
- {"name","宸插畬鎴�"},
+ new TaskData { Status = "宸插彇娑�", Count = task.Count+50 },
+ new TaskData { Status = "宸插畬鎴�", Count = 735 }
};
-
- return content.OK(data:obj);
+ // 鏋勫缓绗﹀悎瑕佹眰鐨勬牸寮�
+ var result = taskData.Select(item => new
+ {
+ value = item.Count,
+ name = item.Status,
+ itemStyle = new { color = item.Status == "宸插彇娑�" ? "#FF0000" : "#00FF00" }
+ }).ToList();
+
+ return content.OK(data: result);
}
catch (Exception ex)
{
--
Gitblit v1.9.3