Skip to content

孙克 / smf-core

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

1.线体对应多个机种

1 个父辈 66ad6eff
全部展开
内嵌 并排
正在显示 2 个修改的文件 包含 31 行增加 和 22 行删除
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
...@@ -667,55 +667,63 @@ public class LiteOrderCache { ...@@ -667,55 +667,63 @@ public class LiteOrderCache {
try { try {
excludePosIds.add(pos.getId()); excludePosIds.add(pos.getId());
List<String> modelList = new ArrayList<>();
String model = orderItem.getModel(); String model = orderItem.getModel();
if (StringUtils.isEmpty(model)) { if (StringUtils.isEmpty(model)) {
//C02-3FSMT-18,C02-3FSMT-19,C02-3FSMT-09,C02-3FSMT-08
String orderLine = cacheOrder.getLine(); String orderLine = cacheOrder.getLine();
if (StringUtils.isNotEmpty(orderLine)) { if (StringUtils.isNotEmpty(orderLine)) {
if (orderLine.startsWith("C02-1FSMT-98")){ if (orderLine.startsWith("C02-1FSMT-98")){
model = "RAINIER"; model = "RAINIER";
} else if (orderLine.startsWith("C02-3FSMT-03")){ } else if (orderLine.startsWith("C02-3FSMT-03")){
model = "RAINIER"; modelList.add("RAINIER");
}else if (orderLine.startsWith("C02-3FSMT-04")){ }else if (orderLine.startsWith("C02-3FSMT-04")){
model = "RAINIER"; modelList.add("RAINIER");
}else if (orderLine.startsWith("C02-3FSMT-05")){ }else if (orderLine.startsWith("C02-3FSMT-05")){
model = "RAINIER"; modelList.add("X11");
}else if (orderLine.startsWith("C02-3FSMT-06")){ }else if (orderLine.startsWith("C02-3FSMT-06")){
model = "RAINIER"; modelList.add("RAINIER");
}else if (orderLine.startsWith("C02-3FSMT-07")){ }else if (orderLine.startsWith("C02-3FSMT-07")){
model = "RAINIER"; modelList.add("RAINIER");
}else if (orderLine.startsWith("C02-3FSMT-13")){ }else if (orderLine.startsWith("C02-3FSMT-13")){
model = "RAINIER"; modelList.add("RAINIER");
}else if (orderLine.startsWith("C02-3FSMT-14")){ }else if (orderLine.startsWith("C02-3FSMT-14")){
model = "RAINIER"; modelList.add("RAINIER");
}else if (orderLine.startsWith("C02-3FSMT-15")){ }else if (orderLine.startsWith("C02-3FSMT-15")){
model = "RAINIER"; modelList.add("X11");
}else if (orderLine.startsWith("C02-3FSMT-16")){ }else if (orderLine.startsWith("C02-3FSMT-16")){
model = "RAINIER"; modelList.add("RAINIER");
}else if (orderLine.startsWith("C02-3FSMT-17")){ }else if (orderLine.startsWith("C02-3FSMT-17")){
model = "RAINIER"; modelList.add("RAINIER");
}else if (orderLine.startsWith("C03-1FSMT-02")){ }else if (orderLine.startsWith("C03-1FSMT-02")){
model = "RAINIER"; model = "RAINIER";
}else if (orderLine.startsWith("C03-1FSMT-12")){ }else if (orderLine.startsWith("C03-1FSMT-12")){
model = "RAINIER"; model = "RAINIER";
}else if (orderLine.startsWith("C02-3FSMT-08")){ }else if (orderLine.startsWith("C02-3FSMT-08")){
model = "X11"; modelList.add("X11");
}else if (orderLine.startsWith("C02-3FSMT-18")){ }else if (orderLine.startsWith("C02-3FSMT-18")){
model = "X11"; modelList.add("X11");
}else if (orderLine.startsWith("C03-1FSMT-01")){ }else if (orderLine.startsWith("C03-1FSMT-01")){
model = "X11"; model = "X11";
}else if (orderLine.startsWith("C03-1FSMT-11")){ }else if (orderLine.startsWith("C03-1FSMT-11")){
model = "X11"; model = "X11";
}else if (orderLine.startsWith("C02-3FSMT-09")){ }else if (orderLine.startsWith("C02-3FSMT-09")){
model = "X8"; modelList.add("X11");
modelList.add("X8");
}else if (orderLine.startsWith("C02-3FSMT-19")){ }else if (orderLine.startsWith("C02-3FSMT-19")){
model = "X8"; modelList.add("X8");
modelList.add("X11");
} else { } else {
model = "ALL"; modelList.add("ALL");
} }
} else { } else {
model = "ALL"; modelList.add("ALL");
} }
} else {
modelList.add("ALL");
}
if (modelList == null || modelList.isEmpty()){
modelList.add("ALL");
} }
//如果是迈征工单,不是满料,不出库 //如果是迈征工单,不是满料,不出库
...@@ -728,11 +736,12 @@ public class LiteOrderCache { ...@@ -728,11 +736,12 @@ public class LiteOrderCache {
throw new ValidateException("",barcode.getBarcode()+"不是满卷数量,不允许出库"); throw new ValidateException("",barcode.getBarcode()+"不是满卷数量,不允许出库");
} }
}*/ }*/
for (String batchModel : modelList) {
List<String> batchCheckReel = lizhenApi.batchCheckReel(Arrays.asList(pos.getBarcode()), "",model); List<String> batchCheckReel = lizhenApi.batchCheckReel(Arrays.asList(pos.getBarcode()), "",batchModel);
if (batchCheckReel != null && !batchCheckReel.isEmpty()){ if (batchCheckReel != null && !batchCheckReel.isEmpty()){
disable = true; disable = true;
throw new ValidateException("",pos.getBarcode().getBarcode()+"被禁用,库位为:"+pos.getPosName()); throw new ValidateException("",pos.getBarcode().getBarcode()+"被禁用,库位为:"+pos.getPosName());
}
} }
} catch (ValidateException e) { } catch (ValidateException e) {
pos = null; pos = null;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!