From 11eaa61d046200bb5eeecfc35d1ca1964505136d Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期三, 23 十月 2024 11:46:07 +0800 Subject: [PATCH] * --- src/main/java/com/zy/common/service/CommonService.java | 197 +++++-------------------------------------------- 1 files changed, 20 insertions(+), 177 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index d1e5681..9057871 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -1,23 +1,19 @@ package com.zy.common.service; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.mapper.Wrapper; -import com.core.common.Arith; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.service.*; -import com.zy.common.model.Shelves; -import com.zy.common.model.StartupDto; +import com.zy.core.properties.SlaveProperties; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import java.util.List; /** * 璐ф灦鏍稿績鍔熻兘 * Created by vincent on 2020/6/11 */ +@Slf4j @Service public class CommonService { @@ -25,22 +21,9 @@ private WrkMastService wrkMastService; @Autowired private WrkLastnoService wrkLastnoService; - @Autowired - private RowLastnoService rowLastnoService; - @Autowired - private BasCrnpService basCrnpService; - @Autowired - private StaDescService staDescService; - @Autowired - private BasDevpService basDevpService; - @Autowired - private LocMastService locMastService; - @Autowired - private LocDetlService locDetlService; /** * 鐢熸垚宸ヤ綔鍙� - * @param wrkMk 0:鍏ュ嚭搴� ; 1:鍏朵粬 * @return workNo(宸ヤ綔鍙�) */ public int getWorkNo(Integer wrkMk) { @@ -48,28 +31,25 @@ if (Cools.isEmpty(wrkLastno)) { throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�"); } - int workNo = 0; - // 鍏ュ嚭搴撶被鍨� - if (wrkLastno.getWrkMk() == 0) { - workNo = wrkLastno.getWrkNo(); - int sNo = wrkLastno.getSNo(); - int eNo = wrkLastno.getENo(); - workNo = workNo>=eNo ? sNo : workNo+1; - - while (true) { - WrkMast wrkMast = wrkMastService.selectById(workNo); - if (null != wrkMast) { - workNo = workNo>=eNo ? sNo : workNo+1; - } else { - break; - } - } - if (workNo > 0){ - wrkLastno.setWrkNo(workNo); - wrkLastnoService.updateById(wrkLastno); + int workNo = wrkLastno.getWrkNo(); + int sNo = wrkLastno.getSNo(); + int eNo = wrkLastno.getENo(); + workNo = workNo>=eNo ? sNo : workNo+1; + while (true) { + WrkMast wrkMast = wrkMastService.selectById(workNo); + if (null != wrkMast) { + workNo = workNo>=eNo ? sNo : workNo+1; + } else { + break; } } + // 淇敼搴忓彿璁板綍 + if (workNo > 0){ + wrkLastno.setWrkNo(workNo); + wrkLastnoService.updateById(wrkLastno); + } + // 妫�楠� if (workNo == 0) { throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳"); } else { @@ -78,143 +58,6 @@ } } return workNo; - } - - /** - * 妫�绱㈠簱浣嶅彿 - * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋� - * @param staDescId 璺緞宸ヤ綔绫诲瀷 - * @param sourceStaNo 婧愮珯 - * @param matNos 鐗╂枡鍙烽泦鍚� - * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿 - */ - public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) { - if (sourceStaNo == 3) { - whsType = 1; - } else if (sourceStaNo == 7) { - whsType = 2; - } else { - throw new CoolException("鏃犳晥鍏ュ簱绔�"); - } - StartupDto startupDto = new StartupDto(); - RowLastno rowLastno = rowLastnoService.selectById(whsType); - if (Cools.isEmpty(rowLastno)) { - throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�"); - } - if (rowLastno.getWhsType() == 1){ - int curRow = rowLastno.getCurrentRow(); - int sRow = rowLastno.getsRow(); - int eRow = rowLastno.geteRow(); - int crn_qty = rowLastno.getCrnQty(); - int rowCount = eRow - sRow + 1; - // 鐩爣鍫嗗灈鏈哄彿 - int crnNo = 0; - // 鐩爣搴撲綅 - LocMast locMast = null; - - // 鍚屼竴澶╁悓瑙勬牸璐х墿闈犺繎鎽嗘硶瑙勫垯 - if (!Cools.isEmpty(matNos)) { - List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0)); - for (String locNo : locNos) { - // 鑾峰彇鎺� - int row = Integer.parseInt(locNo.substring(0, 2)); - // 鍒ゆ柇鏄惁涓烘繁搴撲綅 - double remainder = Arith.remainder(row, rowCount / crn_qty); - int targetRow; - if (remainder == 1) { - // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣� - targetRow = row + 1; - } else if (remainder == 0) { - // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣� - targetRow = row - 1; - } else { - continue; - } - String targetLocNo = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2); - // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣� - LocMast targetLocMast = locMastService.selectById(targetLocNo); - if (targetLocMast != null && targetLocMast.getLocSts().equals("O")) { - locMast = targetLocMast; - crnNo = locMast.getCrnNo(); - break; - } - } - } - - // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋� - if (null == locMast) { - // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙� - Shelves shelves = new Shelves(rowCount, crn_qty); - curRow = shelves.start(curRow); - if (curRow < 0) { - throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳"); - } - for (List<Integer> node : shelves.nodes){ - if (node.contains(curRow)) { - crnNo = shelves.nodes.indexOf(node) + 1; - break; - } - } - } - - basCrnpService.checkSiteStatus(crnNo); - // 鑾峰彇鐩爣绔� - Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() - .eq("type_no", staDescId) - .eq("stn_no", sourceStaNo) - .eq("crn_no", crnNo); - StaDesc staDesc = staDescService.selectOne(wrapper); - if (Cools.isEmpty(staDesc)) { - throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�"); - } - BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn()); - int inQty = staNo.getInQty()==null?0:staNo.getInQty(); - if (staNo.getInEnable().equals("Y") && staNo.getAutoing().equals("Y") && inQty<2) { - // 鏌ユ壘搴撲綅 - if (locMast == null) { - locMast = locMastService.queryFreeLocMast(curRow); - } - if (Cools.isEmpty(locMast)) { - throw new CoolException("娌℃湁绌哄簱浣�"); - } - String locNo = locMast.getLocNo(); - - // 鏇存柊搴撲綅鎺掑彿 - rowLastno.setCurrentRow(curRow); - rowLastnoService.updateById(rowLastno); - - // 杩斿洖dto - startupDto.setCrnNo(crnNo); - startupDto.setSourceStaNo(sourceStaNo); - startupDto.setStaNo(staNo.getDevNo()); - startupDto.setLocNo(locNo); - } else { - throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�"); - } - } else { - throw new CoolException(rowLastno.getWhsType()+"鍙峰簱浣嶆帓鍙峰垎閰嶈鍒欎笉鍙敤"); - } - return startupDto; - } - - public static void main(String[] args) { - System.out.println(Arith.remainder(1, 4)); - System.out.println("0200201".substring(0, 2)); - String locNo = "0800201"; - int row = Integer.parseInt(locNo.substring(0, 2)); - double remainder = Arith.remainder(row, 4); - int targetRow; - if (remainder == 1) { - // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣� - targetRow = row + 1; - } else if (remainder == 0) { - // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣� - targetRow = row - 1; - } else { - return; - } - String zerofill = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2); - System.out.println(zerofill); } public static String zerofill(String msg, Integer count) { @@ -231,4 +74,4 @@ } } -} \ No newline at end of file +} -- Gitblit v1.9.1