From 53d6a24cb335b0c9b4449e1211ce8ea644d68d67 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 31 五月 2024 20:48:53 +0800
Subject: [PATCH] 可根据图号更改下料口车轮数量入库条件

---
 代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs |   65 +++++---------------------------
 1 files changed, 11 insertions(+), 54 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs"
index 141e4f6..2397103 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs"
@@ -59,14 +59,23 @@
                     {
                         item.remark = "瑙﹀彂鍏ュ簱浠诲姟,浣嗘湭鎵惧埌宸ュ崟淇℃伅锛�";
                         item.location_state = LocationStateEnum.Abnormal.ToString();
-                        stationinfoRepository.Update(item, true);
+                        stationinfoRepository.Update(item, x => new { x.remark, x.location_state }, true);
+                        continue;
+                    }
+                    var geometry = Pipeline.QueryMateriel(work.drawingNo);
+                    if (geometry == null)
+                    {
+                        item.remark = "鏈壘鍒拌溅杞俊鎭紒";
+                        item.location_state = LocationStateEnum.Abnormal.ToString();
+                        stationinfoRepository.Update(item, x => new { x.remark, x.location_state }, true);
                         continue;
                     }
 
                     dt_stationinfo TargetLocation = null;
                     string tasktype = "";
 
-                    if (item.quantity == 5)
+                    //if (item.quantity == 5)
+                    if (item.quantity == geometry.stackNoRange)
                     {
                         if (!string.IsNullOrEmpty(work.area) || item.stationCode.Contains("3"))
                             tasktype = "TaskType_OutsourceInbound";
@@ -74,58 +83,6 @@
                             tasktype = "TaskType_Inbound";
 
                         AGVTask.AddQueueTask(stationinfoRepository, agvtaskRepository, item, tasktype, work);
-
-                        #region MyRegion
-                        //if (/*(mesinfo.quantity <= 50 &&*/ !string.IsNullOrEmpty(work.area) || item.stationCode.Contains("3"))
-                        //{
-                        //    //todo 瀵绘壘鍙斁璐у鍗忔斁璐у彴
-                        //    tasktype = "TaskType_OutsourceInbound";
-                        //    TargetLocation = GetEmptyLocation(stationinfoRepository);
-
-                        //}
-                        //else
-                        //{
-                        //    //todo:  璋冪敤WMS鎺ュ彛鍒涘缓浠诲姟
-                        //    tasktype = "TaskType_Inbound";
-                        //    TargetLocation = GetLocation.GetEmptyLocation(stationinfoRepository, work, item);
-                        //}
-                        //if (TargetLocation != null)
-                        //{
-                        //    dt_agvtask agvtask = new dt_agvtask()
-                        //    {
-                        //        agv_fromaddress = item.stationCode,
-                        //        agv_id = Guid.NewGuid(),
-                        //        agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
-                        //        agv_grade = 1,
-                        //        agv_createtime = DateTime.Now,
-                        //        agv_taskstate = "Create",
-                        //        agv_materielid = item.stationType,
-                        //        agv_qty = item.quantity,
-                        //        agv_tasktype = tasktype,
-                        //        agv_toaddress = TargetLocation.stationCode,
-                        //        agv_userid = "绯荤粺",
-                        //        bindSN = item.bindSN,
-                        //        agv_worktype = Convert.ToInt32(work.processCode),
-                        //        agv_materbarcode = work.materialCode,
-                        //        agv_Traytype = item.tray_type,
-                        //        jobID = item.Number,
-                        //        agv_TrayStatus = item.tray_status
-                        //    };
-                        //    agvtaskRepository.Add(agvtask, true);
-
-                        //    item.location_state = LocationStateEnum.InBusy.ToString();
-                        //    stationinfoRepository.Update(item, true);
-
-                        //    TargetLocation.location_state = LocationStateEnum.InBusy.ToString();
-                        //    TargetLocation.stationType = agvtask.agv_materielid;
-                        //    TargetLocation.heatNumber = item.heatNumber;
-                        //    TargetLocation.billetID = item.billetID;
-                        //    TargetLocation.Number = agvtask.jobID;
-                        //    stationinfoRepository.Update(TargetLocation, true);
-                        //    WriteDBLog.Success("鍒涘缓鍏ュ簱浠诲姟", $"浠诲姟缂栧彿锛歿agvtask.agv_tasknum}", "PCS");
-                        //}
-                        #endregion
-
                     }
                 }
             }

--
Gitblit v1.9.3