Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit cfbf1646 由 张少辉
选项

功能优化

1 个父辈 521e3849
全部展开
内嵌 并排
正在显示 5 个修改的文件 包含 31 行增加 和 14 行删除
src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/OutLineController.java
......@@ -389,7 +389,13 @@ public class OutLineController {
}
boxStr = getBoxStrbyBoxPartition(boxStr);
//判断库位中 有没有
Barcode pidBarcode = barcodeManager.findByBarcode(boxStr);
StoragePos oriPos = storagePosManager.getByBarcode(pidBarcode.getBarcode());
if (oriPos != null) {
pidBarcode = oriPos.getBarcode();
}
List<Barcode> subCodes = pidBarcode.getSubCodeList();
if (subCodes == null || subCodes.isEmpty()) {
return ResultBean.newErrorResult(-1, "", "料箱:" + boxStr + "，没有可出库的物料");
......@@ -494,11 +500,9 @@ public class OutLineController {
}
pidBarcode = barcodeManager.save(pidBarcode);
StoragePos pos = BoxHandleUtil.locOnePos(pidBarcode);
if (pos != null) {
pos.setBarcode(pidBarcode);
storagePosManager.save(pos);
if (oriPos != null){
oriPos.setBarcode(pidBarcode);
storagePosManager.save(oriPos);
}
if (!isOut) {
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java
......@@ -700,9 +700,12 @@ public class CDeviceController {
} else if (targetLoc.endsWith("2F")) {
log.info("自动绑定料串[" + materialStr + "]目的地:C1-2F");
MaterialLocUtil.updateStackerLoc(materialStr, "", "C1-2F", 1, orderItem.getOrderNo(), barcode);
} else if (targetLoc.endsWith("1F")) {
} else if (targetLoc.endsWith("C2/1F")) {
log.info("自动绑定料串[" + materialStr + "]目的地:C2-1F");
MaterialLocUtil.updateStackerLoc(materialStr, "", "C2-1F", 1, orderItem.getOrderNo(), barcode);
} else if (targetLoc.endsWith("W2/1F")) {
log.info("自动绑定料串[" + materialStr + "]目的地:W2-1F");
MaterialLocUtil.updateStackerLoc(materialStr, "", "W2-1F", 1, orderItem.getOrderNo(), barcode);
}
}
......@@ -1007,8 +1010,12 @@ public class CDeviceController {
if (boxBarcode != null) {
//判断隔口是否可以放入
if (BinCacheUtil.canPutInBinCode(binCodeStr, warhouseCode)) {
String canPutIn = BinCacheUtil.canMaterialPutInBin(barcode, boxBarcode, binCodeStr);
if (StringUtils.isEmpty(canPutIn)) {
return ResultBean.newOkResult("");
} else {
log.info(barcode.getBarcode() + "不可以放到料格:" + binCodeStr + ",原因为:" + canPutIn);
return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不可以放到料格:" + binCodeStr + ",原因为:" + canPutIn);
}
}
return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不可以放到料格:" + binCodeStr);
......@@ -1403,9 +1410,12 @@ public class CDeviceController {
} else if (targetLoc.endsWith("2F")) {
log.info("自动绑定料串[" + stacker + "]目的地:C1-2F");
MaterialLocUtil.updateStackerLoc(stacker, "", "C1-2F", 1, orderItem.getOrderNo(), barcode);
} else if (targetLoc.endsWith("1F")) {
} else if (targetLoc.endsWith("C2/1F")) {
log.info("自动绑定料串[" + stacker + "]目的地:C2-1F");
MaterialLocUtil.updateStackerLoc(stacker, "", "C2-1F", 1, orderItem.getOrderNo(), barcode);
} else if (targetLoc.endsWith("W2/1F")) {
log.info("自动绑定料串[" + stacker + "]目的地:W2-1F");
MaterialLocUtil.updateStackerLoc(stacker, "", "W2-1F", 1, orderItem.getOrderNo(), barcode);
}
}
......@@ -1860,17 +1870,20 @@ public class CDeviceController {
String targetLoc = order.getLoc();
if (StringUtils.isNotEmpty(targetLoc)){
if (targetLoc.endsWith("BG")) {
log.info("自动绑定料串[" + stacker + "]目的地:C2-3F-BG");
log.info(barcode.getBarcode()+"自动绑定料串[" + stacker + "]目的地:C2-3F-BG");
MaterialLocUtil.updateStackerLoc(stacker, "", "C2-3F-BG", 1, orderItem.getOrderNo(),barcode);
} else if (targetLoc.endsWith("CG")) {
log.info("自动绑定料串[" + stacker + "]目的地:C2-3F-CG");
log.info(barcode.getBarcode()+"自动绑定料串[" + stacker + "]目的地:C2-3F-CG");
MaterialLocUtil.updateStackerLoc(stacker, "", "C2-3F-CG", 1, orderItem.getOrderNo(),barcode);
} else if (targetLoc.endsWith("2F")){
log.info("自动绑定料串["+stacker+"]目的地:C1-2F");
log.info(barcode.getBarcode()+"自动绑定料串["+stacker+"]目的地:C1-2F");
MaterialLocUtil.updateStackerLoc(stacker,"", "C1-2F",1,orderItem.getOrderNo(),barcode);
} else if (targetLoc.endsWith("1F")){
log.info("自动绑定料串["+stacker+"]目的地:C2-1F");
} else if (targetLoc.endsWith("C2/1F")){
log.info(barcode.getBarcode()+"自动绑定料串["+stacker+"]目的地:C2-1F");
MaterialLocUtil.updateStackerLoc(stacker,"", "C2-1F",1,orderItem.getOrderNo(),barcode);
} else if (targetLoc.endsWith("W2/1F")){
log.info(barcode.getBarcode()+"自动绑定料串["+stacker+"]目的地:W2-1F");
MaterialLocUtil.updateStackerLoc(stacker,"", "W2-1F",1,orderItem.getOrderNo(),barcode);
}
}
} catch (ValidateException e) {
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/kafka/service/KafkaService.java
......@@ -184,7 +184,7 @@ public class KafkaService {
for (EquipMsg equipMsg : equipMsgList) {
String errorCode = equipMsg.getErrorCode();
if (StringUtils.isEmpty(errorCode)){
if (StringUtils.isEmpty(errorCode) || StringUtils.isEmpty(equipMsg.getMsg())){
continue;
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!