From ef942fc4483059aa0526e913f9be41982df7bb79 Mon Sep 17 00:00:00 2001 From: zc <zc@123> Date: 星期二, 29 四月 2025 10:37:02 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/service/CommonService.java | 468 ++++++++++++++++++++++++--------------------------------- 1 files changed, 197 insertions(+), 271 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index a7643a0..6807dbb 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -1,30 +1,25 @@ package com.zy.common.service; -import com.alibaba.fastjson.JSON; 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.asrs.utils.Utils; -import com.zy.asrs.utils.VersionUtils; -import com.zy.common.model.LocTypeDto; -import com.zy.common.model.Shelves; -import com.zy.common.model.StartupDto; -import com.zy.core.properties.SlaveProperties; +import com.zy.asrs.domain.param.*; +import com.zy.asrs.entity.LocMast; +import com.zy.asrs.entity.WrkLastno; +import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.service.LocMastService; +import com.zy.asrs.service.WrkLastnoService; +import com.zy.asrs.service.WrkMastLogService; +import com.zy.asrs.service.WrkMastService; +import com.zy.core.News; +import com.zy.core.enums.WrkIoType; +import com.zy.core.enums.WrkStsType; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; +import java.util.Date; -/** - * 璐ф灦鏍稿績鍔熻兘 - * Created by vincent on 2020/6/11 - */ @Slf4j @Service public class CommonService { @@ -32,27 +27,17 @@ @Autowired private WrkMastService wrkMastService; @Autowired + private WrkMastLogService wrkMastLogService; + @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 SlaveProperties slaveProperties; - @Autowired - private LocDetlService locDetlService; /** * 鐢熸垚宸ヤ綔鍙� * @return workNo(宸ヤ綔鍙�) */ - public int getWorkNo(Integer wrkMk) { + public synchronized int getWorkNo(Integer wrkMk) { WrkLastno wrkLastno = wrkLastnoService.selectById(wrkMk); if (Cools.isEmpty(wrkLastno)) { throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�"); @@ -61,17 +46,17 @@ int workNo = wrkLastno.getWrkNo(); int sNo = wrkLastno.getSNo(); int eNo = wrkLastno.getENo(); - workNo = workNo>=eNo ? sNo : workNo+1; + workNo = workNo >= eNo ? sNo : workNo + 1; while (true) { - WrkMast wrkMast = wrkMastService.selectById(workNo); + WrkMast wrkMast = wrkMastService.selectByWorkNo(workNo); if (null != wrkMast) { - workNo = workNo>=eNo ? sNo : workNo+1; + workNo = workNo >= eNo ? sNo : workNo + 1; } else { break; } } // 淇敼搴忓彿璁板綍 - if (workNo > 0){ + if (workNo > 0) { wrkLastno.setWrkNo(workNo); wrkLastnoService.updateById(wrkLastno); } @@ -79,246 +64,11 @@ if (workNo == 0) { throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳"); } else { - if (wrkMastService.selectById(workNo)!=null) { + if (wrkMastService.selectByWorkNo(workNo) != null) { throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪"); } } return workNo; - } - - - /** - * 妫�绱㈠簱浣嶅彿 - * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋� - * @param staDescId 璺緞宸ヤ綔绫诲瀷 - * @param sourceStaNo 婧愮珯 - * @param matNos 鐗╂枡鍙烽泦鍚� - * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿 - */ - @Transactional - public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) { - StartupDto startupDto = new StartupDto(); - // 鐢熸垚宸ヤ綔鍙� - int workNo = getWorkNo(0); - - switch (sourceStaNo) { - case 202: - whsType = 2; - break; - case 205: - whsType = 1; - break; - case 126: - whsType = 3; - break; - case 110: - whsType = 4; - break; - case 301: - whsType = 5; - break; - default: - throw new CoolException("搴撲綅鎺掑彿鍒嗛厤閿欒, 婧愮珯鍙凤細" + sourceStaNo); - } - RowLastno rowLastno = rowLastnoService.selectById(whsType); - if (Cools.isEmpty(rowLastno)) { - throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�"); - } - - // ===============>>>> 寮�濮嬫墽琛� - 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), sRow, eRow); - for (String locNo : locNos) { - if (Utils.isShallowLoc(slaveProperties, locNo)) { - continue; - } - String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo); - // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣� - LocMast shallowLoc = locMastService.selectById(shallowLocNo); - if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) { - if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) { - if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) { - locMast = shallowLoc; - crnNo = locMast.getCrnNo(); - break; - } - } - } - } - } - - // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 - if (staDescId == 10) { - List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow)); - if (locMasts.size() > 0) { - for (LocMast loc : locMasts) { - if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) { - continue; - } - String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo()); - // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣� - LocMast shallowLoc = locMastService.selectById(shallowLocNo); - if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) { - if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) { - locMast = shallowLoc; - crnNo = locMast.getCrnNo(); - break; - } - - } - } - } - } - - // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋� - if (null == locMast) { - Shelves shelves = new Shelves(rowCount, crn_qty); - // 1-4鎺� - if (whsType == 1) { - for (int i = 0; i < shelves.group; i ++) { - curRow = shelves.start(curRow); - if (curRow < 0) { - throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳"); - } - Integer crnNo1 = shelves.get(curRow); - if (basCrnpService.checkSiteError(crnNo1, true)) { - crnNo = crnNo1; - break; - } - } - // 5-8鎺� - } else if (whsType == 2) { - curRow = curRow - 4; - for (int i = 0; i < shelves.group; i ++) { - curRow = shelves.start(curRow); - if (curRow < 0) { - throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳"); - } - Integer crnNo1 = shelves.get(curRow); - if (basCrnpService.checkSiteError(crnNo1 + 1, true)) { - // 鍋忕Щ閲忚ˉ鍋� - curRow = curRow + 4; - crnNo = crnNo1 + 1; - break; - } - - } - // 126绌烘澘鍏� 1-8鎺� - } else { - for (int i = 0; i < shelves.group; i ++) { - curRow = shelves.start(curRow); - if (curRow < 0) { - throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳"); - } - Integer crnNo1 = shelves.get(curRow); - if (basCrnpService.checkSiteError(crnNo1, true)) { - crnNo = crnNo1; - break; - } - } - } - } - - if (crnNo == 0) { - throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満"); - } - // 鑾峰彇鐩爣绔� - 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)) { - log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo); - throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�"); - } - BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn()); - if (!staNo.getAutoing().equals("Y")) { - throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�"); - } - // 鏇存柊搴撲綅鎺掑彿 - rowLastno.setCurrentRow(curRow); - rowLastnoService.updateById(rowLastno); - - // 寮�濮嬫煡鎵惧簱浣� ==============================>> - - // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺� - if (locMast == null) { - if (Utils.isShallowLoc(slaveProperties, curRow)) { - Integer deepRow = Utils.getDeepRow(slaveProperties, curRow); - locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1()); - // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� - if (!locMastService.checkEmptyCount(locMast)) { - locMast = null; - } - } - if (Cools.isEmpty(locMast)) { - locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1()); - // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� - if (!locMastService.checkEmptyCount(locMast)) { - locMast = null; - } - } - } - - // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣� - if (Cools.isEmpty(locMast)) { - // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊 - if (times < rowCount) { - times = times + 1; - return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times); - } else { - times = 0; - } - - // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠� - if (locTypeDto.getLocType1() == 1) { - locTypeDto.setLocType1((short) 2); - return getLocNo(null, staDescId, sourceStaNo, matNos, locTypeDto, times); - } - log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times); - throw new CoolException("娌℃湁绌哄簱浣�"); - } - String locNo = locMast.getLocNo(); - - // 杩斿洖dto - startupDto.setWorkNo(workNo); - startupDto.setCrnNo(crnNo); - startupDto.setSourceStaNo(sourceStaNo); - startupDto.setStaNo(staNo.getDevNo()); - startupDto.setLocNo(locNo); - 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) { @@ -328,11 +78,187 @@ return msg.substring(0, 16); } else { StringBuilder msgBuilder = new StringBuilder(msg); - for(int i = 0; i < count - msg.length(); ++i) { + for (int i = 0; i < count - msg.length(); ++i) { msgBuilder.insert(0, "0"); } return msgBuilder.toString(); } } + public boolean completeTask(CompleteTaskParam param) { + Integer wrkNo = param.getWrkNo(); + WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo); + if (null == wrkMast) { + throw new CoolException("浠诲姟涓嶅瓨鍦�"); + } + + if (wrkMast.getIoType() == WrkIoType.IN.id) { + wrkMast.setWrkSts(WrkStsType.COMPLETE_INBOUND.sts); + } else if (wrkMast.getIoType() == WrkIoType.OUT.id) { + wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts); + } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_MOVE.id) { + wrkMast.setWrkSts(WrkStsType.COMPLETE_MOVE.sts); + } else if (wrkMast.getIoType() == WrkIoType.SHUTTLE_CHARGE.id) { + wrkMast.setWrkSts(WrkStsType.COMPLETE_CHARGE.sts); + } else if (wrkMast.getIoType() == WrkIoType.LOC_MOVE.id) { + wrkMast.setWrkSts(WrkStsType.COMPLETE_LOC_MOVE.sts); + } + + wrkMast.setModiTime(new Date()); + wrkMastService.updateById(wrkMast); + return true; + } + + public boolean cancelTask(CancelTaskParam param) { + Integer wrkNo = param.getWrkNo(); + WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo); + if (null == wrkMast) { + throw new CoolException("浠诲姟涓嶅瓨鍦�"); + } + + wrkMast.setMk("taskCancel"); + wrkMast.setModiTime(new Date()); + wrkMastService.updateById(wrkMast); + return true; + } + + //绉诲簱浠诲姟 + public boolean createLocMoveTask(CreateLocMoveTaskParam param) { + Date now = new Date(); + LocMast sourceLocMast = locMastService.queryByLoc(param.getSourceLocNo()); + if (null == sourceLocMast) { + throw new CoolException("婧愬簱浣嶄笉瀛樺湪"); + } + +// if (!sourceLocMast.getLocSts().equals("F")) { +// throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��"); +// } + + LocMast locMast = locMastService.queryByLoc(param.getLocNo()); + if (null == locMast) { + throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦�"); + } + +// if (!locMast.getLocSts().equals("O")) { +// throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�"); +// } + + // 鑾峰彇宸ヤ綔鍙� + int workNo = getWorkNo(WrkIoType.LOC_MOVE.id); + // 淇濆瓨宸ヤ綔妗� + WrkMast wrkMast = new WrkMast(); + wrkMast.setWrkNo(workNo); + wrkMast.setIoTime(now); + wrkMast.setWrkSts(WrkStsType.NEW_LOC_MOVE.sts); // 宸ヤ綔鐘舵�侊細501.鐢熸垚绉诲簱浠诲姟 + wrkMast.setIoType(WrkIoType.LOC_MOVE.id); // 鍏ュ嚭搴撶姸鎬侊細 201.绉诲簱浠诲姟 + wrkMast.setIoPri(800D); + wrkMast.setSourceLocNo(param.getSourceLocNo()); + wrkMast.setLocNo(param.getLocNo()); // 鐩爣搴撲綅 + wrkMast.setWmsWrkNo(param.getTaskNo()); + wrkMast.setAppeTime(now); + wrkMast.setModiTime(now); + boolean res = wrkMastService.insert(wrkMast); + if (!res) { + News.error("绉诲簱浠诲姟 --- 淇濆瓨宸ヤ綔妗eけ璐ワ紒"); + throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�"); + } + +// sourceLocMast.setLocSts("R"); +// sourceLocMast.setModiTime(new Date()); +// locMastService.updateById(sourceLocMast); +// +// locMast.setLocSts("S"); +// locMast.setModiTime(new Date()); +// locMastService.updateById(locMast); + + return true; + } + + //鍏ュ簱浠诲姟 + public boolean createInTask(CreateInTaskParam param) { + Date now = new Date(); + LocMast locMast = locMastService.queryByLoc(param.getLocNo()); + if (null == locMast) { + throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦�"); + } + + if (!locMast.getLocSts().equals("O")) { + throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�"); + } + WrkMast wms_wrk_no = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", param.getTaskNo())); + if (wms_wrk_no!=null){ + throw new CoolException("宸ヤ綔褰撳凡缁忓瓨鍦�"); + } + + // 鑾峰彇宸ヤ綔鍙� + int workNo = getWorkNo(WrkIoType.IN.id); + // 淇濆瓨宸ヤ綔妗� + WrkMast wrkMast = new WrkMast(); + wrkMast.setWrkNo(workNo); + wrkMast.setIoTime(now); + wrkMast.setWrkSts(WrkStsType.NEW_INBOUND.sts); // 宸ヤ綔鐘舵�侊細1.鐢熸垚鍏ュ簱浠诲姟 + wrkMast.setIoType(WrkIoType.IN.id); // 鍏ュ嚭搴撶姸鎬侊細 1.鍏ュ簱 + wrkMast.setIoPri(100D); + wrkMast.setLocNo(param.getLocNo()); // 鐩爣搴撲綅 + wrkMast.setSourceStaNo(param.getSourceStaNo());//婧愮珯 + wrkMast.setStaNo(param.getStaNo());//鐩爣绔� + wrkMast.setWmsWrkNo(param.getTaskNo()); + wrkMast.setBarcode(param.getBarcode()); + wrkMast.setAppeTime(now); + wrkMast.setModiTime(now); + boolean res = wrkMastService.insert(wrkMast); + if (!res) { + News.error("鍏ュ簱浠诲姟 --- 淇濆瓨宸ヤ綔妗eけ璐ワ紒"); + throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�"); + } + + locMast.setLocSts("S"); + locMast.setModiTime(new Date()); + locMastService.updateById(locMast); + + return true; + } + + //鍑哄簱浠诲姟 + public boolean createOutTask(CreateOutTaskParam param) { + Date now = new Date(); + LocMast locMast = locMastService.queryByLoc(param.getSourceLocNo()); + if (null == locMast) { + throw new CoolException("婧愬簱浣嶄笉瀛樺湪"); + } + + if (!locMast.getLocSts().equals("F")) { + throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��"); + } + WrkMast wms_wrk_no = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", param.getTaskNo())); + if (wms_wrk_no!=null){ + throw new CoolException("宸ヤ綔褰撳凡缁忓瓨鍦�"); + } + // 鑾峰彇宸ヤ綔鍙� + int workNo = getWorkNo(WrkIoType.OUT.id); + // 淇濆瓨宸ヤ綔妗� + WrkMast wrkMast = new WrkMast(); + wrkMast.setWrkNo(workNo); + wrkMast.setIoTime(now); + wrkMast.setWrkSts(WrkStsType.NEW_OUTBOUND.sts); // 宸ヤ綔鐘舵�侊細101.鐢熸垚鍑哄簱浠诲姟 + wrkMast.setIoType(WrkIoType.OUT.id); // 鍏ュ嚭搴撶姸鎬侊細 101.鍑哄簱 + wrkMast.setIoPri(100D); + wrkMast.setSourceLocNo(param.getSourceLocNo()); // 婧愬簱浣� + wrkMast.setStaNo(param.getStaNo());//鐩爣绔� + wrkMast.setWmsWrkNo(param.getTaskNo()); + wrkMast.setAppeTime(now); + wrkMast.setModiTime(now); + boolean res = wrkMastService.insert(wrkMast); + if (!res) { + News.error("鍑哄簱浠诲姟 --- 淇濆瓨宸ヤ綔妗eけ璐ワ紒"); + throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�"); + } + + locMast.setLocSts("R"); + locMast.setModiTime(new Date()); + locMastService.updateById(locMast); + + return true; + } + } -- Gitblit v1.9.1