From dda095e27b535d5748340f127c5f83c0d1324226 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 29 十月 2025 17:30:58 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 346 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 171 insertions(+), 175 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 1738269..be50ff1 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"
@@ -11,6 +11,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Reflection.Metadata;
@@ -31,6 +32,7 @@
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Basic;
using WIDESEA_Model.Models.ERP;
+using WIDESEA_Model.Models.Order;
using WIDESEA_OrderRepository;
using WIDESEA_StorageTaskRepository;
using WIDESEAWCS_BasicInfoRepository;
@@ -54,6 +56,7 @@
private readonly IDt_AreaInfoRepository _areaInfoRepository; //鍖哄煙
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ISys_ConfigService _configService;
+ private readonly IDt_OrderOutDetailsRepository _orderOutDetailsRepository;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -67,7 +70,8 @@
IDt_AreaInfoRepository areaInfoRepository,
IStockInfoDetailRepository stockInfoDetailRepository,
IDt_StationManagerRepository stationManagerRepository,
- ISys_ConfigService configService) : base(BaseDal)
+ ISys_ConfigService configService,
+ IDt_OrderOutDetailsRepository orderOutDetailsRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_stockInfoRepository = stockInfoRepository;
@@ -81,6 +85,7 @@
_stockInfoDetailRepository = stockInfoDetailRepository;
_stationManagerRepository = stationManagerRepository;
_configService = configService;
+ _orderOutDetailsRepository = orderOutDetailsRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -104,78 +109,36 @@
stock.LocationCode = task.TargetAddress;
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 = null;
- if (task.TaskType != (int)TaskOutboundTypeEnum.Outbound)
+ 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)
{
- var stockDetailsToRemove = new List<DtStockInfoDetail>();
-
- // 澶勭悊搴撳瓨鏄庣粏
- if (stock.StockInfoDetails == null || !stock.StockInfoDetails.Any())
- {
- // 褰撳簱瀛樻槑缁嗕负绌烘椂锛屽皢鏁翠釜搴撳瓨绉诲叆鍘嗗彶琛�
- stockInfo_Hty = CreateStockInfoHty(stock, null, true);
- }
- else
- {
- foreach (var item in stock.StockInfoDetails.ToList())
- {
- if (item.OutboundQuantity <= 0 || item.OutboundQuantity > item.Quantity)
- {
- throw new Exception($"鍑哄簱鏁伴噺寮傚父锛岀墿鏂� {item.MaterielCode} 鐨勫嚭搴撴暟閲� {item.OutboundQuantity} 涓嶅悎娉�");
- }
-
- if (item.OutboundQuantity == item.Quantity)
- {
- // 瀹屽叏鍑哄簱锛岀Щ鍏ュ巻鍙茶〃
- if (stockInfo_Hty == null)
- {
- stockInfo_Hty = CreateStockInfoHty(stock, new List<DtStockInfoDetail> { item }, false);
- }
- else
- {
- stockInfo_Hty.StockInfoDetails.Add(CreateStockInfoDetailHty(item));
- }
- stockDetailsToRemove.Add(item);
- }
- else if (item.OutboundQuantity < item.Quantity && item.OutboundQuantity > 0)
- {
- // 閮ㄥ垎鍑哄簱锛屾洿鏂版暟閲�
- item.Quantity -= item.OutboundQuantity;
- item.OutboundQuantity = 0; // 閲嶇疆鍑哄簱鏁伴噺
- }
- }
-
- // 绉婚櫎宸插畬鍏ㄥ嚭搴撶殑鏄庣粏
- foreach (var item in stockDetailsToRemove)
- {
- stock.StockInfoDetails.Remove(item);
- }
- }
+ if (orderDetails.Count > 0)
+ content = await ERPAllocate(orderDetails);
}
-
+ //鍏朵粬鍑哄簱
+ else if (task.TaskType == (int)TaskOutboundTypeEnum.OutOther)
+ {
+ if (orderDetails.Count > 0)
+ content = await ERPMixedSend(orderDetails);
+ }
+ //鐢熶骇棰嗘枡鍑哄簱
+ else if (task.TaskType == (int)TaskOutboundTypeEnum.MaterialRequisition)
+ {
+ if (orderDetails.Count > 0)
+ content = await ERPProduction(orderDetails);
+ }
await _unitOfWorkManage.UseTranAsync(async () =>
{
- // 濡傛灉搴撳瓨鏄庣粏鍏ㄩ儴鍑哄簱瀹屾瘯锛屽垹闄ゅ師搴撳瓨璁板綍
- if (stock.StockInfoDetails == null || !stock.StockInfoDetails.Any())
- {
- await _stockInfoRepository.DeleteDataAsync(stock);
- }
- else
- {
- _stockInfoRepository.UpdateData(stock);
- }
- // 娣诲姞鍘嗗彶璁板綍
- if (stockInfo_Hty != null)
- {
- await AddStockInfoHtyAsync(stockInfo_Hty);
- }
-
+ await DeleteStockInfoAsync(stock.Id);
+ 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 DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
});
@@ -187,55 +150,6 @@
return content.Error(ex.Message);
}
return content;
- }
-
- private DtStockInfo_Hty CreateStockInfoHty(DtStockInfo stock, List<DtStockInfoDetail> details, bool isFullExit)
- {
- var stockInfoHty = new DtStockInfo_Hty()
- {
- PalletCode = stock.PalletCode,
- LocationCode = stock.LocationCode,
- IsFullExit = isFullExit,
- StockStatus = stock.StockStatus,
- OrderNo = stock.OrderNo,
- OrderType = stock.OrderType,
- Remark = stock.Remark,
- StockInfoDetails = new List<DtStockInfoDetail_Hty>()
- };
-
- if (details != null)
- {
- foreach (var detail in details)
- {
- stockInfoHty.StockInfoDetails.Add(CreateStockInfoDetailHty(detail));
- }
- }
-
- return stockInfoHty;
- }
-
- /// <summary>
- /// 鍒涘缓搴撳瓨鏄庣粏鍘嗗彶璁板綍
- /// </summary>
- private DtStockInfoDetail_Hty CreateStockInfoDetailHty(DtStockInfoDetail detail)
- {
- return new DtStockInfoDetail_Hty
- {
- MaterielCode = detail.MaterielCode,
- MaterielName = detail.MaterielName,
- DemandClassification = detail.DemandClassification,
- Warehouse = detail.Warehouse,
- OrderNo = detail.OrderNo,
- Unit = detail.Unit,
- Specs = detail.Specs,
- Weight = detail.Weight,
- Quantity = detail.Quantity,
- OutboundQuantity = detail.OutboundQuantity,
- Status = detail.Status,
- DrawingNumber = detail.DrawingNumber,
- Date = detail.Date,
- Remark = detail.Remark
- };
}
#endregion 鍑哄簱浠诲姟瀹屾垚
@@ -313,8 +227,15 @@
taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
- var result1 = UpdateLocationStatus(task.SourceAddress, LocationEnum.InStockDisable, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- var result2 = UpdateLocationStatus(task.TargetAddress, LocationEnum.Lock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ 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 () =>
{
@@ -330,6 +251,8 @@
}
catch (Exception ex)
{
+ task.ErrorMessage = ex.Message;
+ await BaseDal.UpdateDataAsync(task);
return content.Error(ex.Message);
}
return content;
@@ -505,14 +428,14 @@
return content.Error("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡缁勭洏鎴愬姛");
}
- //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();
- // if (ERPStock == null)
- // {
- // return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
- // }
- //}
+ 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();
+ if (ERPStock == null)
+ {
+ return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
+ }
+ }
var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
if (StartAddress == null)
@@ -588,8 +511,8 @@
await _locationRepository.UpdateDataAsync(result2.Item2);
BaseDal.AddData(taskNew);
});
- //return content = await SendWCSTask(taskDTO);
- return content.OK("鎴愬姛");
+ return content = await SendWCSTask(taskDTO);
+ //return content.OK("鎴愬姛");
}
catch (Exception err)
{
@@ -665,29 +588,12 @@
if (task == null)
return content.Error("鏈壘鍒颁换鍔�");
- if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskInStatusEnum.SC_InFinish || taskState == (int)TaskRelocationStatusEnum.SC_RelocationFinish || taskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
- {
- var taskHty = CreateHistoricalTask(task);
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- var asb = await BaseDal.DeleteDataByIdAsync(task.TaskId);
- var asbHty = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
- if (asb && asbHty)
- content.OK();
- else
- throw new Exception();
- });
+ task.TaskState = taskState;
+ var asb = await BaseDal.UpdateDataAsync(task);
+ if (asb)
content.OK();
- }
else
- {
- task.TaskState = taskState;
- var asb = await BaseDal.UpdateDataAsync(task);
- if (asb)
- content.OK();
- else
- content.Error();
- }
+ content.Error();
}
catch (Exception ex)
{
@@ -768,6 +674,24 @@
}
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>();
+ stcok.StockInfoDetails.ForEach(x =>
+ {
+ outDetails.Add(new Dt_OrderOutDetails()
+ {
+ OrderNo = "",
+ PalletCode = stcok.PalletCode,
+ OrderType = (int)OrderTypeEmun.鐩樼偣鍑哄簱鍗�,
+ ERPOrderId = "",
+ MaterielCode = x.MaterielCode,
+ MaterielName = x.MaterielName,
+ AllocateWarehouse = "WMS鍑哄簱缂撳瓨鍖�",
+ Warehouse = "鏅鸿兘绔嬪簱",
+ WareHouseId = "1001708040006492",
+ AllocateWarehouseId = "1002008120000270",
+ OutboundQuantity = x.Quantity,
+ });
+ });
var taskDto = CreateListTaskDTO(taskNew);
var result = GetlcoationState(taskNew, (int)StatusChangeTypeEnum.AutomaticOutbound);
@@ -777,6 +701,7 @@
_stockInfoRepository.UpdateData(stcok);
await _locationStatusChangeRecordRepository.AddDataAsync(result.Item1);
await _locationRepository.UpdateDataAsync(result.Item2);
+ _orderOutDetailsRepository.AddData(outDetails);
});
return content = await SendWCSTask(taskDto);
}
@@ -1333,14 +1258,12 @@
/// </summary>
/// <param name="palletCode"></param>
/// <returns></returns>
- public async Task<WebResponseContent> ERPProduction(string palletCode)
+ public async Task<WebResponseContent> ERPProduction(List<Dt_OrderOutDetails> orderOutDetails)
{
WebResponseContent content = new WebResponseContent();
try
{
- DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
- Dt_Task task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
- MaterialRequisition allocate = new MaterialRequisition
+ MaterialRequisition materialRequisition = new MaterialRequisition
{
context = new Context
{
@@ -1352,21 +1275,27 @@
documentTypeCode = "TransIn002",
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
-
- issueList = new List<issueList>()
+ issueList = orderOutDetails.Select(item => new issueList
{
- new issueList
- {
- //澶囨枡ID
- PickListID = task.OrderNo,
- //瀛樺偍鍦扮偣
- WhCode = "204",
- //棰嗘枡鏁伴噺
- IssueQty = task.OrderNo,
- }
- }
+ PickListID = item.MaterielID,
+ //瀛樺偍鍦扮偣
+ WhCode = item.WareHouseId,
+ //棰嗘枡鏁伴噺
+ IssueQty = item.OutboundQuantity,
+ }).ToList()
+
};
- return content.OK(data: allocate);
+ var ERPProduction = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.MaterialRequisition);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+
+ var result = await HttpsClient.PostAsync(ERPProduction, materialRequisition.ToJsonString());
+
+ var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
+ if (respone.ResultStatus)
+ {
+ return content.OK();
+ }
+ return content.Error(respone.ResultMsg);
}
catch (Exception ex)
{
@@ -1378,12 +1307,12 @@
/// </summary>
/// <param name="palletCode"></param>
/// <returns></returns>
- public async Task<WebResponseContent> ERPAllocate(string palletCode)
+ ///
+ public async Task<WebResponseContent> ERPAllocate(DtStockInfo stock)
{
WebResponseContent content = new WebResponseContent();
try
{
- DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x=>x.PalletCode== palletCode);
Allocate allocate = new Allocate
{
context = new Context
@@ -1397,19 +1326,78 @@
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
- transferInList = stock.StockInfoDetails.Where(x => x.OutboundQuantity > 0).Select(item => new transferInList
+ transferInList = stock.StockInfoDetails.Select(item => new transferInList
{
//鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
//璋冨叆浠撳簱鍦板潃
- TransInWHCode = item.Remark==""? item.Warehouse: item.Remark,
+ TransInWHCode = "1001708040006492",
//璋冨叆鏁伴噺
TransInQty = item.OutboundQuantity,
// 璋冨嚭浠撳簱缂栫爜
- TransOutWHCode = "201",
+ TransOutWHCode = item.WareHouseId,
}).ToList()
};
- return content.OK(data: allocate);
+ //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)
+ {
+ return content.OK();
+ }
+ return content.Error(respone.ResultMsg);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+
+ public async Task<WebResponseContent> ERPAllocate(List<Dt_OrderOutDetails> orderOutDetails)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ 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 = orderOutDetails.Select(item => new transferInList
+ {
+ //鐗╂枡缂栫爜
+ ItemCode = item.MaterielCode,
+ //璋冨叆浠撳簱鍦板潃
+ TransInWHCode = item.AllocateWarehouseId,
+ //璋冨叆鏁伴噺
+ TransInQty = item.OutboundQuantity,
+ // 璋冨嚭浠撳簱缂栫爜
+ TransOutWHCode = item.WareHouseId,
+ }).ToList()
+ };
+ 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)
+ {
+ return content.OK();
+ }
+ return content.Error(respone.ResultMsg);
}
catch (Exception ex)
{
@@ -1421,12 +1409,11 @@
/// </summary>
/// <param name="palletCode"></param>
/// <returns></returns>
- public async Task<WebResponseContent> ERPMixedSend(string palletCode)
+ public async Task<WebResponseContent> ERPMixedSend(List<Dt_OrderOutDetails> orderOutDetails)
{
WebResponseContent content = new WebResponseContent();
try
{
- DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
MixedSend send = new MixedSend
{
context = new Context
@@ -1440,18 +1427,27 @@
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
- miscShipList = stock.StockInfoDetails.Where(x => x.OutboundQuantity > 0).Select(item => new miscShipList
+ miscShipList = orderOutDetails.Select(item => new miscShipList
{
//鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
//瀛樺偍鍦扮偣缂栧彿
- WhCode = item.Warehouse,
+ WhCode = item.WareHouseId,
//鏉傚彂鏁伴噺
Qty = item.OutboundQuantity,
BenefitDeptCode = "0505",
}).ToList()
};
- return content.OK(data: send);
+ var ERPMixedSend = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.MixedSend);
+ // 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
+ var result = await HttpsClient.PostAsync(ERPMixedSend, send.ToJsonString());
+
+ var respone = JsonConvert.DeserializeObject<Respone>(result.ToString());
+ if (respone.ResultStatus)
+ {
+ return content.OK();
+ }
+ return content.Error(respone.ResultMsg);
}
catch (Exception ex)
{
--
Gitblit v1.9.3