From 5f53f4af369a1c7a8a09eb1f45c20a8581d107a9 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 19 三月 2026 22:20:07 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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..f6c2e50 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"
@@ -127,7 +127,10 @@
return ((char)Convert.ToInt32(match.Groups[1].Value, 16)).ToString();
});
}
-
+ /// <summary>
+ /// MES鎵嬪姩鍙枡鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
public WebResponseContent ReceiveManualIssue(MESManualIssueDTO manualIssueDTO)
{
WebResponseContent content = new WebResponseContent();
@@ -228,6 +231,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;
@@ -243,13 +247,9 @@
return content.Error($"鏈壘鍒版潯鐮亄returnMaterial.BarCode}鐗╂枡淇℃伅");
}
//鍒ゆ柇
- if (returnMaterial.Thickness <= 0 && materielInfo.WarehouseId==WarehouseEnum.LLDYL.ObjToInt())
+ if ((returnMaterial.Thickness <= 0 || returnMaterial.Wide <= 0)&& materielInfo.WarehouseId==WarehouseEnum.LLDYL.ObjToInt())
{
- return content.Error($"鐗╂枡{returnMaterial.MaterialCode}鏉＄爜{returnMaterial.BarCode}鐩村緞涓嶈兘灏忎簬0");
- }
- if (returnMaterial.Wide <= 0 && materielInfo.WarehouseId == WarehouseEnum.LLDYL.ObjToInt())
- {
- return content.Error($"鐗╂枡{returnMaterial.MaterialCode}鏉＄爜{returnMaterial.BarCode}鐩村緞涓嶈兘灏忎簬0");
+ return content.Error($"鐗╂枡{returnMaterial.MaterialCode}鏉＄爜{returnMaterial.BarCode}鐩村緞鎴栧箙瀹戒笉鑳藉皬浜�0");
}
Dt_StockInfo? stockInfoOld = stockInfosOld.FirstOrDefault(x => x.PalletCode == returnMaterial.BarCode);
if (stockInfoOld != null)
@@ -270,6 +270,7 @@
BatchNo = returnMaterial.MaterialLot,
Unit = materielInfo.MaterielUnit,
MaterielThickness = returnMaterial.Thickness,
+ CheckThickness= returnMaterial.Thickness,
MaterielWide = returnMaterial.Wide,
MaterielWeight = returnMaterial.Weight,
MaterielCode = materielInfo.MaterielCode,
@@ -280,7 +281,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 +309,27 @@
TaskTypeEnum taskTypeEnum = aGVStationInfo.StationArea switch
{
nameof(StationAreaEnum.涓�妤煎嵃鍒�) => TaskTypeEnum.PrintYLBackInbound,
+ nameof(StationAreaEnum.涓�妤肩焊寮犳穻鑶�) => TaskTypeEnum.PaperLMYLBackInbound,
+ nameof(StationAreaEnum.涓�妤兼棤绾烘穻鑶�) => TaskTypeEnum.WFBLMYLBackInbound,
+ nameof(StationAreaEnum.浜屾ゼ鏃犵汉甯冭) => TaskTypeEnum.WFBBackInbound,
+ nameof(StationAreaEnum.浜屾ゼ绾歌) => TaskTypeEnum.PaperYLBackInbound,
_ => throw new Exception("鏈壘鍒板搴斾换鍔�")
};
+ if (taskTypeEnum == TaskTypeEnum.WFBLMYLBackInbound || taskTypeEnum == TaskTypeEnum.WFBBackInbound)
+ {
+ 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