I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
yun-zuoyi
qianhs 5 years ago
parent fa8e4c1b55
commit 0a2d9a3d6d
4 changed files with 77 additions and 76 deletions
Show Stats Download Patch File Download Diff File

4
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

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

111
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
Unescape Escape View File

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

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java
Unescape Escape View File

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

30
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save