From 8c0446022fa17265530a2b2e6c75386e2c908dfe Mon Sep 17 00:00:00 2001 From: TQS <56479841@qq.com> Date: 星期二, 31 一月 2023 17:54:58 +0800 Subject: [PATCH] # --- src/main/resources/mapper/LocDetlMapper.xml | 3 +++ src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 16 ++++++++++++---- src/main/webapp/views/pakStore/locDetlQuery.html | 5 +++++ src/main/java/com/zy/common/service/CommonService.java | 6 ++---- 4 files changed, 22 insertions(+), 8 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 2964fb0..58b9e02 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -95,6 +95,14 @@ } } + int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode())); + int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode())); +// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()) +// .last(" wrk_no IN ( SELECT wrk_no FROM asr_wrk_mast WHERE wrk_sts != 15 )")); + if (countLoc > 0 || countWrk > 0) { + throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode()); + } + Date now = new Date(); // 鏃犲崟缁勬墭 @@ -105,10 +113,10 @@ param.getCombMats().forEach(elem -> { DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr()); -// if (Cools.isEmpty(detlDto.getBatch())){ -// String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd); -// detlDto.setBatch(batch); -// } + if (Cools.isEmpty(detlDto.getBatch())){ + String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd); + detlDto.setBatch(batch); + } if (DetlDto.has(detlDtos, detlDto)) { DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 249584e..be2e939 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -374,10 +374,8 @@ Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo()); for (LocMast locMast2:locMasts1){ if (locMast2.getLocSts().equals("O")){ - if (locMast2.getRow1().equals(innermostRow)) { - locMast = locMast2; - break; - } + locMast = locMast2; + break; }else if (!locMast2.getLocSts().equals("F")){ break; } diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml index f87ff1e..10b267a 100644 --- a/src/main/resources/mapper/LocDetlMapper.xml +++ b/src/main/resources/mapper/LocDetlMapper.xml @@ -100,6 +100,9 @@ <if test="anfme!=null and anfme!='' "> and a.anfme like '%' + #{anfme} + '%' </if> + <if test="zpallet!=null and zpallet!='' "> + and a.zpallet like '%' + #{zpallet} + '%' + </if> <if test="startTime!=null and endTime!=null"> and a.modi_time between #{startTime} and #{endTime} </if> diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html index ccbdc03..ee7d181 100644 --- a/src/main/webapp/views/pakStore/locDetlQuery.html +++ b/src/main/webapp/views/pakStore/locDetlQuery.html @@ -66,6 +66,11 @@ <input class="layui-input" type="text" name="specs" placeholder="鐗╂枡瑙勬牸" autocomplete="off"> </div> </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off"> + </div> + </div> <!-- 鏃ユ湡鑼冨洿 --> <div class="layui-inline" style="width: 300px"> <div class="layui-input-inline"> -- Gitblit v1.9.1