update 机台信息增加入库类型

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java

@@ -128,6 +128,11 @@ public class ProdBaseMachineInfo extends TenantEntity {
     @TableLogic
     private String delFlag;
 
+    /**
+     * 入库类型（1直接入库 2扫描入库）
+     */
+    private String instockType;
+
     /**
      * 车间名称
      */

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java

@@ -140,5 +140,10 @@ public class ProdBaseMachineInfoBo extends BaseEntity {
     @ExcelProperty(value = "请求间隔")
     private Long requestInterval;
 
+    /**
+     * 入库类型（1直接入库 2扫描入库）
+     */
+    private String instockType;
+
     private List<ProdBaseMachineProcess> baseMachineProcessList;
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java

@@ -197,6 +197,13 @@ public class ProdBaseMachineInfoVo implements Serializable {
     @ExcelProperty(value = "设备模型名称")
     private String deviceModeName;
 
+    /**
+     * 入库类型（1直接入库 2扫描入库）
+     */
+    @ExcelProperty(value = "入库类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "mes_instock_type")
+    private String instockType;
+
     private List<ProdBaseMachineProcess> baseMachineProcessList;
 
 }