From 4c7732b2d35a0074a7b6f7c768d73f5dbeffdca3 Mon Sep 17 00:00:00 2001 From: tzsk <Administrator@qq.com> Date: 星期三, 04 十二月 2024 09:12:57 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java index 5abd58d..8d1e0dd 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -73,8 +73,7 @@ 鍏ュ簱 */ @Transactional - @Synchronized - public StartupDto createWaitPainWrkMastStart(List<AgvBasDevp> agvBasDevpList, Long userId, boolean isConveyor) { + public synchronized StartupDto createWaitPainWrkMastStart(List<AgvBasDevp> agvBasDevpList, Long userId, boolean isConveyor) { Date now = new Date(); @@ -407,6 +406,7 @@ adjDetl.setBatch(locDetl.getBatch()); adjDetl.setOriQty(locDetl.getAnfme()); adjDetl.setAdjQty(adjust.getCount()); + adjDetl.setMemo(locDetl.getSuppCode()); adjDetl.setModiTime(now); adjDetl.setModiUser(userId); adjDetl.setAppeTime(now); @@ -536,11 +536,13 @@ } //鎷f枡鍏ュ簱 鐩樼偣鍏ュ簱涓嶅彲鍙栨秷 if(wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57){ - throw new CoolException("褰撳墠浠诲姟涓嶅彲鍙栨秷"); + if (userId != 9527) { + throw new CoolException("褰撳墠浠诲姟涓嶅彲鍙栨秷"); + } } //鍏ュ簱鍙栨秷 - if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10){ + if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57){ //婧愮珯鐐� String devNo = wrkMast.getSourceLocNo(); //鐩爣搴撲綅 @@ -603,6 +605,9 @@ if (Cools.isEmpty(agvWrkMast)){ throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪"); } + if (agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53){ + throw new CoolException(workNo+"鍏ュ簱浠诲姟鏃犳硶杞嚭搴�"); + } agvWrkMast.setIoType(101); agvWrkMast.setWrkSts(206L); -- Gitblit v1.9.1