修改bug

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/MToolClamp.java

@@ -133,6 +133,13 @@ public class MToolClamp extends Entity<Long> {
     @Excel(name = "物料类型")
     private String materialType;
 
+
+    @ApiModelProperty(value = "生产分厂")
+    @Length(max = 128, message = "name长度不能超过128")
+    @TableField(value = "factory", condition = LIKE)
+    @Excel(name = "生产分厂")
+    private String factory;
+
     /**
      * 同步状态 0：未同步 1：已同步
      */

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/Tray.java

@@ -105,6 +105,38 @@ public class Tray extends Entity<Long> {
     @Excel(name = "托盘数量")
     private Integer num;
 
+
+    @ApiModelProperty(value = "入场日期")
+    @Length(max = 255, message = "入场日期不能超过128")
+    @TableField(value = "join_date", condition = LIKE)
+    @Excel(name = "入场日期")
+    private String joinDate;
+
+    /**
+     * 物料类型
+     */
+    @ApiModelProperty(value = "物料类型")
+    @Length(max = 128, message = "物料类型长度不能超过128")
+    @InjectionField(api = DICTIONARY_ITEM_CLASS, method = DICTIONARY_ITEM_METHOD, dictType = DictionaryType.MATERIAL_TYPE)
+    @TableField(value = "material_type", condition = LIKE)
+    @Excel(name = "物料类型")
+    private String materialType;
+
+
+    @ApiModelProperty(value = "生产分厂")
+    @Length(max = 128, message = "name长度不能超过128")
+    @TableField(value = "factory", condition = LIKE)
+    @Excel(name = "生产分厂")
+    private String factory;
+
+    @ApiModelProperty(value = "有效期(月)")
+    @TableField(value = "expiry_date", condition = LIKE)
+    private Integer expiryDate;
+
+    @ApiModelProperty(value = "周期(月)")
+    @TableField(value = "period", condition = LIKE)
+    private Integer period;
+
     /**
      * 夹紧位置
      */