From c0a09a7aced8640a8a9ed55442e4dffb7624cec3 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期五, 09 八月 2024 16:20:29 +0800 Subject: [PATCH] #优化 --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 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 d9832fd..344ba76 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -282,7 +282,7 @@ }else if (locMast.getLocSts().equals("F")){ // 鑾峰彇婧愮珯 Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() - .eq("type_no", 110) + .eq("type_no", 101) .eq("stn_no", param.getOutSite()) .eq("crn_no", locMast.getCrnNo()); StaDesc staDesc = staDescService.selectOne(wrapper); @@ -524,7 +524,8 @@ for (OutLocDto dto : dtos) { // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷f枡鍑哄簱 if (ioWorkType == null) { - ioType = dto.isAll() ? 101 : 103; +// ioType = dto.isAll() ? 101 : 103; + ioType = 101; } else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) { ioType = 107; } @@ -788,7 +789,7 @@ wrkMast.setIoTime(now); wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱 - wrkMast.setIoPri(10D); + wrkMast.setIoPri(15D); wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯 wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔� wrkMast.setCrnNo(locMast.getCrnNo()); @@ -1399,6 +1400,22 @@ if (Cools.isEmpty(wrkMast)){ throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪"); } + if (Cools.isEmpty(wrkMast.getLocNo()) && Cools.isEmpty(wrkMast.getSourceLocNo())){ + int devCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().eq("wrk_no", wrkMast.getWrkNo())); + if (devCount!=0){ + throw new CoolException("鍙栨秷澶辫触锛屽伐浣滃彿锛�"+wrkMast.getWrkNo()+"鍦ㄨ緭閫佺嚎涓婅繍琛屼腑锛侊紒锛�"); + } + try{ + wrkMastService.deleteById(wrkMast.getWrkNo()); + List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); + if (!wrkDetls.isEmpty()){ + wrkDetlService.deleteById(wrkMast.getWrkNo()); + } + }catch (Exception e){ + throw new CoolException("鍙栨秷澶辫触锛屽紓甯�"+e); + } + return; + } String locNo = ""; // 寰呬慨鏀圭洰鏍囧簱浣� String locSts = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬� // 鍏ュ簱鍙栨秷锛堜慨鏀圭洰鏍囧簱浣嶏級 -- Gitblit v1.9.1