From 41cf941165039d0a8f55cd1a55f023d788f501ae Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期一, 28 四月 2025 10:38:13 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 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 cc172ba..a3616dc 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -209,11 +209,18 @@ // 鑾峰彇搴撲綅 LocMast locMast = locMastService.selectById(dto.getLocNo()); + if (Cools.isEmpty(locMast)) { + throw new CoolException(dto.getLocNo()+"搴撲綅涓嶅瓨鍦�"); + } + if(!locMast.getLocSts().equals("F")){ + throw new CoolException(dto.getLocNo()+"鎵樼洏闈炲湪搴撶姸鎬�"); + } + Integer outSta = staNo.getDevNo(); //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负204绔欙紝鎷f枡绔欐寚瀹氫负202 - if(locMast.getCrnNo()==2){ - outSta = ioType == 101 ? 204 : 202; - } +// if(locMast.getCrnNo()==2){ +// outSta = ioType == 101 ? 204 : 202; +// } // 鑾峰彇璺緞 StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta); @@ -324,6 +331,7 @@ if (orderDetl == null) { orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null); } + Mat mat=matService.selectOne(new EntityWrapper<Mat>().eq("matnr",locDto.getMatnr())); WrkDetl wrkDetl = new WrkDetl(); wrkDetl.sync(orderDetl); wrkDetl.setZpallet(wrkMast.getBarcode()); @@ -331,6 +339,7 @@ wrkDetl.setWrkNo(workNo); wrkDetl.setBatch(locDto.getBatch()); wrkDetl.setOrderNo(locDto.getOrderNo()); + wrkDetl.setModel(mat.getModel()); wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺 wrkDetl.setAppeTime(now); wrkDetl.setAppeUser(userId); @@ -340,7 +349,7 @@ throw new CoolException("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�"); } // 淇敼璁㈠崟鏄庣粏 - if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) { + if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) { throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触"); } orderService.updateSettle(orderDetl.getOrderId(), 2L, userId); @@ -431,6 +440,9 @@ if (Cools.isEmpty(locMast)) { throw new CoolException(locNo+"搴撲綅涓嶅瓨鍦�"); } + if(!locMast.getLocSts().equals("D")){ + throw new CoolException(locNo+"鎵樼洏闈炲湪搴撶姸鎬�"); + } // 鑾峰彇婧愮珯 Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() .eq("type_no", 110) -- Gitblit v1.9.1