From f9dd569895f007d09c3b568b4a4755d7ae8add45 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 10 二月 2023 17:10:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 181 +++++++++++++++++++++++++-------------------
1 files changed, 102 insertions(+), 79 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 530f2d5..0ca81d5 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,15 +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.entity.Parameter;
+import com.zy.common.model.LocTypeDto;
+import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
-import com.zy.common.model.enums.WorkNoType;
+import com.zy.common.properties.SlaveProperties;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -17,6 +27,7 @@
* 璐ф灦鏍稿績鍔熻兘
* Created by vincent on 2020/6/11
*/
+@Slf4j
@Service
public class CommonService {
@@ -36,6 +47,10 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private SlaveProperties slaveProperties;
+ @Value("${channel.channelMax}")
+ private Integer channelMax;
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -79,95 +94,103 @@
/**
* 妫�绱㈠簱浣嶅彿
* @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞ID
+ * @param staDescId 璺緞宸ヤ綔绫诲瀷
* @param sourceStaNo 婧愮珯
- * @param matNos 鐗╂枡鍙烽泦鍚�
+ * @param matNos 鍟嗗搧缂栧彿闆嗗悎
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) {
- StartupDto startupDto = new StartupDto();
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = getWorkNo(WorkNoType.getWorkNoType(staDescId));
- startupDto.setWorkNo(workNo);
- if (sourceStaNo < 100) {
- whsType = 1;
- } else {
- whsType = 2;
+ @Transactional
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
+ if (sourceStaNo.equals(100)){
+ whsType=1;
+ }else if (sourceStaNo.equals(200)){
+ whsType=2;
}
+
+ StartupDto startupDto = new StartupDto();
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
- if (whsType == 1 || whsType == 2){
- int curRow = rowLastno.getCurrentRow();
- int sRow = rowLastno.getsRow();
- int eRow = rowLastno.geteRow();
- // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
- curRow = curRow == sRow ? eRow : sRow;
- // 鐩爣鍫嗗灈鏈哄彿
- int crnNo;
- switch (whsType) {
- case 1:
- crnNo = 1;
- break;
- case 2:
- crnNo = 2;
- break;
- default:
- throw new CoolException("妫�绱㈠簱浣� -- 妫�绱㈠爢鍨涙満鍙峰け璐�");
- }
+ // ===============>>>> 寮�濮嬫墽琛�
+ int curRow = rowLastno.getCurrentRow();
+ int sRow = rowLastno.getsRow();
+ int eRow = rowLastno.geteRow();
+ int crn_qty = rowLastno.getCrnQty();
+ int rowCount = eRow - sRow;
+ // 鐩爣鍫嗗灈鏈哄彿
+ int crnNo = crn_qty;
+ // 鐩爣搴撲綅
+ LocMast locMast = null;
- 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) {
- // 鏌ユ壘搴撲綅
- LocMast 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()+"鍙峰簱浣嶆帓鍙峰垎閰嶈鍒欎笉鍙敤");
+ if (curRow==3){
+ curRow=4;
+ }else if (curRow==4){
+ curRow=3;
+ }else {
+ rowCount=0;
}
+
+ 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);
+
+ // 寮�濮嬫煡鎵惧簱浣� ==============================>>
+ if (Cools.isEmpty(locMast)) {
+ Integer ruleId = Integer.parseInt(Parameter.get().getFindLocRule());
+ if (whsType!=1){
+ locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
+ } else if (ruleId == 1){ //鎸夋祴璇曡澶囨帓搴忥紝浼樺厛鎺掓弧鍗曞彴璁惧
+ locMast = locMastService.queryFreeLocMast1(curRow, locTypeDto.getLocType1() ,channelMax+1);
+ } else if (ruleId == 2){ //鎸夐�氶亾鎺掑簭锛屽潎鍖�鍒嗛厤姣忓彴璁惧
+
+ locMast = locMastService.queryFreeLocMast2(curRow, locTypeDto.getLocType1() );
+ } else { //榛樿瑙勫垯
+ locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
+ }
+ }
+
+ // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+ if (Cools.isEmpty(locMast)) {
+ // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
+ if (times < rowCount) {
+ times = times + 1;
+ return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
+ }
+
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+ String locNo = locMast.getLocNo();
+
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+ // 杩斿洖dto
+ startupDto.setWorkNo(workNo);
+ startupDto.setCrnNo(crnNo);
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setStaNo(staNo.getDevNo());
+ startupDto.setLocNo(locNo);
return startupDto;
}
- 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");
- }
- return msgBuilder.toString();
- }
- }
-
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1