From 3bd06b0224f4fd61bf0e4f4ad90fb70285a0ce8e Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 22 七月 2025 08:25:02 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index a8329eb..eafeb23 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -212,6 +212,10 @@ assert ioType != null; // 鑾峰彇搴撲綅 LocMast locMast = locMastService.selectById(dto.getLocNo()); + //zc + if (!locMast.getLocSts().equals("F")){ + throw new CoolException(locMast.getLocNo()+"璇ュ簱浣嶄笉鏄湪搴撶姸鎬�"); + } Integer outSta = staNo.getDevNo(); // //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负204绔欙紝鎷f枡绔欐寚瀹氫负202 @@ -444,6 +448,10 @@ if (Cools.isEmpty(locMast)) { throw new CoolException(locNo+"搴撲綅涓嶅瓨鍦�"); } + //zc + if (!locMast.getLocSts().equals("D")){ + throw new CoolException(locNo+"搴撲綅鐘舵�佷笉瀵�"); + } // 鑾峰彇婧愮珯 Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() .eq("type_no", 110) @@ -588,6 +596,10 @@ if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) { throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�"); } + //zc +// if (!loc.getLocSts().equals("F")){ +// throw new CoolException(locNo+"搴撲綅鐘舵�佷笉瀵�"); +// } Date now = new Date(); // 鑾峰彇宸ヤ綔鍙� int workNo = commonService.getWorkNo(WorkNoType.PICK.type); @@ -767,6 +779,7 @@ locDetl.sync(mat); locDetl.setBatch(adjust.getBatch()); locDetl.setLocNo(locMast.getLocNo()); + locDetl.setZpallet(locMast.getBarcode()); locDetl.setAnfme(adjust.getCount()); // 鏁伴噺 locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅 locDetl.setModiTime(now); -- Gitblit v1.9.1