From 71103b2c603fead8d43781dfa385a07a03e1feaa Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 8 Jan 2024 10:55:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workorder/service/impl/PdmBdWorkorderServiceImpl.java | 2 +- .../nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java | 2 ++ .../nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java | 2 ++ .../nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java | 3 ++- .../nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java | 2 ++ .../nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java | 2 ++ .../nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java | 2 ++ .../nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java | 2 ++ .../nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java | 2 ++ .../nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java | 2 ++ .../nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java | 8 +++++--- .../nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java | 4 +++- .../nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java | 2 ++ .../nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java | 3 ++- .../nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java | 3 ++- .../nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java | 2 ++ 16 files changed, 35 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java index 786c79d..dfb24a7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java @@ -190,7 +190,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl lam = new QueryWrapper().lambda(); lam.eq(PdmBdWorkorder::getWorkorder_code, orderCode); - lam.apply("FOR UPDATE"); + lam.last("FOR UPDATE"); return pdmBdWorkorderMapper.selectOne(lam); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java index fee73fe..76a15d0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java @@ -169,6 +169,7 @@ public class CTQKTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1()); @@ -192,6 +193,7 @@ public class CTQKTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java index 7599da1..cedf983 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java @@ -160,6 +160,7 @@ public class DTSKTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String startPoint = taskObj.getPoint_code1(); @@ -186,6 +187,7 @@ public class DTSKTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java index acc3bea..9d35b5e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java @@ -298,7 +298,6 @@ public class FJMKTask extends AbstractTask { } @Override - @Transactional(rollbackFor = Exception.class) protected void updateStatus(String task_code, TaskStatus status) { // 任务完成需要组盘,包装线解锁,覆膜对接位清空,分拣拆垛对接位设置空盘 // 校验任务 @@ -343,6 +342,7 @@ public class FJMKTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { String requestParam = taskObj.getRequest_param(); JSONObject jsonObject = JSONObject.parseObject(requestParam); @@ -394,6 +394,7 @@ public class FJMKTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String bzxPoint = taskObj.getPoint_code2(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java index 6c5548b..3131c00 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java @@ -229,6 +229,7 @@ public class FJQKTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 载具编码：前面需要根据任务判断，没有载具不能生成任务 String requestParam = taskObj.getRequest_param(); @@ -266,6 +267,7 @@ public class FJQKTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 载具编码：前面需要根据任务判断，没有载具不能生成任务 String startPoint = taskObj.getPoint_code1(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java index 9993e2d..4a6785b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java @@ -216,6 +216,7 @@ public class FJQLTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { String startPoint = taskObj.getPoint_code1(); String endPoint = taskObj.getPoint_code2(); @@ -265,6 +266,7 @@ public class FJQLTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { String startPoint = taskObj.getPoint_code1(); SchBasePoint startPointObj = pointService.getById(startPoint); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java index 04fb521..f62a79f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java @@ -232,6 +232,7 @@ public class FJQZRKTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2(); @@ -263,6 +264,7 @@ public class FJQZRKTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java index f34c8f7..63529ac 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java @@ -292,6 +292,7 @@ public class FJRKTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { String requestParam = taskObj.getRequest_param(); JSONObject jsonObject = JSONObject.parseObject(requestParam); @@ -347,6 +348,7 @@ public class FJRKTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java index 335e8bd..92cf149 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java @@ -195,6 +195,7 @@ public class FJSKTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2(); @@ -228,6 +229,7 @@ public class FJSKTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java index 910109c..90d2995 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java @@ -212,6 +212,7 @@ public class FJSLTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { String vehicleCode = taskObj.getVehicle_code(); String vehicleType = taskObj.getVehicle_type(); @@ -248,6 +249,7 @@ public class FJSLTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java index a7f1f39..50db449 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java @@ -74,7 +74,6 @@ public class HNMLTask extends AbstractTask { @Override - @Transactional(rollbackFor = Exception.class) protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -214,6 +213,7 @@ public class HNMLTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2(); @@ -226,7 +226,8 @@ public class HNMLTask extends AbstractTask { // 要把数据存到组盘表。压制工单放进去， SchBaseVehiclematerialgroup groupEntity = vehiclematerialgroupService.getOne( new LambdaQueryWrapper() - .eq(SchBaseVehiclematerialgroup::getGroup_id, taskObj.getGroup_id())); + .eq(SchBaseVehiclematerialgroup::getGroup_id, taskObj.getGroup_id()) + .last("FOR UPDATE")); if (ObjectUtil.isEmpty(groupEntity)) { // 找不到组盘信息 throw new BadRequestException("找不到组盘信息"); @@ -251,7 +252,7 @@ public class HNMLTask extends AbstractTask { yjDevice.setPoint_status(PointStatusEnum.FULL_POINT.getCode()); pointService.updateById(yjDevice); PdmBdRequestMaterialRecord materialRecord = requestMaterialRecordService.getById(recordId); - // 找压机工单, 可能没有开工的工单 + // 找压机工单 -> 根据压机要料表对应的工单 PdmBdWorkorder one = workorderService.getByCode(materialRecord.getWorkorder_id()); if (ObjectUtil.isNotEmpty(one)) { // remove: 给组盘数据设置批次：压制工单+混砂机号+碾次 @@ -279,6 +280,7 @@ public class HNMLTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java index e1725e2..9423475 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java @@ -170,7 +170,6 @@ public class CYZCTask extends AbstractTask { } @Override - @Transactional(rollbackFor = Exception.class) protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -216,6 +215,8 @@ public class CYZCTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 载具编码：前面需要根据任务判断，没有载具不能生成任务 String vehicle_code = taskObj.getVehicle_code(); @@ -269,6 +270,7 @@ public class CYZCTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { String endPoint = taskObj.getPoint_code2(); SchBasePoint endPointObj = pointService.getById(endPoint); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java index 7edcffb..68c34d7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java @@ -200,6 +200,7 @@ public class GZYQLTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String startPoint = taskObj.getPoint_code1(); @@ -219,6 +220,7 @@ public class GZYQLTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String startPoint = taskObj.getPoint_code1(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java index e5793c7..b27a7bb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java @@ -140,7 +140,6 @@ public class YZQKTask extends AbstractTask { } @Override - @Transactional(rollbackFor = Exception.class) protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -183,6 +182,7 @@ public class YZQKTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String startPoint = taskObj.getPoint_code1(); @@ -208,6 +208,7 @@ public class YZQKTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String startPoint = taskObj.getPoint_code1(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java index a86a84f..d444235 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java @@ -150,7 +150,6 @@ public class YZSKTask extends AbstractTask { } @Override - @Transactional(rollbackFor = Exception.class) protected void updateStatus(String task_code, TaskStatus status) { // 校验任务 SchBaseTask taskObj = taskService.getByCode(task_code); @@ -193,6 +192,7 @@ public class YZSKTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2(); @@ -217,6 +217,7 @@ public class YZSKTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java index d5ef986..cfdf1eb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java @@ -313,6 +313,7 @@ public class YZSLTask extends AbstractTask { this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + @Transactional(rollbackFor = Exception.class) public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { String endPoint = taskObj.getPoint_code2(); SchBasePoint endPointObj = pointService.getById(endPoint); @@ -356,6 +357,7 @@ public class YZSLTask extends AbstractTask { taskService.updateById(taskObj); } + @Transactional(rollbackFor = Exception.class) public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2();