From b91c166e2da452578c71423138a0291558b36344 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 25 七月 2025 15:43:15 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/MesTaskService.cs | 106 -----------------------------------------------------
1 files changed, 0 insertions(+), 106 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 42b7f49..68dbbb7 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"
@@ -330,112 +330,6 @@
}
/// <summary>
- /// 鍩烘澘鍑哄簱
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public MesResponseContent SubstrateOut(SubstrateOutModel model)
- {
- try
- {
- string line = string.Empty;
- if (!model.Line.Contains("SCUTL"))
- {
- line = WarehouseEnum.HA58.ToString();
- }
- else
- {
- line = WarehouseEnum.HA57.ToString();
- }
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == line);
- 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("鏃犲簱瀛�");
- }
- }
- tasks.ForEach(x =>
- {
- x.TargetAddress = model.Line;
- x.OrderNo = mesOutboundOrder.TaskNo;
- });
- _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>
--
Gitblit v1.9.3