From 2fa5571c76fa3a9f115a7e7598b297879a437228 Mon Sep 17 00:00:00 2001 From: whycq <123456> Date: 星期二, 13 八月 2024 18:33:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs --- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 2 +- src/main/resources/mapper/LocDetlMapper.xml | 6 ++++-- src/main/java/com/zy/common/service/CommonService.java | 36 ++++++++++++++++++++++++++++-------- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java index e6ce450..1d5fbfa 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java @@ -40,7 +40,7 @@ if (locMast == null) { return false; } - return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1; + return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 0; } @Override diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index bd21470..d10d337 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -123,20 +123,40 @@ if (null == locMast) { Shelves shelves = new Shelves(rowCount, crn_qty); int divides = (int) Arith.divides(1, curRow - 1, 2); - curRow = (int) Arith.remainder(curRow, 2); + //curRow = (int) Arith.remainder(curRow, 2); if (curRow == 0) { - curRow = 2; + curRow = 6; + } else if (curRow == 7) { + curRow = 1; } for (int i = 0; i < shelves.group; i ++) { - curRow = shelves.start(curRow); + //curRow = shelves.start(curRow); if (curRow < 0) { throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳"); } - Integer crnNo1 = shelves.get(curRow); - crnNo1 = crnNo1 + divides*1; + //Integer crnNo1 = shelves.get(curRow); + Integer crnNo1 = 0; + switch (curRow) { + case 1: + case 2: + crnNo1 = 1; + break; + case 3: + case 4: + crnNo1 = 2; + break; + case 5: + case 6: + crnNo1 = 3; + break; + } + //crnNo1 = crnNo1 + divides*1; if (basCrnpService.checkSiteError(crnNo1, true)) { crnNo = crnNo1; - curRow = curRow + divides*2; + //curRow = curRow + divides*2; + // 鏇存柊搴撲綅鎺掑彿 + rowLastno.setCurrentRow(curRow + 1); + rowLastnoService.updateById(rowLastno); break; } } @@ -161,8 +181,8 @@ } // 鏇存柊搴撲綅鎺掑彿 - rowLastno.setCurrentRow(curRow); - rowLastnoService.updateById(rowLastno); + //rowLastno.setCurrentRow(curRow); + //rowLastnoService.updateById(rowLastno); // 寮�濮嬫煡鎵惧簱浣� ==============================>> diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml index 85f6e52..79ef1c3 100644 --- a/src/main/resources/mapper/LocDetlMapper.xml +++ b/src/main/resources/mapper/LocDetlMapper.xml @@ -320,9 +320,11 @@ #{item} </foreach> </if> - and a.bom_code = #{bomCode} + <if test="bomCode != null and bomCode != ''"> + and a.bom_code = #{bomCode} + </if> order by - DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme + DATEPART(yyyy,a.appe_time),DATEPART(mm,a.appe_time),DATEPART(dd,a.appe_time), a.anfme desc, NEWID(), case -- Gitblit v1.9.1