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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyongde
2025-10-30 16:39:07 +08:00
parent 97746d0149 65e24314e8
commit 224ab6f6af
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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