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 10:28:08 +08:00
parent 476a761699
commit 2e20507052
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -545,19 +545,6 @@ public class SlitterServiceImpl implements SlitterService {
PdmBiSlittingproductionplan nextUpPlan = nextPlans.stream().filter(p -> "1".equals(p.getUp_or_down())).findFirst().orElse(null); PdmBiSlittingproductionplan nextUpPlan = nextPlans.stream().filter(p -> "1".equals(p.getUp_or_down())).findFirst().orElse(null);
PdmBiSlittingproductionplan nextDownPlan = nextPlans.stream().filter(p -> "2".equals(p.getUp_or_down())).findFirst().orElse(null); PdmBiSlittingproductionplan nextDownPlan = nextPlans.stream().filter(p -> "2".equals(p.getUp_or_down())).findFirst().orElse(null);
// 找到该分切计划的点位 // 找到该分切计划的点位
// LambdaQueryWrapper<BstIvtCutpointivt> newCutLam = new QueryWrapper<BstIvtCutpointivt>().lambda();
// newCutLam.eq(BstIvtCutpointivt::getPoint_type, "3").eq(BstIvtCutpointivt::getPoint_status, "2")
// .eq(BstIvtCutpointivt::getIs_used, "1");
// if (nextUpPlan != null) {
// newCutLam.eq(BstIvtCutpointivt::getQzz_no1, nextUpPlan.getQzzno());
// }
// if (nextDownPlan != null) {
// newCutLam.eq(BstIvtCutpointivt::getQzz_no2, nextDownPlan.getQzzno());
// }
// BstIvtCutpointivt newCutPoint = bcutpointivtService.getOne(newCutLam, false);
// if (ObjectUtil.isEmpty(newCutPoint)) {
// throw new BadRequestException("分切机【" + device.getExt_code() + "】的下一组分切计划未配送完毕!😊");
// }
BstIvtCutpointivt newCutPoint = cutPointList.get(0); BstIvtCutpointivt newCutPoint = cutPointList.get(0);
String binaryExpress = TaskUtils.binaryConvertExpress(currentUpPlan, currentDownPlan, nextUpPlan, nextDownPlan); String binaryExpress = TaskUtils.binaryConvertExpress(currentUpPlan, currentDownPlan, nextUpPlan, nextDownPlan);
switch (binaryExpress) { switch (binaryExpress) {
@@ -1143,6 +1130,7 @@ public class SlitterServiceImpl implements SlitterService {
pointCode.setQzz_no2(qzzNo); pointCode.setQzz_no2(qzzNo);
} }
}); });
pointCode.setPoint_status("3");
slittingproductionplanService.updateBatchById(plans); slittingproductionplanService.updateBatchById(plans);
bcutpointivtService.updateById(pointCode); bcutpointivtService.updateById(pointCode);
JSONObject res = new JSONObject(); JSONObject res = new JSONObject();