From d22bd22012d734b79ea5764e60b7404df1ed8bc5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 18 Apr 2020 18:18:08 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A=E5=AE=A2?= =?UTF-8?q?=E6=88=B7JIT=E8=87=AA=E5=8A=A8=E4=B8=8B=E8=BE=BE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java | 16 ++++++++++++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java | 12 ++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index b656d3f..808ca31 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -60,17 +60,29 @@ public class IfQueueShipping extends BaseBean implements Serializable { private Double qty; @Column(name = "SUPPLIER_CODE") - @ApiParam("操作人") + @ApiParam("供应商代码") private String supplierCode; + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + @Column(name = "ACTION_DATE_TIME") @ApiParam("操作时间") - private Date actionDateTime; + private String actionDateTime; @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") private String workCenterCode; + @Column(name = "PRODUCE_CATEGORY_CODE") + @ApiParam("产品位置") + private String produceCategoryCode; + + @Column(name = "JIT_LOT_NO") + @ApiParam("JIT队列批次") + private String jitLotNo; + @Column(name = "SYNC_STATUS") @ApiParam("同步状态") private Integer syncStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java index db10be7..d75a1de 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java @@ -43,6 +43,10 @@ public class MesQueueShipping extends BaseBean implements Serializable { @ApiParam("vin") private String vinCode; + @Column(name = "CAR_NO") + @ApiParam("车号") + private String carNo; + @Column(name = "CUST_FLAG_NO") @ApiParam("客户标识号") private String custFlagNo; @@ -63,4 +67,12 @@ public class MesQueueShipping extends BaseBean implements Serializable { @ApiParam("客户产线代码") private String custPlantCode; + @Column(name = "JIT_LOT_NO") + @ApiParam("JIT队列批次") + private String jitLotNo; + + @Column(name = "JIT_ACTUAL_NO") + @ApiParam("客户JIT队列编号") + private String jitActualNo; + } From 48ee207a8a8cc607d5171fc90cff3cdab4318056 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 18 Apr 2020 18:33:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E9=A1=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index 808ca31..fc3bd4e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -8,12 +8,10 @@ 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; -import java.util.Date; /** * @Description :JIT发运数据同步 From 4c637b4e831b78476c0e2ca9fd9b5be8693437cb Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 18 Apr 2020 18:43:41 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[=E5=86=99=E5=85=A5JIT=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index fc3bd4e..b420c4f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -77,6 +77,11 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("产品位置") private String produceCategoryCode; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + @Column(name = "JIT_LOT_NO") @ApiParam("JIT队列批次") private String jitLotNo; From 74a4a1381cc35e78c2f08bed807d40f5d5a7a507 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 20 Apr 2020 11:00:40 +0800 Subject: [PATCH 4/6] mes --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++++++++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 41 ++++++++++++++++++++-- .../i3plus/pojo/mes/model/PartDismantleModel.java | 36 +++++++++++++++++++ 3 files changed, 109 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartDismantleModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index f7e1f81..e692e07 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -11,6 +11,41 @@ import com.fasterxml.jackson.annotation.JsonFormat; **/ public class MesEnumUtil { + /** + * 作业程序组件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_MODULE_TYPE { + MONITOR_MODULE(10, "监听组件"), + REVEAL_MODULE(10, "展示组件"), + BUTTON_MODULE(30, "按钮组件"); + + private int value; + private String description; + + WORK_MODULE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } /** * 排序方式 @@ -3470,7 +3505,6 @@ public class MesEnumUtil { public enum QUALITY_OBJECT_TYPE { ORGANIZE(10, "工厂"), - WORK_CENTER_CODE(20, "产线"), PRODUCT(30, "产品"); private int value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 23b4120..af0c84d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -13,6 +13,42 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * 作业程序组件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_MODULE_TYPE { + MONITOR_MODULE(10, "监听组件"), + REVEAL_MODULE(10, "展示组件"), + BUTTON_MODULE(30, "按钮组件"); + + private int value; + private String description; + + WORK_MODULE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 监听任务明细-采集数据方式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -2023,7 +2059,7 @@ public class MesPcnEnumUtil { } /** - * MesPartCategory实体对应的categoryType值 条码表条码质量状态 + * MesPartCategory实体对应的categoryType值 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PART_CATEGORY_TYPE { @@ -2323,8 +2359,7 @@ public class MesPcnEnumUtil { PACKAGE_SCAN(35, "打包扫描"), INSTOCKED(40, "入库"), SHIPING(50, "发运"), - CLOSE(90, "关闭"), - ; + CLOSE(90, "关闭"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartDismantleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartDismantleModel.java new file mode 100644 index 0000000..86d0dd4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PartDismantleModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class PartDismantleModel { + + @ApiParam("子物料编码") + private String itemPartNo; + + @ApiParam("子物料名称") + private String itemPartName; + + @ApiParam("拆解数") + private BigDecimal dismantleQty; + + @ApiParam("合格数") + private BigDecimal okQty; + + @ApiParam("缺失数") + private BigDecimal missQty; + + @ApiParam("报废数") + private BigDecimal scrapQty; + +} From 1c4050b71f7cb9890ca0e0bdfe75735687abe452 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 20 Apr 2020 11:03:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/IfRawPartData.java | 91 ++++++++++++++++++++++ .../pojo/mes/bean/MesStateMachineStatus.java | 5 ++ .../cn/estsh/i3plus/pojo/mes/model/StepResult.java | 20 +++++ 3 files changed, 116 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java new file mode 100644 index 0000000..acc8c22 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java @@ -0,0 +1,91 @@ +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/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_RAW_PART_DATA") +@Api("原料上线数据") +public class IfRawPartData extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324895596L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PART_TYPE") + @ApiParam("原料类型") + private String partType; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("原料条码") + private String serialNumber; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "SRC_LOT_NO") + @ApiParam("收货批次") + private String srcLotNo; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Column(name = "ORGANIZATION_CODE") + @ApiParam("工厂代码") + private String organizationCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index f7999d6..4b8994b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.model.StepResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -88,4 +89,8 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @Transient @ApiParam("前端显示颜色") private String color; + + @Transient + @ApiParam("状态执行情况") + private StepResult stepResult; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java index 77c8985..9f3ad59 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -18,12 +18,20 @@ public class StepResult { private String msg; + private boolean needStop; + private StationRequestBean stationRequestBean; public static StepResult getNonComplete() { return new StepResult(false, ""); } + public static StepResult getNonCompleteStop() { + StepResult result = new StepResult(false, ""); + result.setNeedStop(true); + return result; + } + public static StepResult getNonComplete(StationRequestBean requestBean) { return new StepResult(false, ""); } @@ -36,6 +44,12 @@ public class StepResult { return new StepResult(false, reqBean); } + public static StepResult getNonCompleteReqBeanStop(StationRequestBean reqBean) { + StepResult stepResult = new StepResult(false, reqBean); + stepResult.setNeedStop(true); + return stepResult; + } + public static StepResult getNonCompleteData(T data) { return new StepResult(false, data, ""); } @@ -44,6 +58,12 @@ public class StepResult { return new StepResult(false, msg); } + public static StepResult getNonCompleteStop(String msg) { + StepResult stepResult = new StepResult(false, msg); + stepResult.setNeedStop(true); + return stepResult; + } + public static StepResult getSuccessComplete(String msg) { return new StepResult(true, msg); } From d4bde19861d6383ad1ec9ae8b1d683f485167df0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 20 Apr 2020 11:16:51 +0800 Subject: [PATCH 6/6] mes --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index e692e07..578c559 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3505,6 +3505,7 @@ public class MesEnumUtil { public enum QUALITY_OBJECT_TYPE { ORGANIZE(10, "工厂"), + WORK_CENTER_CODE(20, "产线"), PRODUCT(30, "产品"); private int value;