From c10a7bae7e6faece2966997403ae6578eba5165c Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Sun, 26 Jul 2020 15:52:04 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index fc4acd3..9877c7e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -64,6 +64,10 @@ public class SysLabelTemplate extends BaseBean { @ApiParam(value ="模板参数拼接") private String paramsPack; + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + @Transient @ApiParam(value ="模板id对应的模板参数") private List labelTemplateParamList; From 2e3f5bb2af4557525c9254098ec02fb1030355b2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 28 Jul 2020 09:42:53 +0800 Subject: [PATCH 02/23] =?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 --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 6b820ef..a0618cf 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 @@ -799,7 +799,8 @@ public class WmsEnumUtil { PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK(640, "PART_NUMBER_CONVERSION_MATERIAL_OUT_STOCK", "零件号转化物料出库"), INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"), CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"), - MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"); + MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"), + PROD_SCRAP(680, "PROD_SCRAP", "生产报废"); private int value; private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 80a7f60..74c110f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -384,6 +384,11 @@ public class WmsDocMovementDetails extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; + @Transient + @ApiParam("工作中心代码") + private String workCenterCode; + + public WmsDocMovementDetails () { From 35cdb1f2572fad7fda56a84fbbc9987e75a166fa Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 28 Jul 2020 12:39:58 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java index eac13e5..f1d76b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java @@ -22,7 +22,10 @@ import javax.persistence.*; @DynamicUpdate @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@Table(name = "SCRIPT_PERSISTENCE") +@Table(name = "SCRIPT_PERSISTENCE", indexes = { + @Index(columnList = "SCRIPT_NO"), + @Index(columnList = "ORGANIZE_CODE") +}) @Api("系统动态脚本") public class EngineScriptPersistence extends BaseBean { private static final long serialVersionUID = 7893111140559759490L; From c18c22a799856cb7628944f6e5ac7750a2941f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 28 Jul 2020 14:08:49 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E7=94=B5=E6=A3=80=E6=B5=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 7fead57..0fe7b90 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -185,6 +185,18 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码打印状态名称") private String printStatusName; + @Transient + @ApiParam("设备代码") + private String equipmentCode; + + @Transient + @ApiParam("设备名称") + private String equipmentName; + + @Transient + @ApiParam("电检结果") + private String electricResult; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") From 34be0bde26be63f11417f6794f373663a9ca95f5 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 28 Jul 2020 15:10:52 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=BB=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index d0c88bb..ac5fe1a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -142,8 +142,8 @@ public class WmsPart extends BaseBean { @Column(name = "PART_GROUP") @ApiParam(value = "物料组") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, - isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isMultiple = 1, isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") private String partGroup; @Column(name = "LOT_CHECK_RULE") From 958a45d3dd5ab7fccda0d39061604abe626fd985 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 28 Jul 2020 18:23:11 +0800 Subject: [PATCH 06/23] 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 07/23] =?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 08/23] 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 09/23] =?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 10/23] =?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 11/23] 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 12/23] 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 13/23] 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 14/23] =?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; } From 46904c43d1f7caa0c53091e8b5f179f84e21e08a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 29 Jul 2020 17:33:18 +0800 Subject: [PATCH 15/23] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2528=EF=BC=8C#2545?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java | 6 ++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index 33bed63..6ef6c90 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -119,6 +119,12 @@ public class WmsActionResponseBean implements Serializable { @ApiParam(value = "工厂代码") private String organizeCode; + @ApiParam(value = "提交模式") + private Integer commitMode; + + @ApiParam(value = "是否允许重置") + private Integer isResetAble; + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index f42fc1e..889b2b3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -81,6 +81,12 @@ public class WmsActionGroup extends BaseBean { @AnnoOutputColumn private Integer isAutoCommit; + // 1=true, 2 = false + @Column(name = "IS_RESET_ABLE", columnDefinition = "int default 1", nullable = false) + @ApiParam(value = "是否允许重置") + @AnnoOutputColumn + private Integer isResetAble; + @Lob @Column(name = "POSITION", columnDefinition = "TEXT") @ApiParam(value = "GOJS位置") @@ -114,7 +120,11 @@ public class WmsActionGroup extends BaseBean { return this.autoInit == null ? 0 : this.autoInit.intValue(); } - public int geSubmitStepSeqVal() { + public int getSubmitStepSeqVal() { return this.submitStepSeq == null ? 0 : this.submitStepSeq.intValue(); } + + public int getIsResetAbleVal() { + return this.isResetAble == null ? 0 : this.isResetAble.intValue(); + } } From f2cf6af1feda2f3e7f24eb4a0de82aff192eff85 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 29 Jul 2020 20:51:58 +0800 Subject: [PATCH 16/23] =?UTF-8?q?Finish=20Task=20#2523=20Cost:16h=20Fix=20?= =?UTF-8?q?Bug=20#10065=20=E5=B7=B2=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index f6e866e..4b8e041 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -225,4 +225,9 @@ public class WmsCSOrderDetails extends BaseBean { this.factQty=factQty; this.locateNo=locateNo; } + + public WmsCSOrderDetails(String partNo,String partNameRdd) { + this.partNo=partNo; + this.partNameRdd = partNameRdd; + } } From 937eac5e87d481b7d933f48e08391685ec599229 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 29 Jul 2020 23:01:56 +0800 Subject: [PATCH 17/23] =?UTF-8?q?Finish=20Task=20#2549=20Cost:4h=20?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E9=A2=86=E6=96=99=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=9D=A5=E6=BA=90=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E5=8C=BA=E3=80=81=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 132 +++++++++++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 8 +- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 11 +- 3 files changed, 149 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 a0618cf..bf70c6d 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 @@ -300,6 +300,62 @@ public class WmsEnumUtil { } } + + /** + * 单据主表状态(ASN,PO,MOVE,QC,SO) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PICKING_MASTER_ORDER_STATUS { + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "已生成"), + FAILED(30, "RECEIPT_FINISH", "生成失败"); + + private int value; + private String code; + private String description; + + PICKING_MASTER_ORDER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** * 收货状态 */ @@ -8795,4 +8851,80 @@ public class WmsEnumUtil { return null; } } + + + /** + * BOM + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOM_PRODUCTING_LINE { + GJ(10, "PIPE", "管件"), + JF(20, "JF", "夹方"), + JH(30, "JH", "机焊"), + SH(40, "SH", "手焊"); + + private String code; + private String description; + int value; + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + BOM_PRODUCTING_LINE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public static String valueOf(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 String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static BOM_PRODUCTING_LINE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 74c110f..85cb2b8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -179,6 +179,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("目的库存地代码") public String destAreaNo; + + @Column(name = "DEST_XB_ZONE_NO") + @ApiParam("目的线边存储区代码") + public String destXBZoneNo; + @Column(name = "LOT_NO") @ApiParam("批次") public String lotNo; @@ -231,6 +236,7 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "父位置号") private String seqNo; + @Transient @ApiParam(value = "客户编号") private String custNo; @@ -385,7 +391,7 @@ public class WmsDocMovementDetails extends BaseBean { public String refSrc; @Transient - @ApiParam("工作中心代码") + @ApiParam("产线代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index f20b634..07812e0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -46,7 +46,7 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "ORDER_NO") @ApiParam(value = "移库单单号") private String orderNo; - /** + /**e * 移动类型:IN=入库,OUT=出库,MOVE=移库 */ @Column(name = "MOVE_TYPE") @@ -231,6 +231,15 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "备注1") private String remake; + + /** + * 10=未生成，20=生成成功，30=生成失败 + */ + @Column(name = "PICKING_ORDER_STATUS", columnDefinition = "int default 10") + @ApiParam(value = "领料单生成状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + public Integer pickingOrderStatus; + @Column(name = "SECONDARY_REMAKE") @ApiParam(value = "备注2") private String secondaryRemake; From ea922affba1b7d1cb0dc471a21062ada7f75e2e5 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 30 Jul 2020 09:02:43 +0800 Subject: [PATCH 18/23] Start Task #2522 Cost:8h Left:8h --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 49 +++++++++++++++++++++- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 8 ++++ .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 4 ++ .../cn/estsh/i3plus/pojo/mes/model/BiModel.java | 32 +++++--------- .../cn/estsh/i3plus/pojo/mes/model/BoardModel.java | 19 +++++++++ 5 files changed, 90 insertions(+), 22 deletions(-) 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 1457811..d4edfa6 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 @@ -1966,7 +1966,8 @@ public class MesEnumUtil { SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"), MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"), MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"), - BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"); + BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"), + BOARD_PLAN_CAPACITY(520, "BOARD_PLAN_CAPACITY", "计划产能看板导入"); private int value; private String service; @@ -6833,4 +6834,50 @@ public class MesEnumUtil { return tmp; } } + + /** + * 工位等级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CELL_GRADE { + + COMMON(10, "普通工位"), + MONITOR(20, "监控工位"); + + private int value; + private String description; + + WORK_CELL_GRADE(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/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index f275899..b07b34c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -66,6 +66,14 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("工作单元端口") private String workCellPort; + @Column(name = "GRADE") + @ApiParam("工作等级") + private Integer grade; + + @Column(name = "TARGET_PASS_RATE") + @ApiParam("目标合格率") + private Integer targetPassRate; + @Transient @ApiParam(value = "子集列表") private List childTreeList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index a80febf..fbc0606 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -71,6 +71,10 @@ public class MesWorkCenter extends BaseBean implements Serializable { @ApiParam("工位监控模式") private Integer monitorType; + @Column(name = "PLAN_TAKT") + @ApiParam("节拍") + private Integer planTakt; + @Transient @ApiParam(value = "子集列表") private List childTreeList; 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 index 84e28b3..6c71dbc 100644 --- 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 @@ -20,11 +20,8 @@ public class BiModel { @ApiParam("工作中心名称") private String workCenterName; - @ApiParam("生产区域代码") - private String areaCode; - - @ApiParam("运行状态") - private String runningStatus; + @ApiParam("工作单元代码") + private String workCellCode; @ApiParam(value = "物料号") private String partNo; @@ -35,12 +32,6 @@ public class BiModel { @ApiParam(value = "计划数量") private double planQty; - @ApiParam(value = "产量") - private double outputQty; - - @ApiParam(value = "完成率") - private double completeRate; - @ApiParam(value = "合格数量") private double passQty = 0; @@ -59,6 +50,15 @@ public class BiModel { @ApiParam(value = "警戒值") private double sentinelValue; + @ApiParam(value = "总数") + private double total; + + @ApiParam(value = "合格数") + private double qualifiedQty = 0; + + @ApiParam(value = "不合格数") + private double unQualifiedQty = 0; + @ApiParam("客户代码") private String customerCode; @@ -76,14 +76,4 @@ public class BiModel { @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/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index 8076ead..32d1136 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -41,6 +41,25 @@ public class BoardModel { @ApiParam("当天停机时间(min)") private String theDayShutDownTime; + + @ApiParam("今日产量") + private Integer actualCapacity; + + @ApiParam("月计划产量") + private Integer monthPlanCapacity; + + @ApiParam("停机时间") + private Integer stopTime; + + @ApiParam("时段产能") + private Integer hourCapacity; + + @ApiParam("计划节拍") + private Integer planTakt; + + @ApiParam("今日完成产量") + private Integer completeCapacity = 0; + @ApiParam("看板时段计划产量") private List boardShiftSectionCapacityList; From 7f5c1735ea9201831b5f118640e8974f5fb36635 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 30 Jul 2020 10:14:53 +0800 Subject: [PATCH 19/23] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 3d121d7..36f5cb9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -25,4 +25,10 @@ public class DataReviewModel { @ApiParam("对象代码") private String objectCode; + @ApiParam("是否合格标识") + private Integer reviewFlag; + + @ApiParam("是否合格") + private String reviewResult; + } From 4a59b5c9135392ff28a0983fb9d40d41d7e9fc49 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 30 Jul 2020 13:46:11 +0800 Subject: [PATCH 20/23] =?UTF-8?q?bug:=2010003=2019073-=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=AE=89=E7=81=AF=E7=B1=BB=E5=9E=8B=E8=87=AA?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=E5=B7=A5?= =?UTF-8?q?=E8=A3=85-20200728?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 8775387..9571391 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -1211,7 +1211,7 @@ public class AndonEnumUtil { QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"), PART("PART_ALARM", 110060104, "物料", "#24BDBA"), PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"), - CHECK("OTHER_ALARM", 110060108, "自处理", "#EAA510"), + CHECK("OTHER_ALARM", 110060108, "工装", "#EAA510"), FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"); private String value; From e007a5273265e01ac9a3c4ad0d5c62b394998e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 30 Jul 2020 14:05:55 +0800 Subject: [PATCH 21/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E7=BA=B3?= =?UTF-8?q?=E5=B7=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 547e017..1b27d84 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 @@ -4566,4 +4566,23 @@ public class MesPcnEnumUtil { } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PTL_IS_LIGHT { + + IS_PICK_LIGHT(10, "不需亮灯"); + + private int value; + private String description; + + MES_PTL_IS_LIGHT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + } + } From 01ac2e85da28478dbc3127d841f27ee1c5dc7884 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 30 Jul 2020 14:35:05 +0800 Subject: [PATCH 22/23] Fix Bug #10087 --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 5 +++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java | 5 ++++- .../cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java | 5 +++-- 6 files changed, 22 insertions(+), 6 deletions(-) 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 d4edfa6..98a5b80 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 @@ -5565,14 +5565,15 @@ public class MesEnumUtil { /** - * 运算对象代码 + * 运算对象代码 Period capacity */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OPERATE_OBJECT_CODE { ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"), ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"), WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"), - EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"); + EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"), + PERIOD_CAPACITY("PERIOD_CAPACITY", "时段产能"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index c4eae0c..22616e2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -47,4 +47,12 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @Column(name = "PART_SN") @ApiParam("料箱条码") private String partSn; + + @Column(name = "TARGET_PASS_RATE") + @ApiParam("目标合格率") + private Double targetPassRate; + + @Column(name = "PRIORITY_ORDER") + @ApiParam("优先级顺序") + private Integer priorityOder; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index b07b34c..d40bd16 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -72,7 +72,7 @@ public class MesWorkCell extends BaseBean implements Serializable { @Column(name = "TARGET_PASS_RATE") @ApiParam("目标合格率") - private Integer targetPassRate; + private Double targetPassRate; @Transient @ApiParam(value = "子集列表") 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 index 6c71dbc..22b4536 100644 --- 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 @@ -59,6 +59,9 @@ public class BiModel { @ApiParam(value = "不合格数") private double unQualifiedQty = 0; + @ApiParam("目标合格率") + private double targetPassRate; + @ApiParam("客户代码") private String customerCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index 32d1136..9d66acd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -55,11 +55,14 @@ public class BoardModel { private Integer hourCapacity; @ApiParam("计划节拍") - private Integer planTakt; + private Integer planTakt = 0; @ApiParam("今日完成产量") private Integer completeCapacity = 0; + @ApiParam("时段产能") + private Integer periodCapacity = 0; + @ApiParam("看板时段计划产量") private List boardShiftSectionCapacityList; 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 c2f1ef7..d608e9c 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,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; /** * @Description: * @Author: jokelin @@ -24,10 +25,10 @@ public class OperateObjectParamModel { private String oeeDate; @ApiParam("开始日期") - private String startDate; + private String startDatetime; @ApiParam("结束日期") - private String endDate; + private String endDatetime; @ApiParam("开始时段") private String startTime; From 13f712161047ae2c6ff255f012b4ed1e61e105ff Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 30 Jul 2020 18:05:18 +0800 Subject: [PATCH 23/23] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 98a5b80..adcf618 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 @@ -1967,7 +1967,7 @@ public class MesEnumUtil { MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"), MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"), BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"), - BOARD_PLAN_CAPACITY(520, "BOARD_PLAN_CAPACITY", "计划产能看板导入"); + BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入"); private int value; private String service; 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 3af83ef..fec2dbd 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 @@ -66,7 +66,7 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { @Column(name = "STOP_TIME") @ApiParam("停机时间") - private Integer stopTime; + private Double stopTime; @Column(name = "ACTUAL_CAPACITY") @ApiParam("今日产量") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index 9d66acd..72615c8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -49,7 +49,7 @@ public class BoardModel { private Integer monthPlanCapacity; @ApiParam("停机时间") - private Integer stopTime; + private double stopTime; @ApiParam("时段产能") private Integer hourCapacity;