From 534b0f2b7bf694d126aa676be46277a0b4355c1d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 12 十一月 2023 13:10:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 9 +
src/main/java/com/zy/asrs/utils/Utils.java | 239 +++++++++++++++----------
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4
src/main/java/com/zy/common/web/WcsController.java | 6
src/main/java/com/zy/common/service/CommonService.java | 227 ++++++++++++++++--------
src/main/resources/application.yml | 2
6 files changed, 308 insertions(+), 179 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 57a83b6..4e1d5b8 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -94,7 +94,7 @@
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
// List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), param.getList().get(0).getMatnr(),null,null, locTypeDto, 1);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), param.getList().get(0).getMatnr(),null,null, locTypeDto);
// 鐢熸垚宸ヤ綔鍙�
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
@@ -468,7 +468,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null,null,null, locTypeDto, 1);
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null,null,null, locTypeDto);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 90c58c9..1f40a61 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -3,13 +3,12 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocMast;
+import com.zy.common.model.LocDetlDto;
import com.zy.common.properties.SlaveProperties;
-import com.zy.common.service.CommonService;
import java.text.DecimalFormat;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
/**
@@ -19,22 +18,22 @@
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
- public static float scale(Float f){
+ public static float scale(Float f) {
if (f == null || f == 0f || Float.isNaN(f)) {
return 0f;
}
return (float) Arith.multiplys(2, f, 1);
}
- public static String zerofill(String msg, Integer count){
- if (msg.length() == count){
+ public static String zerofill(String msg, Integer count) {
+ if (msg.length() == count) {
return msg;
- } else if (msg.length() > count){
+ } 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");
+ for (int i = 0; i < count - msg.length(); i++) {
+ msgBuilder.insert(0, "0");
}
return msgBuilder.toString();
}
@@ -43,7 +42,7 @@
/**
* 鍒ゆ柇鏄惁涓烘繁搴撲綅
*/
- public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo){
+ public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo) {
if (slaveProperties.isDoubleDeep()) {
int row = getRow(locNo);
return slaveProperties.getDoubleLocs().contains(row);
@@ -55,7 +54,7 @@
/**
* 鍒ゆ柇鏄惁涓烘繁搴撲綅
*/
- public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row){
+ public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return slaveProperties.getDoubleLocs().contains(row);
} else {
@@ -66,7 +65,7 @@
/**
* 鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
*/
- public static boolean isDeepLocLeft(SlaveProperties slaveProperties, Integer row){
+ public static boolean isDeepLocLeft(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return slaveProperties.getDoubleLocsLeft().contains(row);
} else {
@@ -78,7 +77,7 @@
/**
* 鍒ゆ柇鏄惁涓哄彸娣卞簱浣�
*/
- public static boolean isDeepLocRight(SlaveProperties slaveProperties, Integer row){
+ public static boolean isDeepLocRight(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return slaveProperties.getDoubleLocsRight().contains(row);
} else {
@@ -89,7 +88,7 @@
/**
* 鍒ゆ柇鏄惁涓烘祬搴撲綅
*/
- public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo){
+ public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo) {
if (slaveProperties.isDoubleDeep()) {
int row = getRow(locNo);
return !slaveProperties.getDoubleLocs().contains(row);
@@ -101,7 +100,7 @@
/**
* 鍒ゆ柇鏄惁涓烘祬搴撲綅
*/
- public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row){
+ public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
return !slaveProperties.getDoubleLocs().contains(row);
} else {
@@ -217,104 +216,148 @@
// slaveProperties.setGroupCount(4);
// Integer deepRow = getDeepRow(slaveProperties, 6);
// System.out.println(deepRow);
-//
// }
- // 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜/浼樺厛鍑哄簱鏂瑰悜 ===>> 鍙嶄箣
- public static List<String> getGroupOutsideLocCrn(String locNo,boolean pakin){
- int row = getRow(locNo);
- List<String> result = new ArrayList<>();
- result.add(locNo);
-
-// result.add(zerofill(String.valueOf(32), 2) + locNo.substring(2));
-
- return result;
- }
-
- public static boolean BooleanWhsTypeSta(Integer whsType){
- if (whsType==1){
+ public static boolean BooleanWhsTypeSta(Integer whsType) {
+ if (whsType == 1) {
return true;
}
return false;
}
- public static int RowCount(Integer whsType,Integer curRow){
- return LocNecessaryParameters(whsType, curRow)[0];
+ public static boolean BooleanWhsTypeSta(Integer whsType, Integer staDescId) {
+ if (whsType == 1 && staDescId != 11 && staDescId != 111) {
+ return true;
+ }
+ return false;
}
- public static int getCurRow(Integer whsType,Integer curRow){
- return LocNecessaryParameters(whsType, curRow)[1];
+
+ public static int RowCount(Integer whsType, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(whsType, curRow, crnNumber)[0];
}
- public static int getCrnNo(Integer whsType,Integer curRow){
- return LocNecessaryParameters(whsType, curRow)[2];
+
+ public static int getCurRow(Integer whsType, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(whsType, curRow, crnNumber)[1];
}
- public static int getNearRow(Integer whsType,Integer curRow){
- return LocNecessaryParameters(whsType, curRow)[3];
+
+ public static int getCrnNo(Integer whsType, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(whsType, curRow, crnNumber)[2];
+ }
+
+ public static int getNearRow(Integer whsType, Integer curRow, Integer crnNumber) {
+ return LocNecessaryParameters(whsType, curRow, crnNumber)[3];
}
//搴撲綅鎺掑彿鍒嗛厤
- public static int[] LocNecessaryParameters(Integer whsType,Integer curRow){
- int[] necessaryParameters=new int[]{0,0,0,0};
- if (BooleanWhsTypeSta(whsType)){
- necessaryParameters[0] = 6;
- switch (curRow){ //婊℃澘姝ｅ父鍏ュ簱
- case 24:
- necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 21:
- necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- default:
- curRow=curRow+4;
- if (curRow<1 || curRow>24){
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細"+curRow);
- }
- if ((curRow-1)%4==0){
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow+3)/4; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- }else if (curRow%4==0){
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = curRow/4; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow-1; //nearRow 鏈�娴呭簱浣嶆帓
- }else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細"+curRow);
- }
- }
- }else {//绌烘澘涓嶅叆1鍙�
- necessaryParameters[0] = 5;
- switch (curRow){
- case 24:
- necessaryParameters[1] = 5; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = 2; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 21:
- necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = 2; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 7; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- default:
- curRow=curRow+4;
- if (curRow<5 || curRow>24){
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細"+curRow);
- }
- if ((curRow-1)%4==0){
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow+3)/4; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- }else if (curRow%4==0){
- necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = curRow/4; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow-1; //nearRow 鏈�娴呭簱浣嶆帓
- }else {
- throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細"+curRow);
- }
+ public static int[] LocNecessaryParameters(Integer whsType, Integer curRow, Integer crnNumber) {
+ switch (whsType){
+ case 1://缁忓吀鍙屼几搴撲綅
+ return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber);
+ default:
+ return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo
+ }
+ }
+
+ //缁忓吀鍙屼几搴撲綅
+ public static int[] LocNecessaryParametersDoubleExtension(Integer whsType, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ if (BooleanWhsTypeSta(whsType)) {
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 4)) {
+ necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals(crnNumber * 4 - 3)) {
+ necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 4;
+ if (curRow < 1 || curRow > (crnNumber * 4)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - 1) % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow + 3) / 4; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = curRow / 4; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
}
}
return necessaryParameters;
}
+
+ //缁忓吀鍙屼几搴撲綅绉诲簱
+ public static int[] LocNecessaryParametersMove(Integer whsType, Integer curRow, Integer moveCrnNo) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ necessaryParameters[0] = 2; // 杞娆℃暟
+ if (curRow.equals(moveCrnNo*4-2)){
+ necessaryParameters[1] = curRow+2; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = moveCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow+1; //nearRow 鏈�娴呭簱浣嶆帓
+ }else {
+ necessaryParameters[1] = curRow-2; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = moveCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow-1; //nearRow 鏈�娴呭簱浣嶆帓
+ }
+ return necessaryParameters;
+ }
+
+
+ public static void main(String[] args) {
+ List<LocMast> locS = new ArrayList<LocMast>();
+ String locNo = "0000102";
+ for (int i = 1; i < 16; i++) {
+ String s = zerofill(String.valueOf(i), 2) + locNo.substring(2);
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(s);
+ locS.add(locMast);
+ }
+ List<String> innermostSideLoc = getInnermostSideLoc(locS);
+ System.out.println(innermostSideLoc);
+ }
+
+ //杞崲涓哄悇鑷搴旂殑娣卞簱浣�
+ public static List<String> getInnermostSideLoc(List<LocMast> locS) {
+ ArrayList<String> listLocRBL = new ArrayList<>();
+ for (LocMast locMast : locS) {
+ String innermostSideLocRBL = Utils.getInnermostSideLocRBL(locMast.getLocNo());
+ if (Cools.isEmpty(innermostSideLocRBL)) {
+ continue;
+ }
+ if (!listLocRBL.contains(innermostSideLocRBL)) {
+ listLocRBL.add(innermostSideLocRBL);
+ }
+ }
+ return listLocRBL;
+ }
+
+ public static String getInnermostSideLocRBL(String locNo) {
+ int row = Utils.getRow(locNo);
+ if (row % 4 == 0 || (row + 3) % 4 == 0) {
+ return zerofill(String.valueOf(row), 2) + locNo.substring(2);
+ } else if ((row + 2) % 4 == 0) {
+ return zerofill(String.valueOf(row - 1), 2) + locNo.substring(2);
+ } else if ((row + 1) % 4 == 0) {
+ return zerofill(String.valueOf(row + 1), 2) + locNo.substring(2);
+ }
+ return null;
+ }
+
+ public static String getInnermostSideLocLBR(String locNo) {
+ int row = Utils.getRow(locNo);
+ if (row % 4 == 0) {
+ return zerofill(String.valueOf(row - 1), 2) + locNo.substring(2);
+ } else if ((row + 3) % 4 == 0) {
+ return zerofill(String.valueOf(row + 1), 2) + locNo.substring(2);
+ }
+ return null;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 09ef9c2..7c50433 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -137,4 +137,13 @@
return true;
}
+ /**
+ * 绫诲瀷妫�娴�
+ * 瀹屽叏妫�娴�
+ **/
+ public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) {
+ // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
+ return dto.getLocType1().equals(loc.getLocType1());
+ }
+
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 29719cf..ae8a351 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -110,22 +110,37 @@
/**
* 妫�绱㈠簱浣嶅彿
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞ID
+ *
+ * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 璺緞ID
* @param sourceStaNo 婧愮珯
- * @param matnr 鐗╂枡鍙烽泦鍚�
+ * @param matnr 鐗╂枡鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch,String grade,LocTypeDto locTypeDto, int times) {
- if (Cools.isEmpty(matnr)){ //鐗╂枡鍙�
- matnr="";
+ 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);
+ }
+
+ /**
+ * 妫�绱㈠簱浣嶅彿
+ *
+ * @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(batch)) { //绠卞彿
+ batch = "";
}
- if (Cools.isEmpty(grade)){ //澶囩敤
- grade="";
+ if (Cools.isEmpty(grade)) { //澶囩敤
+ grade = "";
}
// 鍒濆鍖栧弬鏁�
@@ -137,42 +152,67 @@
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();
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(whsType, curRow);
- rowCount=locNecessaryParameters[0];
- curRow=locNecessaryParameters[1];
- crnNo=locNecessaryParameters[2];
- nearRow=locNecessaryParameters[3];
- if (!basCrnpService.checkSiteError(crnNo,true)){ //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- times++;
- for (int i=times;i<Utils.RowCount(whsType,curRow);i++){
- locNecessaryParameters = Utils.LocNecessaryParameters(whsType, curRow);
- rowCount=locNecessaryParameters[0];
- curRow=locNecessaryParameters[1];
- crnNo=locNecessaryParameters[2];
- nearRow=locNecessaryParameters[3];
- if (basCrnpService.checkSiteError(crnNo,true)){
- break;
- }else {
- times++;
- }
- }
- if (times==Utils.RowCount(whsType,curRow)){
- throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ crnNumber = moveCrnNo;
+ if (times==0){
+ curRow = moveCrnNo*4-1;
+ }else {
+ curRow = moveCrnNo*4-2;
}
}
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (Cools.isEmpty(locMast) && !Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111)) {
+ //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
+ 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;
+
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
+// 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.selectOne(new EntityWrapper<LocMast>().eq("loc_no",shallowLoc));
+ 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())) {
@@ -181,17 +221,63 @@
}
}
}
+ }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 (Cools.isEmpty(locMast) && staDescId == 10) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
- for (LocMast locMast1:locMasts){
- 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("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;
+ }
+ }
+ }
}
}
}
@@ -200,7 +286,7 @@
StaDesc staDesc = null;
BasDevp staNo = null;
- if (Utils.BooleanWhsTypeSta(whsType)){
+ if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
// 鑾峰彇鐩爣绔�
wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", staDescId)
@@ -210,17 +296,18 @@
if (Cools.isEmpty(staDesc)) {
log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- crnNo=0;
+ crnNo = 0;
}
staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
- crnNo=0;
+ crnNo = 0;
}
+ startupDto.setStaNo(staNo.getDevNo());
}
// 鏇存柊搴撲綅鎺掑彿
- if (Utils.BooleanWhsTypeSta(whsType)){
+ if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
}
@@ -228,30 +315,38 @@
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
// 1.鎸夎鍒欐煡鎵惧簱浣�
- if (Cools.isEmpty(locMast) && crnNo!=0){
+ 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){
- 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)){
+ 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)){
+ if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
locMast = null;
}
- // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
- if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
+ // 閫掑綊鏌ヨ
+ if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
if (times < rowCount) {
times = times + 1;
- return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, times);
+ 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("娌℃湁绌哄簱浣�");
}
@@ -263,25 +358,7 @@
startupDto.setWorkNo(workNo);
startupDto.setCrnNo(crnNo);
startupDto.setSourceStaNo(sourceStaNo);
- if (Utils.BooleanWhsTypeSta(whsType)){
- startupDto.setStaNo(staNo.getDevNo());
- }
startupDto.setLocNo(locNo);
return startupDto;
}
-
- private 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();
- }
- }
-
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index fd1cade..adfff62 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -116,7 +116,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null,null,null, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null,null,null, locTypeDto);
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -168,7 +168,7 @@
// 妫�绱㈠簱浣�
List<KeyValueVo> list = waitPakins.stream().map(item-> new KeyValueVo(item.getMatnr(), item.getBatch())).distinct().collect(Collectors.toList());
// List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, null,null,null, locTypeDto,1);
+ StartupDto dto = commonService.getLocNo(1, 1, devpNo, null,null,null, locTypeDto);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -243,7 +243,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null, locTypeDto,1);
+ StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null, locTypeDto);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a2e3289..d88b5cd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=srjtasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1