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

fix:桁架下卷

Browse Source
This commit is contained in:
zhouz
2024-05-31 10:16:43 +08:00
parent 3e7a8f2784
commit 72863a797b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -340,7 +340,7 @@ public class SlitterServiceImpl implements SlitterService {
// 获得设备 // 获得设备
StIvtCutpointivt device = cutpointivtService.getOne(new LambdaQueryWrapper<StIvtCutpointivt>() StIvtCutpointivt device = cutpointivtService.getOne(new LambdaQueryWrapper<StIvtCutpointivt>()
.eq(StIvtCutpointivt::getExt_code, demoPlan.getResource_name())); .eq(StIvtCutpointivt::getExt_code, demoPlan.getResource_name()));
String area = demoPlan.getResource_name().substring(0, 2); String area = demoPlan.getContainer_name().substring(0, 2);
// 获取当前分切机的下一组分切计划(最多四条分切计划) // 获取当前分切机的下一组分切计划(最多四条分切计划)
// hint: 获取到的分切可能是不同组的但具有一定时间顺序 // hint: 获取到的分切可能是不同组的但具有一定时间顺序
List<PdmBiSlittingproductionplan> timePlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>() List<PdmBiSlittingproductionplan> timePlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
@@ -443,6 +443,10 @@ public class SlitterServiceImpl implements SlitterService {
? device.getUp_point_code() : device.getDown_point_code()); ? device.getUp_point_code() : device.getDown_point_code());
taskParam.put("point_code2", currentUpPlan != null taskParam.put("point_code2", currentUpPlan != null
? newCutPoint.getTruss_point_code1() : newCutPoint.getTruss_point_code2()); ? newCutPoint.getTruss_point_code1() : newCutPoint.getTruss_point_code2());
taskParam.put("point_code3", currentUpPlan == null
? device.getUp_point_code() : device.getDown_point_code());
taskParam.put("point_code4", currentUpPlan == null
? newCutPoint.getTruss_point_code1() : newCutPoint.getTruss_point_code2());
taskParam.put("truss_type", "3"); taskParam.put("truss_type", "3");
taskParam.put("empty_site", "3"); taskParam.put("empty_site", "3");
break; break;
@@ -453,7 +457,7 @@ public class SlitterServiceImpl implements SlitterService {
taskParam.put("point_code3", device.getDown_point_code()); taskParam.put("point_code3", device.getDown_point_code());
taskParam.put("point_code4", newCutPoint.getTruss_point_code2()); taskParam.put("point_code4", newCutPoint.getTruss_point_code2());
taskParam.put("truss_type", "4"); taskParam.put("truss_type", "4");
taskParam.put("empty_site", nextUpPlan == null ? "1" : "2"); taskParam.put("empty_site", nextUpPlan == null ? "2" : "1");
break; break;
case "11": case "11":
// 下双上双 // 下双上双
@@ -461,7 +465,7 @@ public class SlitterServiceImpl implements SlitterService {
taskParam.put("point_code2", newCutPoint.getTruss_point_code1()); taskParam.put("point_code2", newCutPoint.getTruss_point_code1());
taskParam.put("point_code3", device.getDown_point_code()); taskParam.put("point_code3", device.getDown_point_code());
taskParam.put("point_code4", newCutPoint.getTruss_point_code2()); taskParam.put("point_code4", newCutPoint.getTruss_point_code2());
taskParam.put("truss_type", "3"); taskParam.put("truss_type", "2");
taskParam.put("empty_site", "3"); taskParam.put("empty_site", "3");
break; break;
default: default: