Commit 45e29006 authored by Tong Li's avatar Tong Li

遗传算法-优化

parent e4927762
...@@ -18,6 +18,8 @@ public class OrderMaterialRequirement { ...@@ -18,6 +18,8 @@ public class OrderMaterialRequirement {
private int operationId; private int operationId;
private String childorderId; private String childorderId;
private String materialId; private String materialId;
private String materialCode;
private String materialName;
private String materialTypeName; private String materialTypeName;
/** /**
......
...@@ -447,7 +447,8 @@ if(routingIds.size()==0) ...@@ -447,7 +447,8 @@ if(routingIds.size()==0)
materialRequirements.add(orderMaterial); materialRequirements.add(orderMaterial);
orderMaterial.setLevel(level); orderMaterial.setLevel(level);
} }
orderMaterial.setMaterialCode(component.getMaterialNumber());
orderMaterial.setMaterialName(component.getMaterialName());
needed -= useStock; needed -= useStock;
if (needed <= 0) { if (needed <= 0) {
orderMaterial.setYpQty(allneeded - needed); orderMaterial.setYpQty(allneeded - needed);
...@@ -645,8 +646,8 @@ if(routingIds.size()==0) ...@@ -645,8 +646,8 @@ if(routingIds.size()==0)
} }
double availableNow = material.getCurrentStock(); double availableNow = material.getCurrentStock();
orderMaterial.setMaterialCode(material.getCode());
orderMaterial.setMaterialType(material.getMaterialType()); orderMaterial.setMaterialName(material.getName());
orderMaterial.setMaterialTypeName(material.getMaterialTypeName()); orderMaterial.setMaterialTypeName(material.getMaterialTypeName());
orderMaterial.setMaterialId(material.getId()); orderMaterial.setMaterialId(material.getId());
orderMaterial.setCkeckLeadTime(material.getCkeckLeadTime()); orderMaterial.setCkeckLeadTime(material.getCkeckLeadTime());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment