From 1395078a48cee5e0402edda34be66298e8e24f33 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 31 May 2024 16:34:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=88=86=E5=88=87=E4=B8=8B=E6=96=99?= =?UTF-8?q?-=E4=B8=8B=E5=8D=95=E4=B8=8A=E5=8D=95=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java | 6 +++++- .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java index 2871611d2..447e002af 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java @@ -95,9 +95,13 @@ public class SlitterDownTrussTask extends AbstractAcsTask { if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { task.setTask_status(TaskStatusEnum.FINISHED.getCode()); String pointCode1 = task.getPoint_code1(); - StIvtCutpointivt point1 = cutpointivtService.getPintByUpOrDownCode(pointCode1, false); String pointCode2 = task.getPoint_code2(); + StIvtCutpointivt point1 = cutpointivtService.getPintByUpOrDownCode(pointCode1, 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 tmpDownQzzNo = point1.getDown_qzzno(); // 更新分切计划 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index 6740aa5c4..f63c57e9b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -396,7 +396,7 @@ public class SlitterServiceImpl implements SlitterService { throw new BadRequestException("系统繁忙，稍后在试!"); } } finally { - if (tryLock) { + if (lock.isLocked() && lock.isHeldByCurrentThread()) { lock.unlock(); } } From e51fd6577a3198febe15ab04c61ca9f5f5a4f8d0 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 3 Jun 2024 15:59:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=BA=B8=E7=AE=A1=E9=87=8D=E9=87=8F?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index f63c57e9b..1a7663592 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -209,10 +209,9 @@ public class SlitterServiceImpl implements SlitterService { } // 分切计划设置纸卷重量 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); - } - if (ObjectUtil.isNotEmpty(material2) && material2.equals(plan.getContainer_name())) { + } else { plan.setPaper_weight(weight2); } TaskUtils.updateOptMessageBySlitterPlan(plan);