From 17bca2d690f283ec110c0c327a8508ed8fba9d21 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 05 六月 2025 09:21:19 +0800
Subject: [PATCH] 最新代码提交

---
 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 92f02cc..4755722 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -73,6 +73,8 @@
         private readonly IPalletTypeInfoRepository _palletTypeInfoRepository;
         private readonly IOutProStockInfoRepository _outProStockInfoRepository;
         private readonly IOutboundRepository _outboundRepository;
+        private readonly IProInStatisticsRepository _proInStatisticsRepository;
+        private readonly IProInStatisticsService _proInStatisticsService;
         public ITaskRepository Repository => BaseDal;
 
         private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -85,7 +87,7 @@
 
         public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();
 
-        public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IStockRepository stockRepository, IBasicService basicService, IRecordService recordService, IOutboundService outboundService, IStockService stockService, IBasicRepository basicRepository, IApiInfoRepository apiInfoRepository, IInvokeERPService invokeERPService, IInboundRepository inboundRepository, IInboundOrderService inboundOrderService, IPalletTypeInfoRepository palletTypeInfoRepository, IOutProStockInfoRepository outProStockInfoRepository, IOutboundRepository outboundRepository) : base(BaseDal)
+        public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IStockRepository stockRepository, IBasicService basicService, IRecordService recordService, IOutboundService outboundService, IStockService stockService, IBasicRepository basicRepository, IApiInfoRepository apiInfoRepository, IInvokeERPService invokeERPService, IInboundRepository inboundRepository, IInboundOrderService inboundOrderService, IPalletTypeInfoRepository palletTypeInfoRepository, IOutProStockInfoRepository outProStockInfoRepository, IOutboundRepository outboundRepository, IProInStatisticsRepository proInStatisticsRepository, IProInStatisticsService proInStatisticsService) : base(BaseDal)
         {
             _mapper = mapper;
             _unitOfWorkManage = unitOfWorkManage;
@@ -102,6 +104,8 @@
             _palletTypeInfoRepository = palletTypeInfoRepository;
             _outProStockInfoRepository = outProStockInfoRepository;
             _outboundRepository = outboundRepository;
+            _proInStatisticsRepository = proInStatisticsRepository;
+            _proInStatisticsService = proInStatisticsService;
         }
 
         /// <summary>
@@ -136,7 +140,7 @@
         /// </summary>
         /// <param name="code"></param>
         /// <returns></returns>
-        public WebResponseContent PutFinish(string code)
+        public WebResponseContent PutFinish(string code, string barCode = "", string taskNum = "")
         {
             try
             {
@@ -145,7 +149,7 @@
                 {
                     return WebResponseContent.Instance.Error($"鏈壘鍒癢CSAApi鍦板潃,璇锋鏌ラ厤缃枃浠�");
                 }
-                string response = HttpHelper.Post($"{url}/api/CTU_AGV/PutFinish?code=" + code);
+                string response = HttpHelper.Post($"{url}/api/CTU_AGV/PutFinish?code={code}&barCode={barCode}&taskNum={taskNum}" );
 
                 return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("杩斿洖閿欒");
             }
@@ -419,7 +423,7 @@
                 switch (task.TaskType)
                 {
                     case (int)TaskTypeEnum.EmptyProductBack:
-                        EmptyProBackCompleted(task);
+                        content = EmptyProBackCompleted(task);
                         break;
                     case (int)TaskTypeEnum.InProduct:
                         content = InProCompleted(task);
@@ -514,8 +518,8 @@
                 _inboundRepository.MesProInOrderDetailRepository.UpdateData(mesProInOrder.Details);
                 _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, lastStatus, LocationStatusEnum.InStock, LocationChangeType.InboundCompleted);
                 _unitOfWorkManage.CommitTran();
-                //涓婁紶ERP
-                _inboundOrderService.FeedbackProIn(mesProInOrder);
+                ////涓婁紶ERP
+                //_inboundOrderService.FeedbackProIn(mesProInOrder);
                 content.OK();
             }
             catch (Exception ex)
@@ -683,6 +687,10 @@
                     {
                         x.Status = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
                     });
+                    if (stockInfo.StockLength>0)
+                    {
+                        stockInfo.StockLength = 0;
+                    }
                     _stockRepository.StockInfoRepository.UpdateData(stockInfo);
                     _stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);
                 }

--
Gitblit v1.9.3