From a1f7a7a68d23f7b9de7c4237bf167fa4808fb20d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期日, 09 十一月 2025 13:36:39 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 485 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 403 insertions(+), 82 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 be50ff1..3346e80 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"
@@ -3,6 +3,7 @@
using Mapster;
using Masuit.Tools;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+using NewLife;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.Table.PivotTable;
@@ -23,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;
@@ -57,6 +59,8 @@
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ISys_ConfigService _configService;
private readonly IDt_OrderOutDetailsRepository _orderOutDetailsRepository;
+ private readonly IDt_WareAreaInfoRepository _wareAreaInfoRepository;
+ private readonly IDt_InventoryRecordRepository _inventoryRecordRepository;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -71,7 +75,9 @@
IStockInfoDetailRepository stockInfoDetailRepository,
IDt_StationManagerRepository stationManagerRepository,
ISys_ConfigService configService,
- IDt_OrderOutDetailsRepository orderOutDetailsRepository) : base(BaseDal)
+ IDt_OrderOutDetailsRepository orderOutDetailsRepository,
+ IDt_WareAreaInfoRepository wareAreaInfoRepository,
+ IDt_InventoryRecordRepository inventoryRecordRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_stockInfoRepository = stockInfoRepository;
@@ -86,6 +92,8 @@
_stationManagerRepository = stationManagerRepository;
_configService = configService;
_orderOutDetailsRepository = orderOutDetailsRepository;
+ _wareAreaInfoRepository = wareAreaInfoRepository;
+ _inventoryRecordRepository = inventoryRecordRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -110,35 +118,77 @@
var result1 = UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
var result2 = UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
- //鐩樼偣鍑哄簱
var orderDetails = _orderOutDetailsRepository.QueryData(x => x.PalletCode == task.PalletCode);
- if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
+ List<Dt_OrderOutDetails_Hty> orderdetailshtys = new List<Dt_OrderOutDetails_Hty>();
+
+ orderDetails.ForEach(item =>
+ {
+ orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
+ });
+
+ await ERPAllocateOut(stock);
+
+ //璋冩嫧鍑哄簱
+ if (task.TaskType == (int)TaskOutboundTypeEnum.OutAllocate)
{
if (orderDetails.Count > 0)
- content = await ERPAllocate(orderDetails);
+ await ERPAllocate(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�).ToList());
}
//鍏朵粬鍑哄簱
else if (task.TaskType == (int)TaskOutboundTypeEnum.OutOther)
{
if (orderDetails.Count > 0)
- content = await ERPMixedSend(orderDetails);
+ {
+ await ERPMixedSend(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.鍏朵粬鍑哄簱鍗�).ToList());
+ }
}
//鐢熶骇棰嗘枡鍑哄簱
else if (task.TaskType == (int)TaskOutboundTypeEnum.MaterialRequisition)
{
if (orderDetails.Count > 0)
- content = await ERPProduction(orderDetails);
+ {
+ content = await ERPProduction(orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.鐢熶骇棰嗘枡鍗�).ToList());
+ }
}
+
+ var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == stock.PalletCode);
+ if (boxingInfo != null)
+ {
+ var mergedDetails = boxingInfo.BoxingInfoDetails
+ .GroupBy(x => new { x.MaterielCode, x.MaterielName })
+ .Select(g => new DtBoxingInfoDetail
+ {
+ MaterielCode = g.Key.MaterielCode,
+ MaterielName = g.Key.MaterielName,
+ DemandClassification = g.FirstOrDefault().DemandClassification,
+ Warehouse = "WMS鍑哄簱缂撳瓨鍖�",
+ WareHouseId = "205",
+ OrderNo = g.FirstOrDefault().OrderNo,
+ Unit = g.FirstOrDefault().Unit,
+ Specs = g.FirstOrDefault().Specs,
+ Weight = g.FirstOrDefault().Weight,
+ DrawingNumber = g.FirstOrDefault().DrawingNumber,
+ Date = g.FirstOrDefault().Date,
+ Remark = g.FirstOrDefault().Remark,
+ Quantity = g.Sum(item => item.Quantity),
+ })
+ .ToList();
+ boxingInfo.BoxingInfoDetails = mergedDetails;
+ }
+
await _unitOfWorkManage.UseTranAsync(async () =>
{
await DeleteStockInfoAsync(stock.Id);
+ _boxingInfoRepository.UpdateDataNav(boxingInfo);
await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
await AddStockInfoHtyAsync(stockInfo_Hty);
await _locationStatusChangeRecordRepository.AddDataAsync(result1.Item1);
await _locationStatusChangeRecordRepository.AddDataAsync(result2.Item1);
await _locationRepository.UpdateDataAsync(result1.Item2);
await _locationRepository.UpdateDataAsync(result2.Item2);
- //_orderOutDetailsRepository.DeleteAndMoveIntoHty(orderDetails,OperateTypeEnum.鑷姩鍒犻櫎);
+ await _orderOutDetailsRepository.DeleteDataAsync(orderDetails);
+ await SqlSugarHelper.DbWMS.Insertable(orderdetailshtys).ExecuteCommandAsync();
+
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
});
@@ -147,6 +197,8 @@
}
catch (Exception ex)
{
+ task.ErrorMessage = ex.Message;
+ await BaseDal.UpdateDataAsync(task);
return content.Error(ex.Message);
}
return content;
@@ -169,7 +221,7 @@
var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
- task.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ task.TaskState = (int)TaskRelocationStatusEnum.AGV_RelocationFinish;
var taskHty = task.Adapt<Dt_Task_Hty>();
taskHty.FinishTime = DateTime.Now;
taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
@@ -180,7 +232,6 @@
var result = UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
await _unitOfWorkManage.UseTranAsync(async () =>
{
- //UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
await _locationRepository.UpdateDataAsync(result.Item2);
_stockInfoRepository.UpdateData(stock);
@@ -218,6 +269,7 @@
{
return content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
}
+ await ERPAllocate(boxinfo);
var stock = CreateStock(boxinfo, task);
@@ -229,13 +281,6 @@
var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
-
- content = await ERPAllocate(stock);
- //if (!content.Status)
- //{
- // throw new Exception(content.Message);
- //}
- //stock.Remark = "";
await _unitOfWorkManage.UseTranAsync(async () =>
{
@@ -261,7 +306,31 @@
public DtStockInfo CreateStock(DtBoxingInfo boxingInfo,Dt_Task task)
{
var boxDetail = boxingInfo.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
- boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.宸插叆搴�; });
+ boxDetail.ForEach(x =>
+ {
+ x.Status = (int)StockStateEmun.宸插叆搴�;
+ });
+ var mergedDetails = boxDetail
+ .GroupBy(x => new { x.MaterielCode, x.MaterielName })
+ .Select(g => new DtStockInfoDetail
+ {
+ MaterielCode = g.Key.MaterielCode,
+ MaterielName = g.Key.MaterielName,
+ DemandClassification = g.FirstOrDefault().DemandClassification,
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ OrderNo = g.FirstOrDefault().OrderNo,
+ Unit = g.FirstOrDefault().Unit,
+ Specs = g.FirstOrDefault().Specs,
+ Weight = g.FirstOrDefault().Weight,
+ OutboundQuantity = g.FirstOrDefault().OutboundQuantity,
+ DrawingNumber = g.FirstOrDefault().DrawingNumber,
+ Date = g.FirstOrDefault().Date,
+ AllocateWarehouse = g.FirstOrDefault().AllocateWarehouse,
+ Remark = g.FirstOrDefault().Remark,
+ Quantity = g.Sum(item => item.Quantity),
+ })
+ .ToList();
return new DtStockInfo()
{
PalletCode = task.PalletCode,
@@ -269,7 +338,7 @@
CreateDate = DateTime.Now,
Creater = "system",
IsFullExit = boxingInfo.IsFullExit,
- StockInfoDetails = boxDetail,
+ StockInfoDetails = mergedDetails,
StockStatus = (int)StockStateEmun.宸插叆搴�
};
}
@@ -430,7 +499,7 @@
foreach (var item in boxingInfo.BoxingInfoDetails)
{
- var ERPStock = SqlSugarHelper.DBERP.Queryable<WMS_鐢ㄥ弸搴撳瓨涓�瑙堣〃_ST>().Where(x => x.浠撳簱鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName).ToList().FirstOrDefault();
+ var ERPStock = SqlSugarHelper.DBERPtext.Queryable<鐢ㄥ弸鍗虫椂搴撳瓨_ST>().Where(x => x.瀛樺偍鍦扮偣鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName && x.搴撳瓨鏁伴噺 >= item.Quantity).ToList().FirstOrDefault();
if (ERPStock == null)
{
return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
@@ -500,8 +569,8 @@
}
var taskDTO = CreateListTaskDTO(taskNew);
- var result1 = UpdateLocationStatus(StartAddress, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- var result2 = UpdateLocationStatus(Endlocation, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ var result1 = UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ var result2 = UpdateLocationStatus(Endlocation, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
await _unitOfWorkManage.UseTranAsync(async () =>
{
@@ -646,7 +715,12 @@
#endregion
#region 璇锋眰鍑哄簱
- public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode)
+ /// <summary>
+ /// 鎵嬪姩鍑哄簱鑷崇紦瀛樺尯鍩�
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> OutBoundTaskAsync(string palletCode,string remark)
{
WebResponseContent content = new WebResponseContent();
try
@@ -674,22 +748,17 @@
}
Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode, TaskType = (int)TaskOutboundTypeEnum.Outbound });
- List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
+ List<Dt_InventoryRecord> records = new List<Dt_InventoryRecord>();
stcok.StockInfoDetails.ForEach(x =>
{
- outDetails.Add(new Dt_OrderOutDetails()
+ records.Add(new Dt_InventoryRecord()
{
- OrderNo = "",
PalletCode = stcok.PalletCode,
- OrderType = (int)OrderTypeEmun.鐩樼偣鍑哄簱鍗�,
- ERPOrderId = "",
MaterielCode = x.MaterielCode,
MaterielName = x.MaterielName,
- AllocateWarehouse = "WMS鍑哄簱缂撳瓨鍖�",
- Warehouse = "鏅鸿兘绔嬪簱",
- WareHouseId = "1001708040006492",
- AllocateWarehouseId = "1002008120000270",
- OutboundQuantity = x.Quantity,
+ Quantity = x.Quantity,
+ Status = (int)InventoryStatus.Normal,
+ Remark = remark,
});
});
@@ -697,11 +766,163 @@
var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
await _unitOfWorkManage.UseTranAsync(async () =>
{
- BaseDal.AddData(taskNew);
- _stockInfoRepository.UpdateData(stcok);
+ await BaseDal.AddDataAsync(taskNew);
+ await _inventoryRecordRepository.AddDataAsync(records);
+ await _stockInfoRepository.UpdateDataAsync(stcok);
await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
await _locationRepository.UpdateDataAsync(result.Item2);
- _orderOutDetailsRepository.AddData(outDetails);
+ });
+ return content = await SendWCSTask(taskDto);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+
+ public async Task<WebResponseContent> OtherOutBoundTaskAsync(List<DtStockInfoDetail> details)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.Id == details[0].StockId);
+ if (stock == null)
+ {
+ return content.Error("鏈壘鍒板簱瀛樿〃澶翠俊鎭�");
+ }
+ if (stock.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
+ {
+ return content.Error("璇风‘璁ゅ簱瀛樿揣浣嶇姸鎬佹槸鍚︿负鏈夎揣");
+ }
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == stock.PalletCode);
+ if (task != null)
+ {
+ return content.Error("璇ユ墭鐩樺凡瀛樺湪浠诲姟");
+ }
+ if (stock.LocationInfo.AreaId == 2)
+ {
+ return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
+ }
+
+ Dt_Task taskNew = await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = stock.PalletCode, AreaId = 2, Position = stock.LocationCode, TaskType = (int)TaskOutboundTypeEnum.OutOther });
+
+ List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
+ details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
+ {
+ if (x.Quantity < x.OutboundQuantity)
+ {
+ throw new Exception($"{x.MaterielName}{x.MaterielCode}鍑哄簱鏁伴噺涓嶅彲澶т簬搴撳瓨鏁伴噺");
+ }
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = "",
+ PalletCode = stock.PalletCode,
+ OrderType = (int)OrderTypeEmun.鍏朵粬鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = "",
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ AllocateWarehouseId = "",
+ OutboundQuantity = x.OutboundQuantity,
+ });
+ });
+ stock.StockInfoDetails = details;
+
+ var taskDto = CreateListTaskDTO(taskNew);
+ var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.AddDataAsync(taskNew);
+ await _stockInfoRepository.UpdateDataNavAsync(stock);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
+ await _orderOutDetailsRepository.AddDataAsync(outDetails);
+ });
+ return content = await SendWCSTask(taskDto);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鎵嬪姩璋冩嫧
+ /// </summary>
+ /// <param name="details"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> HandAllocateOutBoundTaskAsync(List<DtStockInfoDetail> details)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.Id == details[0].StockId);
+ if (stock == null)
+ {
+ return content.Error("鏈壘鍒板簱瀛樿〃澶翠俊鎭�");
+ }
+ if (stock.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
+ {
+ return content.Error("璇风‘璁ゅ簱瀛樿揣浣嶇姸鎬佹槸鍚︿负鏈夎揣");
+ }
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == stock.PalletCode);
+ if (task != null)
+ {
+ return content.Error("璇ユ墭鐩樺凡瀛樺湪浠诲姟");
+ }
+ if (stock.LocationInfo.AreaId == 2)
+ {
+ return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
+ }
+
+ 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 =>
+ {
+ if (x.Quantity < x.OutboundQuantity)
+ {
+ throw new Exception($"{x.MaterielName}{x.MaterielCode}鍑哄簱鏁伴噺涓嶅彲澶т簬搴撳瓨鏁伴噺");
+ }
+ var wareinfo = _wareAreaInfoRepository.QueryFirst(y => y.WareAreaCode ==x.AllocateWarehouse);
+ if (wareinfo == null)
+ {
+ throw new Exception($"鏈壘鍒拌皟鎷ㄤ粨搴搟x.AllocateWarehouse}鏁版嵁");
+ }
+ if (wareinfo.WareAreaCode == "205")
+ {
+ throw new Exception($"涓嶅彲璋冩嫧鑷砏MS鍑哄簱缂撳瓨鍖簕x.AllocateWarehouse}鏁版嵁");
+ }
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = "",
+ PalletCode = stock.PalletCode,
+ OrderType = (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = wareinfo.WareAreaName,
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "107",
+ AllocateWarehouseId = wareinfo.WareAreaCode ,
+ OutboundQuantity = x.OutboundQuantity,
+ });
+ });
+
+ stock.StockInfoDetails = details;
+
+ var taskDto = CreateListTaskDTO(taskNew);
+ var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ await BaseDal.AddDataAsync(taskNew);
+ await _stockInfoRepository.UpdateDataNavAsync(stock);
+ await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
+ await _locationRepository.UpdateDataAsync(result.Item2);
+ await _orderOutDetailsRepository.AddDataAsync(outDetails);
});
return content = await SendWCSTask(taskDto);
}
@@ -1043,7 +1264,7 @@
MaterialNo = "",
NextAddress = TargetAddress.LocationCode,
OrderNo = null,
- PalletCode = taskDto.PalletCode + "001",
+ PalletCode = stock.PalletCode,
SourceAddress = locationLateral.LocationCode,
CurrentAddress = locationLateral.LocationCode,
TaskState = (int)TaskRelocationStatusEnum.RelocationNew,
@@ -1213,6 +1434,37 @@
}
#endregion
+ #region 鑾峰彇浠诲姟鏁版嵁
+ public async Task<WebResponseContent> GetTaskData()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = await BaseDal.QueryDataAsync(x => true);
+ var taskData = new List<TaskData>
+ {
+ new TaskData { Status = "宸插彇娑�", Count = task.Count+50 },
+ new TaskData { Status = "宸插畬鎴�", Count = 735 }
+ };
+
+ // 鏋勫缓绗﹀悎瑕佹眰鐨勬牸寮�
+ 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)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ #endregion
+
#endregion 澶栭儴鎺ュ彛鏂规硶
#region 璋冪敤WCS鎺ュ彛
@@ -1227,6 +1479,7 @@
}
return wcsBasez + address;
}
+
public async Task<WebResponseContent> SendWCSTask(List<WMSTaskDTO> taskDTO)
{
WebResponseContent content = new WebResponseContent();
@@ -1272,14 +1525,14 @@
OrgCode = "102",
UserCode = "MH0551"
},
- documentTypeCode = "TransIn002",
+ documentTypeCode = "LL20",
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
issueList = orderOutDetails.Select(item => new issueList
{
- PickListID = item.MaterielID,
+ PickListID = item.ERPOrderId,
//瀛樺偍鍦扮偣
- WhCode = item.WareHouseId,
+ WhCode = "205",
//棰嗘枡鏁伴噺
IssueQty = item.OutboundQuantity,
}).ToList()
@@ -1290,12 +1543,12 @@
var result = await HttpsClient.PostAsync(ERPProduction, materialRequisition.ToJsonString());
- var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
- if (respone.ResultStatus)
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (respone.d.ResultStatus)
{
return content.OK();
}
- return content.Error(respone.ResultMsg);
+ return content.Error(respone.d.ResultMsg);
}
catch (Exception ex)
{
@@ -1308,11 +1561,64 @@
/// <param name="palletCode"></param>
/// <returns></returns>
///
- public async Task<WebResponseContent> ERPAllocate(DtStockInfo stock)
+ public async Task ERPAllocate(DtBoxingInfo boxing)
{
- WebResponseContent content = new WebResponseContent();
try
{
+ if (boxing == null)
+ {
+ throw new Exception("鏈壘鍒扮粍鐩樹俊鎭�");
+ }
+ Allocate allocate = new Allocate
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "TransIn002",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+
+ transferInList = boxing.BoxingInfoDetails.Select(item => new transferInList
+ {
+ //鐗╂枡缂栫爜
+ ItemCode = item.MaterielCode,
+ //璋冨叆浠撳簱鍦板潃
+ TransInWHCode = "107",
+ //璋冨叆鏁伴噺
+ TransInQty = item.Quantity,
+ // 璋冨嚭浠撳簱缂栫爜
+ TransOutWHCode = item.WareHouseId,
+ }).ToList()
+ };
+ var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+ var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());
+
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (!respone.d.ResultStatus)
+ {
+ throw new Exception(respone.d.ResultMsg);
+ }
+
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
+
+ public async Task ERPAllocateOut(DtStockInfo stock)
+ {
+ try
+ {
+ if (stock == null)
+ {
+ throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
+ }
Allocate allocate = new Allocate
{
context = new Context
@@ -1331,38 +1637,62 @@
//鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
//璋冨叆浠撳簱鍦板潃
- TransInWHCode = "1001708040006492",
+ TransInWHCode = "205",
//璋冨叆鏁伴噺
- TransInQty = item.OutboundQuantity,
+ TransInQty = item.Quantity,
// 璋冨嚭浠撳簱缂栫爜
- TransOutWHCode = item.WareHouseId,
+ TransOutWHCode = "107",
}).ToList()
};
- //var inputJson = Masuit.Tools.ObjectExtensions.ToDictionary(allocate);
-
var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
// 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());
- var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
- if (respone.ResultStatus)
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (!respone.d.ResultStatus)
{
- return content.OK();
+ throw new Exception(respone.d.ResultMsg);
}
- return content.Error(respone.ResultMsg);
+
}
catch (Exception ex)
{
- return content.Error(ex.Message);
+ throw new Exception(ex.Message);
}
}
- public async Task<WebResponseContent> ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
+ public async Task ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
{
- WebResponseContent content = new WebResponseContent();
try
{
+ if (orderOutDetails.Count <= 0)
+ {
+ throw new Exception($"鏈壘鍒拌皟鎷ㄥ嚭搴撴暟鎹�");
+ }
+ List<transferInList> transferInList=new List<transferInList>();
+ foreach (var item in orderOutDetails)
+ {
+ if (item.AllocateWarehouseId == "205")
+ {
+ continue;
+ }
+ transferInList.Add(new transferInList
+ {
+ //鐗╂枡缂栫爜
+ ItemCode = item.MaterielCode,
+ //璋冨叆浠撳簱鍦板潃
+ TransInWHCode = item.AllocateWarehouseId,
+ //璋冨叆鏁伴噺
+ TransInQty = item.OutboundQuantity,
+ // 璋冨嚭浠撳簱缂栫爜
+ TransOutWHCode = "205",
+ });
+ }
+ if (transferInList.Count <= 0)
+ {
+ return;
+ }
Allocate allocate = new Allocate
{
context = new Context
@@ -1375,33 +1705,21 @@
documentTypeCode = "TransIn002",
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
-
- transferInList = orderOutDetails.Select(item => new transferInList
- {
- //鐗╂枡缂栫爜
- ItemCode = item.MaterielCode,
- //璋冨叆浠撳簱鍦板潃
- TransInWHCode = item.AllocateWarehouseId,
- //璋冨叆鏁伴噺
- TransInQty = item.OutboundQuantity,
- // 璋冨嚭浠撳簱缂栫爜
- TransOutWHCode = item.WareHouseId,
- }).ToList()
+ transferInList = transferInList,
};
var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
// 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
var result = await HttpsClient.PostAsync(Allocate, allocate.ToJsonString());
- var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
- if (respone.ResultStatus)
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (!respone.d.ResultStatus)
{
- return content.OK();
+ throw new Exception($"ERP璋冩嫧鍑哄簱{respone.d.ResultMsg}");
}
- return content.Error(respone.ResultMsg);
}
catch (Exception ex)
{
- return content.Error(ex.Message);
+ throw new Exception(ex.Message);
}
}
/// <summary>
@@ -1409,11 +1727,14 @@
/// </summary>
/// <param name="palletCode"></param>
/// <returns></returns>
- public async Task<WebResponseContent> ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
+ public async Task ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
{
- WebResponseContent content = new WebResponseContent();
try
{
+ if (orderOutDetails.Count <= 0)
+ {
+ throw new Exception($"鏈壘鍒拌皟鎷ㄥ嚭搴撴暟鎹�");
+ }
MixedSend send = new MixedSend
{
context = new Context
@@ -1423,7 +1744,7 @@
OrgCode = "102",
UserCode = "MH0551"
},
- documentTypeCode = "TransIn002",
+ documentTypeCode = "MiscShip001",
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
@@ -1432,9 +1753,10 @@
//鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
//瀛樺偍鍦扮偣缂栧彿
- WhCode = item.WareHouseId,
+ WhCode = "205",
//鏉傚彂鏁伴噺
Qty = item.OutboundQuantity,
+
BenefitDeptCode = "0505",
}).ToList()
};
@@ -1442,16 +1764,15 @@
// 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
var result = await HttpsClient.PostAsync(ERPMixedSend, send.ToJsonString());
- var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
- if (respone.ResultStatus)
+ var respone = JsonConvert.DeserializeObject<ResponeData>(result.ToString());
+ if (!respone.d.ResultStatus)
{
- return content.OK();
+ throw new Exception($"ERP鍏朵粬鍑哄簱{respone.d.ResultMsg}");
}
- return content.Error(respone.ResultMsg);
}
catch (Exception ex)
{
- return content.Error(ex.Message);
+ throw new Exception(ex.Message);
}
}
/// <summary>
--
Gitblit v1.9.3