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 | 494 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 363 insertions(+), 131 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 4c88553..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"
@@ -31,6 +31,10 @@
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
{
@@ -518,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>
@@ -719,7 +746,6 @@
MesResponseContent modelCount = new MesResponseContent();
try
{
-
Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA58.ToString());
if (warehouse == null)
{
@@ -742,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,
@@ -758,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)
@@ -839,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("浠撳簱鍩虹淇℃伅鏈厤缃�");
@@ -859,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();
}
@@ -1105,36 +1173,88 @@
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}");
}
}
@@ -1672,5 +1792,117 @@
}
return content;
}
+
+ public WebResponseContent PPTaskMove(string palletCode, string startPoint, int warehouseId, List<string> serNums)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == warehouseId);
+ if (warehouse == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
+ }
+
+ 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
+ {
+ return WebResponseContent.Instance.Error("璇ユ墭鐩樼爜閿欒锛屾垨涓嶅睘浜嶱P骞冲簱");
+ }
+ _unitOfWorkManage.BeginTran();
+ int taskId = BaseDal.AddData(newTask);
+ newTask.TaskId = taskId;
+ _unitOfWorkManage.CommitTran();
+ PushTasksToWCS(new List<Dt_Task> { newTask }, "AGV_PP");
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ public WebResponseContent IsValidMCDates(List<MatSerNumAnalysisModel> analysisModels)
+ {
+ string[] effDates = analysisModels.Select(x => x.EffectiveDate).Distinct().ToArray();
+ string[] ProDates = analysisModels.Select(x => x.ProductionDate).Distinct().ToArray();
+ foreach (string effDate in effDates)
+ {
+ string format = "yyyy-MM-dd"; // 鐩爣鏍煎紡
+ DateTime parsedDate;
+ // 瑙ｆ瀽骞堕獙璇佹牸寮�
+ bool isValid = DateTime.TryParseExact(
+ effDate,
+ format,
+ CultureInfo.InvariantCulture,
+ DateTimeStyles.None,
+ out parsedDate
+ );
+
+ if (!isValid)
+ {
+ return WebResponseContent.Instance.Error("鏍煎紡鏃犳晥鎴栨棩鏈熶笉鍚堟硶");
+ }
+ }
+ foreach (string ProDate in ProDates)
+ {
+ 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 WebResponseContent.Instance.OK();
+ }
}
}
--
Gitblit v1.9.3