From 7d173d42cba04b4243f13c6ce013b04e1be4dc95 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 07 三月 2025 16:59:34 +0800
Subject: [PATCH] 成品输送线
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs | 212 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 191 insertions(+), 21 deletions(-)
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 9fce273..cc46e19 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"
@@ -29,6 +29,7 @@
using WIDESEA_DTO.Task;
using WIDESEA_DTO.Stock;
using SqlSugar;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
namespace WIDESEA_TaskInfoService
{
@@ -76,7 +77,7 @@
(x.EnableStatus == (int)EnableStatusEnum.Normal || x.EnableStatus == (int)EnableStatusEnum.OnlyOut));
if (locationInfo == null)
{
- return responseContent.Error($"娴嬭瘯鏋惰揣浣�:{stockInfo.LocationCode}鍑哄簱鏉′欢涓嶆弧瓒�");
+ return responseContent.Error($"娴嬭瘯鏋惰揣浣嶃�傘�傘�傘�傘�傘�傘�傘�傘��:{stockInfo.LocationCode}鍑哄簱鏉′欢涓嶆弧瓒�");
}
//鐢熸垚娴嬭瘯鏋跺嚭搴撲换鍔� 閿佸畾搴撳瓨 鏇存敼璐т綅鐘舵��
Dt_Task taskOut = new()
@@ -293,7 +294,46 @@
}
return content;
}
-
+ /// <summary>
+ /// WMS鍚屾鎴愬搧鍑哄簱鑷矼ES
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_ShipmentOrderSync.ToString());
+ MESRoot<MesShipmentOrderSync> root = new MESRoot<MesShipmentOrderSync>()
+ {
+ From = "WMS",
+ DateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Content = model
+ };
+ JsonSerializerSettings settings = new JsonSerializerSettings
+ {
+ ContractResolver = new CamelCasePropertyNamesContractResolver()
+ };
+ string request = JsonConvert.SerializeObject(root, settings);
+ string response = HttpMesHelper.Post(apiInfo.ApiAddress, request);
+ MesResponseContent mesResponseContent = response.DeserializeObject<MesResponseContent>();
+ //璋冪敤鎺ュ彛
+ if (mesResponseContent.BSucc == true)
+ {
+ content.OK(mesResponseContent.StrMsg);
+ }
+ else
+ {
+ content.Error(mesResponseContent.StrMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
/// <summary>
///
/// </summary>
@@ -614,11 +654,14 @@
//}
#endregion
+ _unitOfWorkManage.BeginTran();
Db.InsertNav(mesOutboundOrder).Include(x => x.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
return MesResponseContent.Instance.OK();
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
return MesResponseContent.Instance.Error(ex.Message);
}
@@ -734,6 +777,7 @@
{
try
{
+ //涓�娆″彧鍙戜竴鍗风墿鏂欏叆搴撴槑缁�
foreach (var item in model.MaterialLotInfo)
{
//鑾峰彇鐗╂枡淇℃伅
@@ -936,21 +980,140 @@
{
return content.Error("鏈壘鍒颁粨搴撲俊鎭�");
}
+ Dt_LocationInfo locationInfo = _basicRepository.LocationInfoRepository.QueryFirst(x => x.WarehouseId == warehouse.WarehouseId);
+ if (locationInfo==null)
+ {
+ return content.Error($"鏈壘鍒皗warehouse.WarehouseCode}璐т綅淇℃伅");
+ }
+ //鍐呭寘淇℃伅缁勭洏
List<Dt_MesProInOrderDetail> mesProInOrderDetails = new List<Dt_MesProInOrderDetail>();
foreach (var item in bagInfoModel.BagDetails)
{
- mesProInOrderDetails.Add(_mapper.Map<Dt_MesProInOrderDetail>(item));
+ foreach (var child in item.BagItems)
+ {
+ Dt_MesProInOrderDetail mesProInOrderDetail = new Dt_MesProInOrderDetail()
+ {
+ BagNo = item.BagNo,
+ ProductCode = item.ProductCode,
+ ProductVersion = item.ProductVersion,
+ SETQty = child.SETQty,
+ OKPCSQTY = child.OKPCSQTY,
+ DateCode = item.DateCode,
+ XQty = child.XQty,
+ XSite = child.XSite,
+ Weight = item.Weight,
+ PackingDate = item.PackingDate,
+ LotNumber = child.LotNumber,
+ ERPOrder = child.ERPOrder,
+ SaleOrder = child.SaleOrder,
+ MoNumber = child.MoNumber,
+ };
+ mesProInOrderDetails.Add(mesProInOrderDetail);
+ }
+ }
+ List<Dt_ProStockInfoDetail> proStockInfoDetails = new List<Dt_ProStockInfoDetail>();
+ foreach (var item in mesProInOrderDetails)
+ {
+ proStockInfoDetails.Add(_mapper.Map<Dt_ProStockInfoDetail>(item));
}
Dt_MesProInOrder mesProInOrder = new Dt_MesProInOrder()
{
WarehouseId = warehouse.WarehouseId,
BatchNo = bagInfoModel.BatchNo,
+ WorkCenter = bagInfoModel.WorkCenter,
MesProStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
UnPackStock = bagInfoModel.UnPackStock,
Details = mesProInOrderDetails
};
+ Dt_ProStockInfo proStockInfo = new Dt_ProStockInfo()
+ {
+ PalletCode = bagInfoModel.BatchNo,
+ PalletType = 1,
+ WarehouseId = warehouse.WarehouseId,
+ StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt(),
+ proStockInfoDetails = proStockInfoDetails
+ };
+ Dt_Task newTask = new Dt_Task()
+ {
+ CurrentAddress = bagInfoModel.WorkCenter,
+ Grade = 0,
+ NextAddress = "",
+ PalletCode = proStockInfo.PalletCode,
+ Roadway = locationInfo.RoadwayNo,
+ SourceAddress = bagInfoModel.WorkCenter,
+ TargetAddress = "",
+ TaskType = TaskTypeEnum.InProduct.ObjToInt(),
+ TaskStatus = TaskStatusEnum.New.ObjToInt(),
+ WarehouseId = warehouse.WarehouseId,
+ PalletType = proStockInfo.PalletType
+ };
+ _unitOfWorkManage.BeginTran();
+ int taskId = BaseDal.AddData(newTask);
+ newTask.TaskId = taskId;
Db.InsertNav(mesProInOrder).Include(x => x.Details).ExecuteCommand();
+ Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
+ //鎺ㄩ�佷换鍔�
+ PushTasksToWCS(new List<Dt_Task> { newTask });
return content.OK("鎺ユ敹鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+ public MesResponseContent BoxStockin(MesBoxInfoModel boxInfoModel)
+ {
+ MesResponseContent content = new MesResponseContent();
+ try
+ {
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA101.ToString());
+ //鑾峰彇MES鍐呭寘淇℃伅
+ List<Dt_MesProInOrderDetail> mesProInOrderDetails = new List<Dt_MesProInOrderDetail>();
+ foreach (var item in boxInfoModel.Bags)
+ {
+ foreach (var child in item.BagItems)
+ {
+ Dt_MesProInOrderDetail mesProInOrderDetail = new Dt_MesProInOrderDetail()
+ {
+ BagNo = item.BagNo,
+ ProductCode = item.ProductCode,
+ ProductVersion = item.ProductVersion,
+ SETQty = child.SETQty,
+ OKPCSQTY = child.OKPCSQTY,
+ DateCode = item.DateCode,
+ XQty = child.XQty,
+ XSite = child.XSite,
+ Weight = item.Weight,
+ PackingDate = item.PackingDate,
+ LotNumber = child.LotNumber,
+ ERPOrder = child.ERPOrder,
+ SaleOrder = child.SaleOrder,
+ MoNumber = child.MoNumber,
+ };
+ mesProInOrderDetails.Add(mesProInOrderDetail);
+ }
+ }
+ List<Dt_ProStockInfoDetail> proStockInfoDetails = new List<Dt_ProStockInfoDetail>();
+ foreach (var item in mesProInOrderDetails)
+ {
+ proStockInfoDetails.Add(_mapper.Map<Dt_ProStockInfoDetail>(item));
+ }
+ Dt_ProStockInfo proStockInfo = new Dt_ProStockInfo()
+ {
+ PalletCode = boxInfoModel.BoxNo,
+ PalletType = 0,
+ WarehouseId = warehouse.WarehouseId,
+ ShipmentOrder = boxInfoModel.ShipmentOrder,
+ StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(),
+ proStockInfoDetails = proStockInfoDetails
+ };
+ _unitOfWorkManage.BeginTran();
+ Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
+ return content.OK("澶栧寘鎺ユ敹鎴愬姛");
}
catch (Exception ex)
{
@@ -958,7 +1121,6 @@
}
return content;
}
-
/// <summary>
/// 鎴愬搧杩斿伐鎻愬簱
/// </summary>
@@ -966,28 +1128,40 @@
/// <returns></returns>
public MesResponseContent RworkTask(RworkTaskModel model)
{
+ MesResponseContent content = new MesResponseContent();
try
{
Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA72.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.ProductVersion));
- if (stockInfo == null)
+ if (warehouse==null)
{
- return MesResponseContent.Instance.Error($"灏炬暟浠�:{model.ProductVersion}鏃犲彲鐢ㄥ簱瀛�");
+ return MesResponseContent.Instance.Error("鏈壘鍒版浠撳簱");
}
- Dt_Task exsit2 = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
-
-
+ Dt_MesRworkOutboundOrder mesRworkOutboundOrder = new Dt_MesRworkOutboundOrder()
+ {
+ WarehouseId=warehouse.WarehouseId,
+ TaskNo=model.TaskNo,
+ OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
+ ProductCode=model.ProductCode,
+ ProductName=model.ProductName,
+ ProductVersion=model.ProductVersion,
+ DateCode=model.DateCode,
+ RequiredQuantity=model.RequiredQuantity,
+ FactoryCode= model.FactoryCode,
+ SaleOrder=model.SaleOrder,
+ InventoryType=model.InventoryType,
+ };
+ _unitOfWorkManage.BeginTran();
+ _outboundService.RworkOutboundOrderService.AddData(mesRworkOutboundOrder);
+ _unitOfWorkManage.CommitTran();
+ return content.OK("鎻愪緵杩斿簱鍗曟帴鏀舵垚鍔�");
}
catch (Exception ex)
{
-
- throw;
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
}
- return MesResponseContent.Instance.OK();
+ return content;
}
@@ -1484,9 +1658,5 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
-
-
-
-
}
}
--
Gitblit v1.9.3