From ef6a447ebd464a254b5d028c1b108fdc6db82fb3 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 27 九月 2022 15:47:33 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 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 dec51c8..0036cd3 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -98,7 +98,8 @@ wrkMast.setIoTime(new Date()); wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱 - wrkMast.setIoPri(13D); // 浼樺厛绾э細13 + Double ioPri = wrkMastService.getIoPri(1, dto.getLocNo()); + wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13 wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true)?1:0);; wrkMast.setCrnNo(dto.getCrnNo()); wrkMast.setSourceStaNo(dto.getSourceStaNo()); @@ -226,7 +227,8 @@ wrkMast.setIoTime(now); wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬� - wrkMast.setIoPri(13D); // 浼樺厛绾э細13 + Double ioPri = wrkMastService.getIoPri(ioType, dto.getLocNo()); + wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13 wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), false)?1:0);; wrkMast.setCrnNo(locMast.getCrnNo()); wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯 @@ -302,7 +304,8 @@ wrkMast.setIoTime(now); wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬� - wrkMast.setIoPri(13D); // 浼樺厛绾э細13 + Double ioPri = wrkMastService.getIoPri(ioType, taskDto.getLocNo()); + wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13 wrkMast.setOutMost(locMastService.isOutMost(taskDto.getLocNo(), false)?1:0);; wrkMast.setCrnNo(locMast.getCrnNo()); wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯 @@ -382,7 +385,8 @@ wrkMast.setIoTime(new Date()); wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱 - wrkMast.setIoPri(10D); // 浼樺厛绾э細10 + Double ioPri = wrkMastService.getIoPri(10, dto.getLocNo()); + wrkMast.setIoPri(ioPri); // 浼樺厛绾э細10 wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true)?1:0);; wrkMast.setCrnNo(dto.getCrnNo()); wrkMast.setSourceStaNo(dto.getSourceStaNo()); @@ -462,7 +466,8 @@ wrkMast.setIoTime(new Date()); wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱 - wrkMast.setIoPri(10D); + Double ioPri = wrkMastService.getIoPri(110, locNo); + wrkMast.setIoPri(ioPri); wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯 wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔� wrkMast.setOutMost(locMastService.isOutMost(locNo, false)?1:0);; -- Gitblit v1.9.1