From 8fcd7a67e4391a5f1fbdb590c2a3f913aeb2a0a0 Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期二, 31 三月 2026 14:11:23 +0800
Subject: [PATCH] PP平库功能上线，PDA优化，部分问题点优化
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs | 1033 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 567 insertions(+), 466 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 86aad6c..fa02772 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"
@@ -30,12 +30,19 @@
using WIDESEA_DTO.Stock;
using SqlSugar;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using WIDESEA_Core.CodeConfigEnum;
+using WIDESEA_DTO.Basic;
+using System.Globalization;
+using System.Collections;
namespace WIDESEA_TaskInfoService
{
public partial class TaskService
{
static object lock_out = new object();
+
+ static object solderMask_out = new object();
/// <summary>
/// 娴嬭瘯鏋跺嚭浠�
@@ -77,7 +84,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()
@@ -95,6 +102,15 @@
PalletType = stockInfo.PalletType,
WarehouseId = stockInfo.WarehouseId,
};
+ string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
+ float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
+ string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
+ if (MaterielCode != null && Quantity != null && BatchNo != null)
+ {
+ taskOut.MaterielCode = MaterielCode;
+ taskOut.Quantity = Quantity;
+ taskOut.BatchNo = BatchNo;
+ }
stockInfo.StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾;
LocationStatusEnum locationStatus = (LocationStatusEnum)locationInfo.LocationStatus;
locationInfo.LocationStatus = (int)LocationStatusEnum.Lock;
@@ -111,6 +127,174 @@
_unitOfWorkManage.CommitTran();
//灏嗕换鍔℃帹閫佸埌WCS
PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV_CSJ");
+ responseContent.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ responseContent.Error(ex.Message);
+ }
+ return responseContent;
+ }
+ }
+ public MesResponseContent SolderMaskOutNotice(SolderMaskOutNotice model)
+ {
+ lock (solderMask_out)
+ {
+ MesResponseContent responseContent = new MesResponseContent();
+ try
+ {
+
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA154.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.LotNo));
+ if (stockInfo == null)
+ {
+ return responseContent.Error($"闃茬剨搴�:鏃爗model.LotNo}鍙敤搴撳瓨");
+ }
+ Dt_Task exsit2 = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
+ if (exsit2 != null)
+ {
+ return responseContent.Error($"闃茬剨浠诲姟{stockInfo.PalletCode}宸插瓨鍦�");
+ }
+
+ Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode &&
+ x.WarehouseId == stockInfo.WarehouseId &&
+ x.LocationStatus == (int)LocationStatusEnum.InStock &&
+ (x.EnableStatus == (int)EnableStatusEnum.Normal || x.EnableStatus == (int)EnableStatusEnum.OnlyOut));
+ if (locationInfo == null)
+ {
+ return responseContent.Error($"闃茬剨璐т綅:{stockInfo.LocationCode}鍑哄簱鏉′欢涓嶆弧瓒�");
+ }
+ //鐢熸垚闃茬剨鍑哄簱浠诲姟 閿佸畾搴撳瓨 鏇存敼璐т綅鐘舵��
+ Dt_Task taskOut = new()
+ {
+ CurrentAddress = stockInfo.LocationCode,
+ Grade = 0,
+ PalletCode = stockInfo.PalletCode,
+ NextAddress = "",
+ Roadway = locationInfo.RoadwayNo,
+ SourceAddress = stockInfo.LocationCode,
+ TargetAddress = model.TargetAddressCode,
+ TaskStatus = (int)TaskStatusEnum.New,
+ TaskType = stockInfo.PalletType<2 ? (int)TaskTypeEnum.MaskOutNoticeSmall : (int)TaskTypeEnum.MaskOutNoticeLarge,
+ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
+ PalletType = stockInfo.PalletType,
+ WarehouseId = stockInfo.WarehouseId,
+ };
+ string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
+ float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
+ string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
+ if (MaterielCode != null && Quantity != null && BatchNo != null)
+ {
+ taskOut.MaterielCode = MaterielCode;
+ taskOut.Quantity = Quantity;
+ taskOut.BatchNo = BatchNo;
+ }
+ stockInfo.StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾;
+ LocationStatusEnum locationStatus = (LocationStatusEnum)locationInfo.LocationStatus;
+ locationInfo.LocationStatus = (int)LocationStatusEnum.Lock;
+ //鍒ゆ柇鏄惁鏈夊嚭搴撳崟淇℃伅
+ _unitOfWorkManage.BeginTran();
+ //鏇存柊搴撳瓨鐘舵��
+ _stockRepository.StockInfoRepository.UpdateData(stockInfo);
+ //鏇存柊璐т綅鐘舵��
+ _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
+ //鏂板缓浠诲姟
+ BaseDal.AddData(taskOut);
+ //鍔犲叆璐т綅鍙樺姩璁板綍
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, locationStatus, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", taskOut.TaskNum);
+ _unitOfWorkManage.CommitTran();
+ //灏嗕换鍔℃帹閫佸埌WCS
+ PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV_ZH");
+ responseContent.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ responseContent.Error(ex.Message);
+ }
+ return responseContent;
+ }
+ }
+
+ public MesResponseContent SolderMaskOut(SolderMaskOut model)
+ {
+ lock (solderMask_out)
+ {
+ MesResponseContent responseContent = new MesResponseContent();
+ try
+ {
+
+
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA154.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.LotNo));
+ if (stockInfo == null)
+ {
+ return responseContent.Error($"闃茬剨搴�:鏃爗model.LotNo}鍙敤搴撳瓨");
+ }
+ Dt_Task exsit2 = Repository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
+ if (exsit2 != null)
+ {
+ return responseContent.Error($"闃茬剨浠诲姟{stockInfo.PalletCode}宸插瓨鍦�");
+ }
+
+ Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode &&
+ x.WarehouseId == stockInfo.WarehouseId &&
+ x.LocationStatus == (int)LocationStatusEnum.InStock &&
+ (x.EnableStatus == (int)EnableStatusEnum.Normal || x.EnableStatus == (int)EnableStatusEnum.OnlyOut));
+ if (locationInfo == null)
+ {
+ return responseContent.Error($"闃茬剨璐т綅:{stockInfo.LocationCode}鍑哄簱鏉′欢涓嶆弧瓒�");
+ }
+ //鐢熸垚闃茬剨鍑哄簱浠诲姟 閿佸畾搴撳瓨 鏇存敼璐т綅鐘舵��
+ Dt_Task taskOut = new()
+ {
+ CurrentAddress = stockInfo.LocationCode,
+ Grade = 0,
+ PalletCode = stockInfo.PalletCode,
+ NextAddress = "",
+ Roadway = locationInfo.RoadwayNo,
+ SourceAddress = stockInfo.LocationCode,
+ TargetAddress = model.TargetAddressCode,
+ TaskStatus = (int)TaskStatusEnum.New,
+ TaskType = stockInfo.PalletType < 2 ? (int)TaskTypeEnum.MaskOutSmall : (int)TaskTypeEnum.MaskOutLarge,
+ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
+ PalletType = stockInfo.PalletType,
+ WarehouseId = stockInfo.WarehouseId,
+ };
+ string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
+ float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
+ string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
+ if (MaterielCode != null && Quantity != null && BatchNo != null)
+ {
+ taskOut.MaterielCode = MaterielCode;
+ taskOut.Quantity = Quantity;
+ taskOut.BatchNo = BatchNo;
+ }
+ stockInfo.StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾;
+ LocationStatusEnum locationStatus = (LocationStatusEnum)locationInfo.LocationStatus;
+ locationInfo.LocationStatus = (int)LocationStatusEnum.Lock;
+ //鍒ゆ柇鏄惁鏈夊嚭搴撳崟淇℃伅
+ _unitOfWorkManage.BeginTran();
+ //鏇存柊搴撳瓨鐘舵��
+ _stockRepository.StockInfoRepository.UpdateData(stockInfo);
+ //鏇存柊璐т綅鐘舵��
+ _basicService.LocationInfoService.UpdateLocationStatus(locationInfo, stockInfo.PalletType, LocationStatusEnum.Lock, stockInfo.WarehouseId);
+ //鏂板缓浠诲姟
+ BaseDal.AddData(taskOut);
+ //鍔犲叆璐т綅鍙樺姩璁板綍
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, locationStatus, LocationStatusEnum.Lock, LocationChangeType.OutboundAssignLocation, stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", taskOut.TaskNum);
+ _unitOfWorkManage.CommitTran();
+ //灏嗕换鍔℃帹閫佸埌WCS
+ PushTasksToWCS(new List<Dt_Task>() { taskOut }, "AGV_ZH");
responseContent.OK();
}
catch (Exception ex)
@@ -157,6 +341,15 @@
PalletType = stockInfo.PalletType,
WarehouseId = stockInfo.WarehouseId,
};
+ string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
+ float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
+ string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
+ if (MaterielCode != null && Quantity != null && BatchNo != null)
+ {
+ taskIn.MaterielCode = MaterielCode;
+ taskIn.Quantity = Quantity;
+ taskIn.BatchNo = BatchNo;
+ }
//鏇存敼搴撳瓨鐘舵��
stockInfo.StockStatus = StockStatusEmun.閫�搴�.ObjToInt();
BaseDal.AddData(taskIn);
@@ -329,6 +522,29 @@
return model;
}
+ public MesMaterialLotaAceptModel PPGetMesMaterialLotaAceptModel(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 = 2,
+ WarehouseArea = warehouseCode,
+ WarehouseLocation = warehouseCode
+ };
+
+ return model;
+ }
/// <summary>
/// 鍩烘澘鍑哄簱
/// </summary>
@@ -336,6 +552,7 @@
/// <returns></returns>
public MesResponseContent SubstrateOut(SubstrateOutModel model)
{
+ MesResponseContent content = new MesResponseContent();
try
{
string line = string.Empty;
@@ -350,15 +567,15 @@
Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == line);
if (warehouse == null)
{
- return MesResponseContent.Instance.Error($"浠撳簱鍩虹淇℃伅鏈厤缃�");
+ return content.Error($"浠撳簱鍩虹淇℃伅鏈厤缃�");
}
Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == model.MaterialCode);
if (materielInfo == null)
{
- return MesResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡淇℃伅");
+ return content.Error($"鏈壘鍒拌鐗╂枡淇℃伅");
}
-
+ //鐢熸垚MES鏉挎枡鍑哄簱鍗曟嵁
Dt_MesOutboundOrder mesOutboundOrder = new Dt_MesOutboundOrder()
{
CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
@@ -374,14 +591,15 @@
};
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 =>
@@ -415,23 +633,26 @@
_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);
+ WebResponseContent contentResponse = _outboundService.MesOutboundOrderService.LockOutboundStockDataUpdate(stockInfos, outStockLockInfos, locationInfos, tasks: tasks);
- if (!content.Status)
+ if (!contentResponse.Status)
{
_unitOfWorkManage.RollbackTran();
- return MesResponseContent.Instance.Error(content.Message);
+ return content.Error(contentResponse.Message);
}
}
_unitOfWorkManage.CommitTran();
PushTasksToWCS(tasks);
-
-
- return MesResponseContent.Instance.OK();
+ //灏嗗紑鏂欏垎閰嶇殑搴撳瓨鎵樼洏杩斿洖缁橫ES
+ content.Content = new
+ {
+ VehicleCode = stockInfos?.Select(x => x.PalletCode).ToList()
+ };
+ return content.OK();
}
catch (Exception ex)
{
- return MesResponseContent.Instance.Error(ex.Message);
+ return content.Error(ex.Message);
}
}
@@ -451,10 +672,16 @@
}
Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == palletTypeInfo.WarehouseId);
-
+ //鍒ゆ柇鏄惁鎵樼洏搴撳瓨鏄惁宸插瓨鍦�
+ Dt_StockInfo stockInfoOld = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == model.CarrierCode);
+ if (stockInfoOld != null)
+ {
+ return MesResponseContent.Instance.Error($"鎵樼洏鍙峰簱瀛榹model.CarrierCode}宸插瓨鍦�");
+ }
Dt_StockInfo_Hty stockInfo_Hty = _stockRepository.StockInfo_HtyRepository.QueryData(x => x.PalletCode == model.CarrierCode).OrderByDescending(x => x.SourceId).First();
Dt_StockInfoDetail_Hty stockInfoDetail_Hty = _stockRepository.StockInfoDetail_HtyRepository.QueryFirst(x => x.StockId == stockInfo_Hty.SourceId);
+
Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
{
@@ -519,7 +746,6 @@
MesResponseContent modelCount = new MesResponseContent();
try
{
-
Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
if (warehouse == null)
{
@@ -542,7 +768,7 @@
};
mesPPOutboundOrderDetail.Add(dt_MesPPOutboundOrderDetail);
}
- Dt_MesPPOutboundOrder mesOutboundOrder = new Dt_MesPPOutboundOrder()
+ Dt_MesPPOutboundOrder mesPPOutboundOrder1 = new Dt_MesPPOutboundOrder()
{
CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
MaterialCode = model.MaterialCode,
@@ -558,67 +784,111 @@
Details = mesPPOutboundOrderDetail
};
#region
- //Db.InsertNav(mesOutboundOrder).Include(x=>x.Details).ExecuteCommand();
- // List<Dt_Task> tasks = new List<Dt_Task>();
+ 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_MesPPOutboundOrder, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.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();
- // });
+ List<Dt_StockInfo>? stockInfos = null;
+ List<Dt_OutStockLockInfo>? outStockLockInfos = null;
+ List<Dt_LocationInfo>? locationInfos = null;
+ List<Dt_MaterielCodeInfo> materielCodes = new List<Dt_MaterielCodeInfo>();
+ {
+ (List<Dt_StockInfo>, Dt_MesPPOutboundOrder, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.AssignPPStockOutbound(mesPPOutboundOrder1);
+ if (result.Item1 != null && result.Item1.Count > 0)
+ {
+ tasks = GetTasks(result.Item1, TaskTypeEnum.MesPPOutbound);
+ 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;
- // mesPPOutboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ stockInfos = result.Item1;
+ mesPPOutboundOrder1 = result.Item2;
+ outStockLockInfos = result.Item3;
+ locationInfos = result.Item4;
+ foreach (var item in mesPPOutboundOrderDetail)
+ {
+ item.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ }
- // }
- // else
- // {
- // throw new Exception("鏃犲簱瀛�");
- // }
- // }
- // tasks.ForEach(x =>
- // {
- // x.TargetAddress = model.TargetAddressCode;
- // });
- // _unitOfWorkManage.BeginTran();
-
- // int id = BaseDal.AddData(tasks);
- // outStockLockInfos.ForEach(x =>
- // {
- // x.OrderNo = mesOutboundOrder.TaskNo;
- // x.OrderDetailId = id;
- // });
- // //_outboundService.MesPPOutboundOrderService.Repository.AddData(mesOutboundOrder);
- // Db.InsertNav(mesOutboundOrder).Include(x => x.Details).ExecuteCommand();
- // 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);
-
- //}
- #endregion
+ }
+ else
+ {
+ throw new Exception("鏃犲簱瀛�");
+ }
+ }
+ tasks.ForEach(x =>
+ {
+ if (x.Roadway.Contains("AGV_PP"))
+ {
+ x.TargetAddress = model.TargetAddressCode;
+ }
+
+ });
_unitOfWorkManage.BeginTran();
- Db.InsertNav(mesOutboundOrder).Include(x => x.Details).ExecuteCommand();
+
+ int id = BaseDal.AddData(tasks);
+ outStockLockInfos.ForEach(x =>
+ {
+ x.OrderNo = mesPPOutboundOrder1.TaskNo;
+ x.OrderDetailId = id;
+ });
+ Db.InsertNav(mesPPOutboundOrder1).Include(x => x.Details).ExecuteCommand();
+ if (stockInfos.Count > 0 && stockInfos != null)
+ {
+ var lkstockInfo = stockInfos.Where(x => x.LocationCode.Contains("SC01_PP")).ToList();
+ if(lkstockInfo != null)
+ {
+ foreach (var item in lkstockInfo)
+ {
+ Dt_MaterielInfo materielInfo = BaseDal.Db.Queryable<Dt_MaterielInfo>().Where(x => x.MaterielCode == item.Details.FirstOrDefault().MaterielCode).First();
+ if(materielInfo == null)
+ {
+ return MesResponseContent.Instance.Error($"鏈壘鍒扮墿鏂欑紪鍙穥item.Details.FirstOrDefault().MaterielCode}鐨勭墿鏂欎俊鎭�");
+ }
+ Dt_MaterielCodeInfo materielCodeInfo = new Dt_MaterielCodeInfo()
+ {
+ MaterielCode = item.Details.FirstOrDefault().MaterielCode,
+ MaterielName = materielInfo.MaterielName,
+ MaterielSpec = materielInfo.MaterielSpec,
+ LotNo = item.Details.FirstOrDefault().BatchNo,
+ ProductionDate = item.Details.FirstOrDefault().ProductionDate.ObjToDate(),
+ EffectiveDate = item.Details.FirstOrDefault().EffectiveDate.ObjToDate(),
+ PurchaseOrderNo = DateTime.Now.ToString("yyMMdd") + item.Details.FirstOrDefault().BatchNo,
+ Quantity = item.Details.FirstOrDefault().StockQuantity,
+ MaterielLength = (decimal)materielInfo.MaterielLength,
+ WarehouseId = warehouse.WarehouseId
+ };
+ materielCodes.Add(materielCodeInfo);
+ }
+ Db.Insertable(materielCodes).ExecuteCommand();
+ }
+ }
+ 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();
+ var pktask = tasks.Where(x => x.Roadway.Contains("AGV_PP")).ToList();
+ if(pktask != null&& pktask.Count>0)
+ {
+ PushTasksToWCS(pktask, "AGV_PP");
+ }
+ var lktask = tasks.Where(x => x.Roadway.Contains("SC01_PP")).ToList();
+ if (lktask != null&& lktask.Count>0)
+ {
+ PushTasksToWCS(lktask);
+ }
+
+ #endregion
+ //_unitOfWorkManage.BeginTran();
+ //Db.InsertNav(mesOutboundOrder).Include(x => x.Details).ExecuteCommand();
+ //_unitOfWorkManage.CommitTran();
return MesResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -639,7 +909,7 @@
try
{
- Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
+ Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA581.ToString());
if (warehouse == null)
{
return MesResponseContent.Instance.Error("浠撳簱鍩虹淇℃伅鏈厤缃�");
@@ -659,67 +929,65 @@
CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
TaskNo = model.TaskNo,
OrderType = OutOrderTypeEnum.Issue.ObjToInt(),
- OrderStatus = OutOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ OrderStatus = OutOrderStatusEnum.鍑哄簱涓�.ObjToInt(),
WarehouseId = warehouse.WarehouseId,
Details = mesPPCutOutboundOrderDetail,
};
_unitOfWorkManage.BeginTran();
Db.InsertNav(mesPPOutboundOrder).Include(x => x.Details).ExecuteCommand();
- _unitOfWorkManage.CommitTran();
+
#region
- //List<Dt_Task> tasks = new List<Dt_Task>();
+ 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_MesPPCutOutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.AssignStockOutbound(mesPPOutboundOrder, mesPPCutOutboundOrderDetail);
- // if (result.Item1 != null && result.Item1.Count > 0)
- // {
- // tasks = GetTasks(result.Item1, TaskTypeEnum.MesOutbound);
- // result.Item2.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
- // result.Item3.ForEach(x =>
- // {
- // x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
- // });
+ List<Dt_StockInfo>? stockInfos = null;
+ List<Dt_OutStockLockInfo>? outStockLockInfos = null;
+ List<Dt_LocationInfo>? locationInfos = null;
+ {
+ (List<Dt_StockInfo>, List<Dt_MesPPCutOutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundService.MesPPOutboundOrderService.AssignPPCutStockOutbound(mesPPOutboundOrder, mesPPCutOutboundOrderDetail);
+ if (result.Item1 != null && result.Item1.Count > 0)
+ {
+ tasks = GetTasks(result.Item1, TaskTypeEnum.MesPPCutOutbound);
+ result.Item2.ForEach(x =>
+ {
+ x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+ });
+ result.Item3.ForEach(x =>
+ {
+ x.Status = OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt();
+ });
- // stockInfos = result.Item1;
- // mesPPCutOutboundOrderDetail = result.Item2;
- // outStockLockInfos = result.Item3;
- // locationInfos = result.Item4;
+ stockInfos = result.Item1;
+ mesPPCutOutboundOrderDetail = result.Item2;
+ outStockLockInfos = result.Item3;
+ locationInfos = result.Item4;
- // }
- // else
- // {
- // throw new Exception("鏃犲簱瀛�");
- // }
- //}
- //tasks.ForEach(x =>
- //{
- // x.TargetAddress = mesPPCutOutboundOrderDetail.TargetAddressCode;
- //});
- //_unitOfWorkManage.BeginTran();
+ }
+ else
+ {
+ throw new Exception("鏃犲簱瀛�");
+ }
+ }
+
- //int id = BaseDal.AddData(tasks);
- //outStockLockInfos.ForEach(x =>
- //{
- // x.OrderNo = mesPPOutboundOrder.TaskNo;
- // x.OrderDetailId = id;
- //});
- ////_outboundService.MesPPOutboundOrderService.Repository.AddData(mesOutboundOrder);
+ int id = BaseDal.AddData(tasks);
+ outStockLockInfos.ForEach(x =>
+ {
+ x.OrderNo = mesPPOutboundOrder.TaskNo;
+ });
+
+ 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);
+ }
+ }
//Db.InsertNav(mesPPOutboundOrder).Include(x => x.Details).ExecuteCommand();
- //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, "AGV_PP");
+ _unitOfWorkManage.CommitTran();
+ PushTasksToWCS(tasks, "AGV_PP");
#endregion
return MesResponseContent.Instance.OK();
}
@@ -866,8 +1134,17 @@
TaskType = TaskTypeEnum.Inbound.ObjToInt(),
TaskStatus = TaskStatusEnum.New.ObjToInt(),
WarehouseId = stockInfo.WarehouseId,
- PalletType = stockInfo.PalletType
+ PalletType = stockInfo.PalletType,
};
+ string MaterielCode = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.MaterielCode;
+ float Quantity = (float)stockInfo.Details.Where(x => x.StockId == stockInfo.Id).Sum(x => x.StockQuantity);
+ string BatchNo = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault()?.BatchNo;
+ if (MaterielCode != null && Quantity != null && BatchNo != null)
+ {
+ newTask.MaterielCode = MaterielCode;
+ newTask.Quantity = Quantity;
+ newTask.BatchNo = BatchNo;
+ }
LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;
_unitOfWorkManage.BeginTran();
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, lastStatus, LocationStatusEnum.Lock, LocationChangeType.InboundAssignLocation);
@@ -896,218 +1173,91 @@
MesResponseContent content = new MesResponseContent();
try
{
- //闇�鍒ゆ柇鏌ヨ绔嬪簱,骞冲簱
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.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.MaterielCode == model.MaterialCode && x.CutedWidth == model.CutedWidth));
- if (stockInfo == null)
+ Dt_Warehouse lkwarehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
+ Dt_Warehouse pkwarehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA581.ToString());
+
+ if (lkwarehouse == null || pkwarehouse == null)
{
- return content.Error($"PP浠撶珛搴�/骞冲簱锛氱墿鏂欑紪鍙�:{model.MaterialCode},瑁佸垏瀹�:{model.CutedWidth},鏈壘鍒版鐗╂枡搴撳瓨淇℃伅");
+ return content.Error("绔嬪簱鎴栧钩搴撲粨搴撲俊鎭笉瀛樺湪");
}
- var stock = stockInfo.Details.FirstOrDefault();
- if (stock != null)
+
+ List<Dt_StockInfo> lkstockInfos = _stockRepository.StockInfoRepository.Db
+ .Queryable<Dt_StockInfo>()
+ .Where(x => x.WarehouseId == lkwarehouse.WarehouseId
+ && x.StockStatus == (int)StockStatusEmun.鍏ュ簱瀹屾垚)
+ .Includes(x => x.Details)
+ .ToList();
+
+ List<Dt_StockInfo> lkTargetStockInfos = lkstockInfos
+ .Where(x => x.Details != null && x.Details.Any(d => d.MaterielCode == model.MaterialCode))
+ .ToList();
+
+ List<Dt_StockInfo> pkstockInfos = _stockRepository.StockInfoRepository.Db
+ .Queryable<Dt_StockInfo>()
+ .Where(x => x.WarehouseId == pkwarehouse.WarehouseId
+ && x.StockStatus == (int)StockStatusEmun.鍏ュ簱瀹屾垚)
+ .Includes(x => x.Details)
+ .ToList();
+
+ List<Dt_StockInfo> pkTargetStockInfos = pkstockInfos
+ .Where(x => x.Details != null && x.Details.Any(d => d.MaterielCode == model.MaterialCode))
+ .ToList();
+
+
+ decimal lkTotalQuantity = (decimal)lkTargetStockInfos
+ .SelectMany(x => x.Details ?? new List<Dt_StockInfoDetail>())
+ .Where(d => d.MaterielCode == model.MaterialCode)
+ .Sum(d => d.StockQuantity);
+
+ // 骞冲簱鎬绘暟
+ decimal pkTotalQuantity = (decimal)pkTargetStockInfos
+ .SelectMany(x => x.Details ?? new List<Dt_StockInfoDetail>())
+ .Where(d => d.MaterielCode == model.MaterialCode)
+ .Sum(d => d.StockQuantity);
+
+ if (lkTotalQuantity <= 0 && pkTotalQuantity <= 0)
{
- content.Content = new
- {
- MaterialCode = stock.MaterielCode,
- Quantity = stock.StockQuantity,
- Unit = stock.Unit,
- Warehouse = warehouse.WarehouseCode,
- WarehouseName = warehouse.WarehouseName,
- CutedWidth = stock.CutedWidth,
- CarrierCode = stockInfo.PalletCode,
- MaterialLot = stock.BatchNo,
- };
+ return content.Error($"PP浠撶珛搴�/骞冲簱锛氱墿鏂欑紪鍙�:{model.MaterialCode},鏈壘鍒版鐗╂枡搴撳瓨淇℃伅");
}
+
+ content.Content = new List<object>
+ {
+ new
+ {
+ MaterialCode = model.MaterialCode,
+ Quantity = lkTotalQuantity,
+ Unit = lkTargetStockInfos.SelectMany(x => x.Details ?? new List<Dt_StockInfoDetail>())
+ .Where(d => d.MaterielCode == model.MaterialCode)
+ .FirstOrDefault()?.Unit ?? "绠�",
+ Warehouse = lkwarehouse.WarehouseCode,
+ WarehouseName = lkwarehouse.WarehouseName,
+ CutedWidth = 0,
+ CarrierCode = "",
+ MaterialLot = "",
+ },
+ new
+ {
+ MaterialCode = model.MaterialCode,
+ Quantity = pkTotalQuantity,
+ Unit = pkTargetStockInfos.SelectMany(x => x.Details ?? new List<Dt_StockInfoDetail>())
+ .Where(d => d.MaterielCode == model.MaterialCode)
+ .FirstOrDefault()?.Unit ?? "绠�",
+ Warehouse = pkwarehouse.WarehouseCode,
+ WarehouseName = pkwarehouse.WarehouseName,
+ CutedWidth = 0,
+ CarrierCode = "",
+ MaterialLot = "",
+ }
+ };
+
return content.OK();
}
catch (Exception ex)
{
- return MesResponseContent.Instance.Error(ex.Message);
+ return MesResponseContent.Instance.Error($"鏌ヨ搴撳瓨澶辫触锛歿ex.Message}");
}
}
- /// <summary>
- /// MES鎴愬搧鍏ュ簱鍗曟帴鏀�
- /// </summary>
- /// <returns></returns>
- public MesResponseContent BagInfoSync(MesBagInfoModel bagInfoModel)
- {
- MesResponseContent content = new MesResponseContent();
- try
- {
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == bagInfoModel.WarehouseCode);
- if (warehouse == null)
- {
- 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)
- {
- 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浼犲叆鐨勫嚭搴撳崟鍙锋槸鍚﹀瓨鍦�
- Dt_ProOutOrder proOutOrder = _outboundRepository.ProOutOrderRepository.Db.Queryable<Dt_ProOutOrder>().Where(x=>x.ProOutOrderNo== boxInfoModel.ShipmentOrder).Includes(x=>x.Details).First();
- if (proOutOrder==null)
- {
- return content.Error($"鍗曞彿{boxInfoModel.ShipmentOrder}涓嶅瓨鍦�");
- }
- //鑾峰彇鎵�鏈夋垚鍝佸嚭搴撳唴鍖呬俊鎭�
- List<Dt_ProStockInfoDetail> dt_ProStockInfos = _stockRepository.ProStockInfoDetailRepository.QueryData(x=>x.ProOutDetailStatus==StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt());
- //鑾峰彇MES鍐呭寘淇℃伅
- List<Dt_MesProInOrderDetail> mesProInOrderDetails = new List<Dt_MesProInOrderDetail>();
- foreach (var item in boxInfoModel.Bags)
- {
- foreach (var child in item.BagItems)
- {
- Dt_ProStockInfoDetail? proStockInfoDetail = dt_ProStockInfos.Where(x=>x.BagNo==item.BagNo)?.FirstOrDefault();
- if (proStockInfoDetail==null)
- {
- return content.Error($"鍐呭寘{item.BagNo}璐х墿鐘舵�佸紓甯�");
- }
- 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));
- }
- proStockInfoDetails.ForEach(x =>
- {
- x.ProOutDetailStatus = StockStatusEmun.骞冲簱鍏ュ簱瀹屾垚.ObjToInt();
- });
-
- Dt_ProStockInfo proStockInfo = new Dt_ProStockInfo()
- {
- PalletCode = boxInfoModel.BoxNo,
- PalletType = 0,
- WarehouseId = warehouse.WarehouseId,
- ShipmentOrder = boxInfoModel.ShipmentOrder,
- StockStatus = StockStatusEmun.骞冲簱鍏ュ簱瀹屾垚.ObjToInt(),
- proStockInfoDetails = proStockInfoDetails
- };
- _unitOfWorkManage.BeginTran();
- //鏍规嵁澶栧寘淇℃伅瑙ｇ粦鍐呭寘涓庤兌妗嗗簱瀛樺叧绯�
- WebResponseContent UnBindContent = _stockService.ProStockInfoService.UnBindStock(proStockInfoDetails);
- if (!UnBindContent.Status)
- {
- throw new Exception(UnBindContent.Message);
- }
- Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand();
- _unitOfWorkManage.CommitTran();
- return content.OK("澶栧寘鎺ユ敹鎴愬姛");
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
+
/// <summary>
@@ -1602,52 +1752,22 @@
}
}
/// <summary>
- /// MES鎴愬搧鍑哄簱鍗曞悓姝ユ暟鎹鐞�
+ /// 鑾峰彇MES闃荤剨鎵规淇℃伅
/// </summary>
- public MesShipmentOrderSync MesOutSync(Dt_OutProStockInfo outProStockInfo, Dt_ProOutOrderDetail proOutOrderDetail)
- {
- List<MesShipOrderDetail> mesShipOrderDetails = new List<MesShipOrderDetail>();
- //鑾峰彇鍑哄簱鍗�
- Dt_ProOutOrder proOutOrder = _outboundService.ProOutOrderService.Repository.QueryFirst(x=>x.Id== proOutOrderDetail.ProOrderId);
- //鑾峰彇瀹㈡埛
- Dt_CustomerInfo customerInfo = _basicRepository.CustomerInfoRepository.QueryFirst(x=>x.Code==proOutOrderDetail.Customer);
-
- MesShipOrderDetail orderDetail = new MesShipOrderDetail()
- {
- ProductCode = proOutOrderDetail.PCode,
- ProductVersion = proOutOrderDetail.PVer,
- Qty = outProStockInfo.AssignQuantity,
- SaleOrder = proOutOrderDetail.SaleOrder,
- Sequence = outProStockInfo.Id,
- WorkCenter = "SPCK_OUTER-001"
- };
- mesShipOrderDetails.Add(orderDetail);
- MesShipmentOrderSync shipmentOrderSync = new MesShipmentOrderSync()
- {
- ShipmentOrder = proOutOrder.ProOutOrderNo,
- PlantShipDate = proOutOrder.PlantShipDate.ToString("yyyy-MM-dd HH:mm:ss"),
- Customer = proOutOrderDetail.Customer,
- FactoryCode = proOutOrderDetail.FactoryCode,
- ShipName = customerInfo.Name,
- ShippingAddress = customerInfo.NickName,
- OrderDetails = mesShipOrderDetails
- };
- return shipmentOrderSync;
- }
- /// <summary>
- /// WMS鍚屾鎴愬搧鍑哄簱鑷矼ES
- /// </summary>
- public WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model)
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public WebResponseContent GetZHMesMaterialLot(string materialLot)
{
WebResponseContent content = new WebResponseContent();
try
{
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_ShipmentOrderSync.ToString());
- MESRoot<MesShipmentOrderSync> root = new MESRoot<MesShipmentOrderSync>()
+ Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_GetProductByLot.ToString());
+ object obj = new { LotNo = materialLot };
+ MESRoot<object> root = new MESRoot<object>()
{
From = "WMS",
DateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Content = model
+ Content = obj
};
JsonSerializerSettings settings = new JsonSerializerSettings
{
@@ -1659,7 +1779,7 @@
//璋冪敤鎺ュ彛
if (mesResponseContent.BSucc == true)
{
- content.OK(mesResponseContent.StrMsg);
+ content.OK(mesResponseContent.StrMsg, mesResponseContent.Content);
}
else
{
@@ -1673,90 +1793,66 @@
return content;
}
- /// <summary>
- /// MES鎴愬搧杩斿伐鎻愬簱
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public MesResponseContent RworkTask(RworkTaskModel model)
+ public WebResponseContent PPTaskMove(string palletCode, string startPoint, int warehouseId, List<string> serNums)
{
- MesResponseContent content = new MesResponseContent();
+ WebResponseContent content = new WebResponseContent();
try
{
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA72.ToString());
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == warehouseId);
if (warehouse == null)
{
- return content.Error($"灏炬暟浠撲俊鎭湭閰嶇疆");
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
}
- Dt_MesRworkOutboundOrder rworkOutboundOrderOld = _outboundRepository.RworkOutboundOrderRepository.QueryFirst(x=>x.TaskNo== model.TaskNo);
- if (rworkOutboundOrderOld==null)
- {
- return content.Error($"鎻愬簱浠诲姟鍗晎model.TaskNo}宸插瓨鍦�");
- }
- Dt_MesRworkOutboundOrder mesRworkOutboundOrder = new Dt_MesRworkOutboundOrder()
- {
- WarehouseId = warehouse.WarehouseId,
- TaskNo = model.TaskNo,
- OrderStatus = OutOrderStatusEnum.鏈紑濮�.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,
- OrderType = model.InventoryType,
- };
- List<Dt_Task> tasks = new List<Dt_Task>();
- List<Dt_ProStockInfo>? proStockInfos = null;
- List<Dt_OutProStockInfo>? outProStockInfos = null;
- List<Dt_LocationInfo>? locationInfos = null;
- //鍒嗛厤搴撳瓨鐢熸垚鎻愬簱浠诲姟
- (List<Dt_ProStockInfo>?, Dt_MesRworkOutboundOrder?, List<Dt_OutProStockInfo>?, List<Dt_LocationInfo>) result = _outboundService.RworkOutboundOrderService.AssignMesStocks(mesRworkOutboundOrder);
- 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();
- });
- proStockInfos = result.Item1;
- mesRworkOutboundOrder = result.Item2;
- outProStockInfos = result.Item3;
- locationInfos = result.Item4;
+ Dt_Task task = Repository.QueryFirst(x => x.PalletCode == palletCode && x.WarehouseId == warehouseId);
+ if (task != null)
+ {
+ return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡鐢熸垚浠诲姟");
+ }
+
+ List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.PPPKSerNumAnalysis, serNums);
+ //楠岃瘉鍒ゆ柇鏃堕棿鏍煎紡
+ WebResponseContent IsValidContent = IsValidMCDates(models);
+ if (!IsValidContent.Status)
+ {
+ return content.Error(IsValidContent.Message);
+ }
+
+ Dt_Task newTask = new Dt_Task()
+ {
+ CurrentAddress = startPoint,
+ Grade = 0,
+ NextAddress = "PPCuttingWarehouse",
+ PalletCode = palletCode,
+ Roadway = "AGV_PP",
+ SourceAddress = startPoint,
+ TargetAddress = "PPCuttingWarehouse",
+ TaskType = TaskTypeEnum.MesPPMove.ObjToInt(),
+ TaskStatus = TaskStatusEnum.New.ObjToInt(),
+ WarehouseId = warehouseId,
+ PalletType = 0,
+ MaterielCode = models.FirstOrDefault()?.MaterielCode,
+ Quantity = (float)models.FirstOrDefault()?.Quantity,
+ BatchNo = models.FirstOrDefault()?.LotNo
+ };
+ if (palletCode.Contains("DJ"))
+ {
+ newTask.PalletType = 2;
+ }
+ else if (palletCode.Contains("XJ"))
+ {
+ newTask.PalletType = 1;
}
else
{
- throw new Exception("鏃犲簱瀛樺垎閰�");
+ return WebResponseContent.Instance.Error("璇ユ墭鐩樼爜閿欒锛屾垨涓嶅睘浜嶱P骞冲簱");
}
- tasks.ForEach(x =>
- {
- x.TargetAddress = "5236";
- x.OrderNo = mesRworkOutboundOrder.TaskNo;
- });
_unitOfWorkManage.BeginTran();
-
- int id = BaseDal.AddData(tasks);
- outProStockInfos.ForEach(x =>
- {
- x.OrderNo = mesRworkOutboundOrder.TaskNo;
- x.OrderDetailId = id;
- });
- if (proStockInfos != null && proStockInfos.Count > 0 && outProStockInfos != null && outProStockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
- {
- WebResponseContent updateContent = _outboundService.RworkOutboundOrderService.LockOutboundStockDataUpdate(proStockInfos, outProStockInfos, locationInfos, tasks: tasks);
-
- if (!updateContent.Status)
- {
- _unitOfWorkManage.RollbackTran();
- return content.Error(updateContent.Message);
- }
- }
- _outboundService.RworkOutboundOrderService.Repository.AddData(mesRworkOutboundOrder);
- return content.OK("鎻愪緵杩斿簱鍗曟帴鏀舵垚鍔�");
+ int taskId = BaseDal.AddData(newTask);
+ newTask.TaskId = taskId;
+ _unitOfWorkManage.CommitTran();
+ PushTasksToWCS(new List<Dt_Task> { newTask }, "AGV_PP");
+ content.OK();
}
catch (Exception ex)
{
@@ -1765,43 +1861,48 @@
}
return content;
}
- /// <summary>
- /// 搴撳瓨鏉垮悓姝ユ帴鍙�
- /// </summary>
- public WebResponseContent ProductOutBoundSync(MesProductOutBound model)
+
+ public WebResponseContent IsValidMCDates(List<MatSerNumAnalysisModel> analysisModels)
{
- WebResponseContent content = new WebResponseContent();
- try
+ string[] effDates = analysisModels.Select(x => x.EffectiveDate).Distinct().ToArray();
+ string[] ProDates = analysisModels.Select(x => x.ProductionDate).Distinct().ToArray();
+ foreach (string effDate in effDates)
{
- Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.WMS_MES_ProductOutBound.ToString());
- MESRoot<MesProductOutBound> root = new MESRoot<MesProductOutBound>()
+ string format = "yyyy-MM-dd"; // 鐩爣鏍煎紡
+ DateTime parsedDate;
+ // 瑙ｆ瀽骞堕獙璇佹牸寮�
+ bool isValid = DateTime.TryParseExact(
+ effDate,
+ format,
+ CultureInfo.InvariantCulture,
+ DateTimeStyles.None,
+ out parsedDate
+ );
+
+ if (!isValid)
{
- 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);
+ return WebResponseContent.Instance.Error("鏍煎紡鏃犳晥鎴栨棩鏈熶笉鍚堟硶");
}
}
- catch (Exception ex)
+ foreach (string ProDate in ProDates)
{
- content.Error(ex.Message);
+ string format = "yyyy-MM-dd"; // 鐩爣鏍煎紡
+ DateTime parsedDate;
+ // 瑙ｆ瀽骞堕獙璇佹牸寮�
+ bool isValid = DateTime.TryParseExact(
+ ProDate,
+ format,
+ CultureInfo.InvariantCulture,
+ DateTimeStyles.None,
+ out parsedDate
+ );
+
+ if (!isValid)
+ {
+ return WebResponseContent.Instance.Error("鏍煎紡鏃犳晥鎴栨棩鏈熶笉鍚堟硶");
+ }
}
- return content;
+ return WebResponseContent.Instance.OK();
}
}
}
--
Gitblit v1.9.3