From e85acdcfff511bb99f3c5f4b538df9eb19cb4cc9 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 28 Jul 2020 21:32:29 +0800 Subject: [PATCH 01/58] =?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 02/58] 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 03/58] =?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 04/58] =?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 05/58] 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 06/58] 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 07/58] 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 08/58] =?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 09/58] =?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 10/58] =?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 11/58] =?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 12/58] 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 13/58] =?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 14/58] =?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 15/58] =?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 16/58] =?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 17/58] 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 d231b88a37853a9eaff9ee190c064a96f39755a6 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 30 Jul 2020 17:55:18 +0800 Subject: [PATCH 18/58] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=8B=86=E5=88=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java | 3 +++ 1 file changed, 3 insertions(+) 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 13f712161047ae2c6ff255f012b4ed1e61e105ff Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 30 Jul 2020 18:05:18 +0800 Subject: [PATCH 19/58] =?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 20/58] 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 21/58] =?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 22/58] =?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 { +} From 7f55af4477452436523f670eceda09cafcbfa7a5 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 30 Jul 2020 21:15:24 +0800 Subject: [PATCH 23/58] Finish Task #2560 Cost:8h --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 33 ++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java | 58 ++++++++++++++++++++++ .../pojo/wms/repository/WmsEnumRepository.java | 9 ++++ 3 files changed, 100 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsEnumRepository.java 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..1e5c3b5 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 @@ -8795,4 +8795,37 @@ public class WmsEnumUtil { return null; } } + + /** + * 循环规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CYCLE_RULE { + FIVE_SECONDs("0/5 * * * * ?", "FIVE_SECONDs", "五秒一次"), + TWENTY_SECONDS("0/20 * * * * ?", "TWENTY_SECONDS", "二十秒一次"), + EVERY_DAY("0 0 0 * * ?", "EVERY_DAY", "每天零点"), + EVERY_HOUR("0 0 * * * ?", "EVERY_HOUR", "每小时"); + + private String value; + private String code; + private String description; + + CYCLE_RULE(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java new file mode 100644 index 0000000..ba7a2b7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 数据字典-枚举 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-07-30 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_ENUM") +@Api("数据字典-枚举") +public class WmsEnum extends BaseBean { + private static final long serialVersionUID = -6422649826279645604L; + + @Column(name = "ENUM_TYPE") + @ApiParam(value = "枚举类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String enumType; + + @Column(name = "ENUM_TYPE_DESC") + @ApiParam(value = "枚举类型描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String enumTypeDesc; + + @Column(name = "ENUM_VALUE_SEQ") + @ApiParam(value = "枚举值序号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer enumValueSeq; + + @Column(name = "ENUM_VALUE") + @ApiParam(value = "枚举值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String enumValue; + + @Column(name = "ENUM_VALUE_DESC") + @ApiParam(value = "枚举值描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String enumValueDesc; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsEnumRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsEnumRepository.java new file mode 100644 index 0000000..06e360b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsEnumRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsEnum; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsEnumRepository extends BaseRepository { +} From 784cd87c71837f448b5226155c3c537f23c21652 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 30 Jul 2020 22:08:13 +0800 Subject: [PATCH 24/58] ptl --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java index 6733022..3c88059 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java @@ -86,6 +86,10 @@ public class PtlMainTask extends BaseBean implements Serializable { @ApiParam("区域代码") private String areaNo; + @Column(name = "SECTION_NO") + @ApiParam("区段代码") + private String sectionNo; + @Column(name = "TASK_TYPE") @ApiParam("任务类型") private String taskType; From bc9adf8ac0c6d0cdb9dd2827801836b874900372 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 30 Jul 2020 23:22:48 +0800 Subject: [PATCH 25/58] ptl --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 9c85618..1dda378 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -15,6 +15,37 @@ public class PtlPcnEnumUtil { * 状态机异常处理状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FINISH_PICK_SEND_FLAG { + SECTION(10, "10", "区段"), + AREA(10, "20", "区域"); + + private int value; + private String code; + private String description; + + FINISH_PICK_SEND_FLAG(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; + } + } + + /** + * 状态机异常处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS { TRUE(10, "已处理"), FALSE(20, "未处理"); From 5990e56dfd9c1b8fd9947b6f150458e7afbbb22e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 31 Jul 2020 09:36:04 +0800 Subject: [PATCH 26/58] =?UTF-8?q?Finish=20Task=20#2540=20Cost:8h=20?= =?UTF-8?q?=E5=96=9C=E5=BE=B7WMS-=E6=96=B0=E5=A2=9E=E2=80=9C=E5=9B=9E?= =?UTF-8?q?=E4=BC=A0=E6=BA=90=E6=9D=90=E6=96=99=E6=89=A3=E5=87=8F=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E2=80=9D=E7=9A=84=E6=8E=A5=E5=8F=A3=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index b816bfe..835facc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -114,6 +114,10 @@ public class SapDocFgSum extends BaseBean { @ApiParam(value = "备注") private String errorMsg; + @Transient + @ApiParam(value = "生产线") + private String lineNo; + @JsonSerialize(using = ToStringSerializer.class) @Transient public Long wdfdId; @@ -159,6 +163,32 @@ public class SapDocFgSum extends BaseBean { this.seqNo = seqNo; this.itemSeqNo = itemSeqNo; } + + public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, + String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, + String effStartTime, String bomVersion, String fGOrderNo, String seqNo, String itemSeqNo, String lineNo) { + this.wdfdId = wdfdId; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.unit = unit; + this.erpWorkCenter = erpWorkCenter; + this.inAreaNo = inAreaNo; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.itemUnit = itemUnit; + this.outAreaNo = outAreaNo; + this.itemQty = itemQty; + this.src = src; + this.isLock = isLock; + this.effStartTime = effStartTime; + this.bomVersion = bomVersion; + this.fGOrderNo = fGOrderNo; + this.seqNo = seqNo; + this.itemSeqNo = itemSeqNo; + this.lineNo = lineNo; + } + public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) { this.wdfdId = wdfdId; From 4ff84de904587b4a6a985d5da8660945403f5beb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 31 Jul 2020 18:04:50 +0800 Subject: [PATCH 27/58] =?UTF-8?q?=E3=80=902557=20sap=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E9=94=81=E5=AE=9A=E5=9B=9E=E4=BC=A0=E4=BF=A1=E6=81=AF=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=EF=BC=8C=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E7=B1=BB=E5=9E=8B=EF=BC=8Cerp=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java index 71b81f7..87c12d1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java @@ -33,9 +33,9 @@ public class WmsSapOrderLock extends BaseBean { @ApiParam("订单号") public String orderNo; - @Column(name = "BUSI_TYPE") + @Column(name = "ORDER_TYPE") @ApiParam("业务类型") - public String busiType; + public String orderType; @Column(name = "ITEM") @ApiParam("行号") @@ -49,4 +49,18 @@ public class WmsSapOrderLock extends BaseBean { @ApiParam("同步标识") public Integer isSync = 2; + @Column(name = "BUSI_TYPE_CODE") + @ApiParam(value = "类型编号") + private Integer busiTypeCode; + + @Column(name = "TRANS_TYPE_CODE") + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @Column(name = "ERP_ORDER_NO") + @ApiParam("源单号") + public String erpOrderNo; + + + } From f25a186d775f4800ad2175f10754a29b7fed1c32 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 31 Jul 2020 18:13:05 +0800 Subject: [PATCH 28/58] =?UTF-8?q?=E3=80=902511=2007=201.2.3.4.3=E5=9D=A4?= =?UTF-8?q?=E6=B3=B0ERP&WMS=E6=8E=A5=E5=8F=A3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java index 32ce767..aa4f0e2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -72,4 +72,8 @@ public class WmsDocSoDetails extends BaseBean { @Transient @ApiParam(value = "客户编号") private String custCode; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料编码") + public String custPartNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java index 863ea9c..89fb7e6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java @@ -64,5 +64,9 @@ public class WmsDocSoMaster extends BaseBean { @ApiParam(value = "客户发往地名称") private String flagName; + @Column(name = "PLAN_DELIVERY_DATE") + @ApiParam(value = "交期") + private String planDeliveryDate; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 902425b..c1b1a4d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -179,6 +179,10 @@ public class WmsPOMaster extends BaseBean { @Column(name = "ERP_SRC_NO") private String erpSrcNo; + @Column(name = "DEPART_NAME") + @ApiParam(value = "部门名称", example = "1") + public Integer departName; + public WmsPOMaster() { } From 31f289e1be9d2926e1a27d56b7ac1d0a8dd70f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sat, 1 Aug 2020 13:06:19 +0800 Subject: [PATCH 29/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=92=8C=E7=94=B5=E6=A3=80=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java index 81e32c2..21d2f7e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java @@ -84,6 +84,9 @@ public class ProductInfoManageModel { @ApiParam("总队列类型") private List queueTypeList; + @ApiParam("总工单类型") + private List workTypeList; + public ProductInfoManageModel() { } From af539c85a77ed5da55070b2388e8a612dc08524a Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 1 Aug 2020 14:47:08 +0800 Subject: [PATCH 30/58] mgn bug --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 51 +++++++++++++++++++++- .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 4 ++ .../cn/estsh/i3plus/pojo/mes/model/BiModel.java | 32 ++++++++++++-- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 4 files changed, 83 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 adcf618..ba0b0c0 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 @@ -248,7 +248,8 @@ public class MesEnumUtil { PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"), CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"), OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"), - ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"); + ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"), + NO_CHECK_SN(50, "NO_CHECK_SN", "不校验条码"); private int value; private String code; @@ -6881,4 +6882,52 @@ public class MesEnumUtil { return tmp; } } + + /** + * 样本类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SAMPLE_TYPE { + + NORMAL(10, "正常"), + FIRST_ARTICLE(20, "首件"), + MEDIUM_SIZED(30, "中件"), + LAST_PIECE(40, "末件"); + + private int value; + private String description; + + SAMPLE_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/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 925d075..d2e184a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -108,6 +108,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("产线") private String workCenterCode; + @Column(name = "SAMPLE_TYPE") + @ApiParam("样本类型") + private Integer sampleType; + @ApiParam(value = "检测结果") @Transient private String reulstStatus; 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 22b4536..a0d3218 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,14 +59,38 @@ public class BiModel { @ApiParam(value = "不合格数") private double unQualifiedQty = 0; + @ApiParam(value = "合格率") + private double qualifiedRate = 0; + + @ApiParam(value = "一次合格率") + private double onceQualifiedRate = 0; + + @ApiParam(value = "不合格率") + private double unQualifiedRate = 0; + @ApiParam("目标合格率") private double targetPassRate; - @ApiParam("客户代码") - private String customerCode; + @ApiParam("颜色标识") + private Integer colorFlag = 0; + + @ApiParam("首检") + private Integer firstCheck; + + @ApiParam("巡检") + private Integer onSiteCheck; + + @ApiParam("首件") + private Integer firstArticle; + + @ApiParam("中件") + private Integer mediumSized; + + @ApiParam("末件") + private Integer lastPiece; - @ApiParam("客户名称") - private String customerName; + @ApiParam("末检") + private Integer endCheck;//首件、30中件、40末件 @ApiParam("x坐标内容") private List xAxis; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index cae893e..e2ccd0e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -300,7 +300,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); } if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) { - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean); + DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean); } if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) { DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); From 05fa7dba04c21ce3465b873e1ce17713ddbdeb63 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 1 Aug 2020 18:36:08 +0800 Subject: [PATCH 31/58] Fix Bug #10227 --- .../i3plus/pojo/mes/bean/MesBoardDisplay.java | 48 ++++++++++++++++++++++ .../mes/repository/MesBoardDisplayRepository.java | 13 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 +- 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java new file mode 100644 index 0000000..535d9c1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/8/1 5:55 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_DISPLAY") +@Api("MES_看板跑马灯") +public class MesBoardDisplay extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1537754345697889680L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "DISPLAY_CONTENT") + @ApiParam("显示内容") + private String displayContent; + + @Column(name = "IS_ROLL") + @ApiParam("是否滚动") + private String isRoll; + + @Column(name = "ROLL_SPEED") + @ApiParam("滚动速度") + private String rollSpeed; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.java new file mode 100644 index 0000000..8f55d8c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardDisplay; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/8/1 6:03 下午 + * @Modify: + */ +public interface MesBoardDisplayRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index e2ccd0e..cd30d03 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -297,10 +297,10 @@ public class MesHqlPack { public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterCode())) { - DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); } if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) { - DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean); } if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) { DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); From 5fad38392e58310444127567ab262e505fc76077 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 2 Aug 2020 13:05:38 +0800 Subject: [PATCH 32/58] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B4=A2=E5=BC=95=20?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E8=A1=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 19 +++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 10 +++++----- .../estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 2 +- .../mes/engine/script/EngineScriptPersistence.java | 2 +- .../engine/script/EngineScriptPersistenceHistory.java | 2 +- 6 files changed, 31 insertions(+), 9 deletions(-) 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 1b27d84..4a38289 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 @@ -4585,4 +4585,23 @@ public class MesPcnEnumUtil { } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PHOTO_EXTRACT_STATUS { + NEED_SYNC_DATA(10, "待同步数据"), + ALREADY_SYNC_DATA(20, "已同步数据"); + + private int value; + private String description; + + PHOTO_EXTRACT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index 700a5cb..dcf9033 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import java.io.Serializable; @@ -29,7 +30,9 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_BOM") +@Table(name = "MES_BOM", indexes = { + @Index(columnList = "PART_NO") +}) @Api("BOM清单") public class MesBom extends BaseBean implements Serializable { private static final long serialVersionUID = 6781011059554785782L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 4e09969..6cf3353 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -10,10 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; import java.util.List; @@ -29,7 +26,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLC") +@Table(name = "MES_PLC", indexes = { + @Index(columnList = "PLC_CODE"), + @Index(columnList = "TAG_ADDRESS") +}) @Api("PLC配置表") public class MesPlc extends BaseBean implements Serializable { private static final long serialVersionUID = -7172265186837551268L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 47cd239..c0251f8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -52,7 +52,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("排序号") - private String seq; + private Double seq; @Column(name = "STATUS") @ApiParam("状态") 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 f1d76b0..c798811 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,7 @@ import javax.persistence.*; @DynamicUpdate @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@Table(name = "SCRIPT_PERSISTENCE", indexes = { +@Table(name = "MES_SCRIPT_PERSISTENCE", indexes = { @Index(columnList = "SCRIPT_NO"), @Index(columnList = "ORGANIZE_CODE") }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java index 80c332c..3ee75bc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java @@ -22,7 +22,7 @@ import javax.persistence.*; @DynamicUpdate @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@Table(name = "SCRIPT_PERSISTENCE_HISTORY") +@Table(name = "MES_SCRIPT_PERSISTENCE_HISTORY") @Api("系统动态脚本") public class EngineScriptPersistenceHistory extends BaseBean { From c060377822cb0090d3ebb25244da0f821ce2ed1d Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 2 Aug 2020 14:48:28 +0800 Subject: [PATCH 33/58] =?UTF-8?q?=E4=B8=AD=E8=88=AABI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 22616e2..e2e4915 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 @@ -54,5 +54,5 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @Column(name = "PRIORITY_ORDER") @ApiParam("优先级顺序") - private Integer priorityOder; + private Integer priorityOder = 0; } From 6c5e646d4930da78c49e4773edf2959192e3b017 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 2 Aug 2020 16:27:14 +0800 Subject: [PATCH 34/58] test merge master --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..8ef99a3 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..a6c1bea 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..0a2f9d4 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..5f809e6 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..557548a 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index a6a0d68..8778b3c 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..34a7337 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..670eb15 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..ce2dc01 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..b8c9643 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..1d29933 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..284225c 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..7ff16c9 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..353a02b 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..b125cee 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..c9d54a9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..39f1e2f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..df01041 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..c2104bf 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From e8611616db6ee2f02f29d249a54979f932bf763d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 2 Aug 2020 18:36:53 +0800 Subject: [PATCH 35/58] IPC --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 41 ++++++++++++++++++++++ 1 file changed, 41 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 4a38289..859b9a7 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 @@ -16,6 +16,47 @@ public class MesPcnEnumUtil { * 作业程序组件类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IPC_PROD_ACTION_TYPE { + HAND_WORK(10, "10", "手工录入模式"), + PLC_WORK(20, "20", "PLC监听模式"); + + private int value; + private String code; + private String description; + + IPC_PROD_ACTION_TYPE(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 codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 作业程序组件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { MONITOR_MODULE(10, "监听组件"), REVEAL_MODULE(20, "展示组件"), From 3ec8109e82ab9e872e4342b77b9c622dedd7bdcf Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 2 Aug 2020 19:54:28 +0800 Subject: [PATCH 36/58] =?UTF-8?q?=E6=9E=AA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 4a38289..e6fb010 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 @@ -4604,4 +4604,5 @@ public class MesPcnEnumUtil { } + } From 72c8e2243324a4edbaaf5107b544e7d59d4d30e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 2 Aug 2020 20:15:34 +0800 Subject: [PATCH 37/58] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E4=BB=A3=E7=A0=81=E8=B0=83=E8=AF=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java index 76123e8..b1355c7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java @@ -9,7 +9,8 @@ public class MesInterfaceEnumUtil { SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), MES2WMS(30, "MES2WMS", "MES --> WMS"), - WMS2MES(40, "WMS2MES", "WMS --> MES"); + WMS2MES(40, "WMS2MES", "WMS --> MES"), + MES2SAP(50, "MES2SAP", "MES --> SAP"); private int value; private String name; From 394a332de25d4b391ddf47be3e907f2aacd281a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 2 Aug 2020 21:45:19 +0800 Subject: [PATCH 38/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java | 4 ++-- .../estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java index 535d9c1..7077a43 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java @@ -40,9 +40,9 @@ public class MesBoardDisplay extends BaseBean implements Serializable { @Column(name = "IS_ROLL") @ApiParam("是否滚动") - private String isRoll; + private Integer isRoll; @Column(name = "ROLL_SPEED") @ApiParam("滚动速度") - private String rollSpeed; + private Integer rollSpeed; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java index 21d2f7e..d73253f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java @@ -81,6 +81,9 @@ public class ProductInfoManageModel { @ApiParam("明细队列序列") private Double queDetailSeq; + @ApiParam("主队列编号") + private String orderNo; + @ApiParam("总队列类型") private List queueTypeList; @@ -97,4 +100,13 @@ public class ProductInfoManageModel { this.produceColor = produceColor; this.queDetailSeq = queDetailSeq; } + + public ProductInfoManageModel(String vinCode, String produceCategoryCode, String orderNo, Double queDetailSeq, Double queueSeq, String workType) { + this.vinCode = vinCode; + this.produceCategoryCode = produceCategoryCode; + this.orderNo = orderNo; + this.queDetailSeq = queDetailSeq; + this.queueSeq = queueSeq; + this.workType = workType; + } } From 41cbe4f3809891dea9a03d2b6934dab154b85e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 3 Aug 2020 11:47:48 +0800 Subject: [PATCH 39/58] =?UTF-8?q?=E3=80=9010284=2019048-=E6=B3=A8=E5=A1=91?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E5=AF=BC=E5=85=A5=E5=8F=98?= =?UTF-8?q?=E6=9B=B4-20200803=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java index 34186bd..698ffde 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java @@ -38,4 +38,12 @@ public class MesMouldPart extends BaseBean implements Serializable { @Column(name = "MOULD_CODE") @ApiParam("模具代码") private String mouldCode; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty = 0d; + + @Column(name = "MOULD_TYPE") + @ApiParam("模具类型") + private String mouldType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java index fb93d98..d5d2d97 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java @@ -62,4 +62,12 @@ public class ZzMesWorkOrderModel extends BaseBean { @AnnoOutputColumn(required = false) private Integer rows; + @ApiParam("模具类型") + @AnnoOutputColumn(required = false) + private String mouldType; + + @ApiParam("模具编号集合") + @AnnoOutputColumn(required = false) + private String mouldCodeList; + } From 9a959a5184a4da44bfbe4ff47637ba74df85d750 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 3 Aug 2020 11:49:47 +0800 Subject: [PATCH 40/58] pcn enum --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 2e8b13f..8040d62 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -13,10 +13,10 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** - * 作业程序组件类型 + * 注塑生产操作模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum IPC_PROD_ACTION_TYPE { + public enum IPC_ACTION_TYPE { HAND_WORK(10, "10", "手工录入模式"), PLC_WORK(20, "20", "PLC监听模式"); @@ -24,7 +24,7 @@ public class MesPcnEnumUtil { private String code; private String description; - IPC_PROD_ACTION_TYPE(int value, String code, String description) { + IPC_ACTION_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; From 51bae8d1e631fa1b07cdb59c31c6563c3a328388 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 3 Aug 2020 15:32:36 +0800 Subject: [PATCH 41/58] =?UTF-8?q?Fix=20Bug=20#10312=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2=E5=8F=96=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E5=88=97=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index cbddf7b..86c2074 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2985,7 +2985,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result); - DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "dataSrc", result); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result); getStringBuilderPack(wmsFieldInfo, result); return result; } From 5a6a7a77fc3eeb1ff90ecf3fe957dcd6881ddc3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 3 Aug 2020 18:24:16 +0800 Subject: [PATCH 42/58] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E7=A7=BB=E9=99=A4=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/common/Pager.java | 7 ----- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 32 +++++++++++++++++++++- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 +- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index 0a90b00..a8731c8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java @@ -159,13 +159,6 @@ public class Pager { } public int getEndRow() { - if(pageSize > 0){ - if(currentPage > 1){ - return currentPage * pageSize; - }else { - return pageSize; - } - } return endRow; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 9162a1f..91912ab 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; +import java.sql.Timestamp; /** * @Description : @@ -1573,7 +1574,7 @@ public class CommonEnumUtil { BIG_DECIMAL(32, "BigDecimal", "大浮点型", "java.math.BigDecimal", BigDecimal.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0.0"), BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class, PROPERTY_CONTROL_TYPE.RADIO, SQL_WHERE.EQUAL, null), BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class, PROPERTY_CONTROL_TYPE.TEXT, SQL_WHERE.EQUAL, null), - DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss"); + DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", Timestamp.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss"); /** * 属性类型值 @@ -1911,6 +1912,19 @@ public class CommonEnumUtil { return null; } + public String getJDBCUrl(String database,String host,Integer port,String instanceName){ + if(this.getValue() == SOURCE_MARIA_DB.getValue()){ + return getJDBCUrlMySQL(database,host,port); + }else if(this.getValue() == SOURCE_ORACLE.getValue()){ + return getJDBCUrlOracle(database,host,port); + }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ + return getJDBCUrlPostgreSQL(database,host,port); + }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ + return getJDBCUrlSQLServer(database,host,port,instanceName); + } + return null; + } + public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ if(StringUtils.isNotBlank(databaseProductName)){ if(databaseProductName.indexOf(":mysql:") != -1){ @@ -1941,6 +1955,22 @@ public class CommonEnumUtil { private String getJDBCUrlSQLServer(String database,String host,Integer port){ return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; } + + private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){ + StringBuffer sb = new StringBuffer(); + sb.append("jdbc:sqlserver://").append(host); + // 实例 + if (StringUtils.isNotBlank(instanceName)) { + sb.append("\\").append(instanceName); + } + // 端口 + sb.append(":").append(port); + // 数据库 + sb.append(";database=").append(database); + // 自动重连 + sb.append(";autoReconnect=true"); + return sb.toString(); + } } /** diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 225cfd7..e00e6e9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -345,8 +345,8 @@ public class CoreHqlPack { public static DdlPackBean packDdlSysRoleCheckOnly(SysRole role) { DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumNOEqualPack(role.getId(), "id", result); DdlPreparedPack.getStringEqualPack(role.getName(), "name", result); - DdlPreparedPack.getNumEqualPack(role.getId(), "id", result); return result; } From 101a71970c4043571827e8c0d54a3b1e532fdc0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 3 Aug 2020 18:25:18 +0800 Subject: [PATCH 43/58] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C=E5=8F=8A=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=B5=8B=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/dynamic/DynamicEntity.java | 1 - .../base/enumutil/BlockSoftSwitchEnumUtil.java | 143 +++++++++++++++++++++ 2 files changed, 143 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 91b8cd0..7488292 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.Transient; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index dd4bd75..97c8733 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -918,4 +918,147 @@ public class BlockSoftSwitchEnumUtil { } + /** + * 脚本类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SCRIPT_TYPE { + MESSAGE_PROCESS(10, "报文处理","可用参数:transData,orginData"); + + private int value; + private String description; + private String scriptRule; + + private BS_SCRIPT_TYPE (int value, String description,String scriptRule) { + this.value = value; + this.description = description; + this.scriptRule = scriptRule; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + public String getScriptRule() { + return scriptRule; + } + + 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 BS_SCRIPT_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + + /** + * 脚本语言 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SCRIPT_LANGUAGE { +// SPEL(10, "Spring表达式语言(SpEL)"), + JAVASCRIPT(20, "JavaScript(JS)"); + + private int value; + private String description; + + private BS_SCRIPT_LANGUAGE (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 BS_SCRIPT_LANGUAGE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + + /** + * 脚本执行方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SCRIPT_EXECUTE_METHOD { + EXECUTE_SCRIPT(10, "执行脚本"), + EXECUTE_METHOD(20, "执行方法"), + EXECUTE_OBJECT_METHOD(30, "执行对象方法"); + + private int value; + private String description; + + private BS_SCRIPT_EXECUTE_METHOD (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 BS_SCRIPT_EXECUTE_METHOD valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + } From 18a09cc4b6178996887cdc9df1343daea2bd182b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 3 Aug 2020 18:26:31 +0800 Subject: [PATCH 44/58] =?UTF-8?q?FTP=E5=A4=9A=E6=96=87=E4=BB=B6=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E9=97=AE=E9=A2=98=20=E8=84=9A=E6=9C=AC=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E5=8A=9F=E8=83=BD=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/softswitch/SuitClientModel.java | 2 + .../i3plus/pojo/softswitch/bean/BsBusiScript.java | 107 +++++++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsDataSource.java | 4 + .../i3plus/pojo/softswitch/bean/BsLongData.java | 3 + .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 7 ++ .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 4 + .../pojo/softswitch/bean/BsSuitRequestRecord.java | 5 +- .../repository/BsBusiScriptRepository.java | 14 +++ .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 15 ++- 9 files changed, 158 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index eac5415..4c82b54 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -105,6 +105,8 @@ public class SuitClientModel implements Serializable { @XStreamCDATA private Object suitResultMessage; + private boolean isNeedRetry = false; + public SuitClientModel() { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java new file mode 100644 index 0000000..3168c77 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java @@ -0,0 +1,107 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.math.NumberUtils; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 业务脚本 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-07-28 14:35 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_BUSI_SCRIPT") +@ApiModel(value = "业务脚本", description = "业务脚本") +public class BsBusiScript extends BaseBean { + + private static final long serialVersionUID = 1419277265159912600L; + + @Column(name = "SCRIPT_NAME") + @ApiModelProperty(value = "脚本名称") + private String scriptName; + + @Column(name = "SCRIPT_CODE") + @ApiModelProperty(value = "脚本代码") + private String scriptCode; + + @Column(name = "SCRIPT_TYPE") + @ApiModelProperty(value = "脚本类型") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_TYPE.class) + private Integer scriptType; + + public String getScriptTypeTxt() { + return scriptType == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_TYPE.valueOfDescription(scriptType); + } + + @Column(name = "SCRIPT_LANGUAGE") + @ApiModelProperty(value = "脚本语言") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_LANGUAGE.class) + private Integer scriptLanguage; + + public String getScriptLanguageTxt() { + return scriptLanguage == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_LANGUAGE.valueOfDescription(scriptLanguage); + } + + @Column(name = "SCRIPT_EXECUTE_METHOD") + @ApiModelProperty(value = "脚本执行方式") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_EXECUTE_METHOD.class) + private Integer scriptExecuteMethod; + + public String getScriptExecuteMethodTxt() { + return scriptExecuteMethod == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_EXECUTE_METHOD.valueOfDescription(scriptExecuteMethod); + } + + @Column(name = "SCRIPT_OBJ_NAME") + @ApiModelProperty(value = "脚本对象名称") + private String scriptObjName; + + @Column(name = "SCRIPT_METHOD_NAME") + @ApiModelProperty(value = "脚本方法名称") + private String scriptMethodName; + + @Column(name = "SCRIPT_CONTENT") + @ApiModelProperty(value = "脚本内容") + private String scriptContent; + + @Column(name = "SCRIPT_DESC") + @ApiModelProperty(value = "脚本描述") + private String scriptDesc; + + @Column(name = "REF_ID") + @ApiModelProperty(value = "关联id") + @JsonSerialize(using = ToStringSerializer.class) + private Long refId; + + @Column(name = "SCRIPT_VERSION") + @ApiModelProperty(value = "脚本版本") + private Integer scriptVersion; + + public int getScriptVersion(){ + return scriptVersion == null ? NumberUtils.INTEGER_ONE : scriptVersion; + } + + public BsBusiScript nextVersion() { + setScriptVersion(getScriptVersion() + 1); + return this; + } + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java index 2f04bc8..e3ddc94 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java @@ -52,6 +52,10 @@ public class BsDataSource extends BaseBean { @ApiParam(value = "数据源端口") private Integer dataSourcePort; + @Column(name = "DATA_SOURCE_INSTANCE_NAME") + @ApiParam(value = "数据源实例名称") + private String dataSourceInstanceName; + @Column(name = "DATA_SOURCE_USER") @ApiParam(value = "用户名") private String dataSourceUser; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java index 4f87d41..ed054c8 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,6 +36,7 @@ public class BsLongData extends BaseBean { private static final long serialVersionUID = -329128754646765129L; @Column(name = "REF_ID") @ApiParam(value = "关联id") + @JsonSerialize(using = ToStringSerializer.class) private Long refId; @Column(name = "REF_DATA_TYPE") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index a515e18..200ba31 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -40,6 +41,7 @@ public class BsSuitCase extends BaseBean { @Column(name = "CASE_TYPE_ID") @ApiParam(value = "套件类型id(枚举)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class) private Integer caseTypeId; public int getCaseTypeIdVal(){ @@ -76,6 +78,7 @@ public class BsSuitCase extends BaseBean { @Column(name = "SUIT_MODE_ID") @ApiParam(value = "适配模式(枚举,主动，被动)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_MODE.class) private Integer suitModeId; @Column(name = "SUIT_ACTION_ID") @@ -230,6 +233,10 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "适配器状态") private Integer suitCaseStatus; + @Column(name = "BIND_BUSI_SCRIPT_CODE") + @ApiParam(value = "绑定业务脚本Code") + private String bindBusiScriptCode; + @Transient @ApiParam(value = "适配器套件明细") private Object bsSuitCaseDetail; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 957bd5e..d67c241 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -133,6 +133,10 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "处理时间") private String processTime; + @Column(name = "SCRIPT_RESULT") + @ApiParam(value = "脚本结果") + private String scriptResult; + @Transient @ApiParam(value = "适配记录参数") private List bsSuitRecordParamList; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java index 81ae451..6ba934f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.List; /** * @Description : 请求适配记录 @@ -46,10 +47,12 @@ public class BsSuitRequestRecord extends BaseBean { private Integer requestSource; // 移动至记录数据表 - @Lob @Column(name = "REQUEST_ORGIN_PARAM") @ApiParam(value = "请求原始参数") private String requestOrginParam; + @Transient + @ApiParam(value = "id-查询条件") + private List searchIdList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java new file mode 100644 index 0000000..99401ba --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsBusiScript; + +/** + * @Description : 业务脚本 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-07-28 15:13 + * @Modify: + **/ +public interface BsBusiScriptRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 28aa126..cfa357f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -261,7 +261,7 @@ public class SoftSwitchHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); return ddlPackBean; } @@ -323,6 +323,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitRecord.getScriptResult(),"scriptResult",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); @@ -367,6 +368,7 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlBsSuitRequestRecord(BsSuitRequestRecord bsSuitRequestRecord){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsSuitRequestRecord); + DdlPreparedPack.getInPackList(bsSuitRequestRecord.getSearchIdList(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRequestRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRequestRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); @@ -416,7 +418,16 @@ public class SoftSwitchHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsLongData); DdlPreparedPack.timeBuilder(bsLongData.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); DdlPreparedPack.getNumEqualPack(bsLongData.getRefDataType(),"refDataType",ddlPackBean); - DdlPreparedPack.getStringLikePack(bsLongData.getData(),"data",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsLongData.getData(),"data",ddlPackBean); + return ddlPackBean; + } + + public static DdlPackBean packHqlBsBusiScript(BsBusiScript bsBusiScript){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsBusiScript); + DdlPreparedPack.getStringLikerPack(bsBusiScript.getScriptName(),"scriptName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsBusiScript.getScriptCode(),"scriptCode",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsBusiScript.getScriptType(),"scriptType",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsBusiScript.getRefId(),"refId",ddlPackBean); return ddlPackBean; } } From 26fe63eb8aee2118dfa76edc02c286ba8a028005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 3 Aug 2020 20:40:57 +0800 Subject: [PATCH 45/58] =?UTF-8?q?=E3=80=9010278=2019048-=E6=80=BB=E8=A3=85?= =?UTF-8?q?=E6=A0=87=E8=AE=B0=E4=B8=8D=E8=89=AF=E5=8A=9F=E8=83=BD=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E5=A4=96=E9=83=A8=E8=BE=93=E5=85=A5=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=A0=87=E8=AE=B0=E4=B8=8D=E8=89=AF-2020-08-03=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 677525f..f6b8df1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -290,6 +290,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("客户集合") private List custList; + @Transient + @ApiParam("工位完成数量") + private Integer stationCompleteQty = 0; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From b928acae4752699f1c4a2d71f0f9a4abcde7b594 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Mon, 3 Aug 2020 21:03:28 +0800 Subject: [PATCH 46/58] =?UTF-8?q?1.=20=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=B0=E5=BD=95=E7=BB=84=E4=BB=B6=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E8=80=97=E6=97=B6=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsActionCallResult.java | 24 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsActionLog.java | 4 ++++ .../i3plus/pojo/wms/bean/WmsActionLogData.java | 4 ++++ .../i3plus/pojo/wms/bean/WmsActionLogDetails.java | 5 +++++ 4 files changed, 37 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionCallResult.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionCallResult.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionCallResult.java new file mode 100644 index 0000000..aef56f0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionCallResult.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import lombok.Data; + +/** + * @Description : 调用流程处理组件时的返回对象 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-08-03 20:54 + * @Modify: + **/ +@Data +public class WmsActionCallResult { + private Object resultObj; + /** + * 执行耗时，单位 ms + */ + private Integer duration; + + public WmsActionCallResult(Object resultObj, Integer duration) { + this.resultObj = resultObj; + this.duration = duration; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java index 4b8e558..ea59343 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java @@ -124,6 +124,10 @@ public class WmsActionLog extends BaseBean { @ApiParam(value = "结束组件编号", example = "0") public Long endAmId; + @Column(name = "DURATION") + @ApiParam(value = "执行耗时，单位：毫秒", example = "0") + public Integer duration = 0; + public Long getInitAmId() { if (initAmId != null) { return initAmId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java index b96ae52..da9a121 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java @@ -78,4 +78,8 @@ public class WmsActionLogData extends BaseBean { @Column(name = "ERROR_MSG", columnDefinition = "TEXT") @ApiParam(value = "异常信息") private String errorMsg; + + @Column(name = "DURATION") + @ApiParam(value = "执行耗时，单位：毫秒", example = "0") + public Integer duration = 0; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index facb1fc..a4d878e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -116,6 +116,11 @@ public class WmsActionLogDetails extends BaseBean { @Column(name="MOVE_NO") @ApiParam(value = "移动单单号") public String moveNo; + + @Column(name = "DURATION") + @ApiParam(value = "执行耗时，单位：毫秒", example = "0") + public Integer duration = 0; + public Long getAsId() { if (asId != null) { return asId.longValue(); From 4c9cdcb6a03124ea397015e2ecb6f1498a86c387 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 3 Aug 2020 21:24:38 +0800 Subject: [PATCH 47/58] tmp --- .../i3plus/pojo/mes/bean/MesHncAgvRunning.java | 50 ++++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++ .../mes/repository/MesHncAgvRunningRepository.java | 12 ++++++ 3 files changed, 66 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java new file mode 100644 index 0000000..ca6cde8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/8/3 17:51 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_HNC_AGV_RUNNING") +@Api("延锋海纳川agv运行状态表") +public class MesHncAgvRunning extends BaseBean implements Serializable { + private static final long serialVersionUID = 4293079676019967513L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "TIME_OUT") + @ApiParam("倒计时超时") + private Integer timeOut; + + @Column(name = "DELAY_HELP") + @ApiParam("延时帮助") + private Integer delayHelp; + + @Column(name = "EMERGENCY_STOP") + @ApiParam("紧急停止") + private Integer emergencyStop; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 6cf3353..d43d5af 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -86,6 +86,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("PLC配置") private String plcCfg; + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + private String busiType; + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.java new file mode 100644 index 0000000..f1d8b5a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesHncAgvRunning; + +/** + * @author Wynne.Lu + * @date 2020/8/3 17:54 + * @desc + */ +public interface MesHncAgvRunningRepository extends BaseRepository { +} From 0b3c53b4cace325c8f6c678290bf7ab25104090b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 3 Aug 2020 21:39:21 +0800 Subject: [PATCH 48/58] =?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/mes/model/TorqueReviewModel.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java new file mode 100644 index 0000000..7c44153 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class TorqueReviewModel { + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("枪类型") + private String gunType; + + @ApiParam("检测结果") + private String checkResult; + +} From 33cace48ab7f52a9c9096d757025a6b0120bce1b Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 4 Aug 2020 10:00:31 +0800 Subject: [PATCH 49/58] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 62c4058..e566905 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -180,6 +180,9 @@ public class StationRequestBean implements Serializable { @ApiParam("班次名称") private String shiftName; + @ApiParam("创建时间") + private String createDatetime; + @Override public String toString() { return "StationRequestBean{" + From f368ec88ccb944fb8201ed9949f19915c19ebaca Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 4 Aug 2020 18:23:17 +0800 Subject: [PATCH 50/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6=E7=BB=84=E4=BB=B6=E8=B0=83=E7=94=A8=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsActionLogData.java | 60 ++++++++++++++-------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java index da9a121..1ca730c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java @@ -11,10 +11,7 @@ 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 javax.persistence.*; /** * @Description :作业记录参数表 @@ -33,14 +30,41 @@ import javax.persistence.Table; public class WmsActionLogData extends BaseBean { private static final long serialVersionUID = -8150713013135101134L; - @Column(name = "ALD_ID") - @ApiParam(value = "记录明细编号") + + @Column(name = "TASK_NO") + @ApiParam(value = "作业任务编号", example = "1") + @JsonSerialize(using = ToStringSerializer.class) + public String taskNo; + + @Column(name = "TRANS_TYPE_CODE") + @ApiParam(value = "交易类型编号") + public String transTypeCode; + + @Transient + @Column(name = "MOVE_NO") + @ApiParam(value = "移动单单号") + public String moveNo; + + @Column(name = "AG_ID") + @ApiParam(value = "作业流程编号", example = "1") @JsonSerialize(using = ToStringSerializer.class) - private Long aldId; + public Long agId; - @Column(name = "ALD_SEQ") - @ApiParam(value = "步骤序号") - private Integer aldSeq; + @Column(name = "AL_NAME_RDD") + @ApiParam(value = "流程名称") + public String agNameRdd; + + @Column(name = "ACTION_USER_NAME") + @ApiParam(value = "作业人员") + public String actionUserName; + + @Column(name = "FIX_NO") + @ApiParam(value = "设备编号") + public String fixNo; + + @Column(name = "AGD_SEQ") + @ApiParam(value = "作业步骤序号") + private Integer agdSeq; @Column(name = "CALL_CLASS") @ApiParam(value = "实现类") @@ -54,21 +78,17 @@ public class WmsActionLogData extends BaseBean { @ApiParam(value = "执行状态") private Integer executeStatus; - @Column(name = "START_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="开始执行时间",example = "2000-01-01 01:00:00") - private String startTime; - - @Column(name = "END_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00") - private String endTime; - + /** + * 保存调用组件时的 params + */ @Lob @Column(name = "IN_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输入参数") private String inParams; + /** + * 保存调用组件后的返回值 + */ @Lob @Column(name = "OUT_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输出参数") From 8bc0da924c159a3952a69e9cb829066003218b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 4 Aug 2020 19:43:41 +0800 Subject: [PATCH 51/58] =?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 --- .../main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java | 3 +++ .../java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java | 6 +++++- 3 files changed, 14 insertions(+), 1 deletion(-) 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 36f5cb9..843eb9c 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 @@ -31,4 +31,10 @@ public class DataReviewModel { @ApiParam("是否合格") private String reviewResult; + @ApiParam("关键件颜色") + private String keyPartColor; + + @ApiParam("生产数据颜色") + private String prodDataColor; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java index 7c44153..e29550d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java @@ -18,4 +18,7 @@ public class TorqueReviewModel { @ApiParam("检测结果") private String checkResult; + @ApiParam("显示颜色") + private String showColor; + } 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 d5f7f23..9d94855 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 @@ -142,6 +142,9 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("防错码") private String pokeYokeFix; + @ApiParam("防错码长度") + private String pokeYokeLength; + private Map psets = new LinkedHashMap<>(); public TorqueCollectionModel(String vinCode) { @@ -207,7 +210,7 @@ public class TorqueCollectionModel implements Serializable { public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer pset1, Integer pset2, Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8, - Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix) { + Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix, String pokeYokeLength) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -226,6 +229,7 @@ public class TorqueCollectionModel implements Serializable { this.sendSeq = sendSeq; this.checkScanCount = checkScanCount; this.pokeYokeFix = pokeYokeFix; + this.pokeYokeLength = pokeYokeLength; assemblePsets(); } From a01cd4d34bdb94ba8ae8d5e0edb69de95046bf7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 4 Aug 2020 19:49:46 +0800 Subject: [PATCH 52/58] =?UTF-8?q?=E3=80=90=E6=B3=A8=E5=A1=91=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index f6b8df1..1e81a07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -294,6 +294,10 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("工位完成数量") private Integer stationCompleteQty = 0; + @Transient + @ApiParam("客户物料号") + private String customerPartNo; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java index d5d2d97..834aedf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java @@ -70,4 +70,8 @@ public class ZzMesWorkOrderModel extends BaseBean { @AnnoOutputColumn(required = false) private String mouldCodeList; + @ApiParam("工作中心名称") + @AnnoOutputColumn(required = false) + private String workCenterName; + } From 5739ac27bb64088bd52d83c709b50dca2d7fdf07 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 4 Aug 2020 20:09:02 +0800 Subject: [PATCH 53/58] =?UTF-8?q?=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java | 4 ++++ .../i3plus/pojo/mes/bean/{template => }/MesWorkCellDefect.java | 10 +++++++++- .../pojo/mes/repository/MesWorkCellDefectRepository.java | 2 +- .../pojo/mes/repository/MesWorkCellDefectsRepository.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 6 files changed, 20 insertions(+), 4 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{template => }/MesWorkCellDefect.java (85%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index a4a2dca..c7cdeb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -61,6 +61,10 @@ public class MesDefect extends BaseBean implements Serializable { private String defectLocation; @Transient + @ApiParam("颜色值") + private String colorValue; + + @Transient @ApiParam("缺陷类型子集") private List mesDefectList; public MesDefect() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index 9f87ea7..3b1c38e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -45,4 +45,8 @@ public class MesTypeCfg extends BaseBean implements Serializable { @Column(name = "BUSINESS_TYPE_NAME") @ApiParam("业务类型名称") private String businessTypeName; + + @Column(name = "COLOR_VALUE") + @ApiParam("颜色值") + private String colorValue; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java similarity index 85% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java index 025ae54..25ac166 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.bean.template; +package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -47,6 +47,14 @@ public class MesWorkCellDefect extends BaseBean implements Serializable { @ApiParam("物料集") private String partAssemble; + @Column(name = "AREA_CODE") + @ApiParam("物料集") + private String areaCode; + + @Column(name = "DEFECT_TYPE") + @ApiParam("缺陷类型") + private String defectType; + @Transient @ApiParam("缺陷名称") private String defectCodeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java index 43b09f2..6cf2246 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import org.springframework.stereotype.Repository; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java index be056c0..ad54293 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import org.springframework.stereotype.Repository; /** * @Description: diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index cd30d03..d0caed6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -9,7 +9,7 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; -import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; From d5d16569bbbc4a9d0d8732d4311f0a4cb8014ae5 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 5 Aug 2020 10:40:08 +0800 Subject: [PATCH 54/58] =?UTF-8?q?Fix=20bug#10283=2020089+=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E7=A7=BB=E5=8A=A8=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 0c358df..35a819c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -163,6 +163,10 @@ public class WmsMoveMaster extends BaseBean { private String snapshotTime; @Transient + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Transient private Integer isSnapshot; @Transient From 59a1acdafcd720701ed5761d67557f9555dc789f Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 5 Aug 2020 10:58:33 +0800 Subject: [PATCH 55/58] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- sonar-project.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 86c2074..98a1d3f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2614,7 +2614,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsActionLogByActionLogData(WmsActionLogData actionLogData) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(actionLogData.getAldId(), "aldId", packBean); + //DdlPreparedPack.getNumEqualPack(actionLogData.getAldId(), "aldId", packBean); DdlPreparedPack.getStringEqualPack(actionLogData.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getNumEqualPack(actionLogData.getIsValid(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(actionLogData.getIsDeleted(), "isDeleted", packBean); diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..ae014e9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 39f6819e9b9b1ee00670196cc43018b2d1c699ce Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 5 Aug 2020 11:07:12 +0800 Subject: [PATCH 56/58] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 8ef99a3..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a6c1bea..d2521de 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0a2f9d4..b599490 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 5f809e6..aca1465 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 557548a..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 8778b3c..a6a0d68 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 34a7337..04b40d4 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 670eb15..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ce2dc01..ac387fd 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index b8c9643..bbe0ff9 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 1d29933..be533a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 284225c..14e8567 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 7ff16c9..102ab0e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 353a02b..864c56a 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index b125cee..e755225 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index c9d54a9..194f0cb 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 39f1e2f..60543fe 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index df01041..bdc4cab 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c2104bf..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index ae014e9..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-PROD-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 067a859e83489e041748378a116013dcd7960760 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 5 Aug 2020 11:28:28 +0800 Subject: [PATCH 57/58] =?UTF-8?q?=E3=80=9010229=2019081--=20=E5=9C=A8?= =?UTF-8?q?=E5=B7=B2=E6=9C=89=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=8A=A5=E5=B7=A5=E9=80=BB=E8=BE=91=E4=B8=8A=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E5=8E=9F=E6=9D=90=E6=96=99=E6=89=A3=E5=87=8F=E9=80=BB?= =?UTF-8?q?=E8=BE=91=20--20200802=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) 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 4b8e041..67ddf69 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 @@ -80,7 +80,6 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("条码") public String sn; - /** * 质检状态:1=未质检,10=质检中,20=质检合格, * 30=质检不合格,40=已退货 @@ -117,6 +116,10 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; + @Column(name = "LOT_NO", nullable = false) + @ApiParam("收货批次") + public String lotNo = ""; + @Transient @ApiParam(value = "实盘数量", example = "1") @AnnoOutputColumn(hidden = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 7bea734..3a6c6f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -47,6 +48,10 @@ public class WmsCSRange extends BaseBean { @ApiParam("物料名称") public String partNameRdd; + @Column(name = "WH_NO") + @ApiParam("仓库代码") + public String whNo; + @Column(name = "ZONE_NO") @ApiParam("存储区编号") public String zoneNo; @@ -64,6 +69,15 @@ public class WmsCSRange extends BaseBean { @ApiParam("原单号") public String srcOrderNo; + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "库存数量", example = "0") + public Double qty; + + @Column(name = "LOT_NO", nullable = false) + @ApiParam("收货批次") + public String lotNo = ""; + @Transient @ApiParam("存储区编号组") @AnnoOutputColumn(hidden = true) From fa4b1e09aae287d40ebd09210ac82cd082c18dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 5 Aug 2020 14:47:24 +0800 Subject: [PATCH 58/58] =?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 --- .../java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 9d94855..974c7e4 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 @@ -170,7 +170,7 @@ public class TorqueCollectionModel implements Serializable { public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq, Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount, - String pokeYokeFix) { + String pokeYokeFix, String pokeYokeLength) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -186,6 +186,7 @@ public class TorqueCollectionModel implements Serializable { this.isPf = isPf; this.qualifiedCount = qualifiedCount; this.pokeYokeFix = pokeYokeFix; + this.pokeYokeLength = pokeYokeLength; } /**