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

Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms

Browse Source
This commit is contained in:
zhouz
2024-06-04 10:37:40 +08:00
parent ce3324a8af e51fd6577a
commit f84e0fb42e
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,9 +95,13 @@ public class SlitterDownTrussTask extends AbstractAcsTask {
if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
task.setTask_status(TaskStatusEnum.FINISHED.getCode()); task.setTask_status(TaskStatusEnum.FINISHED.getCode());
String pointCode1 = task.getPoint_code1(); String pointCode1 = task.getPoint_code1();
StIvtCutpointivt point1 = cutpointivtService.getPintByUpOrDownCode(pointCode1, false);
String pointCode2 = task.getPoint_code2(); String pointCode2 = task.getPoint_code2();
StIvtCutpointivt point1 = cutpointivtService.getPintByUpOrDownCode(pointCode1, false);
BstIvtCutpointivt point2 = bcutpointivtService.getPintByTrussCode(pointCode2, false); BstIvtCutpointivt point2 = bcutpointivtService.getPintByTrussCode(pointCode2, false);
if (ObjectUtil.isEmpty(point1)) {
point1 = cutpointivtService.getPintByUpOrDownCode(pointCode2, false);
point2 = bcutpointivtService.getPintByTrussCode(pointCode1, false);
}
String tmpUpQzzNo = point1.getUp_qzzno(); String tmpUpQzzNo = point1.getUp_qzzno();
String tmpDownQzzNo = point1.getDown_qzzno(); String tmpDownQzzNo = point1.getDown_qzzno();
// 更新分切计划 // 更新分切计划

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

@@ -209,10 +209,9 @@ public class SlitterServiceImpl implements SlitterService {
} }
// 分切计划设置纸卷重量 // 分切计划设置纸卷重量
for (PdmBiSlittingproductionplan plan : plans) { for (PdmBiSlittingproductionplan plan : plans) {
if (ObjectUtil.isNotEmpty(material1) && material1.equals(plan.getContainer_name())) { if (SlitterConstant.SLITTER_SUB_VOLUME_LEFT.equals(plan.getLeft_or_right())) {
plan.setPaper_weight(weight1); plan.setPaper_weight(weight1);
} } else {
if (ObjectUtil.isNotEmpty(material2) && material2.equals(plan.getContainer_name())) {
plan.setPaper_weight(weight2); plan.setPaper_weight(weight2);
} }
TaskUtils.updateOptMessageBySlitterPlan(plan); TaskUtils.updateOptMessageBySlitterPlan(plan);
@@ -396,7 +395,7 @@ public class SlitterServiceImpl implements SlitterService {
throw new BadRequestException("系统繁忙，稍后在试!"); throw new BadRequestException("系统繁忙，稍后在试!");
} }
} finally { } finally {
if (tryLock) { if (lock.isLocked() && lock.isHeldByCurrentThread()) {
lock.unlock(); lock.unlock();
} }
} }