From b2ad000e07e1c87d3561b5aa94fdc88c779872f0 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 18 二月 2025 22:34:54 +0800
Subject: [PATCH] 1

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs"
index 9673adf..cc108bf 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs"
@@ -26,15 +26,22 @@
             {
                 string ConveyorLineID = AppSettings.Configuration[nameof(ConveyorLineID)];
                 if (!ConveyorLineID.Split(",").Contains(lineDTO.stationCode)) throw new Exception($"鏈壘鍒拌緭閫佺嚎缂栧彿[{lineDTO.stationCode}]鐨勪俊鎭�");
-                switch (lineDTO.stationCode)
-                {
-                    case "102":
-                        content = TransmissionlineRequest(lineDTO);
-                        break;
-                    case "1001":
-                        content = ProductionlineRequest(lineDTO);
-                        break;
-                }
+                content = TransmissionlineRequest(lineDTO);
+                //switch (lineDTO.stationCode)
+                //{
+                //    case "102":
+                //        content = TransmissionlineRequest(lineDTO);
+                //        break;
+                //    case "Z1":
+                //    case "Z2":
+                //    case "Z3":
+                //    case "X1":
+                //    case "X2":
+                //    case "X3":
+                //        content = ProductionlineRequest(lineDTO);
+                //        break;
+                //    default: throw new Exception("鏈畾涔夌珯鍙帮細" + lineDTO.stationCode);
+                //}
             }
             catch (Exception ex)
             {
@@ -115,18 +122,19 @@
 
                 Dt_StockInfoDetail stockInfoDetail = stockInfo.Details.FirstOrDefault();
 
-                if (lineDTO.Spec != 1 || lineDTO.Weight != 500)//妫�娴嬫潯浠堕渶鏇存敼锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒
+                if (/*lineDTO.Spec != 1 ||*/ lineDTO.Weight > 1500)//妫�娴嬫潯浠堕渶鏇存敼锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒
                 {
-                    task.NextAddress = "101";
+                    //task.NextAddress = "101";
                     task.TaskState = (int)InTaskStatusEnum.InException;
-                    task.Remark = $"鎵樼洏[{lineDTO.Barcode}]淇℃伅涓嶅悎鏍�";
+                    task.Remark = $"鎵樼洏[{lineDTO.Barcode}]瓒呴噸";
+                    //task.Remark = $"鎵樼洏[{lineDTO.Barcode}]淇℃伅涓嶅悎鏍�";
                     //stockInfo.StockStatus = StockStatusEmun.鍏ュ簱鎾ら攢.ObjToInt();
                 }
                 else
                 {
-                    task.NextAddress = "104";
+                    task.NextAddress = "1004";
                     task.CurrentAddress = lineDTO.stationCode;
-                    task.Remark=string.Empty;
+                    task.Remark = string.Empty;
                     task.TaskState = (int)InTaskStatusEnum.Line_InExecuting;
                     stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
                     stockInfoDetail.Status = StockStatusEmun.鍏ュ簱纭.ObjToInt();

--
Gitblit v1.9.3