From 32678f5c24c7681a198b517fa72db1de2e98646d Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 08 七月 2024 22:00:42 +0800
Subject: [PATCH] PCS平面图检测线段

---
 代码管理/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs"
index baee244..fe4d685 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs"
@@ -94,7 +94,7 @@
 
             var Section_one = DBIems.Where(x => IsInRange(x.StackerNo, 4, 13, 4, 24)).ToList();
             var Section_two = DBIems.Where(x => IsInRange(x.StackerNo, 4, 11, 4, 12)).ToList();
-            var Section_three = DBIems.Where(x => IsInRange(x.StackerNo, 4, 9, 4, 10)).ToList();
+            var Section_three = DBIems.Where(x => IsInRange(x.StackerNo, 4, 9, 4, 10)).OrderByDescending(x=>x.StackerNo).ToList();
             var Section_four = DBIems.Where(x => IsInRange(x.StackerNo, 4, 1, 4, 8)).ToList();
             var Section_six = DBIems.Where(x => IsInRange(x.StackerNo, 10, 1, 10, 2)).ToList();   //10.1-10.2
             var Section_seven = DBIems.Where(x => IsInRange(x.StackerNo, 10, 3, 10, 4)).ToList(); //10.3-10.4
@@ -360,7 +360,7 @@
             List<SectionData> DataList2 = new List<SectionData>();
             var Section_one = DBIems.Where(x => IsInRange(x.StackerNo, 5, 13, 5, 24)).ToList();
             var Section_two = DBIems.Where(x => IsInRange(x.StackerNo, 5, 11, 5, 12)).ToList();
-            var Section_three = DBIems.Where(x => IsInRange(x.StackerNo, 5, 9, 5, 10)).ToList();
+            var Section_three = DBIems.Where(x => IsInRange(x.StackerNo, 5, 9, 5, 10)).OrderByDescending(x => x.StackerNo).ToList();
             var Section_four = DBIems.Where(x => IsInRange(x.StackerNo, 5, 1, 5, 8)).ToList();
 
 
@@ -491,7 +491,7 @@
             if (DBIems.Count == 0)
             {
                 List<SectionData> DBIemss = new List<SectionData>();
-                for (int i = 0; i < 31; i++)
+                for (int i = 0; i < 36; i++)
                 {
                     var seDataList = new SectionData
                     {
@@ -523,6 +523,21 @@
                         case 30:
                             seDataList.stackerNo = "鏈烘鎵�3";
                             break;
+                        case 31:
+                            seDataList.stackerNo = "7.26";
+                            break;
+                        case 32:
+                            seDataList.stackerNo = "7.27";
+                            break;
+                        case 33:
+                            seDataList.stackerNo = "7.28";
+                            break;
+                        case 34:
+                            seDataList.stackerNo = "7.29";
+                            break;
+                        case 35:
+                            seDataList.stackerNo = "7.30";
+                            break;
                         default:
                             break;
                     }
@@ -540,8 +555,12 @@
             }
 
             var Section_one = DBIems.Where(x => IsInRange(x.StackerNo, 6, 13, 6, 20) || x.StackerNo == "6.24" || x.StackerNo == "7.21").ToList();
+
+            var Section_fourteen= DBIems.Where(x => IsInRange(x.StackerNo, 7, 26, 7, 27)).ToList(); //涓婃枡鍙�
+            var Section_sixteen = DBIems.Where(x => IsInRange(x.StackerNo, 7, 28, 7, 30)).ToList(); //涓婃枡鍙�
+
             var Section_two = DBIems.Where(x => IsInRange(x.StackerNo, 6, 11, 6, 12)).ToList();
-            var Section_three = DBIems.Where(x => IsInRange(x.StackerNo, 6, 9, 6, 10)).ToList();
+            var Section_three = DBIems.Where(x => IsInRange(x.StackerNo, 6, 9, 6, 10)).OrderByDescending(x => x.StackerNo).ToList();
             var Section_four = DBIems.Where(x => IsInRange(x.StackerNo, 6, 1, 6, 8)).ToList();
             var Section_thirteen = DBIems.Where(x => IsInRange(x.StackerNo, 6, 21, 6, 23)).ToList();
 
@@ -618,7 +637,9 @@
                 Section_eleven,
                 Section_twelve,
                 Section_thirteen,
-                Section_fifteen
+                Section_fifteen,
+                Section_fourteen,
+                Section_sixteen
             };
 
             return Ok(data);

--
Gitblit v1.9.3