From a8e17feaaaafd549c81ea7e18f5c968af28d9391 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期二, 09 七月 2024 14:01:13 +0800
Subject: [PATCH] 工单清理，检测线段
---
代码管理/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 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 3fc2ea7..07bd8b3 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"
@@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.Linq;
using WIDESEA_Comm;
+using WIDESEA_Comm.PLCDBItem;
using WIDESEA_Core.EFDbContext;
using WIDESEA_Core.Extensions;
using WIDESEA_Core.Utilities;
@@ -39,7 +40,8 @@
{
var DBIems = WheelDBItem.VK4WheelDBItem; //鑾峰彇杈婇亾锛岃緭閫佺嚎淇℃伅
var DBIems2 = VKDBItem.VK4DBItem; //VK4鐘舵�佷俊鎭璞￠泦鍚�
- // VK4妗佹灦鏈烘鎵嬪璞￠泦鍚�
+
+ var DBIems3 = Oiling_machine.Oiling_machineDBItem;
if (DBIems.Count == 0)
{
@@ -92,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
@@ -358,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();
@@ -489,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
{
@@ -521,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;
}
@@ -538,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, 26, 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();
@@ -616,7 +637,9 @@
Section_eleven,
Section_twelve,
Section_thirteen,
- Section_fifteen
+ Section_fifteen,
+ Section_fourteen,
+ Section_sixteen
};
return Ok(data);
@@ -767,10 +790,10 @@
}
#endregion
+ #region pcs骞抽潰鍥惧簱浣嶄俊鎭�
[HttpPost("dt_stationinfolist")]
- public WebResponseContent dt_stationinfolist()
+ public IActionResult dt_stationinfolist()
{
- WebResponseContent content = new WebResponseContent();
VOLContext volContext = new VOLContext();
Idt_stationinfoRepository dsta = new dt_stationinfoRepository(volContext);
string[] stationCodes = { "W", "A", "B", "C", "D01" };
@@ -781,13 +804,11 @@
int inst = dsta.Find(_ => true).Where(a => a.stationCode.Contains(code)).GroupBy(a => a.line).Count();
responseData.Add(Tuple.Create(data, inst));
}
- content.Data = responseData;
- return content;
+ return Ok(responseData);
}
[HttpPost("pcs_dt_stationinfolist")]
- public WebResponseContent pcs_dt_stationinfolist()
+ public IActionResult pcs_dt_stationinfolist()
{
- WebResponseContent content = new WebResponseContent();
VOLContext volContext = new VOLContext();
Idt_stationinfoRepository dsta = new dt_stationinfoRepository(volContext);
string[] stationCodes = { "X01", "X02", "X03", "S", "DD001" };
@@ -797,8 +818,11 @@
var data = dsta.Find(_ => true).Where(a => a.stationCode.Contains(code)).OrderBy(a => a.stationCode).ToList();
responseData.Add(Tuple.Create(data));
}
- content.Data = responseData;
- return content;
+ return Ok(responseData);
}
+ #endregion
+
+
+
}
}
--
Gitblit v1.9.3