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 01/12] =?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 937eac5e87d481b7d933f48e08391685ec599229 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 29 Jul 2020 23:01:56 +0800 Subject: [PATCH 02/12] =?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 03/12] 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 04/12] =?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 8180795cd7515c70f2d7c8ec8fdbc12f22a2ca58 Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Thu, 30 Jul 2020 13:06:37 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96-?= =?UTF-8?q?=E6=89=93=E5=8C=85=E6=97=B6=E5=B0=86=E5=B7=A5=E4=BD=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=AD=98=E5=85=A5=E5=8C=85=E8=A3=85=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/MesPackage.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index a46c53d..560dcd0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -86,6 +86,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + @Column(name = "MEMO") @ApiParam("备注") private String memo; 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 06/12] =?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 07/12] =?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 08/12] 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 09/12] =?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; From ffc70e158af8606af162dd643e527283525eadc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 30 Jul 2020 19:57:07 +0800 Subject: [PATCH 10/12] BUG#8696 --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java | 3 +-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java index 3eb65ad..a78f43f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java @@ -30,8 +30,7 @@ public class WmsFieldInfoModel implements Serializable { @ApiParam("处理类型") private int handleType; - public WmsFieldInfoModel (String baseRepository, int handleType, List wmsFieldInfoList) { - this.baseRepository = baseRepository; + public WmsFieldInfoModel ( int handleType, List wmsFieldInfoList) { this.wmsFieldInfoList = wmsFieldInfoList; this.handleType = handleType; } 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..53c5fea 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 @@ -36,11 +36,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 fd42a3292a6bbd88cabfc3bd0d425ed3eea6a78c Mon Sep 17 00:00:00 2001 From: "jack.jia" Date: Thu, 30 Jul 2020 20:57:45 +0800 Subject: [PATCH 11/12] =?UTF-8?q?Fix=20Bug=20#10090,=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=B6=82=E8=A3=85=E4=BA=8C=E6=AC=A1=E7=AE=B1=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E7=AE=B1=E6=9D=A1=E7=A0=81=E5=B7=A5=E4=BD=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BC=9A=E4=B9=B1=E6=8E=89=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java index 15c9efe..809a892 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -63,6 +63,12 @@ public class ProdPackModel implements Serializable { @ApiParam("是否封箱") public Integer isSealed; + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + public ProdPackModel() { } From bc2d29c006dd33db18763d54fcb9e3fd6231b309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 30 Jul 2020 21:03:44 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E3=80=902547=2007=201.2.4.6.1.10=20PCR-2?= =?UTF-8?q?00617001=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4-=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E4=B8=8D=E8=89=AF=E7=B4=A7=E6=80=A5=E6=8B=89?= =?UTF-8?q?=E6=96=99=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java | 81 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 ++ .../pojo/mes/repository/IfPartPullRepository.java | 14 ++++ 3 files changed, 99 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartPullRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java new file mode 100644 index 0000000..e26bbcd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java @@ -0,0 +1,81 @@ +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.Lob; +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_PART_PULL") +@Api("IF_物料拉动") +public class IfPartPull extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324895596L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PARENT_PART_NO") + @ApiParam("产品物料编码") + private String parentPartNo; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料编码") + private String itemPartNo; + + @Column(name = "QTY") + @ApiParam("拉动数量") + private Double qty; + + @Column(name = "ORGANIZTION_CODE") + @ApiParam("工厂代码") + private String organizationCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + @Lob + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 817a07c..8d7c019 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -139,4 +139,8 @@ public class MesPart extends BaseBean implements Serializable { @Transient @ApiParam("分类名称") private String categoryName; + + @Transient + @ApiParam("拉动数量") + private Double pullQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartPullRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartPullRepository.java new file mode 100644 index 0000000..ff20aaf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartPullRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfPartPull; +import cn.estsh.i3plus.pojo.mes.bean.IfRawPartData; + +/** + * @Description : + * @Reference : + * @CreateDate : 2020-04-21 09:53 + * @Modify: + **/ +public interface IfPartPullRepository extends BaseRepository { +}