From 62681d14e34466f4ed4eafaa2cef197c53e6fd82 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 26 二月 2025 14:07:05 +0800
Subject: [PATCH] 修改打印样式 修改报工界面查询条件 修改磨边获取出片线路条件 大理片非钢化出片添加宽度与数量限制
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index a2f9d00..66c0e66 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -120,12 +120,12 @@
out08Glassstate = "1";
}
-// taskRequestTypeValue = "3";
+// taskRequestTypeValue = "2";
// out08Glassstate = "1";
// out10Glassstate = "1";
// currentSlot = "1";
// confirmationWrodValue = "0";
-// glassIdeValue = "P25010108|44|1";
+// glassIdeValue = "P25021704|75|12";
log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{}锛岃幏鍙栧埌鐨勭‘璁ゅ瓧涓猴細{}锛岃幏鍙栧埌鐨勫嚭鐗囩姸鎬佸垎鍒负锛欰09:{}銆丄10:{},褰撳墠鏍煎瓙鍙蜂负锛歿}",
taskRequestTypeValue, glassIdeValue, confirmationWrodValue, out08Glassstate, out10Glassstate, currentSlot);
@@ -395,8 +395,19 @@
endcell = queryLineByGlassInfo(a09EdgGlass, a10EdgGlass, glassInfo, out08Glassstate, out10Glassstate);
} else {
//鎸夌収鐘舵�佸垽鏂袱鏉＄嚎璧伴偅鏉＄嚎
- endcell = computerLineByState(out08Glassstate, out10Glassstate);
-
+ GlassInfo glassInfos = glassInfoService.getOne(
+ new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, glassId)
+ );
+ if(glassInfos!=null){
+ if (Math.max(glassInfos.getWidth(), glassInfos.getHeight()) > Integer.parseInt(firstLength) && out08Glassstate == 1) {
+ endcell = Const.A09_OUT_TARGET_POSITION;
+ } else {
+ endcell = computerLineByState(out08Glassstate, out10Glassstate);
+ }
+ }else{
+ endcell = computerLineByState(out08Glassstate, out10Glassstate);
+ }
if (out08Glassstate == 1 && out10Glassstate == 1) {
EdgStorageCageDetails a09EdgGlass = queryGlassByTaskCache(Const.A09_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
EdgStorageCageDetails a10EdgGlass = queryGlassByTaskCache(Const.A10_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
@@ -419,19 +430,21 @@
wrapper.last("order by count(t.glass_id) desc limit 2");
List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(wrapper);
if (CollectionUtil.isEmpty(list)) {
+ log.info("绗煎瓙鍐呮病鏈夋壘鍒板悎閫傜殑鐜荤拑");
MPJQueryWrapper<GlassInfo> queryWrapper = new MPJQueryWrapper<GlassInfo>()
.selectAll(GlassInfo.class).eq("t.glass_id", glassId);
if (endcell == Const.A10_OUT_TARGET_POSITION) {
- queryWrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
+ queryWrapper.leftJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
"case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
"on t.glass_id = t1.glass_id and (t1.first_length between " + minTwoFirstLength + " and " + firstLength
+ " and t1.second_length between " + minTwoSecondLength + " and " + secondLength + ") ");
} else {
- queryWrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
+ queryWrapper.leftJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
"case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
"on t.glass_id = t1.glass_id and (t1.first_length >=" + minOneFirstLength + " and t1.second_length>=" + minOneSecondLength + ") ");
}
GlassInfo one = glassInfoService.getOne(queryWrapper);
+ log.info("鎵惧埌鍚堥�傜殑鐜荤拑" + one);
if (one != null) {
EdgStorageCageDetails resultDetails = new EdgStorageCageDetails();
BeanUtils.copyProperties(one, resultDetails);
@@ -480,6 +493,10 @@
}
}
}
+ if (endcell == Const.A09_OUT_TARGET_POSITION && Math.min(glassInfo.getWidth(), glassInfo.getHeight()) < Integer.parseInt(minOneFirstLength)) {
+ log.info("灏哄涓嶇鍚堟渶澶х嚎鏈�灏忓昂瀵竰}", glassInfo);
+ return Boolean.FALSE;
+ }
return saveOutGlassMessageBySlot(glassInfo, endcell, confirmationWrodAddress, glassId, currentSlot);
}
--
Gitblit v1.8.0