分支自 SuZhouGuanHong/TaiYuanTaiZhong

huanghongfeng
2024-07-09 a8e17feaaaafd549c81ea7e18f5c968af28d9391
工单清理,检测线段
已修改4个文件
20 ■■■■■ 文件已修改
代码管理/PCS/WCS_Client/src/views/Home.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/PCS/WCS_Client/src/views/Homes/Homest/centerLeft4index.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/PCS/WCS_Server/WIDESEA_WebApi/Controllers/ReadplcController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/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");
}
´úÂë¹ÜÀí/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>
´úÂë¹ÜÀí/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
        }
´úÂë¹ÜÀí/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();