From 517966d4dbed6ef6e5d591720b971af427e6b63a Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 04 十二月 2025 15:25:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 479 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 303 insertions(+), 176 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 9ffa669..f9c3670 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,23 +1,29 @@
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.domain.param.*;
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.asrs.utils.Utils;
+import com.zy.common.model.NavigateNode;
+import com.zy.common.utils.NavigateUtils;
+import com.zy.common.utils.RedisUtil;
+import com.zy.core.News;
+import com.zy.core.enums.RedisKeyType;
+import com.zy.core.enums.WrkIoType;
+import com.zy.core.enums.WrkStsType;
+import com.zy.core.model.StationObjModel;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
-/**
- * 璐ф灦鏍稿績鍔熻兘
- * Created by vincent on 2020/6/11
- */
+@Slf4j
@Service
public class CommonService {
@@ -26,209 +32,330 @@
@Autowired
private WrkLastnoService wrkLastnoService;
@Autowired
- private RowLastnoService rowLastnoService;
+ private LocMastService locMastService;
@Autowired
private BasCrnpService basCrnpService;
@Autowired
- private StaDescService staDescService;
+ private NavigateUtils navigateUtils;
@Autowired
- private BasDevpService basDevpService;
+ private CommonService commonService;
@Autowired
- private LocMastService locMastService;
- @Autowired
- private LocDetlService locDetlService;
+ private RedisUtil redisUtil;
/**
* 鐢熸垚宸ヤ綔鍙�
- * @param wrkMk 0:鍏ュ嚭搴� ; 1:鍏朵粬
* @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("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
- 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.selectByWorkNo(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 {
- 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 妫�绱㈠埌鐨勫簱浣嶅彿
- */
- 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("鏃犳晥鍏ュ簱绔�");
+ public boolean completeTask(CompleteTaskParam param) {
+ Integer wrkNo = param.getWrkNo();
+ WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ if (null == wrkMast) {
+ throw new CoolException("浠诲姟涓嶅瓨鍦�");
}
- StartupDto startupDto = new StartupDto();
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
- if (Cools.isEmpty(rowLastno)) {
- 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.LOC_MOVE.id) {
+ wrkMast.setWrkSts(WrkStsType.COMPLETE_LOC_MOVE.sts);
}
- 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.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;
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ return true;
}
- 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;
+ public boolean cancelTask(CancelTaskParam param) {
+ Integer wrkNo = param.getWrkNo();
+ WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ if (null == wrkMast) {
+ throw new CoolException("浠诲姟涓嶅瓨鍦�");
}
- String zerofill = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
- System.out.println(zerofill);
+
+ wrkMast.setMk("taskCancel");
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ return true;
}
- public static String zerofill(String msg, Integer count) {
- if (msg.length() == count) {
- return msg;
- } else if (msg.length() > count) {
- return msg.substring(0, 16);
- } else {
- StringBuilder msgBuilder = new StringBuilder(msg);
- for(int i = 0; i < count - msg.length(); ++i) {
- msgBuilder.insert(0, "0");
+ //绉诲簱浠诲姟
+ 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("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
+ }
+
+ double ioPri = 800D;
+ if (param.getTaskPri() != null) {
+ ioPri = param.getTaskPri().doubleValue();
+ }
+
+ Integer sourceCrnNo = commonService.findCrnNoByLocNo(sourceLocMast.getLocNo());
+ if (sourceCrnNo == null) {
+ throw new CoolException("鏈壘鍒板搴斿爢鍨涙満");
+ }
+
+ Integer crnNo = commonService.findCrnNoByLocNo(locMast.getLocNo());
+ if (crnNo == null) {
+ throw new CoolException("鏈壘鍒板搴斿爢鍨涙満");
+ }
+
+ if (!sourceCrnNo.equals(crnNo)) {
+ 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(ioPri);
+ wrkMast.setSourceLocNo(param.getSourceLocNo());
+ wrkMast.setLocNo(param.getLocNo()); // 鐩爣搴撲綅
+ wrkMast.setCrnNo(crnNo);
+ wrkMast.setWmsWrkNo(param.getTaskNo());
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ News.error("绉诲簱浠诲姟 --- 淇濆瓨宸ヤ綔妗ｅけ璐ワ紒");
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ 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("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
+ }
+
+ double ioPri = 100D;
+ if (param.getTaskPri() != null) {
+ ioPri = param.getTaskPri().doubleValue();
+ }
+
+ Integer crnNo = commonService.findCrnNoByLocNo(locMast.getLocNo());
+ if (crnNo == 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(ioPri);
+ wrkMast.setLocNo(param.getLocNo()); // 鐩爣搴撲綅
+ wrkMast.setSourceStaNo(param.getSourceStaNo());//婧愮珯
+ wrkMast.setStaNo(param.getStaNo());//鐩爣绔�
+ wrkMast.setWmsWrkNo(param.getTaskNo());
+ wrkMast.setBarcode(param.getBarcode());
+ wrkMast.setCrnNo(crnNo);
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ News.error("鍏ュ簱浠诲姟 --- 淇濆瓨宸ヤ綔妗ｅけ璐ワ紒");
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ locMast.setLocSts("S");
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+
+ //缂撳瓨璁板綍褰撳墠鍛戒护鍫嗗灈鏈虹紪鍙�
+ redisUtil.set(RedisKeyType.CURRENT_CIRCLE_TASK_CRN_NO.key, crnNo, 60 * 60 * 24);
+ return true;
+ }
+
+ //鍑哄簱浠诲姟
+ public boolean createOutTask(CreateOutTaskParam param) {
+ Date now = new Date();
+ LocMast locMast = locMastService.queryByLoc(param.getLocNo());
+ if (null == locMast) {
+ throw new CoolException("婧愬簱浣嶄笉瀛樺湪");
+ }
+
+ if (!locMast.getLocSts().equals("F")) {
+ throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��");
+ }
+
+ double ioPri = 100D;
+ if (param.getTaskPri() != null) {
+ ioPri = param.getTaskPri().doubleValue();
+ }
+
+ Integer crnNo = commonService.findCrnNoByLocNo(locMast.getLocNo());
+ if (crnNo == null) {
+ throw new CoolException("鏈壘鍒板搴斿爢鍨涙満");
+ }
+
+ Integer sourceStationId = commonService.findOutStationId(crnNo, param.getStaNo());
+ if (sourceStationId == 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(ioPri);
+ wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+ wrkMast.setSourceStaNo(sourceStationId);//婧愮珯
+ wrkMast.setStaNo(param.getStaNo());//鐩爣绔�
+ wrkMast.setWmsWrkNo(param.getTaskNo());
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setCrnNo(crnNo);
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ News.error("鍑哄簱浠诲姟 --- 淇濆瓨宸ヤ綔妗ｅけ璐ワ紒");
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ locMast.setLocSts("R");
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+
+ return true;
+ }
+
+ public Integer findCrnNoByLocNo(String locNo) {
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ for (BasCrnp basCrnp : basCrnps) {
+ String controlRows = basCrnp.getControlRows();
+ if (Cools.isEmpty(controlRows)) {
+ continue;
}
- return msgBuilder.toString();
+
+ List<Integer> rowList = JSON.parseArray(controlRows, Integer.class);
+ if(rowList.contains(Utils.getRow(locNo))) {
+ return basCrnp.getCrnNo();
+ }
}
+ return null;
}
-}
\ No newline at end of file
+ public Integer findInStationId(Integer crnNo, Integer sourceStationId) {
+ BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crnNo));
+ if(basCrnp == null) {
+ return null;
+ }
+
+ Integer targetStationId = null;
+ List<StationObjModel> stationList = basCrnp.getInStationList$();
+ for (StationObjModel stationObjModel : stationList) {
+ try {
+ String startLev = String.valueOf(sourceStationId).substring(0, 1);
+ List<NavigateNode> navigateNodes = navigateUtils.calcByStationId(Integer.parseInt(startLev), sourceStationId, stationObjModel.getStationId());
+ if(navigateNodes != null) {
+ targetStationId = stationObjModel.getStationId();
+ break;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return targetStationId;
+ }
+
+ public Integer findOutStationId(Integer crnNo, Integer targetStationId) {
+ BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crnNo));
+ if(basCrnp == null) {
+ return null;
+ }
+
+ Integer finalSourceStationId = null;
+ List<StationObjModel> stationList = basCrnp.getOutStationList$();
+ for (StationObjModel stationObjModel : stationList) {
+ try {
+ String startLev = String.valueOf(targetStationId).substring(0, 1);
+ List<NavigateNode> navigateNodes = navigateUtils.calcByStationId(Integer.parseInt(startLev), stationObjModel.getStationId(), targetStationId);
+ if(navigateNodes != null) {
+ finalSourceStationId = stationObjModel.getStationId();
+ break;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return finalSourceStationId;
+ }
+
+}
--
Gitblit v1.9.1