Merge remote-tracking branch 'origin/master'

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java

@@ -436,6 +436,8 @@ public class MesToWmsServiceImpl implements MesToWmsService {
             } else {
                 throw new BadRequestException("任务标识为：" + dto.getTask_code() + "的任务正在操作中！");
             }
+        } catch (Exception e) {
+            throw e;
         } finally {
             if (tryLock) {
                 lock.unlock();
@@ -445,6 +447,7 @@ public class MesToWmsServiceImpl implements MesToWmsService {
 
     @Override
     @SneakyThrows
+    @Transactional
     public MesResponse backMaterial(MesBackMaterialRequestDto dto) {
         MDC.put(TagNameEnum.TAG_NAME.getTag(), TagNameEnum.MES_BACK_MATERIAL.getTag());
         log.info("MES下发设备退料信息输入参数：-------------------: {}", dto);
@@ -546,6 +549,8 @@ public class MesToWmsServiceImpl implements MesToWmsService {
             } else {
                 throw new BadRequestException("任务标识为：" + dto.getTask_code() + "的任务正在操作中！");
             }
+        } catch (Exception e) {
+            throw e;
         } finally {
             if (tryLock) {
                 lock.unlock();