From f005489b61a2cd2fff9d2e7e20bcdf6cbbf38044 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 24 Mar 2020 13:15:35 +0800 Subject: [PATCH 1/4] ptl --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java index 41fc4d0..05b54f6 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java @@ -33,6 +33,10 @@ public class PtlMainTask extends BaseBean implements Serializable { @ApiParam("主任务编号") private String taskNo; + @Column(name = "ORDER_NO") + @ApiParam("业务单号") + private String orderNo; + @Column(name = "SEQ") @ApiParam("主任务顺序号") private Integer seq; From 0c3d14a3f95d54dce29f506353cf0bb304b9e3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 24 Mar 2020 14:22:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?wms=E6=8F=92=E4=BB=B6=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89=E9=92=AE=E5=A2=9E=E5=BC=BA=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 309bdcc..02f71d3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -5152,13 +5152,14 @@ public class WmsEnumUtil { } /** - * 插件类型 10-PDA插件，20-交易处理插件 + * 插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件 * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PLUGIN_TYPE { PDA_PLUGIN(10, "PDA_PLUGIN", "PDA插件"), - TRANS_PLUGIN(20, "TRANS_PLUGIN", "交易处理插件"); + BTN_PLUGIN(20, "BTN_PLUGIN", "按钮增强插件"), + TRANS_PLUGIN(30, "TRANS_PLUGIN", "交易处理插件"); private int value; private String code; From 0ca85027516f957fe3b946dd29356a5dab451b56 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 24 Mar 2020 18:52:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A1518?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 18 ++--- .../i3plus/pojo/ptl/bean/PtlMainTaskDetail.java | 18 ++++- .../estsh/i3plus/pojo/ptl/model/MesQueueOrder.java | 91 ++++++++++++++++++++++ .../i3plus/pojo/ptl/model/MesQueueOrderDetail.java | 90 +++++++++++++++++++++ .../estsh/i3plus/pojo/ptl/model/MesStationBom.java | 83 ++++++++++++++++++++ 5 files changed, 290 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 86e527d..4a4bb65 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1469,9 +1469,9 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_SECTION_TASK_TYPE { - CREATE(10, "CREATE", "JIT任务"), - RECEIPT(20, "IN_PROGRESS", "单据任务"), - RECEIPT_FINISH(30, "COMPLETED", "单点任务"); + JIT_TASK(10, "JIT_TASK", "JIT任务"), + DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"), + SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务"); private int value; private String code; @@ -1560,9 +1560,9 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_TASK_TYPE { - CREATE(10, "JIT_TASK", "JIT任务"), - RECEIPT(20, "DOCUMENT_TASK", "单据任务"), - RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务"); + JIT_TASK(10, "JIT_TASK", "JIT任务"), + DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"), + SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务"); private int value; private String code; @@ -1606,9 +1606,9 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MAIN_TASK_TYPE { - CREATE(10, "JIT_TASK", "JIT任务"), - RECEIPT(20, "DOCUMENT_TASK", "单据任务"), - RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务"); + JIT_TASK(10, "JIT_TASK", "JIT任务"), + DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"), + SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务"); private int value; private String code; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java index ba3146c..a0eb09b 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java @@ -38,9 +38,17 @@ public class PtlMainTaskDetail extends BaseBean implements Serializable { private String partNo; @Column(name = "PART_NAME") - @ApiParam("产品物料名称") + @ApiParam("产品物料号名称") private String partName; + @Column(name = "ITEM_PART_NO") + @ApiParam("拣选物料号") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("拣选物料名称") + private String itemPartName; + @Column(name = "QTY") @ApiParam("数量") private Integer qty; @@ -49,4 +57,12 @@ public class PtlMainTaskDetail extends BaseBean implements Serializable { @ApiParam("物料种类") private Integer partCategory; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java new file mode 100644 index 0000000..167a62d --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: 生产队列主表 + * @Reference: + * @Author: wangjie + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@ApiModel("生产队列主表") +public class MesQueueOrder implements Serializable { + + private static final long serialVersionUID = -3124113504001270712L; + + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("Vin") + private String vinCode; + + @ApiParam("客户标识号") + private String custFlagNo; + + @ApiParam("产品配置代码") + private String prodCfgCode; + + @ApiParam("产品配置名称") + private String prodCfgNameRdd; + + @ApiParam("排序") + private Double seq; + + @ApiParam("生产工单号") + private String workOrderNo; + + @ApiParam("状态") + private Integer status; + + @ApiParam("客户产线代码") + private String custProdLineCode; + + @ApiParam("区域代码") + private String areaCode; + + @ApiParam("锁定标识") + private Integer isLock; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("工单类型") + private String workType; + + @ApiParam("队列类型") + private Integer queueType; + + @ApiParam("生产组代码") + private String pgCode; + + @ApiParam(value = "id") + public Long id; + + @ApiParam(value ="组织代码") + public String organizeCode; + + @ApiParam(value = "有效性") + public Integer isValid; + + @ApiParam(value = "是否已删除") + public Integer isDeleted; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam(value = "修改人") + public String modifyUser; + + @ApiParam(value = "修改日期") + public String modifyDatetime; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java new file mode 100644 index 0000000..48d66be --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: 生产队列明细 + * @Reference: + * @Author: wangjie + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@ApiModel("生产队列明细") +public class MesQueueOrderDetail implements Serializable { + + private static final long serialVersionUID = 1945173626511595078L; + + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("队列明细序号") + private Double seq; + + @ApiParam("数量") + private Double qty; + + @ApiParam("状态") + private Integer status; + + @ApiParam("生产类型") + private String workType; + + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @ApiParam("产品类型名称") + private String produceCategoryNameRdd; + + @ApiParam("产品类型名称") + private String pptCode; + + @ApiParam("分组队列编号") + private String queueGroupNo; + + @ApiParam("组内编号") + private Integer groupNo; + + @ApiParam("料架是否已打印") + private Integer isGroupPrinted; + + @ApiParam("已生产数量") + private Double finsihQty; + + @ApiParam(value = "id") + public Long id; + + @ApiParam(value ="组织代码") + public String organizeCode; + + @ApiParam(value = "有效性") + public Integer isValid; + + @ApiParam(value = "是否已删除") + public Integer isDeleted; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam(value = "修改人") + public String modifyUser; + + @ApiParam(value = "修改日期") + public String modifyDatetime; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java new file mode 100644 index 0000000..fdfb332 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.ptl.model; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description :工位物料清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@ApiModel("工位物料清单") +public class MesStationBom implements Serializable { + + private static final long serialVersionUID = -2658812944873600461L; + + @ApiParam("零件号") + private String partNo; + + @ApiParam("产品物料名称") + private String partName; + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("子零件") + private String itemPartNo; + + @ApiParam("原材料物料名称") + private String itemPartName; + + @ApiParam(value = "子零件数量") + private Double qty; + + @ApiParam(value = "是否可重复") + private Integer isRepeat; + + @ApiParam(value = "是否检查") + private Integer isCheck; + + @ApiParam(value = "是否投料配置") + private Integer isFeed; + + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; + + @ApiParam(value = "匹配规则") + private Integer matchRule; + + @ApiParam(value = "id") + public Long id; + + @ApiParam(value ="组织代码") + public String organizeCode; + + @ApiParam(value = "有效性") + public Integer isValid; + + @ApiParam(value = "是否已删除") + public Integer isDeleted; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam(value = "修改人") + public String modifyUser; + + @ApiParam(value = "修改日期") + public String modifyDatetime; + +} From 8b750e6a769066153f99dc050f09d09f642dd62f Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 25 Mar 2020 11:28:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 8 ++- .../estsh/i3plus/pojo/mes/bean/MesProductData.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesRouteStatus.java | 78 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StationRequestBean.java | 8 +++ 4 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index befec26..5dd8c97 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -55,9 +55,9 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("数据下限") private Double lowerLimit; - @Column(name = "TERMINAL_ID") + @Column(name = "WORK_CELL_CODE") @ApiParam("工位") - private Integer terminalId; + private String workCellCode; @Column(name = "TORQUE_GROUP") @ApiParam("扭矩组") @@ -79,6 +79,10 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("JOB_ID") private Integer jobId; + @Column(name = "LAST_TIGHTENING_ID") + @ApiParam("最后一次扭矩id") + private Long lastTighteningId; + @Transient @ApiParam("扭矩值") private Double torqueValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 8590fbb..5db7e04 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -113,7 +113,7 @@ public class MesProductData extends BaseBean implements Serializable { @Lob @Column(name = "LINE_DATA") @ApiParam("生产数据") - private List lineData; + private String lineData; @Lob @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java new file mode 100644 index 0000000..780af83 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +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; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "MES_ROUTE_STATUS") +@EqualsAndHashCode(callSuper = true) +@Api("流程状态") +public class MesRouteStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 4988786372428896721L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "STATUS_NAME") + @ApiParam("状态名称") + private String statusName; + + @Column(name = "NEXT_STATUS") + @ApiParam("下一状态") + private String nextStatus; + + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型") + private Integer triggerType; + + @Column(name = "TRIGGER_EVENT") + @ApiParam("触发事件") + private String triggerEvent; + + @Column(name = "TRIGGER_WHERE") + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @Column(name = "ACTION_AMG_ID") + @ApiParam("触发调用") + private Long actionAmgId; + + @Column(name = "IN_AMG_ID") + @ApiParam("进入状态调用") + private Long inAmgId; + + @Column(name = "OUT_AMG_ID") + @ApiParam("离开状态调用") + private Long outAmgId; + + @Column(name = "STATUS_TYPE") + @ApiParam("状态类型") + private Integer statusType; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 6fcf819..5ff5cdc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesRouteStatus; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -98,6 +100,12 @@ public class StationRequestBean implements Serializable { @ApiParam("数据map") private Map dataMap; + @ApiParam("流程状态集合") + private List routeStatusList; + + @ApiParam("当前流程状态") + private MesRouteStatus curRouteStatus; + @Override public String toString() { return "StationRequestBean{" +