From 981a80940e47409300c09847684ca530f75b4a5f Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 10 一月 2025 23:56:33 +0800
Subject: [PATCH] 优化WCS辅料出库逻辑
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs | 246 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 243 insertions(+), 3 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 3d8e7d2..6000ca6 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"
@@ -23,6 +23,7 @@
using WIDESEA_ITaskInfoRepository;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
+using WIDESEA_Common.OrderEnum;
namespace WIDESEA_TaskInfoService
{
@@ -43,7 +44,7 @@
try
{
Dt_Task exsit = Repository.QueryFirst(x => x.TargetAddress == model.TargetAddressCode);
- if(exsit != null)
+ if (exsit != null)
{
return responseContent.Error($"鐩爣鍦板潃閲嶅");
}
@@ -96,7 +97,7 @@
//鏇存柊搴撳瓨鐘舵��
_stockRepository.StockInfoRepository.UpdateData(stockInfo);
//鏇存柊璐т綅鐘舵��
- _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, (PalletTypeEnum)stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
+ _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
//鏂板缓浠诲姟
BaseDal.AddData(taskOut);
//鍔犲叆璐т綅鍙樺姩璁板綍
@@ -195,7 +196,7 @@
//娓呴櫎搴撳瓨淇℃伅
_unitOfWorkManage.BeginTran();
_stockRepository.StockInfoRepository.DeleteAndMoveIntoHty(stockInfoUpdates, OperateTypeEnum.鑷姩鍒犻櫎);
- _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfoDetails,OperateTypeEnum.鑷姩鍒犻櫎);
+ _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfoDetails, OperateTypeEnum.鑷姩鍒犻櫎);
_unitOfWorkManage.CommitTran();
responseContent.OK($"鎶ュ簾鎴愬姛");
}
@@ -246,5 +247,244 @@
}
return content;
}
+
+ /// <summary>
+ /// 鐗╂枡鍑哄簱锛學MS鍚屾鍑哄簱鐗╂枡鎵规鑷矼ES
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public WebResponseContent UploadMesMaterialLotaAcept(MesMaterialLotaAceptModel model)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_MaterialLotaAcept.ToString());
+ MESRoot<MesMaterialLotaAceptModel> root = new MESRoot<MesMaterialLotaAceptModel>()
+ {
+ 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>
+ /// <param name="stockInfo"></param>
+ /// <param name="stockInfoDetail"></param>
+ /// <param name="taskNo"></param>
+ /// <param name="warehouseCode"></param>
+ /// <param name="quantity"></param>
+ /// <param name="cutedType"></param>
+ /// <param name="ppWidth"></param>
+ /// <returns></returns>
+ public MesMaterialLotaAceptModel GetMesMaterialLotaAceptModel(Dt_StockInfo stockInfo, Dt_StockInfoDetail stockInfoDetail, string taskNo, string warehouseCode, float quantity, string cutedType = "", float ppWidth = 0)
+ {
+ MesMaterialLotaAceptModel model = new MesMaterialLotaAceptModel()
+ {
+ CarrierCode = stockInfo.PalletCode,
+ CutedType = cutedType,
+ ExpirationDate = stockInfoDetail.EffectiveDate,
+ MaterialBarCode = stockInfoDetail.SerialNumber,
+ MaterialCode = stockInfoDetail.MaterielCode,
+ MaterialLot = stockInfoDetail.MaterielCode + "," + stockInfoDetail.BatchNo,
+ MaterialName = stockInfoDetail.MaterielName,
+ PPWidth = ppWidth,
+ ProductionDate = stockInfoDetail.ProductionDate,
+ Quantity = quantity,
+ Supplier = "",
+ TaskNo = taskNo,
+ Type = 1,
+ WarehouseArea = warehouseCode,
+ WarehouseLocation = warehouseCode
+ };
+
+ return model;
+ }
+
+ /// <summary>
+ /// 鍩烘澘鍑哄簱
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public MesResponseContent SubstrateOut(SubstrateOutModel model)
+ {
+ try
+ {
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA57.ToString());
+ if (warehouse == null)
+ {
+ return MesResponseContent.Instance.Error($"浠撳簱鍩虹淇℃伅鏈厤缃�");
+ }
+
+ Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == model.MaterialCode);
+ if (materielInfo == null)
+ {
+ return MesResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡淇℃伅");
+ }
+
+ Dt_MesOutboundOrder mesOutboundOrder = new Dt_MesOutboundOrder()
+ {
+ CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
+ Line = model.Line,
+ MaterialCode = model.MaterialCode,
+ MaterialName = model.MaterialName,
+ OrderQuantity = model.RequiredQuantity,
+ TaskNo = model.TaskNo,
+ Unit = model.Unit,
+ OrderType = MesOutboundOrderTypeEnum.SubstrateOut.ObjToInt(),
+ OrderStatus = OutOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ WarehouseId = warehouse.WarehouseId
+ };
+
+ List<Dt_Task> tasks = new List<Dt_Task>();
+
+ List<Dt_StockInfo>? stockInfos = null;
+ List<Dt_OutStockLockInfo>? outStockLockInfos = null;
+ List<Dt_LocationInfo>? locationInfos = null;
+ {
+ (List<Dt_StockInfo>, Dt_MesOutboundOrder, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesOutboundOrderService.AssignStockOutbound(mesOutboundOrder);
+ if (result.Item1 != null && result.Item1.Count > 0)
+ {
+ tasks = GetTasks(result.Item1, TaskTypeEnum.MesOutbound);
+ result.Item2.OrderStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ result.Item3.ForEach(x =>
+ {
+ x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
+ });
+
+ stockInfos = result.Item1;
+ mesOutboundOrder = result.Item2;
+ outStockLockInfos = result.Item3;
+ locationInfos = result.Item4;
+ }
+ else
+ {
+ throw new Exception("鏃犲簱瀛�");
+ }
+ }
+ _unitOfWorkManage.BeginTran();
+
+ int id = BaseDal.AddData(tasks);
+ outStockLockInfos.ForEach(x =>
+ {
+ x.OrderNo = mesOutboundOrder.TaskNo;
+ x.OrderDetailId = id;
+ });
+ _outboundService.MesOutboundOrderService.Repository.AddData(mesOutboundOrder);
+ if (stockInfos != null && stockInfos.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
+ {
+ WebResponseContent content = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);
+
+ if (!content.Status)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return MesResponseContent.Instance.Error(content.Message);
+ }
+ }
+ _unitOfWorkManage.CommitTran();
+ PushTasksToWCS(tasks);
+
+
+ return MesResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return MesResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鍩烘澘浣欐枡閫�搴�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public MesResponseContent SubstrateBack(SubstrateBackModel model)
+ {
+ try
+ {
+ Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => model.CarrierCode.Contains(x.CodeStartStr));
+ if (palletTypeInfo == null)
+ {
+ return MesResponseContent.Instance.Error($"鏈瘑鍒鎵樼洏绫诲瀷锛岃纭鎵樼洏鍙�");
+ }
+
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode == WarehouseEnum.HA57.ToString());
+
+ Dt_StockInfo stockInfo = new Dt_StockInfo()
+ {
+ PalletCode = model.CarrierCode,
+ PalletType = palletTypeInfo.PalletType,
+ WarehouseId = warehouse.WarehouseId,
+ StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt()
+ };
+
+ Dt_StockInfoDetail_Hty stockInfoDetail_Hty = _stockRepository.StockInfoDetail_HtyRepository.QueryFirst(x => x.BatchNo == model.MaterialLot && x.MaterielCode == model.MaterialCode);
+
+ Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
+ {
+ BatchNo = stockInfoDetail_Hty?.BatchNo ?? "",
+ EffectiveDate = model.ExpirationDate,
+ MaterielCode = model.MaterialCode,
+ InboundOrderRowNo = stockInfoDetail_Hty?.InboundOrderRowNo ?? 0,
+ MaterielName = model.MaterialCode,
+ ProductionDate = model.ProductionDate,
+ OrderNo = stockInfoDetail_Hty?.OrderNo ?? "",
+ OutboundQuantity = 0,
+ SerialNumber = stockInfoDetail_Hty?.SerialNumber ?? "0",
+ StockQuantity = model.Quantity,
+ Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
+ Unit = model.Unit
+ };
+
+ Dt_Task task = new Dt_Task()
+ {
+ PalletCode = stockInfo.PalletCode,
+ CurrentAddress = "",
+ NextAddress = "",
+ PalletType = stockInfo.PalletType,
+ Roadway = "RGV01_BC",
+ SourceAddress = "RGV01_BC",
+ TargetAddress = "",
+ TaskStatus = TaskStatusEnum.New.ObjToInt(),
+ TaskType = TaskTypeEnum.MesMatReturn.ObjToInt(),
+ WarehouseId = warehouse.WarehouseId
+ };
+
+ _unitOfWorkManage.BeginTran();
+ Db.InsertNav(stockInfo).Include(x => x.Details).ExecuteCommand();
+ BaseDal.AddData(task);
+ _unitOfWorkManage.CommitTran();
+
+ return MesResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return MesResponseContent.Instance.Error(ex.Message);
+ }
+ }
}
}
--
Gitblit v1.9.3