【1432 工位扫描-ESOP展示组件开发，队列组件调整】【工位扫描-ESOP展示组件开发，队列组件调整】

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -3277,7 +3277,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SHIPPING_ACTUAL_STATUS {
         CREATE(10, "创建"),
-        CANCEL(20, "已发运");
+        SHIPPED(20, "已发运");
 
         private int value;
         private String description;
@@ -3403,7 +3403,7 @@ public class MesPcnEnumUtil {
         public int getValue() {
             return value;
         }
-        
+
         public String getCode() {
             return code;
         }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -28,78 +29,78 @@ import java.io.Serializable;
 @Table(name = "if_queue_shipping")
 @Api("JIT发运数据同步")
 public class IfQueueShipping extends BaseBean implements Serializable {
-    private static final long serialVersionUID = -8961182851667690154L;
-    @Column(name = "JIT_NO")
-    @ApiParam("JIT队列编号")
-    private String jitNo;
+	private static final long serialVersionUID = -8961182851667690154L;
+	@Column(name = "JIT_NO")
+	@ApiParam("JIT队列编号")
+	private String jitNo;
 
-    @Column(name = "VIN_CODE")
-    @ApiParam("vin")
-    private String vinCode;
+	@Column(name = "VIN_CODE")
+	@ApiParam("vin")
+	private String vinCode;
 
-    @Column(name = "CUST_FLAG_NO")
-    @ApiParam("客户标识号")
-    private String custFlagNo;
+	@Column(name = "CUST_FLAG_NO")
+	@ApiParam("客户标识号")
+	private String custFlagNo;
 
-    @Column(name = "PART_NO")
-    @ApiParam("物料号")
-    private String partNo;
+	@Column(name = "PART_NO")
+	@ApiParam("物料号")
+	private String partNo;
 
-    @Column(name = "PART_NAME")
-    @ApiParam("物料名称")
-    private String partName;
+	@Column(name = "PART_NAME")
+	@ApiParam("物料名称")
+	private String partName;
 
-    @Column(name = "PRODUCT_SN")
-    @ApiParam("产品条码")
-    private String productSn;
+	@Column(name = "PRODUCT_SN")
+	@ApiParam("产品条码")
+	private String productSn;
 
-    @Column(name = "QTY")
-    @ApiParam("数量")
-    private Double qty;
+	@Column(name = "QTY")
+	@ApiParam("数量")
+	private Double qty;
 
-    @Column(name = "SUPPLIER_CODE")
-    @ApiParam("供应商代码")
-    private String supplierCode;
+	@Column(name = "SUPPLIER_CODE")
+	@ApiParam("供应商代码")
+	private String supplierCode;
 
-    @Column(name = "ACTION_USER")
-    @ApiParam("操作人")
-    private String actionUser;
+	@Column(name = "ACTION_USER")
+	@ApiParam("操作人")
+	private String actionUser;
 
-    @Column(name = "ACTION_DATE_TIME")
-    @ApiParam("操作时间")
-    private String actionDateTime;
+	@Column(name = "ACTION_DATE_TIME")
+	@ApiParam("操作时间")
+	private String actionDateTime;
 
-    @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("产线")
-    private String workCenterCode;
+	@Column(name = "WORK_CENTER_CODE")
+	@ApiParam("产线")
+	private String workCenterCode;
 
-    @Column(name = "PRODUCE_CATEGORY_CODE")
-    @ApiParam("产品位置")
-    private String produceCategoryCode;
+	@Column(name = "PRODUCE_CATEGORY_CODE")
+	@ApiParam("产品位置")
+	private String produceCategoryCode;
 
 
-    @Column(name = "QUEUE_GROUP_NO")
-    @ApiParam("分组队列编号")
-    private String queueGroupNo;
+	@Column(name = "QUEUE_GROUP_NO")
+	@ApiParam("分组队列编号")
+	private String queueGroupNo;
 
-    @Column(name = "JIT_LOT_NO")
-    @ApiParam("JIT队列批次")
-    private String jitLotNo;
+	@Column(name = "JIT_LOT_NO")
+	@ApiParam("JIT队列批次")
+	private String jitLotNo;
 
-    @Column(name = "SYNC_STATUS")
-    @ApiParam("同步状态")
-    private Integer syncStatus;
+	@Column(name = "SYNC_STATUS")
+	@ApiParam("同步状态")
+	private Integer syncStatus;
 
-    @Column(name = "ERROR_MESSAGE")
-    @ApiParam("异常消息")
-    private String errorMessage;
+	@Column(name = "ERROR_MESSAGE")
+	@ApiParam("异常消息")
+	private String errorMessage;
 
-    @Column(name = "ACTION_CODE")
-    @ApiParam("动作代码")
-    private String actionCode;
+	@Column(name = "ACTION_CODE")
+	@ApiParam("动作代码")
+	private String actionCode;
 
-    @Column(name = "IF_CODE")
-    @ApiParam("接口代码")
-    private String ifCode;
+	@Column(name = "IF_CODE")
+	@ApiParam("接口代码")
+	private String ifCode;
 
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java

@@ -31,11 +31,11 @@ import java.io.Serializable;
 })
 @Api("工作单元组件参数配置")
 public class MesWorkCellModuleParam extends BaseBean implements Serializable {
-    private static final long serialVersionUID = 4836155960343256982L;
+	private static final long serialVersionUID = 4836155960343256982L;
 
-    @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("产线")
-    private String workCenterCode;
+	@Column(name = "WORK_CENTER_CODE")
+	@ApiParam("产线")
+	private String workCenterCode;
 
 	@Column(name = "WORK_CELL_CODE")
 	@ApiParam("工作单元代码")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java

@@ -16,27 +16,27 @@ import java.io.Serializable;
 @Data
 @Api("JIT发运队列列表Model")
 public class QueueShippingModel implements Serializable {
-    private Long id;
+	private Long id;
 
-    @ApiParam("显示颜色")
-    private String color;
+	@ApiParam("显示颜色")
+	private String color;
 
-    @ApiParam("队列编号")
-    private String jisActualNo;
+	@ApiParam("队列编号")
+	private String jisActualNo;
 
-    @ApiParam("产品位置代码")
-    private String produceCtgyCode;
+	@ApiParam("产品位置代码")
+	private String produceCtgyCode;
 
-    @ApiParam("产品位置")
-    private String prodCfgName;
+	@ApiParam("产品位置")
+	private String prodCfgName;
 
-    @ApiParam("起始vin")
-    private String vin;
+	@ApiParam("起始vin")
+	private String vin;
 
-    @ApiParam("结束vin")
-    private String endVin;
+	@ApiParam("结束vin")
+	private String endVin;
 
-    @ApiParam("料架号")
-    private String queueGroupNo;
+	@ApiParam("料架号")
+	private String queueGroupNo;
 
 }