Skip to content

孙克 / smf-core

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

1.适配第二套站位信息

1 个父辈 733890f5
内嵌 并排
正在显示 6 个修改的文件 包含 544 行增加 和 8 行删除
src/main/java/com/neotel/smfcore/core/device/handler/impl/XLRBoxHandler.java
...@@ -24,6 +24,7 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos; ...@@ -24,6 +24,7 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.DevicesStatusUtil; import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
import com.neotel.smfcore.custom.Jkem21481.bean.StorageExport; import com.neotel.smfcore.custom.Jkem21481.bean.StorageExport;
import com.neotel.smfcore.custom.Jkem21481.util.FeederInfoUtil;
import com.neotel.smfcore.custom.Jkem21481.util.StorageExportUtil; import com.neotel.smfcore.custom.Jkem21481.util.StorageExportUtil;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -401,6 +402,7 @@ public class XLRBoxHandler extends BaseDeviceHandler { ...@@ -401,6 +402,7 @@ public class XLRBoxHandler extends BaseDeviceHandler {
String taskExport = task.getExport(); String taskExport = task.getExport();
if(taskExport.startsWith(export)){ if(taskExport.startsWith(export)){
String feederInfo= task.getAppendData("feederInfo"); String feederInfo= task.getAppendData("feederInfo");
feederInfo = FeederInfoUtil.getOriginalFeeder(feederInfo);
String feeder = StorageExportUtil.getCurrentExportFeeder(export); String feeder = StorageExportUtil.getCurrentExportFeeder(export);
if (feederInfo.startsWith(feeder)) { if (feederInfo.startsWith(feeder)) {
return task; return task;
......
src/main/java/com/neotel/smfcore/custom/Jkem21481/bean/StorageExportOutDetail.java
...@@ -11,6 +11,8 @@ public class StorageExportOutDetail { ...@@ -11,6 +11,8 @@ public class StorageExportOutDetail {
private String feederInfo; private String feederInfo;
private String orderFeederInfo;
private String status; private String status;
private String lastStatus; private String lastStatus;
......
src/main/java/com/neotel/smfcore/custom/Jkem21481/controller/StorageExportController.java
...@@ -9,6 +9,7 @@ import com.neotel.smfcore.core.system.util.TaskService; ...@@ -9,6 +9,7 @@ import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.custom.Jkem21481.bean.StorageExport; import com.neotel.smfcore.custom.Jkem21481.bean.StorageExport;
import com.neotel.smfcore.custom.Jkem21481.bean.StorageExportOutDetail; import com.neotel.smfcore.custom.Jkem21481.bean.StorageExportOutDetail;
import com.neotel.smfcore.custom.Jkem21481.bean.dto.StorageExportDto; import com.neotel.smfcore.custom.Jkem21481.bean.dto.StorageExportDto;
import com.neotel.smfcore.custom.Jkem21481.util.FeederInfoUtil;
import com.neotel.smfcore.custom.Jkem21481.util.NetworkUtil; import com.neotel.smfcore.custom.Jkem21481.util.NetworkUtil;
import com.neotel.smfcore.custom.Jkem21481.util.StorageExportUtil; import com.neotel.smfcore.custom.Jkem21481.util.StorageExportUtil;
import com.neotel.smfcore.custom.Jkem21481.util.UmSettingUtil; import com.neotel.smfcore.custom.Jkem21481.util.UmSettingUtil;
...@@ -91,6 +92,7 @@ public class StorageExportController { ...@@ -91,6 +92,7 @@ public class StorageExportController {
String feederInfo = dataLog.getAppendData("feederInfo"); String feederInfo = dataLog.getAppendData("feederInfo");
String taskExport = dataLog.getExport(); String taskExport = dataLog.getExport();
if (StringUtils.isNotEmpty(taskExport) && StringUtils.isNotEmpty(feederInfo)) { if (StringUtils.isNotEmpty(taskExport) && StringUtils.isNotEmpty(feederInfo)) {
feederInfo = FeederInfoUtil.getOriginalFeeder(feederInfo);
if (taskExport.startsWith(export) && feederInfo.startsWith(feeder)) { if (taskExport.startsWith(export) && feederInfo.startsWith(feeder)) {
if (dataLog.isWait()) { if (dataLog.isWait()) {
log.info("清空出料口:" + export + ",feeder为:" + feeder + ",任务需要取消,barcode为:" + dataLog.getBarcode() + ",状态为:" + dataLog.getStatus()); log.info("清空出料口:" + export + ",feeder为:" + feeder + ",任务需要取消,barcode为:" + dataLog.getBarcode() + ",状态为:" + dataLog.getStatus());
...@@ -181,6 +183,10 @@ public class StorageExportController { ...@@ -181,6 +183,10 @@ public class StorageExportController {
detail.setStatus(OP_STATUS.ABNORMAL.name()); detail.setStatus(OP_STATUS.ABNORMAL.name());
} }
} }
String orderFeederInfo = detail.getOrderFeederInfo();
if (StringUtils.isEmpty(orderFeederInfo)){
detail.setOrderFeederInfo(detail.getFeederInfo());
}
} }
storageExport.setDetailList(resultList); storageExport.setDetailList(resultList);
outDetailList.add(storageExport); outDetailList.add(storageExport);
......
src/main/java/com/neotel/smfcore/custom/Jkem21481/controller/UmExportSettingController.java
...@@ -145,6 +145,7 @@ public class UmExportSettingController { ...@@ -145,6 +145,7 @@ public class UmExportSettingController {
resultDto.setBarcode(barcodeStr); resultDto.setBarcode(barcodeStr);
resultDto.setStatus(lastTask.getStatus()); resultDto.setStatus(lastTask.getStatus());
resultDto.setLastStatus(lastTask.getStatus()); resultDto.setLastStatus(lastTask.getStatus());
resultDto.setOrderFeederInfo(feederInfo);
return ResultBean.newOkResult(resultDto); return ResultBean.newOkResult(resultDto);
} }
} }
......
src/main/java/com/neotel/smfcore/custom/Jkem21481/util/FeederInfoUtil.java 0 → 100644
package com.neotel.smfcore.custom.Jkem21481.util;
import com.neotel.smfcore.common.utils.StringUtils;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.Map;
@Component
public class FeederInfoUtil {
//映射关系
private static Map<String, String> feederMap = new HashMap<>();
public static String getOriginalFeeder(String key) {
if (feederMap.isEmpty()) {
feederMap = getFeerderMap();
}
String value = feederMap.get(key);
if (StringUtils.isNotEmpty(value)) {
return value;
}
return key;
}
private static Map<String, String> getFeerderMap() {
Map<String, String> resultMap = new HashMap<>();
resultMap.put("110100", "10001L");
resultMap.put("110200", "10001R");
resultMap.put("110300", "10002L");
resultMap.put("110400", "10002R");
resultMap.put("110500", "10003L");
resultMap.put("110600", "10003R");
resultMap.put("110700", "10004L");
resultMap.put("110800", "10004R");
resultMap.put("110900", "10005L");
resultMap.put("111000", "10005R");
resultMap.put("111100", "10006L");
resultMap.put("111200", "10006R");
resultMap.put("111300", "10007L");
resultMap.put("111400", "10007R");
resultMap.put("111500", "10008L");
resultMap.put("111600", "10008R");
resultMap.put("111700", "10009L");
resultMap.put("111800", "10009R");
resultMap.put("111900", "10010L");
resultMap.put("112000", "10010R");
resultMap.put("112100", "10011L");
resultMap.put("112200", "10011R");
resultMap.put("112300", "10012L");
resultMap.put("112400", "10012R");
resultMap.put("112500", "10013L");
resultMap.put("112600", "10013R");
resultMap.put("112700", "10014L");
resultMap.put("112800", "10014R");
resultMap.put("112900", "10015L");
resultMap.put("113000", "10015R");
resultMap.put("113100", "10016L");
resultMap.put("113200", "10016R");
resultMap.put("113300", "10017L");
resultMap.put("113400", "10017R");
resultMap.put("113500", "10018L");
resultMap.put("113600", "10018R");
resultMap.put("113700", "10019L");
resultMap.put("113800", "10019R");
resultMap.put("113900", "10020L");
resultMap.put("114000", "10020R");
resultMap.put("114100", "10021L");
resultMap.put("114200", "10021R");
resultMap.put("114300", "10022L");
resultMap.put("114400", "10022R");
resultMap.put("114500", "10023L");
resultMap.put("114600", "10023R");
resultMap.put("114700", "10024L");
resultMap.put("114800", "10024R");
resultMap.put("114900", "10025L");
resultMap.put("115000", "10025R");
resultMap.put("115100", "10026L");
resultMap.put("115200", "10026R");
resultMap.put("115300", "10027L");
resultMap.put("115400", "10027R");
resultMap.put("115500", "10028L");
resultMap.put("115600", "10028R");
resultMap.put("115700", "10029L");
resultMap.put("115800", "10029R");
resultMap.put("115900", "10030L");
resultMap.put("116000", "10030R");
resultMap.put("120100", "20001L");
resultMap.put("120200", "20001R");
resultMap.put("120300", "20002L");
resultMap.put("120400", "20002R");
resultMap.put("120500", "20003L");
resultMap.put("120600", "20003R");
resultMap.put("120700", "20004L");
resultMap.put("120800", "20004R");
resultMap.put("120900", "20005L");
resultMap.put("121000", "20005R");
resultMap.put("121100", "20006L");
resultMap.put("121200", "20006R");
resultMap.put("121300", "20007L");
resultMap.put("121400", "20007R");
resultMap.put("121500", "20008L");
resultMap.put("121600", "20008R");
resultMap.put("121700", "20009L");
resultMap.put("121800", "20009R");
resultMap.put("121900", "20010L");
resultMap.put("122000", "20010R");
resultMap.put("122100", "20011L");
resultMap.put("122200", "20011R");
resultMap.put("122300", "20012L");
resultMap.put("122400", "20012R");
resultMap.put("122500", "20013L");
resultMap.put("122600", "20013R");
resultMap.put("122700", "20014L");
resultMap.put("122800", "20014R");
resultMap.put("122900", "20015L");
resultMap.put("123000", "20015R");
resultMap.put("123100", "20016L");
resultMap.put("123200", "20016R");
resultMap.put("123300", "20017L");
resultMap.put("123400", "20017R");
resultMap.put("123500", "20018L");
resultMap.put("123600", "20018R");
resultMap.put("123700", "20019L");
resultMap.put("123800", "20019R");
resultMap.put("123900", "20020L");
resultMap.put("124000", "20020R");
resultMap.put("124100", "20021L");
resultMap.put("124200", "20021R");
resultMap.put("124300", "20022L");
resultMap.put("124400", "20022R");
resultMap.put("124500", "20023L");
resultMap.put("124600", "20023R");
resultMap.put("124700", "20024L");
resultMap.put("124800", "20024R");
resultMap.put("124900", "20025L");
resultMap.put("125000", "20025R");
resultMap.put("125100", "20026L");
resultMap.put("125200", "20026R");
resultMap.put("125300", "20027L");
resultMap.put("125400", "20027R");
resultMap.put("125500", "20028L");
resultMap.put("125600", "20028R");
resultMap.put("125700", "20029L");
resultMap.put("125800", "20029R");
resultMap.put("125900", "20030L");
resultMap.put("126000", "20030R");
resultMap.put("210100", "30001L");
resultMap.put("210200", "30001R");
resultMap.put("210300", "30002L");
resultMap.put("210400", "30002R");
resultMap.put("210500", "30003L");
resultMap.put("210600", "30003R");
resultMap.put("210700", "30004L");
resultMap.put("210800", "30004R");
resultMap.put("210900", "30005L");
resultMap.put("211000", "30005R");
resultMap.put("211100", "30006L");
resultMap.put("211200", "30006R");
resultMap.put("211300", "30007L");
resultMap.put("211400", "30007R");
resultMap.put("211500", "30008L");
resultMap.put("211600", "30008R");
resultMap.put("211700", "30009L");
resultMap.put("211800", "30009R");
resultMap.put("211900", "30010L");
resultMap.put("212000", "30010R");
resultMap.put("212100", "30011L");
resultMap.put("212200", "30011R");
resultMap.put("212300", "30012L");
resultMap.put("212400", "30012R");
resultMap.put("212500", "30013L");
resultMap.put("212600", "30013R");
resultMap.put("212700", "30014L");
resultMap.put("212800", "30014R");
resultMap.put("212900", "30015L");
resultMap.put("213000", "30015R");
resultMap.put("213100", "30016L");
resultMap.put("213200", "30016R");
resultMap.put("213300", "30017L");
resultMap.put("213400", "30017R");
resultMap.put("213500", "30018L");
resultMap.put("213600", "30018R");
resultMap.put("213700", "30019L");
resultMap.put("213800", "30019R");
resultMap.put("213900", "30020L");
resultMap.put("214000", "30020R");
resultMap.put("214100", "30021L");
resultMap.put("214200", "30021R");
resultMap.put("214300", "30022L");
resultMap.put("214400", "30022R");
resultMap.put("214500", "30023L");
resultMap.put("214600", "30023R");
resultMap.put("214700", "30024L");
resultMap.put("214800", "30024R");
resultMap.put("214900", "30025L");
resultMap.put("215000", "30025R");
resultMap.put("215100", "30026L");
resultMap.put("215200", "30026R");
resultMap.put("215300", "30027L");
resultMap.put("215400", "30027R");
resultMap.put("215500", "30028L");
resultMap.put("215600", "30028R");
resultMap.put("215700", "30029L");
resultMap.put("215800", "30029R");
resultMap.put("215900", "30030L");
resultMap.put("216000", "30030R");
resultMap.put("220100", "40001L");
resultMap.put("220200", "40001R");
resultMap.put("220300", "40002L");
resultMap.put("220400", "40002R");
resultMap.put("220500", "40003L");
resultMap.put("220600", "40003R");
resultMap.put("220700", "40004L");
resultMap.put("220800", "40004R");
resultMap.put("220900", "40005L");
resultMap.put("221000", "40005R");
resultMap.put("221100", "40006L");
resultMap.put("221200", "40006R");
resultMap.put("221300", "40007L");
resultMap.put("221400", "40007R");
resultMap.put("221500", "40008L");
resultMap.put("221600", "40008R");
resultMap.put("221700", "40009L");
resultMap.put("221800", "40009R");
resultMap.put("221900", "40010L");
resultMap.put("222000", "40010R");
resultMap.put("222100", "40011L");
resultMap.put("222200", "40011R");
resultMap.put("222300", "40012L");
resultMap.put("222400", "40012R");
resultMap.put("222500", "40013L");
resultMap.put("222600", "40013R");
resultMap.put("222700", "40014L");
resultMap.put("222800", "40014R");
resultMap.put("222900", "40015L");
resultMap.put("223000", "40015R");
resultMap.put("223100", "40016L");
resultMap.put("223200", "40016R");
resultMap.put("223300", "40017L");
resultMap.put("223400", "40017R");
resultMap.put("223500", "40018L");
resultMap.put("223600", "40018R");
resultMap.put("223700", "40019L");
resultMap.put("223800", "40019R");
resultMap.put("223900", "40020L");
resultMap.put("224000", "40020R");
resultMap.put("224100", "40021L");
resultMap.put("224200", "40021R");
resultMap.put("224300", "40022L");
resultMap.put("224400", "40022R");
resultMap.put("224500", "40023L");
resultMap.put("224600", "40023R");
resultMap.put("224700", "40024L");
resultMap.put("224800", "40024R");
resultMap.put("224900", "40025L");
resultMap.put("225000", "40025R");
resultMap.put("225100", "40026L");
resultMap.put("225200", "40026R");
resultMap.put("225300", "40027L");
resultMap.put("225400", "40027R");
resultMap.put("225500", "40028L");
resultMap.put("225600", "40028R");
resultMap.put("225700", "40029L");
resultMap.put("225800", "40029R");
resultMap.put("225900", "40030L");
resultMap.put("226000", "40030R");
resultMap.put("310100", "50001L");
resultMap.put("310200", "50001R");
resultMap.put("310300", "50002L");
resultMap.put("310400", "50002R");
resultMap.put("310500", "50003L");
resultMap.put("310600", "50003R");
resultMap.put("310700", "50004L");
resultMap.put("310800", "50004R");
resultMap.put("310900", "50005L");
resultMap.put("311000", "50005R");
resultMap.put("311100", "50006L");
resultMap.put("311200", "50006R");
resultMap.put("311300", "50007L");
resultMap.put("311400", "50007R");
resultMap.put("311500", "50008L");
resultMap.put("311600", "50008R");
resultMap.put("311700", "50009L");
resultMap.put("311800", "50009R");
resultMap.put("311900", "50010L");
resultMap.put("312000", "50010R");
resultMap.put("312100", "50011L");
resultMap.put("312200", "50011R");
resultMap.put("312300", "50012L");
resultMap.put("312400", "50012R");
resultMap.put("312500", "50013L");
resultMap.put("312600", "50013R");
resultMap.put("312700", "50014L");
resultMap.put("312800", "50014R");
resultMap.put("312900", "50015L");
resultMap.put("313000", "50015R");
resultMap.put("313100", "50016L");
resultMap.put("313200", "50016R");
resultMap.put("313300", "50017L");
resultMap.put("313400", "50017R");
resultMap.put("313500", "50018L");
resultMap.put("313600", "50018R");
resultMap.put("313700", "50019L");
resultMap.put("313800", "50019R");
resultMap.put("313900", "50020L");
resultMap.put("314000", "50020R");
resultMap.put("314100", "50021L");
resultMap.put("314200", "50021R");
resultMap.put("314300", "50022L");
resultMap.put("314400", "50022R");
resultMap.put("314500", "50023L");
resultMap.put("314600", "50023R");
resultMap.put("314700", "50024L");
resultMap.put("314800", "50024R");
resultMap.put("314900", "50025L");
resultMap.put("315000", "50025R");
resultMap.put("315100", "50026L");
resultMap.put("315200", "50026R");
resultMap.put("315300", "50027L");
resultMap.put("315400", "50027R");
resultMap.put("315500", "50028L");
resultMap.put("315600", "50028R");
resultMap.put("315700", "50029L");
resultMap.put("315800", "50029R");
resultMap.put("315900", "50030L");
resultMap.put("316000", "50030R");
resultMap.put("320100", "60001L");
resultMap.put("320200", "60001R");
resultMap.put("320300", "60002L");
resultMap.put("320400", "60002R");
resultMap.put("320500", "60003L");
resultMap.put("320600", "60003R");
resultMap.put("320700", "60004L");
resultMap.put("320800", "60004R");
resultMap.put("320900", "60005L");
resultMap.put("321000", "60005R");
resultMap.put("321100", "60006L");
resultMap.put("321200", "60006R");
resultMap.put("321300", "60007L");
resultMap.put("321400", "60007R");
resultMap.put("321500", "60008L");
resultMap.put("321600", "60008R");
resultMap.put("321700", "60009L");
resultMap.put("321800", "60009R");
resultMap.put("321900", "60010L");
resultMap.put("322000", "60010R");
resultMap.put("322100", "60011L");
resultMap.put("322200", "60011R");
resultMap.put("322300", "60012L");
resultMap.put("322400", "60012R");
resultMap.put("322500", "60013L");
resultMap.put("322600", "60013R");
resultMap.put("322700", "60014L");
resultMap.put("322800", "60014R");
resultMap.put("322900", "60015L");
resultMap.put("323000", "60015R");
resultMap.put("323100", "60016L");
resultMap.put("323200", "60016R");
resultMap.put("323300", "60017L");
resultMap.put("323400", "60017R");
resultMap.put("323500", "60018L");
resultMap.put("323600", "60018R");
resultMap.put("323700", "60019L");
resultMap.put("323800", "60019R");
resultMap.put("323900", "60020L");
resultMap.put("324000", "60020R");
resultMap.put("324100", "60021L");
resultMap.put("324200", "60021R");
resultMap.put("324300", "60022L");
resultMap.put("324400", "60022R");
resultMap.put("324500", "60023L");
resultMap.put("324600", "60023R");
resultMap.put("324700", "60024L");
resultMap.put("324800", "60024R");
resultMap.put("324900", "60025L");
resultMap.put("325000", "60025R");
resultMap.put("325100", "60026L");
resultMap.put("325200", "60026R");
resultMap.put("325300", "60027L");
resultMap.put("325400", "60027R");
resultMap.put("325500", "60028L");
resultMap.put("325600", "60028R");
resultMap.put("325700", "60029L");
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");
return resultMap;
}
}
src/main/java/com/neotel/smfcore/custom/Jkem21481/util/StorageExportUtil.java
...@@ -92,11 +92,15 @@ public class StorageExportUtil { ...@@ -92,11 +92,15 @@ public class StorageExportUtil {
left = false; left = false;
} }
String export = ""; String export = "";
//获取到原始的站位信息
String originalFeeder = FeederInfoUtil.getOriginalFeeder(feederInfo);
//截取倒数第二第三位,当判断放到哪个箱子10001L //截取倒数第二第三位,当判断放到哪个箱子10001L
String currentLocStr = feederInfo.substring(feederInfo.length() - 3, feederInfo.length() - 1); String currentLocStr = originalFeeder.substring(originalFeeder.length() - 3, originalFeeder.length() - 1);
int currentLoc = Integer.valueOf(currentLocStr); int currentLoc = Integer.valueOf(currentLocStr);
if (feederInfo.startsWith("1") || feederInfo.startsWith("5")) { if (originalFeeder.startsWith("1") || originalFeeder.startsWith("5")) {
if (left) { if (left) {
if (currentLoc >= 1 && currentLoc <= 15) { if (currentLoc >= 1 && currentLoc <= 15) {
if (secondReel) { if (secondReel) {
...@@ -126,7 +130,7 @@ public class StorageExportUtil { ...@@ -126,7 +130,7 @@ public class StorageExportUtil {
} }
} }
} }
} else if (feederInfo.startsWith("2") || feederInfo.startsWith("6")) { } else if (originalFeeder.startsWith("2") || originalFeeder.startsWith("6")) {
if (left) { if (left) {
if (currentLoc >= 1 && currentLoc <= 15) { if (currentLoc >= 1 && currentLoc <= 15) {
if (secondReel) { if (secondReel) {
...@@ -156,7 +160,7 @@ public class StorageExportUtil { ...@@ -156,7 +160,7 @@ public class StorageExportUtil {
} }
} }
} }
} else if (feederInfo.startsWith("3") || feederInfo.startsWith("7")) { } else if (originalFeeder.startsWith("3") || originalFeeder.startsWith("7")) {
if (left) { if (left) {
if (currentLoc >= 1 && currentLoc <= 15) { if (currentLoc >= 1 && currentLoc <= 15) {
if (secondReel) { if (secondReel) {
...@@ -186,7 +190,7 @@ public class StorageExportUtil { ...@@ -186,7 +190,7 @@ public class StorageExportUtil {
} }
} }
} }
} else if (feederInfo.startsWith("4") || feederInfo.startsWith("8")) { } else if (originalFeeder.startsWith("4") || originalFeeder.startsWith("8")) {
if (left) { if (left) {
if (currentLoc >= 1 && currentLoc <= 15) { if (currentLoc >= 1 && currentLoc <= 15) {
if (secondReel) { if (secondReel) {
...@@ -243,7 +247,9 @@ public class StorageExportUtil { ...@@ -243,7 +247,9 @@ public class StorageExportUtil {
String lastStatus = outDetail.getStatus(); String lastStatus = outDetail.getStatus();
outDetail.setLastStatus(lastStatus); outDetail.setLastStatus(lastStatus);
outDetail.setStatus(status); outDetail.setStatus(status);
outDetail.setFeederInfo(feederInfo); String originalFeeder = FeederInfoUtil.getOriginalFeeder(feederInfo);
outDetail.setFeederInfo(originalFeeder);
outDetail.setOrderFeederInfo(feederInfo);
outDetail.setBarcode(barcode); outDetail.setBarcode(barcode);
outDetail.setPartNumber(partNumber); outDetail.setPartNumber(partNumber);
detailList.add(outDetail); detailList.add(outDetail);
...@@ -294,6 +300,7 @@ public class StorageExportUtil { ...@@ -294,6 +300,7 @@ public class StorageExportUtil {
dto.setFeederInfo(detail.getFeederInfo()); dto.setFeederInfo(detail.getFeederInfo());
dto.setPartNumber(detail.getPartNumber()); dto.setPartNumber(detail.getPartNumber());
dto.setLastStatus(detail.getLastStatus()); dto.setLastStatus(detail.getLastStatus());
dto.setOrderFeederInfo(detail.getOrderFeederInfo());
return dto; return dto;
} }
} }
...@@ -343,6 +350,10 @@ public class StorageExportUtil { ...@@ -343,6 +350,10 @@ public class StorageExportUtil {
public static synchronized void updateExportByOrder(String export, String barcode, String feederInfo, String orderNo, String status, String partNumber, boolean countTask) { public static synchronized void updateExportByOrder(String export, String barcode, String feederInfo, String orderNo, String status, String partNumber, boolean countTask) {
log.info("修改出料口:" + export + "barcode为:" + barcode + ",站位信息为:" + feederInfo + "工单号为:" + orderNo + ",状态为:" + status + ",partNumber为:" + partNumber); log.info("修改出料口:" + export + "barcode为:" + barcode + ",站位信息为:" + feederInfo + "工单号为:" + orderNo + ",状态为:" + status + ",partNumber为:" + partNumber);
String exportFeederInfo = FeederInfoUtil.getOriginalFeeder(feederInfo);
String orderFeederInfo = feederInfo;
//获取到对应的出料口 //获取到对应的出料口
boolean hasFeederInfo = false; boolean hasFeederInfo = false;
StorageExport storageExport = exportMap.get(export); StorageExport storageExport = exportMap.get(export);
...@@ -356,11 +367,12 @@ public class StorageExportUtil { ...@@ -356,11 +367,12 @@ public class StorageExportUtil {
if (detailList != null && !detailList.isEmpty()) { if (detailList != null && !detailList.isEmpty()) {
for (StorageExportOutDetail detail : detailList) { for (StorageExportOutDetail detail : detailList) {
String detailFeederInfo = detail.getFeederInfo(); String detailFeederInfo = detail.getFeederInfo();
if (detailFeederInfo.equals(feederInfo)) { if (detailFeederInfo.equals(exportFeederInfo)) {
detail.setBarcode(barcode); detail.setBarcode(barcode);
detail.setPartNumber(partNumber); detail.setPartNumber(partNumber);
detail.setStatus(status); detail.setStatus(status);
detail.setLastStatus(status); detail.setLastStatus(status);
detail.setOrderFeederInfo(orderFeederInfo);
hasFeederInfo = true; hasFeederInfo = true;
break; break;
} }
...@@ -372,7 +384,8 @@ public class StorageExportUtil { ...@@ -372,7 +384,8 @@ public class StorageExportUtil {
detail.setBarcode(barcode); detail.setBarcode(barcode);
detail.setPartNumber(partNumber); detail.setPartNumber(partNumber);
detail.setStatus(status); detail.setStatus(status);
detail.setFeederInfo(feederInfo); detail.setFeederInfo(exportFeederInfo);
detail.setOrderFeederInfo(orderFeederInfo);
detailList.add(detail); detailList.add(detail);
} }
storageExport.setDetailList(detailList); storageExport.setDetailList(detailList);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!