组件订单数据拉取:适配配件型号跟计量单位

This commit is contained in:
gaoqr
2026-07-29 18:51:48 +08:00
parent a525540f5b
commit 14d5a21b87
2 changed files with 9 additions and 2 deletions
@@ -958,7 +958,8 @@ public class ProducingOrderConverter {
target.setName(part.getName()); target.setName(part.getName());
target.setType(SEAL_PART_GROUP.equals(part.getGroup()) target.setType(SEAL_PART_GROUP.equals(part.getGroup())
? SEAL_PART_GROUP : 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()); boolean sealPart = SEAL_PART_GROUP.equals(part.getGroup());
target.setSpec(empty(material.getSpec())); target.setSpec(empty(material.getSpec()));
// 对方 width/length/height 对应原导入结构的宽/长/厚。 // 对方 width/length/height 对应原导入结构的宽/长/厚。
@@ -969,7 +970,8 @@ public class ProducingOrderConverter {
target.setColor(partColor(material)); target.setColor(partColor(material));
target.setBrand(empty(material.getBrand())); target.setBrand(empty(material.getBrand()));
target.setFactory(empty(material.getFactory())); target.setFactory(empty(material.getFactory()));
target.setUnit("0"); // 配件计量单位。
target.setUnit(empty(part.getUnit()));
target.setNum(part.getQuantity() == null ? 1D : part.getQuantity()); target.setNum(part.getQuantity() == null ? 1D : part.getQuantity());
int partType = defaultPartType(part.getType()); int partType = defaultPartType(part.getType());
target.setIsComposite(partType == 1 || partType == 2); target.setIsComposite(partType == 1 || partType == 2);
@@ -164,6 +164,11 @@ public class ProducingOrderResponse {
private String materialId; private String materialId;
private Integer type; private Integer type;
private String group; private String group;
/**
* 配件型号和计量单位。
*/
private String model;
private String unit;
private Double quantity; private Double quantity;
/** /**
* 对方配件定义的长、宽、高;转换层适配到原拆单结构的宽、长、厚字段。 * 对方配件定义的长、宽、高;转换层适配到原拆单结构的宽、长、厚字段。