From d60e84cbedb554555578f071de95c4a8049183db Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期五, 13 六月 2025 15:16:43 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index 2762165..d136157 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -623,7 +623,7 @@ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁 if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>(). eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) { - throw new CoolException(param.getBarcode() + "鏁版嵁姝e湪杩涜鍏ュ簱"); + throw new CoolException(param.getBarcode() + "璇峰嬁閲嶅缁勬墭锛�"); } if(param.getBarcode().length()!=8){ @@ -634,10 +634,16 @@ } int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode())); + if (countLoc > 0 ) { + throw new CoolException("銆婂簱瀛樸�嬫潯鐮佹暟鎹凡瀛樺湪===>>" + param.getBarcode()); + } int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode())); + if (countWrk > 0){ + throw new CoolException("銆婂伐浣滄。銆嬫潯鐮佹暟鎹凡瀛樺湪===>>" + param.getBarcode()); + } int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode())); - if (countLoc > 0 || countWrk > 0 || countwait > 0) { - throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode()); + if (countwait > 0){ + throw new CoolException("銆婄粍鎵樻。銆嬫潯鐮佹暟鎹凡瀛樺湪===>>" + param.getBarcode()); } Date now = new Date(); @@ -666,7 +672,7 @@ } WaitPakin waitPakin = new WaitPakin(); waitPakin.sync(mat); - waitPakin.setBatch(detlDto.getBatch()); + waitPakin.setBatch(DateUtils.convert(new Date(), DateUtils.yyyyMMdd)); waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮� waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵�� // waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺 -- Gitblit v1.9.1