From 958a45d3dd5ab7fccda0d39061604abe626fd985 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 28 Jul 2020 18:23:11 +0800 Subject: [PATCH 1/9] Finish Task #2080 Cost:8h --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java index 6ef36b6..d4dd9d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java @@ -1,3 +1,4 @@ + package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; @@ -36,11 +37,6 @@ public class WmsModeTransport extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String organizeName; - @Column(name = "ORGANIZE_CODE") - @ApiParam(value = "工厂代码") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String organizeCode; - @Column(name = "TRANSPORT_TYPE") @ApiParam(value = "运输方式") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, dataSrc = "TRANSPORT_TYPE") From e85acdcfff511bb99f3c5f4b538df9eb19cb4cc9 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 28 Jul 2020 21:32:29 +0800 Subject: [PATCH 2/9] =?UTF-8?q?Fix=20bug#9994=20=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=98=8E=E7=BB=86--=E6=98=BE=E7=A4=BA=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/dto/WmsDocMovementMasterDto.java | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsDocMovementMasterDto.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsDocMovementMasterDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsDocMovementMasterDto.java new file mode 100644 index 0000000..7416abb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsDocMovementMasterDto.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description :单据 + * @Reference : + * @Author :puxiao.liao + * @CreateDate : 2020-07-21 2:37 下午 + * @Modify: + **/ +@Data +@Api("单据") +public class WmsDocMovementMasterDto implements Serializable { + + private static final long serialVersionUID = -1388177116144308137L; + + @ApiParam("工厂编号") + private String organizeCode; + + @ApiParam("单据明细") + private List wmsDocMovementDetailsList; + +} From 47f7e24f5792c4883d6296dfc7620a09e77a1152 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 28 Jul 2020 21:45:27 +0800 Subject: [PATCH 3/9] Fix Bug #10060 --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 38a7634..2c5d063 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 @@ -2592,7 +2592,8 @@ public class MesPcnEnumUtil { FORM("form", "文本按钮"), SPEC_TEXT("spec_text", "工步弹框文本"), IMAGE_LIST("image_list", "图片列表"), - SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"); + SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"), + BACKGROUND_COLOR_TEXT("BACKGROUND_COLOR_TEXT", "背景色文字"); private String value; private String description; From 7593b63cfc8602f4066e024efb5abeaafc5b6c8c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 29 Jul 2020 04:56:22 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E9=87=8D=E5=81=9A=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 2c5d063..547e017 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 @@ -4024,7 +4024,8 @@ public class MesPcnEnumUtil { JUMP_PROCESS(10, "跳过工序"), JUMP_STEP(20, "跳过工步"), JUMP_STATE(30, "跳过状态点"), - ABNORMAL_DEDUCTION(40, "扣减异常"); + ABNORMAL_DEDUCTION(40, "扣减异常"), + REDO_STATION(50, "工位重做"); private int value; private String description; From 0f8326d5f88e5afa7b603fdf199ec95533358afa Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Wed, 29 Jul 2020 05:04:30 +0800 Subject: [PATCH 5/9] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E6=89=AD=E7=9F=A9?= =?UTF-8?q?=E6=9E=AA=E9=87=87=E9=9B=86=E9=83=A8=E5=88=86=E5=9B=A0=E4=B8=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=98=E5=8A=A8=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index 02084bb..d5f7f23 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.mes; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -143,6 +144,10 @@ public class TorqueCollectionModel implements Serializable { private Map psets = new LinkedHashMap<>(); + public TorqueCollectionModel(String vinCode) { + this.vinCode = vinCode; + } + /** * 大枪查询结果构造方法 * From 2a93bb2ca4c0225864a6faa159efb786947c7ff7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 29 Jul 2020 09:28:12 +0800 Subject: [PATCH 6/9] Finish Task #2521 --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 8 ++ .../cn/estsh/i3plus/pojo/mes/model/BiModel.java | 89 ++++++++++++++++++++++ .../pojo/mes/model/OperateObjectParamModel.java | 9 ++- 3 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index 0fedc5b..43454da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -108,6 +108,14 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("OEE") private Double oee; + @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,3)") + @ApiParam("OEE目标值") + private Double targetOee; + + @Column(name = "MIN_OEE", columnDefinition = "decimal(18,3)") + @ApiParam("OEE警戒值") + private Double minOee; + @Column(name = "BUSI_DATA") @ApiParam("自定义数据") private String busiData; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java new file mode 100644 index 0000000..84e28b3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java @@ -0,0 +1,89 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/28 2:37 下午 + * @Modify: + */ +@Data +public class BiModel { + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("生产区域代码") + private String areaCode; + + @ApiParam("运行状态") + private String runningStatus; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "计划数量") + private double planQty; + + @ApiParam(value = "产量") + private double outputQty; + + @ApiParam(value = "完成率") + private double completeRate; + + @ApiParam(value = "合格数量") + private double passQty = 0; + + @ApiParam(value = "不良数量") + private double ngQty = 0; + + @ApiParam(value = "实际数量") + private double actualQty = 0; + + @ApiParam(value = "合格率") + private double passRate; + + @ApiParam(value = "不良率") + private double ngRate; + + @ApiParam(value = "警戒值") + private double sentinelValue; + + @ApiParam("客户代码") + private String customerCode; + + @ApiParam("客户名称") + private String customerName; + + @ApiParam("x坐标内容") + private List xAxis; + + @ApiParam("一些携带值 eg:异常类型，异常次数") + private Map carryMap; + + @ApiParam("图表显示的数据") + private List series; + + @ApiParam("列名") + private Map colMap; + + @Deprecated + public double getCompleteRate() { + if (this.planQty != 0) { + this.completeRate = outputQty / planQty; + } else { + this.completeRate = 0; + } + return this.completeRate; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java index 2b25ff8..c2f1ef7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java @@ -3,8 +3,6 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Transient; - /** * @Description: * @Author: jokelin @@ -25,10 +23,15 @@ public class OperateObjectParamModel { @ApiParam("日期") private String oeeDate; + @ApiParam("开始日期") + private String startDate; + + @ApiParam("结束日期") + private String endDate; + @ApiParam("开始时段") private String startTime; - @Transient @ApiParam("结束时段") private String endTime; From 47a155e1d162e4cfd83a93287d4d94b55c1b9c6c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 29 Jul 2020 15:03:12 +0800 Subject: [PATCH 7/9] git push --- .../cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index 83396d1..92bcd86 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -39,14 +39,22 @@ public class MesCustomerPart extends BaseBean implements Serializable { private String partNo; @Column(name = "CUSTOMER_PART_NO") - @ApiParam("客户零件号") + @ApiParam("客户物料号") private String customerPartNo; @Column(name = "CUSTOMER_PART_NAME") - @ApiParam("客户零件描述") + @ApiParam("客户物料名称") private String customerPartName; + @Column(name = "CUSTOMER_PART_COLOR") + @ApiParam("客户物料颜色") + private String customerPartColor; + + @Column(name = "QTY") + @ApiParam("用量") + private Double qty; + @Column(name = "CUSTOMER_CFG_CODE") - @ApiParam("客戶配置代碼") + @ApiParam("客户配置代码") private String customerCfgCode; } From 3223158529009e0317b72bbd5f7844d047fae6b7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 29 Jul 2020 17:25:18 +0800 Subject: [PATCH 8/9] Fix Bug #10108 --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 49 +++++++++++++++++++++- .../i3plus/pojo/mes/bean/MesBoardPlanCapacity.java | 24 +++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) 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 f4bba13..1457811 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 @@ -5165,7 +5165,8 @@ public class MesEnumUtil { BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"), BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"), BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"), - BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"); + BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), + BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"); private String code; private String description; @@ -6786,4 +6787,50 @@ public class MesEnumUtil { return tmp; } } + + /** + * 工作中心 工位监控模式 10=工单作业，20=标准作业 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CENTER_MONITOR_TYPE { + + ORDER_WORK(10, "工单作业"), + STANDARD_WORK(20, "标准作业"); + + private int value; + private String description; + + WORK_CENTER_MONITOR_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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index 842f52f..3af83ef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -56,6 +56,30 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { @ApiParam("计划产量") private Integer planCapacity; + @Column(name = "MONTH_PLAN_CAPACITY") + @ApiParam("月计划产量") + private Integer monthPlanCapacity; + + @Column(name = "HOUR_CAPACITY") + @ApiParam("时段产能") + private Integer hourCapacity; + + @Column(name = "STOP_TIME") + @ApiParam("停机时间") + private Integer stopTime; + + @Column(name = "ACTUAL_CAPACITY") + @ApiParam("今日产量") + private Integer actualCapacity; + + @Column(name = "PLAN_TAKT") + @ApiParam("计划节拍") + private Integer planTakt; + + @Column(name = "IS_MANUAL") + @ApiParam("是否手工展示") + private Integer isManual; + @Transient @ApiParam("班次名称") private String shiftName; From 3c3a5f6068cda814a5db64f146662545f137a7ba Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 29 Jul 2020 17:29:08 +0800 Subject: [PATCH 9/9] =?UTF-8?q?Fix=20bug#9902=2020089+=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=8B=86=E5=88=86=E6=9D=A1=E7=A0=81=E5=BC=82=E5=B8=B8+0724?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java index c0bf451..1a9fb95 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java @@ -36,4 +36,6 @@ public abstract class BaseComponetsParam implements Serializable { @ApiParam(value = "工厂代码") public String organizeCode; + + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index f371330..9c33dde 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -52,4 +52,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable { @ApiParam(value = "新条码") public WmsStockSn NewWmsStockSn; + + @ApiParam(value = "拆分条码") + public Integer splitSn; }