Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit dc0c4d8b 由 zshaohui
选项

1.工单分配出料口,站位信息修改

1 个父辈 9b9da445
内嵌 并排
正在显示 2 个修改的文件 包含 184 行增加 和 124 行删除
src/main/java/com/neotel/smfcore/custom/Jkem21481/util/FeederInfoUtil.java
......@@ -385,126 +385,130 @@ public class FeederInfoUtil {
resultMap.put("325800", "60029R");
resultMap.put("325900", "60030L");
resultMap.put("326000", "60030R");
resultMap.put("410100", "70001L");
resultMap.put("410200", "70001R");
resultMap.put("410300", "70002L");
resultMap.put("410400", "70002R");
resultMap.put("410500", "70003L");
resultMap.put("410600", "70003R");
resultMap.put("410700", "70004L");
resultMap.put("410800", "70004R");
resultMap.put("410900", "70005L");
resultMap.put("411000", "70005R");
resultMap.put("411100", "70006L");
resultMap.put("411200", "70006R");
resultMap.put("411300", "70007L");
resultMap.put("411400", "70007R");
resultMap.put("411500", "70008L");
resultMap.put("411600", "70008R");
resultMap.put("411700", "70009L");
resultMap.put("411800", "70009R");
resultMap.put("411900", "70010L");
resultMap.put("412000", "70010R");
resultMap.put("412100", "70011L");
resultMap.put("412200", "70011R");
resultMap.put("412300", "70012L");
resultMap.put("412400", "70012R");
resultMap.put("412500", "70013L");
resultMap.put("412600", "70013R");
resultMap.put("412700", "70014L");
resultMap.put("412800", "70014R");
resultMap.put("412900", "70015L");
resultMap.put("413000", "70015R");
resultMap.put("413100", "70016L");
resultMap.put("413200", "70016R");
resultMap.put("413300", "70017L");
resultMap.put("413400", "70017R");
resultMap.put("413500", "70018L");
resultMap.put("413600", "70018R");
resultMap.put("413700", "70019L");
resultMap.put("413800", "70019R");
resultMap.put("413900", "70020L");
resultMap.put("414000", "70020R");
resultMap.put("414100", "70021L");
resultMap.put("414200", "70021R");
resultMap.put("414300", "70022L");
resultMap.put("414400", "70022R");
resultMap.put("414500", "70023L");
resultMap.put("414600", "70023R");
resultMap.put("414700", "70024L");
resultMap.put("414800", "70024R");
resultMap.put("414900", "70025L");
resultMap.put("415000", "70025R");
resultMap.put("415100", "70026L");
resultMap.put("415200", "70026R");
resultMap.put("415300", "70027L");
resultMap.put("415400", "70027R");
resultMap.put("415500", "70028L");
resultMap.put("415600", "70028R");
resultMap.put("415700", "70029L");
resultMap.put("415800", "70029R");
resultMap.put("415900", "70030L");
resultMap.put("416000", "70030R");
resultMap.put("420100", "80001L");
resultMap.put("420200", "80001R");
resultMap.put("420300", "80002L");
resultMap.put("420400", "80002R");
resultMap.put("420500", "80003L");
resultMap.put("420600", "80003R");
resultMap.put("420700", "80004L");
resultMap.put("420800", "80004R");
resultMap.put("420900", "80005L");
resultMap.put("421000", "80005R");
resultMap.put("421100", "80006L");
resultMap.put("421200", "80006R");
resultMap.put("421300", "80007L");
resultMap.put("421400", "80007R");
resultMap.put("421500", "80008L");
resultMap.put("421600", "80008R");
resultMap.put("421700", "80009L");
resultMap.put("421800", "80009R");
resultMap.put("421900", "80010L");
resultMap.put("422000", "80010R");
resultMap.put("422100", "80011L");
resultMap.put("422200", "80011R");
resultMap.put("422300", "80012L");
resultMap.put("422400", "80012R");
resultMap.put("422500", "80013L");
resultMap.put("422600", "80013R");
resultMap.put("422700", "80014L");
resultMap.put("422800", "80014R");
resultMap.put("422900", "80015L");
resultMap.put("423000", "80015R");
resultMap.put("423100", "80016L");
resultMap.put("423200", "80016R");
resultMap.put("423300", "80017L");
resultMap.put("423400", "80017R");
resultMap.put("423500", "80018L");
resultMap.put("423600", "80018R");
resultMap.put("423700", "80019L");
resultMap.put("423800", "80019R");
resultMap.put("423900", "80020L");
resultMap.put("424000", "80020R");
resultMap.put("424100", "80021L");
resultMap.put("424200", "80021R");
resultMap.put("424300", "80022L");
resultMap.put("424400", "80022R");
resultMap.put("424500", "80023L");
resultMap.put("424600", "80023R");
resultMap.put("424700", "80024L");
resultMap.put("424800", "80024R");
resultMap.put("424900", "80025L");
resultMap.put("425000", "80025R");
resultMap.put("425100", "80026L");
resultMap.put("425200", "80026R");
resultMap.put("425300", "80027L");
resultMap.put("425400", "80027R");
resultMap.put("425500", "80028L");
resultMap.put("425600", "80028R");
resultMap.put("425700", "80029L");
resultMap.put("425800", "80029R");
resultMap.put("425900", "80030L");
resultMap.put("426000", "80030R");
resultMap.put("420100", "70001L");
resultMap.put("420200", "70001R");
resultMap.put("420300", "70002L");
resultMap.put("420400", "70002R");
resultMap.put("420500", "70003L");
resultMap.put("420600", "70003R");
resultMap.put("420700", "70004L");
resultMap.put("420800", "70004R");
resultMap.put("420900", "70005L");
resultMap.put("421000", "70005R");
resultMap.put("421100", "70006L");
resultMap.put("421200", "70006R");
resultMap.put("421300", "70007L");
resultMap.put("421400", "70007R");
resultMap.put("421500", "70008L");
resultMap.put("421600", "70008R");
resultMap.put("421700", "70009L");
resultMap.put("421800", "70009R");
resultMap.put("421900", "70010L");
resultMap.put("422000", "70010R");
resultMap.put("422100", "70011L");
resultMap.put("422200", "70011R");
resultMap.put("422300", "70012L");
resultMap.put("422400", "70012R");
resultMap.put("422500", "70013L");
resultMap.put("422600", "70013R");
resultMap.put("422700", "70014L");
resultMap.put("422800", "70014R");
resultMap.put("422900", "70015L");
resultMap.put("423000", "70015R");
resultMap.put("423100", "70016L");
resultMap.put("423200", "70016R");
resultMap.put("423300", "70017L");
resultMap.put("423400", "70017R");
resultMap.put("423500", "70018L");
resultMap.put("423600", "70018R");
resultMap.put("423700", "70019L");
resultMap.put("423800", "70019R");
resultMap.put("423900", "70020L");
resultMap.put("424000", "70020R");
resultMap.put("424100", "70021L");
resultMap.put("424200", "70021R");
resultMap.put("424300", "70022L");
resultMap.put("424400", "70022R");
resultMap.put("424500", "70023L");
resultMap.put("424600", "70023R");
resultMap.put("424700", "70024L");
resultMap.put("424800", "70024R");
resultMap.put("424900", "70025L");
resultMap.put("425000", "70025R");
resultMap.put("425100", "70026L");
resultMap.put("425200", "70026R");
resultMap.put("425300", "70027L");
resultMap.put("425400", "70027R");
resultMap.put("425500", "70028L");
resultMap.put("425600", "70028R");
resultMap.put("425700", "70029L");
resultMap.put("425800", "70029R");
resultMap.put("425900", "70030L");
resultMap.put("426000", "70030R");
resultMap.put("450100", "81001F");
resultMap.put("450200", "81002F");
resultMap.put("450300", "81003F");
resultMap.put("450400", "81004F");
resultMap.put("450500", "81005F");
resultMap.put("450600", "81006F");
resultMap.put("450700", "81007F");
resultMap.put("450800", "81008F");
resultMap.put("450900", "81009F");
resultMap.put("451000", "81010F");
resultMap.put("451100", "81011F");
resultMap.put("451200", "81012F");
resultMap.put("451300", "81013F");
resultMap.put("451400", "81014F");
resultMap.put("451500", "81015F");
resultMap.put("451600", "81016F");
resultMap.put("451700", "81017F");
resultMap.put("451800", "81018F");
resultMap.put("451900", "81019F");
resultMap.put("452000", "81020F");
resultMap.put("452100", "81021F");
resultMap.put("452200", "81022F");
resultMap.put("452300", "81023F");
resultMap.put("452400", "81024F");
resultMap.put("452500", "81025F");
resultMap.put("452600", "81026F");
resultMap.put("452700", "81027F");
resultMap.put("452800", "81028F");
resultMap.put("452900", "81029F");
resultMap.put("453000", "81030F");
resultMap.put("410100", "80018L");
resultMap.put("410200", "80018R");
resultMap.put("410300", "80019L");
resultMap.put("410400", "80019R");
resultMap.put("410500", "80020L");
resultMap.put("410600", "80020R");
resultMap.put("410700", "80021L");
resultMap.put("410800", "80021R");
resultMap.put("410900", "80022L");
resultMap.put("411000", "80022R");
resultMap.put("411100", "80023L");
resultMap.put("411200", "80023R");
resultMap.put("411300", "80024L");
resultMap.put("411400", "80024R");
resultMap.put("411500", "80025L");
resultMap.put("411600", "80025R");
resultMap.put("411700", "80026L");
resultMap.put("411800", "80026R");
resultMap.put("411900", "80027L");
resultMap.put("412000", "80027R");
resultMap.put("412100", "80028L");
resultMap.put("412200", "80028R");
resultMap.put("412300", "80029L");
resultMap.put("412400", "80029R");
resultMap.put("412500", "80030L");
resultMap.put("412600", "80030R");
resultMap.put("412700", "80031L");
resultMap.put("412800", "80031R");
resultMap.put("412900", "80032L");
resultMap.put("413000", "80032R");
resultMap.put("413100", "80033L");
resultMap.put("413200", "80033R");
resultMap.put("413300", "80034L");
resultMap.put("413400", "80034R");
return resultMap;
}
......
src/main/java/com/neotel/smfcore/custom/Jkem21481/util/StorageExportUtil.java
......@@ -44,6 +44,7 @@ public class StorageExportUtil {
private void initExport() {
initExportMap();
initExportFeederMap();
log.info("加载完成");
}
......@@ -190,7 +191,7 @@ public class StorageExportUtil {
}
}
}
} else if (originalFeeder.startsWith("4") || originalFeeder.startsWith("8")) {
} else if (originalFeeder.startsWith("4")) {
if (left) {
if (currentLoc >= 1 && currentLoc <= 15) {
if (secondReel) {
......@@ -220,6 +221,44 @@ public class StorageExportUtil {
}
}
}
} else if (originalFeeder.startsWith("8")) {
if (originalFeeder.endsWith("F")) {
if (left) {
if (currentLoc >= 1 && currentLoc <= 30) {
if (secondReel) {
export = "UM4_1";
} else {
export = "UM4_3";
}
}
} else {
if (currentLoc >= 1 && currentLoc <= 30) {
if (secondReel) {
export = "UM8_1";
} else {
export = "UM8_3";
}
}
}
} else if (originalFeeder.endsWith("L") || originalFeeder.endsWith("R")) {
if (left) {
if (currentLoc >= 18 && currentLoc <= 34) {
if (secondReel) {
export = "UM4_1";
} else {
export = "UM4_2";
}
}
} else {
if (currentLoc >= 18 && currentLoc <= 34) {
if (secondReel) {
export = "UM8_1";
} else {
export = "UM8_2";
}
}
}
}
}
return export;
}
......@@ -494,9 +533,26 @@ public class StorageExportUtil {
}
private void initExportFeederMap(){
List<String> endList = Arrays.asList("L", "R");
//8是特殊的单独处理
for (int i = 81001; i <= 81030; i++) {
String feeder = i + "F";
addFeederMap("UM4_3", feeder);
addFeederMap("UM8_3", feeder);
}
for (String end : endList) {
for (int i = 80018; i <= 80034 ; i++) {
String feeder = i + end;
addFeederMap("UM4_2",feeder);
addFeederMap("UM8_2",feeder);
}
}
for (String end : endList) {
for (int feederStart = 1; feederStart <= 8; feederStart++) {
for (int feederStart = 1; feederStart <= 7; feederStart++) {
for (int feederEnd = 1; feederEnd <= 30; feederEnd++) {
String feeder = "";
if (1 <= feederEnd && feederEnd < 10) {
......@@ -541,8 +597,8 @@ public class StorageExportUtil {
}
}
//feeder为40001L-40015L/40001L-40015L只可以放4_3或者8_3
if (feederStart == 4 || feederStart == 8) {
//如果feederStart为4的话feeder为40001L-40015L放4_3或者8_3
if(feederStart == 4){
if (1 <= feederEnd && feederEnd <= 15) {
addFeederMap("UM4_3",feeder);
addFeederMap("UM8_3",feeder);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!