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

fix：内包间套轴异常处理

Browse Source
This commit is contained in:
liyongde
2024-07-08 15:49:56 +08:00
parent 5698d4165e
commit b3e62b8d47
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
View File

@@ -105,6 +105,7 @@
FROM bst_ivt_cutpointivt bc FROM bst_ivt_cutpointivt bc
LEFT JOIN pdm_bi_slittingproductionplan p ON p.qzzno = bc.qzz_no1 OR p.qzzno = bc.qzz_no2 LEFT JOIN pdm_bi_slittingproductionplan p ON p.qzzno = bc.qzz_no1 OR p.qzzno = bc.qzz_no2
WHERE bc.point_type IN ('1', '3') AND bc.point_status = '2' WHERE bc.point_type IN ('1', '3') AND bc.point_status = '2'
AND (IFNULL(bc.qzz_no1,'') <![CDATA[ <> ]]> '' OR IFNULL(bc.qzz_no2,'') <![CDATA[ <> ]]> '')
AND p.resource_name = #{resource_name} AND p.resource_name = #{resource_name}
</select> </select>

14
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -57,12 +57,11 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.getPointLocationInCutDevice;
import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.getNumberByResourceCode; import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.getNumberByResourceCode;
import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.getPointLocationInCutDevice;
/** /**
* @author lyd * @author lyd
@@ -267,12 +266,17 @@ public class SlitterServiceImpl implements SlitterService {
boolean tryLockPointR = lockPointR.tryLock(0, TimeUnit.SECONDS); boolean tryLockPointR = lockPointR.tryLock(0, TimeUnit.SECONDS);
try { try {
if (tryLockPointR) { if (tryLockPointR) {
List<PdmBiSlittingproductionplan> planTemp = slittingproductionplanService.list(
new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
.in(PdmBiSlittingproductionplan::getContainer_name, collect));
PdmBiSlittingproductionplan tempPlan = planTemp.get(0);
// 需要枷锁 // 需要枷锁
JSONObject exParam = new JSONObject(); JSONObject exParam = new JSONObject();
exParam.put("point_code1", startPoint.getPoint_code()); exParam.put("point_code1", startPoint.getPoint_code());
exParam.put("point_code2", exceptionPoint.getPoint_code()); exParam.put("point_code2", SlitterConstant.SLITTER_SHAFT_UP.equals(tempPlan.getUp_or_down())
exParam.put("vehicle_code1", "-"); ? exceptionPoint.getTruss_point_code1() : exceptionPoint.getTruss_point_code2());
exParam.put("vehicle_code2", "-"); exParam.put("vehicle_code1", SlitterTaskUtil.getQzzNoByUpOrDown(tempPlan));
exParam.put("vehicle_code2", SlitterTaskUtil.getQzzNoByUpOrDown(tempPlan));
exParam.put("task_type", SlitterEnum.TASK_TYPE.code("套轴异常处理桁架任务")); exParam.put("task_type", SlitterEnum.TASK_TYPE.code("套轴异常处理桁架任务"));
exParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); exParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA);
sendNBJExceptionPointTask.createTask(exParam); sendNBJExceptionPointTask.createTask(exParam);

13
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java
View File

@@ -273,4 +273,17 @@ public class SlitterTaskUtil {
} }
return res; return res;
} }
/**
* 通过分切计划的上下轴返回对应的气胀轴编码
* @param plan 分切机
* @return 气胀轴编码或者"-"
*/
public static String getQzzNoByUpOrDown(PdmBiSlittingproductionplan plan) {
if (SlitterConstant.SLITTER_SHAFT_UP.equals(plan.getUp_or_down())) {
return plan.getQzzno();
} else {
return "-";
}
}
} }