From 9e579eda4601ed7b492b9d19a24e8146f6ebdf8d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 19 四月 2025 19:50:43 +0800
Subject: [PATCH] 优化空托出入库逻辑

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
index 979ab9b..c7c40f5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
@@ -47,7 +47,7 @@
         /// </summary>
         /// <param name="materielGroupDTO"></param>
         /// <returns></returns>
-        public WebResponseContent PdaAddEmptyStockInfo(string barcode)
+        public WebResponseContent PdaAddEmptyStockInfo(string barcode, string station)
         {
             try
             {
@@ -59,31 +59,34 @@
                 {
                     task = new Dt_Task()
                     {
-                        CurrentAddress = "1001",
-                        NextAddress = "SC01",
-                        SourceAddress = "1001",
+                        CurrentAddress = station,
+                        NextAddress = "1001",
+                        SourceAddress = station,
                         TargetAddress = "SC01",
                         Creater = "System",
                         PalletCode = barcode,
                         Roadway = "SC01",
                         OrderNo = DateTime.Now.ToString("yyMMdd"),
                         TaskNum = _taskRepository.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
-                        TaskState = InTaskStatusEnum.AGV_InFinish.ObjToInt(),
+                        TaskState = InTaskStatusEnum.InNew.ObjToInt(),
                         TaskType = TaskTypeEnum.PalletInbound.ObjToInt(),
                         CreateDate = DateTime.Now,
                         Dispatchertime = DateTime.Now,
                     };
                     Db.Ado.BeginTran();
-                    _stockService.StockInfoService.AddStockEmpty(barcode);
+                    WebResponseContent content = _stockService.StockInfoService.AddStockEmpty(barcode);
+                    if (!content.Status) throw new Exception(content.Message);
                     _taskRepository.AddData(task);
                     List<WMSTaskDTO> wMSTaskDTOs = _mapper.Map<List<WMSTaskDTO>>(new List<Dt_Task> { task });
                     var ResultData = HttpHelper.PostAsync(WCSInterfaceAddress.ReceiveTask, wMSTaskDTOs.ToJson(), headers: new Dictionary<string, string>());
                     if (ResultData.Result == null) throw new Exception($"鍚慦CS涓嬪彂绌烘墭鍏ュ簱浠诲姟瓒呮椂");
-                    WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
+                    content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
                     if (content == null) throw new Exception($"涓嬪彂绌烘墭鍏ュ簱浠诲姟WCS鏃犲搷搴�");
                     if (!content.Status) throw new Exception(content.Message);
                     Db.Ado.CommitTran();
                 }
+                else
+                    throw new Exception($"鎵樼洏鍙枫�恵barcode}銆戝凡瀛樺湪浠诲姟");
                 #endregion
                 return WebResponseContent.Instance.OK();
             }

--
Gitblit v1.9.3