From c27d3ae9d5130a230e1dcb59abd4e8851dceb9d6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 24 四月 2025 14:22:20 +0800
Subject: [PATCH] #新增盘点单号，页面修改
---
src/main/java/com/zy/common/service/CommonService.java | 606 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 417 insertions(+), 189 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fd12d84..1082805 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
@@ -19,7 +20,13 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
import java.util.List;
+
+import static com.zy.asrs.utils.Utils.zerofill;
/**
* 璐ф灦鏍稿績鍔熻兘
@@ -88,163 +95,106 @@
return workNo;
}
+ //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
+ @Transactional
+ public StartupDto getScanBarcodeEmptyBoard() {
+ StartupDto startupDto = new StartupDto();
+ Integer staNo = 0;
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216)) < 2) {
+ staNo = 216;
+ }
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220)) < 2) {
+ staNo = 220;
+ }
+
+ startupDto.setStaNo(staNo);
+ return startupDto;
+ }
+
/**
* 妫�绱㈠簱浣嶅彿
*
* @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, 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; // 鐩爣搴撲綅
-
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, List<String> batchs, LocTypeDto locTypeDto, int times) {
+ // 鐩爣鍫嗗灈鏈哄彿
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];
- break;
- } else {
- times++;
- }
- }
- if (nearRow == 0) {
- throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
- }
-
- boolean signRule1 = false;
- boolean signRule2 = false;
+ // 鐩爣搴撲綅
+ LocMast locMast = null;
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
-// 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;
+ for (int i = 0; i < 4; i++) {
+ //鎵惧簱浣嶆寜鍫嗗灈鏈哄彿鏉ユ壘锛屼粠涓嬪線涓婏紝浠庡墠寰�鍚庯紝浠庡乏鍒板彸
+ List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("crn_no", whsType)
+ .eq("loc_sts", "O")
+ .orderBy("lev1")
+ .orderBy("bay1")
+ .orderBy("row1"));
+ BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
+ .eq("crn_no", whsType));
+ if (locMastList.size() < 5 || crn_no.getInEnable().equals("N") || crn_no.getCrnSts() != 1) {
+ if (whsType == 4) {
+ whsType = 1;
+ } else {
+ whsType++;
}
- 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("F")){
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast2.getLocNo()));
- if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())) {
+ i++;
+ continue;
+ }
+ for (LocMast locMast1 : locMastList) {
+ //鍒ゆ柇搴撲綅鏄惁涓�3鐨勬祬搴撲綅锛屽鏋滄槸鏌ョ湅鍏舵繁搴撲綅鏄惁涓虹┖
+ if (locMast1.getRow1() % 4 == 3) {
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("lev1", locMast1.getLev1())
+ .eq("bay1", locMast1.getBay1())
+ .eq("row1", locMast1.getRow1() + 1)
+ );
+ if (locMast2.getLocSts().equals("O")) {
+ locMast = locMast2;
+ break;
+ } else if (locMast2.getLocSts().equals("F")) {
locMast = locMast1;
break;
- }
- }
- }
- }else if (signRule2){
- List<String> locNos = locDetlService.getSameDetlToday(matnr,batch, 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())) {
+ } else {
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;
- }
- }
+
+ } else if (locMast1.getRow1() % 4 == 2) {
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("lev1", locMast1.getLev1())
+ .eq("bay1", locMast1.getBay1())
+ .eq("row1", locMast1.getRow1() - 1)
+ );
+ if (locMast2.getLocSts().equals("F")) {
+ locMast = locMast1;
+ break;
+ } else {
+ continue;
}
+ } else {
+ locMast = locMast1;
+ break;
}
+ }
+ if (Cools.isEmpty(locMast)) {
+ if (whsType == 4) {
+ whsType = 1;
+ } else {
+ whsType++;
+ }
+ i++;
+ }
+ if (!Cools.isEmpty(locMast)) {
+ break;
}
}
@@ -252,67 +202,46 @@
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;
- }
- staNo = basDevpService.selectById(staDesc.getCrnStn());
- if (!staNo.getAutoing().equals("Y")) {
-// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
- crnNo = 0;
- }
- startupDto.setStaNo(staNo.getDevNo());
+ // 鑾峰彇鐩爣绔�
+ wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", whsType);
+ staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, whsType);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+ staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+ throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
}
- // 鏇存柊搴撲綅鎺掑彿
- if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
- 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"));
- 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;
- }
-
- // 閫掑綊鏌ヨ
+ // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount) {
+ if (times < 4) {
times = times + 1;
- return getLocNo(1, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ return getLocNo(1, staDescId, sourceStaNo, matNos, batchs, 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);
-// }
+ //1==>3==>4==>2
+ // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
+ if (locTypeDto.getLocType1() != 2) {
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿},寮�濮嬫煡璇㈤噸搴撲綅浠�", JSON.toJSONString(locTypeDto), times);
+ int i = 0;
+ if (locTypeDto.getLocType1() == 1) {
+ i = 3;
+ } else if (locTypeDto.getLocType1() == 3) {
+ i = locTypeDto.getLocType1() + 1;
+ } else if (locTypeDto.getLocType1() == 4) {
+ i = 2;
+ }
+
+ locTypeDto.setLocType1((short) i);
+ times = 1;
+ return getLocNo(1, staDescId, sourceStaNo, matNos, batchs, locTypeDto, times);
+ }
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
}
@@ -322,9 +251,308 @@
int workNo = getWorkNo(0);
// 杩斿洖dto
startupDto.setWorkNo(workNo);
- startupDto.setCrnNo(crnNo);
+ startupDto.setCrnNo(whsType);
startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locNo);
return startupDto;
}
+
+// /**
+// * 妫�绱㈠簱浣嶅彿
+// *
+// * @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) {
+// 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*2; 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"));
+// int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100));
+// if (locMasts.size()-crnCountO<=2){
+// times++;
+// continue;
+// }
+// break;
+// } else {
+// times++;
+// }
+// }
+// if (nearRow == 0) {
+// throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+// }
+//
+// boolean signRule1 = false;
+// boolean signRule2 = false;
+//
+//
+// if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+// // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
+// 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){
+// if (nearRow!=curRow){
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").orderBy("lev1"));
+// for (LocMast locMast1:locMasts){
+// //鑾峰彇宸烽亾
+// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow<nearRow);
+// //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+// LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,groupOutsideLocCrn);
+// if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){
+// LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
+//// if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr()) && batch.equals(Cools.isEmpty(locDetl.getBatch()) ? "" : locDetl.getBatch()) && grade.equals(Cools.isEmpty(locDetl.getBrand()) ? "" : locDetl.getBrand())) {
+// //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+// locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,groupOutsideLocCrn);
+// 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 && Utils.BooleanWhsTypeStaIoType(whsType)) {
+//// 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 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+// if (!locMasts.isEmpty()) {
+// 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(rowLastno, 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")) {
+// log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+//// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+// crnNo = 0;
+// }
+// startupDto.setStaNo(staNo.getDevNo());
+// }
+// // 鏇存柊搴撲綅鎺掑彿
+// if (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).orderBy("bay1",true));
+// for (LocMast locMast1 : locMasts) {
+// if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+// continue;
+// }
+// if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+// 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;
+// }
+// } else {
+// if (!Cools.isEmpty(locMast1)) {
+// locMast = locMast1;
+// break;
+// }
+// }
+// }
+//
+// if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)){
+// for (LocMast locMast1 : locMasts) {
+// if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+// continue;
+// }
+// if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+// 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;
+// } else {
+// locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+// .eq("loc_no", shallowLoc).eq("loc_sts", "F"));
+// if (!Cools.isEmpty(locMast2)) {
+// locMast = locMast1;
+// break;
+// } else {
+// locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+// .eq("loc_no", shallowLoc).eq("loc_sts", "D"));
+// if (!Cools.isEmpty(locMast2)) {
+// locMast = locMast1;
+// break;
+// }
+// }
+// }
+// } else {
+// if (!Cools.isEmpty(locMast1)) {
+// locMast = locMast1;
+// break;
+// }
+// }
+// }
+// }
+// }
+//
+// if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
+// locMast = null;
+// }
+//
+// // 閫掑綊鏌ヨ
+// if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
+// // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
+// if (times < rowCount*2) {
+// times = times + 1;
+// return getLocNoRun(whsType, 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;
+// }
}
--
Gitblit v1.9.1