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_WCS/JobsPart/Common/AutoUpdateWork.cs | 5 +++--
代码管理/PCS/WCS_Client/src/views/Home.vue | 2 +-
代码管理/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs | 2 +-
代码管理/PCS/WCS_Client/src/views/Homes/Homest/centerLeft4index.vue | 13 +++++++------
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Home.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Home.vue"
index dcbebfe..3ff9106 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Home.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Home.vue"
@@ -227,7 +227,7 @@
<style scoped>
.home-page {
- width: 125%;
+ width: 155%;
background-image: url("../assets/imgs/pageBg.png");
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft4index.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft4index.vue"
index 4c587b6..98989d0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft4index.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/Homes/Homest/centerLeft4index.vue"
@@ -4,7 +4,7 @@
<div style="margin-top: -6px;">
<!--杞﹂棿涔嬩笅鐨勮緤閬撶嚎-->
- <div style="margin-top: -30px;">
+ <!-- <div style="margin-top: -30px;">
<div class="box" >
<div v-for="items in plcList_one.section_fourteen" class="box_sto"
:style="{ 'background-color': getBackgroundColor2(items.r_wheel_SN) }">
@@ -30,12 +30,13 @@
</div>
</div>
- </div>
+ </div> -->
<!--杞﹂棿涔嬩笅鐨勮緤閬撶嚎-->
- <div style="margin-top: -164px;margin-right: 30px;">
- <!--涓嬭溅闂翠腑闂磋緤閬�-->
- <div class="box" style="height: 66px;display: flex;width: 210px;">
+ <!--涓嬭溅闂翠腑闂磋緤閬�-->
+ <div style="margin-top: -124px;margin-right: 30px;">
+
+ <div class="box" style="height: 66px;display: flex;width: 350px;">
<div v-for="items in plcList_one.section_sixteen" class="box_sto2"
:style="{ 'background-color': getBackgroundColor2(items.r_wheel_SN) }">
<el-tooltip class="item" effect="dark" placement="left">
@@ -59,8 +60,8 @@
</el-tooltip>
</div>
</div>
- <!--涓嬭溅闂翠腑闂磋緤閬�-->
</div>
+ <!--涓嬭溅闂翠腑闂磋緤閬�-->
</div>
</div>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs"
index 73ba95a..5b81463 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs"
@@ -63,7 +63,7 @@
Idt_management_timeRepository timeRepository = new dt_management_timeRepository(context);
var val = timeRepository.Find(x => x.management_name == "FinishMesWork").FirstOrDefault().management_numericalvalue;
- var mes_heads = mes_HeadRepository.Find(x => x.quantity == x.finishNum || x.CreateTime.AddDays(val) < DateTime.Now).ToList();
+ var mes_heads = mes_HeadRepository.Find(x => x.quantity == x.finishNum || x.CreateTime.AddDays(val) < DateTime.Now).Take(10).ToList();
#region 妫�娴嬬嚎宸ュ崟
var mes_head_jcxs = mes_heads.Where(x => x.processCode == "28").ToList();
@@ -83,9 +83,10 @@
foreach (var mes_head in mes_head_jjgs)
{
var inventorys = inventoryRepository.Find(x => x.jobID == mes_head.jobID).ToList();
- if (inventorys.Count == mes_head.quantity)
+ if (inventorys.Count == mes_head.quantity || inventorys.Count==0)
AddHtyMesWork(mes_head, mes_HeadRepository);
}
+ var k = "鍔犺浇瀹屾垚";
}
#endregion
}
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 fe4d685..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"
@@ -557,7 +557,7 @@
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_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)).OrderByDescending(x => x.StackerNo).ToList();
--
Gitblit v1.9.3