diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/ProducingOrderConverter.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/ProducingOrderConverter.java index 320b7a24f..e6692c9ea 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/ProducingOrderConverter.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/ProducingOrderConverter.java @@ -958,7 +958,8 @@ public class ProducingOrderConverter { target.setName(part.getName()); target.setType(SEAL_PART_GROUP.equals(part.getGroup()) ? SEAL_PART_GROUP : part.getGroup()); - target.setModel(empty(material.getModel())); + // 配件型号。 + target.setModel(empty(part.getModel())); boolean sealPart = SEAL_PART_GROUP.equals(part.getGroup()); target.setSpec(empty(material.getSpec())); // 对方 width/length/height 对应原导入结构的宽/长/厚。 @@ -969,7 +970,8 @@ public class ProducingOrderConverter { target.setColor(partColor(material)); target.setBrand(empty(material.getBrand())); target.setFactory(empty(material.getFactory())); - target.setUnit("0"); + // 配件计量单位。 + target.setUnit(empty(part.getUnit())); target.setNum(part.getQuantity() == null ? 1D : part.getQuantity()); int partType = defaultPartType(part.getType()); target.setIsComposite(partType == 1 || partType == 2); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/dto/ProducingOrderResponse.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/dto/ProducingOrderResponse.java index 1dcfdd4dc..a0103797b 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/dto/ProducingOrderResponse.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/dto/ProducingOrderResponse.java @@ -164,6 +164,11 @@ public class ProducingOrderResponse { private String materialId; private Integer type; private String group; + /** + * 配件型号和计量单位。 + */ + private String model; + private String unit; private Double quantity; /** * 对方配件定义的长、宽、高;转换层适配到原拆单结构的宽、长、厚字段。