root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:优化空轴退回功能

Browse Source
This commit is contained in:
tuqiang
2025-04-30 16:04:44 +08:00
parent e1e81b54e0
commit 7b67504230
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/dao/mapper/BstIvtShafttubeivtMapper.xml
View File

@@ -71,16 +71,16 @@
WHERE b.have_qzz = '1' WHERE b.have_qzz = '1'
AND b.point_type = '6' AND b.point_type = '6'
AND b.qzz_size = #{size} AND b.qzz_size = #{size}
<if test="qzz_size != 6"> <if test="size != 6">
AND b.qzz_generation = #{qzz_generation} AND b.qzz_generation = #{qzz_generation}
</if> </if>
AND b.point_location = #{location} AND b.point_location = #{location}
AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07' AND t.point_code2 = b.point_code) AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[ < ]]> '07' AND t.point_code2 = b.point_code)
AND 0 = (SELECT COUNT(*) FROM bst_ivt_shafttubeivt bb WHERE bb.have_qzz ='1' AND bb.point_type = '6' AND 0 = (SELECT COUNT(*) FROM bst_ivt_shafttubeivt bb WHERE bb.have_qzz ='1' AND bb.point_type = '6'
<if test="qzz_size != 6"> <if test="size != 6">
AND bb.qzz_generation = #{qzz_generation} AND bb.qzz_generation = #{qzz_generation}
</if> </if>
AND bb.qzz_size = #{qzz_size} AND bb.point_location = #{location} AND bb.sort_seq > b.sort_seq) AND bb.qzz_size = #{size} AND bb.point_location = #{location} AND bb.sort_seq > b.sort_seq)
ORDER BY b.sort_seq ASC ORDER BY b.sort_seq ASC
</select> </select>
</mapper> </mapper>

6
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/ReturnShaftAgvTask.java
View File

@@ -110,7 +110,7 @@ public class ReturnShaftAgvTask extends AbstractAcsTask {
if (ObjectUtil.isEmpty(putWaitPoint)) { if (ObjectUtil.isEmpty(putWaitPoint)) {
throw new BadRequestException("未找到可存放气涨轴规格「" + endPoint + "」的等待点位"); throw new BadRequestException("未找到可存放气涨轴规格「" + endPoint + "」的等待点位");
} }
log.info("点位信息：{}", endPointObj);
// 创建行架任务 // 创建行架任务
if (ObjectUtil.isNotEmpty(endPointObj.getQzz_no1())){ if (ObjectUtil.isNotEmpty(endPointObj.getQzz_no1())){
@@ -126,7 +126,7 @@ public class ReturnShaftAgvTask extends AbstractAcsTask {
param.put("point_code1", endPointObj.getTruss_point_code1()); param.put("point_code1", endPointObj.getTruss_point_code1());
param.put("point_code2", putWaitPoint.getPoint_code()); param.put("point_code2", putWaitPoint.getPoint_code());
// hint: 当前分切计划的气涨轴尺寸 // hint: 当前分切计划的气涨轴尺寸
param.put("qzz_size", endPointObj.getQzz_no1()); param.put("qzz_size", size);
param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>气胀轴缓存位")); param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>气胀轴缓存位"));
param.put("is_bushing", "0"); param.put("is_bushing", "0");
@@ -145,7 +145,7 @@ public class ReturnShaftAgvTask extends AbstractAcsTask {
param.put("point_code1", endPointObj.getTruss_point_code2()); param.put("point_code1", endPointObj.getTruss_point_code2());
param.put("point_code2", putWaitPoint.getPoint_code()); param.put("point_code2", putWaitPoint.getPoint_code());
// hint: 当前分切计划的气涨轴尺寸 // hint: 当前分切计划的气涨轴尺寸
param.put("qzz_size", endPointObj.getQzz_no2()); param.put("qzz_size", size);
param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>气胀轴缓存位")); param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>气胀轴缓存位"));
param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); param.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
param.put("is_bushing", "0"); param.put("is_bushing", "0");