Skip to content

孙克 / smf-core

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

1.适配第二套站位信息

1 个父辈 733890f5
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 32 行增加 和 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/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!