From edc7293bf81729ebaa2d7cdd9a1f3aeaf567f538 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 31 十二月 2025 17:32:08 +0800
Subject: [PATCH] 更新
---
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
index 1f47085..560f30f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs"
@@ -228,6 +228,7 @@
//閫�鏂�
List<Dt_StockInfo> stockInfos=new List<Dt_StockInfo>();
List<Dt_Task> tasksNew = new List<Dt_Task>();
+ List<Dt_AGVStationInfo> _AGVStationInfos = new List<Dt_AGVStationInfo>();
foreach (var item in returnIssueDTOs.Where(x => x.ReturnMaterial != null))
{
MESReturnMaterial? returnMaterial = item.ReturnMaterial;
@@ -270,6 +271,7 @@
BatchNo = returnMaterial.MaterialLot,
Unit = materielInfo.MaterielUnit,
MaterielThickness = returnMaterial.Thickness,
+ CheckThickness= returnMaterial.Thickness,
MaterielWide = returnMaterial.Wide,
MaterielWeight = returnMaterial.Weight,
MaterielCode = materielInfo.MaterielCode,
@@ -280,7 +282,7 @@
IsPick = returnMaterial.Whether == 0 ? WhetherEnum.True.ObjToInt() : WhetherEnum.False.ObjToInt(),
Remark = StockStatusEmun.MES浣欐枡閫�搴�.ToString()
};
- if (stockInfo.MaterielWide > 1200)
+ if (stockInfo.MaterielWide >= 1160)
{
stockInfo.PalletType = 2;
}
@@ -308,13 +310,25 @@
TaskTypeEnum taskTypeEnum = aGVStationInfo.StationArea switch
{
nameof(StationAreaEnum.涓�妤煎嵃鍒�) => TaskTypeEnum.PrintYLBackInbound,
+ nameof(StationAreaEnum.涓�妤肩焊寮犳穻鑶�) => TaskTypeEnum.PaperFilmYLBackInbound,
+ nameof(StationAreaEnum.涓�妤兼棤绾烘穻鑶�) => TaskTypeEnum.WFBLMYLBackInbound,
_ => throw new Exception("鏈壘鍒板搴斾换鍔�")
};
+ if (taskTypeEnum== TaskTypeEnum.WFBLMYLBackInbound)
+ {
+ Dt_AGVStationInfo? stationInfo = AssignWFBStation(_AGVStationInfos?.Select(x=>x.AGVStationCode).ToList()) ?? throw new Exception("鏈壘鍒板彲鐢ㄦ棤绾哄竷鏆傚瓨鏋�");
+ newTask.NextAddress = stationInfo.AGVStationCode;
+ newTask.TargetAddress = stationInfo.AGVStationCode;
+ newTask.Roadway = "AGV";
+ stationInfo.IsOccupied = 1;
+ _AGVStationInfos.Add(stationInfo);
+ }
newTask.TaskType = taskTypeEnum.ObjToInt();
tasksNew.Add(newTask);
}
_unitOfWorkManage.BeginTran();
BaseDal.AddData(tasksNew);
+ _basicRepository.AGVStationInfoRepository.UpdateData(_AGVStationInfos);
_stockRepository.StockInfoRepository.AddData(stockInfos);
_unitOfWorkManage.CommitTran();
//鎺ㄩ�佷换鍔�
--
Gitblit v1.9.3