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..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);
@@ -396,7 +395,7 @@ public class SlitterServiceImpl implements SlitterService {
                     throw new BadRequestException("系统繁忙，稍后在试!");
                 }
             } finally {
-                if (tryLock) {
+                if (lock.isLocked() && lock.isHeldByCurrentThread()) {
                     lock.unlock();
                 }
             }