diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/Detail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/Detail.java index 8364f3886..5cb07703f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/Detail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/Detail.java @@ -18,7 +18,7 @@ import java.util.List; @NoArgsConstructor @Accessors(chain = false) // 设置 chain = false,避免生产单导入有问 public class Detail { - private Integer multi_num; + private Integer multiNum; // 柜体 长 宽 深 private Double width; private Double height; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/IBoardPardInfo.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/IBoardPardInfo.java deleted file mode 100644 index f2fe97abc..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/IBoardPardInfo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cf.imes.module.executor.util.deviseData; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * CAD板件配件信息详情 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false,避免生产单导入有问 -public class IBoardPardInfo { - private String goodsId; - private String goodsName; - private int goodType; - private String goodTypeName; - private String factory; - private String brand; - private String model; - private String spec; - private String unit; - private String color; - private String material; //材质 - -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/IBoardProdInfo.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/IBoardProdInfo.java index 8ec5d7bdb..0ff8d981c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/IBoardProdInfo.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/IBoardProdInfo.java @@ -43,7 +43,6 @@ public class IBoardProdInfo { // 生产小板 板件信息 private Long plateId; //板件Id private Long rawGoodsId;//未对应商品Id - private String plateNo;//自定义板号 private String name; //板件名称 private Integer texture; //纹路 纹路(0正纹1可翻转2反纹)