From ed8bd2cd2634798298e90cf075a67173b154f0fa Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 18 八月 2025 14:19:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 831 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 676 insertions(+), 155 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index a45668c..fd6c66a 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,23 +1,35 @@
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.common.model.Shelves;
+import com.zy.asrs.utils.Utils;
+import com.zy.asrs.utils.VersionUtils;
+import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
+import com.zy.common.properties.SlaveProperties;
+import com.zy.system.entity.Config;
+import com.zy.system.mapper.ConfigMapper;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 璐ф灦鏍稿績鍔熻兘
* Created by vincent on 2020/6/11
*/
+@Slf4j
@Service
public class CommonService {
@@ -37,10 +49,15 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private SlaveProperties slaveProperties;
+
+ @Resource
+ private ConfigMapper configMapper;
/**
* 鐢熸垚宸ヤ綔鍙�
- * @param wrkMk 0:鍏ュ嚭搴� ; 1:鍏朵粬
+ * @param wrkMk
* @return workNo(宸ヤ綔鍙�)
*/
public int getWorkNo(Integer wrkMk) {
@@ -48,28 +65,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 {
@@ -80,148 +94,655 @@
return workNo;
}
- /**
- * 妫�绱㈠簱浣嶅彿
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞ID
- * @param sourceStaNo 婧愮珯
- * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
- */
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) {
+ //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
+ @Transactional
+ public StartupDto getScanBarcodeEmptyBoard(){
StartupDto startupDto = new StartupDto();
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
- if (Cools.isEmpty(rowLastno)) {
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ Integer staNo = 0;
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216))<2){
+ staNo=216;
}
- 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()+"鍙峰簱浣嶆帓鍙峰垎閰嶈鍒欎笉鍙敤");
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220))<2){
+ staNo=220;
}
+
+ startupDto.setStaNo(staNo);
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);
+ /**
+ * 妫�绱㈠簱浣嶅彿
+ *
+ * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 璺緞ID
+ * @param sourceStaNo 婧愮珯
+ * @param matnr 鐗╂枡鍙烽泦鍚�
+ * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+ */
+ @Transactional
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
+ return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
}
- 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");
+ /**
+ * 鍙屾繁鎵惧簱浣�
+ */
+ @Transactional
+ public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo,LocTypeDto locTypeDto,int times) {
+ LocMast locMast;
+
+ locMast = getLocNoStepSingle(locTypeDto);
+
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ }
+
+ //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+
+ // 鎼滅储鍗曞搧(鏁翠釜搴撲綅缁�)
+ private LocMast getLocNoStepSingle(LocTypeDto locTypeDto) {
+
+ LocMast locMast = null;
+
+ // 鑾峰彇妯″紡涓虹數鑴戞ā寮忥紝鏃犱换鍔＄殑鍫嗗灈鏈哄垪琛�:闃叉鍒嗛厤鍒板爢鍨涙満涓嶅彲鐢�
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts",3)
+ .eq("wrk_no",0).eq("in_enable","Y"));
+ if (basCrnps.isEmpty()) {
+ // 閮芥湁浠诲姟鍒欒幏鍙栫數鑴戞ā寮忕殑鍫嗗灈鏈哄垪琛�
+ basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts",3).eq("in_enable","Y"));
+ }
+ if (basCrnps.isEmpty()) {
+ throw new CoolException("娌℃湁鍙敤鍫嗗灈鏈�,鍫嗗灈鏈哄仠姝㈡垨寮傚父鎴栫鐢�");
+ }
+ // 鍙敤鍫嗗灈鏈哄垪琛�
+ List<Integer> crnNoList = basCrnps.stream().map(BasCrnp::getCrnNo).collect(Collectors.toList());
+
+ // 鑾峰彇澶囪揣鍖洪厤缃�
+ Config config = configMapper.selectConfigByCode("auto_stock_up");
+ if (config == null) {
+ throw new CoolException("鐞嗚揣鑾峰彇澶囪揣鍖洪厤缃敊璇紒锛侊紒");
+ }
+
+ // 鍓嶅嚑鍒楁槸澶囪揣鍖�
+ int columnNum = Integer.parseInt(config.getValue());
+
+ // 鎼滅储娣卞簱浣�
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts","O").in("crn_no",crnNoList).in("row1","1,4,5,8,9,12,13,16,17,20,21,24").orderBy("lev1,bay1,row1")
+ .gt("bay1",columnNum));
+
+ // 娣卞簱浣嶆病鏈夊垯鎼滅储娴呭簱浣�
+ if (locMasts.isEmpty()) {
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts","O").in("crn_no",crnNoList).in("row1","2,3,6,7,10,11,14,15,18,19,22,23").orderBy("lev1,bay1,row1")
+ .gt("bay1",columnNum));
+ }
+ if (locMasts.isEmpty()) {
+ throw new CoolException("娌℃湁鍙敤搴撲綅");
+ }
+
+ // 璁板綍鍫嗗灈鏈烘槸鍚︽煡璇㈣繃锛岄伩鍏嶉噸澶嶆煡璇�
+ Map<Integer,Boolean> crnMap = new HashMap<>();
+ for (LocMast mast : locMasts) {
+ if (crnMap.get(mast.getCrnNo()) == null) {
+ //棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(mast, 10)) {
+ locMast = mast;
+ break;
+ } else {
+ crnMap.put(mast.getCrnNo(),true);
+ }
}
- return msgBuilder.toString();
}
+
+ return locMast;
}
-}
\ No newline at end of file
+ //杩斿洖dto
+ private StartupDto getLocNoStep6(Integer staDescId, Integer sourceStaNo, LocMast locMast) {
+ StartupDto startupDto = new StartupDto();
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no",locMast.getCrnNo());
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}", staDescId, sourceStaNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+
+ // 妫�娴嬬洰鏍囩珯
+ BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+ throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+ }
+
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+ // 杩斿洖dto
+ startupDto.setWorkNo(workNo);
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setStaNo(staNo.getDevNo());
+ startupDto.setLocNo(locMast.getLocNo());
+ startupDto.setCrnNo(locMast.getCrnNo());
+ return startupDto;
+ }
+ /**
+ * 妫�绱㈠簱浣嶅彿
+ *
+ * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 鍏ュ簱绫诲瀷
+ * @param sourceStaNo 婧愮珯
+ * @param matnr 鐗╂枡鍙烽泦鍚�
+ * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+ */
+ @Transactional
+ public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
+ matnr = "";
+ }
+ if (Cools.isEmpty(batch)) { //绠卞彿
+ batch = "";
+ }
+ if (Cools.isEmpty(grade)) { //澶囩敤
+ grade = "";
+ }
+
+ // 鍒濆鍖栧弬鏁�
+ int crnNo = 0; //鍫嗗灈鏈哄彿
+ int nearRow = 0; //鏈�娴呭簱浣嶆帓
+ int curRow = 0; //鏈�娣卞簱浣嶆帓
+ int rowCount = 0; //杞杞
+ LocMast locMast = null; // 鐩爣搴撲綅
+
+ StartupDto startupDto = new StartupDto();
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ int sRow = rowLastno.getsRow();
+ int eRow = rowLastno.geteRow();
+ int crnNumber = rowLastno.getCrnQty();
+
+ if (Cools.isEmpty(rowLastno)) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+ // ===============>>>> 寮�濮嬫墽琛�
+ curRow = rowLastno.getCurrentRow();
+
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ crnNumber = moveCrnNo;
+ if (times==0){
+ curRow = moveCrnNo*4-1;
+ }else {
+ curRow = moveCrnNo*4-2;
+ }
+ }
+
+ //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
+ for (int i = times; i < crnNumber; i++) {
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(whsType, curRow, crnNumber);
+ curRow = locNecessaryParameters[1];
+ crnNo = locNecessaryParameters[2];
+ if (basCrnpService.checkSiteError(crnNo, true)) {
+ rowCount = locNecessaryParameters[0];
+ nearRow = locNecessaryParameters[3];
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ if (locMasts.size()<=10){
+ times++;
+ continue;
+ }
+ break;
+ } else {
+ times++;
+ }
+ }
+ if (nearRow == 0) {
+ throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ }
+
+ boolean signRule1 = false;
+ boolean signRule2 = false;
+
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
+// if (!Cools.isEmpty(matnr) && (staDescId == 1)){
+// signRule1 = true;
+// }
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
+ if (!Cools.isEmpty(matnr) && staDescId == 1) {
+ signRule2 = true;
+ }
+
+ if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
+ signRule1 = true;
+ }
+
+ if (signRule1){
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ for (LocMast locMast1:locMasts){
+ if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+ continue;
+ }
+ String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
+ LocMast locMast2 = locMastService.selectById(shallowLoc);
+ if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("F")){
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast2.getLocNo()));
+ if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())) {
+ locMast = locMast1;
+ break;
+ }
+ }
+ }
+ }else if (signRule2){
+ List<String> locNos = locDetlService.getSameDetlToday(matnr, 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 (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
+ if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗�
+// if (staDescId == 10) {
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+// for (LocMast locMast1:locMasts){
+// if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+// continue;
+// }
+// String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
+// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",shallowLoc));
+// if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("D")){
+// locMast = locMast1;
+// 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 (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
+ if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ Wrapper<StaDesc> wrapper = null;
+ StaDesc staDesc = null;
+ BasDevp staNo = null;
+
+ if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
+ // 鑾峰彇鐩爣绔�
+ wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", crnNo);
+ staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ crnNo = 0;
+ }else {
+ staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ crnNo = 0;
+ }
+ startupDto.setStaNo(staNo.getDevNo());
+ }
+ }
+
+ // 鏇存柊搴撲綅鎺掑彿
+ if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
+ rowLastno.setCurrentRow(curRow);
+ rowLastnoService.updateById(rowLastno);
+ }
+
+ // 寮�濮嬫煡鎵惧簱浣� ==============================>>
+
+ // 1.鎸夎鍒欐煡鎵惧簱浣�
+ if (Cools.isEmpty(locMast) && crnNo != 0) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").orderBy("lev1",true));
+ for (LocMast locMast1 : locMasts) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+ continue;
+ }
+ String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O"));
+ if (!Cools.isEmpty(locMast2)) {
+ locMast = locMast2;
+ break;
+ }
+ }
+ }
+
+ if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
+ locMast = null;
+ }
+
+ // 閫掑綊鏌ヨ
+ if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
+ // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
+ if (times < rowCount) {
+ times = times + 1;
+ return getLocNoRun(1, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ }
+// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+// if (locTypeDto.getLocType1() < 2) {
+// int i = locTypeDto.getLocType1() + 1;
+// locTypeDto.setLocType1((short)i);
+// return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
+// }
+ 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.setLocNo(locNo);
+ return startupDto;
+ }
+
+ @Transactional
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto,Integer rgvNo) {
+ return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0,rgvNo);
+ }
+
+ /**
+ * 妫�绱㈠簱浣嶅彿
+ *
+ * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 璺緞ID
+ * @param sourceStaNo 婧愮珯
+ * @param matnr 鐗╂枡鍙烽泦鍚�
+ * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+ */
+ @Transactional
+ public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times,Integer rgvNo) {
+ if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
+ matnr = "";
+ }
+ if (Cools.isEmpty(batch)) { //绠卞彿
+ batch = "";
+ }
+ if (Cools.isEmpty(grade)) { //澶囩敤
+ grade = "";
+ }
+
+ // 鍒濆鍖栧弬鏁�
+ int crnNo = 0; //鍫嗗灈鏈哄彿
+ int nearRow = 0; //鏈�娴呭簱浣嶆帓
+ int curRow = 0; //鏈�娣卞簱浣嶆帓
+ int rowCount = 0; //杞杞
+ LocMast locMast = null; // 鐩爣搴撲綅
+
+ StartupDto startupDto = new StartupDto();
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ int sRow = rowLastno.getsRow();
+ int eRow = rowLastno.geteRow();
+ int crnNumber = rowLastno.getCrnQty();
+
+ if (Cools.isEmpty(rowLastno)) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+ // ===============>>>> 寮�濮嬫墽琛�
+ curRow = rowLastno.getCurrentRow();
+
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ crnNumber = moveCrnNo;
+ if (times==0){
+ curRow = moveCrnNo*4-1;
+ }else {
+ curRow = moveCrnNo*4-2;
+ }
+ }
+
+ //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
+ for (int i = times; i < crnNumber; i++) {
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(whsType, curRow, crnNumber);
+ curRow = locNecessaryParameters[1];
+ crnNo = locNecessaryParameters[2];
+ if (rgvNo==1 && crnNo<=3){
+ if (basCrnpService.checkSiteError(crnNo, true)) {
+ rowCount = locNecessaryParameters[0];
+ nearRow = locNecessaryParameters[3];
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ if (locMasts.size()<=10){
+ times++;
+ continue;
+ }
+ break;
+ } else {
+ times++;
+ }
+ }else if (rgvNo==2 && crnNo>=4){
+ if (basCrnpService.checkSiteError(crnNo, true)) {
+ rowCount = locNecessaryParameters[0];
+ nearRow = locNecessaryParameters[3];
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ if (locMasts.size()<=10){
+ times++;
+ continue;
+ }
+ break;
+ } else {
+ times++;
+ }
+ }else {
+ times++;
+ }
+
+ }
+ if (nearRow == 0) {
+ throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ }
+
+ boolean signRule1 = false;
+ boolean signRule2 = false;
+
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
+// if (!Cools.isEmpty(matnr) && (staDescId == 1)){
+// signRule1 = true;
+// }
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
+ if (!Cools.isEmpty(matnr) && staDescId == 1) {
+ signRule2 = true;
+ }
+
+ if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
+ signRule1 = true;
+ }
+
+ if (signRule1){
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ for (LocMast locMast1:locMasts){
+ if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+ continue;
+ }
+ String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
+ LocMast locMast2 = locMastService.selectById(shallowLoc);
+ if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("F")){
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast2.getLocNo()));
+ if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())) {
+ locMast = locMast1;
+ break;
+ }
+ }
+ }
+ }else if (signRule2){
+ List<String> locNos = locDetlService.getSameDetlToday(matnr, 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 (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
+ if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗�
+// if (staDescId == 10) {
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+// for (LocMast locMast1:locMasts){
+// if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+// continue;
+// }
+// String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
+// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",shallowLoc));
+// if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("D")){
+// locMast = locMast1;
+// 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 (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
+// if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+// locMast = shallowLoc;
+// crnNo = locMast.getCrnNo();
+// break;
+// }
+// }
+// }
+// }
+// }
+// }
+
+ Wrapper<StaDesc> wrapper = null;
+ StaDesc staDesc = null;
+ BasDevp staNo = null;
+
+ if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
+ // 鑾峰彇鐩爣绔�
+ wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", crnNo);
+ staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ crnNo = 0;
+ }else {
+ staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ crnNo = 0;
+ }
+ startupDto.setStaNo(staNo.getDevNo());
+ }
+ }
+
+ // 鏇存柊搴撲綅鎺掑彿
+ if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
+ rowLastno.setCurrentRow(curRow);
+ rowLastnoService.updateById(rowLastno);
+ }
+
+ // 寮�濮嬫煡鎵惧簱浣� ==============================>>
+
+ // 1.鎸夎鍒欐煡鎵惧簱浣�
+ if (Cools.isEmpty(locMast) && crnNo != 0) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").orderBy("lev1",true));
+ for (LocMast locMast1 : locMasts) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+ continue;
+ }
+ String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O"));
+ if (!Cools.isEmpty(locMast2)) {
+ locMast = locMast2;
+ break;
+ }
+ }
+ }
+
+ if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
+ locMast = null;
+ }
+
+ // 閫掑綊鏌ヨ
+ if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
+ // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
+ if (times < rowCount) {
+ times = times + 1;
+ return getLocNoRun(1, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times,rgvNo);
+ }
+// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+// if (locTypeDto.getLocType1() < 2) {
+// int i = locTypeDto.getLocType1() + 1;
+// locTypeDto.setLocType1((short)i);
+// return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
+// }
+ 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.setLocNo(locNo);
+ return startupDto;
+ }
+}
--
Gitblit v1.9.1