From 9e64ee8258543b8d31c2a18feb2835e71bf12044 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 26 Nov 2019 09:14:30 +0800 Subject: [PATCH 01/37] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1221?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 15 ++++++++++++++- .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 21 +++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 3 files changed, 38 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 bd6cc87..5821577 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 @@ -629,6 +629,16 @@ public class MesEnumUtil { } 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; + } } /** @@ -1285,7 +1295,10 @@ public class MesEnumUtil { MES_PCN_SYNC_CFG(50, "PCN同步配置"), MES_PART(60, "物料表"), MES_PRODUCE_CATEGORY(70, "产品类型"), - MES_PACK_SPEC(80, "包装规格"); + MES_PACK_SPEC(80, "包装规格"), + MES_PROD_PACK(90, "产品包装关系"), + MES_PRODUCT_ENCODE_CFG(100, "产品编码配置"), + MES_BOM(110, "物料清单"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index a55e442..8b6ac75 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -350,4 +350,25 @@ public class MesHqlPack { } + /** + * MES班组信息查询条件封装 + * + * @param shiftGroup + * @param organizeCode + * @return + */ + public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) { + + DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode); + if (!StringUtils.isEmpty(shiftGroup.getGroupCode())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean); + } + if (!StringUtils.isEmpty(shiftGroup.getGroupName())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean); + } + if (!StringUtils.isEmpty(shiftGroup.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } } 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 d614b27..d125255 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 @@ -365,6 +365,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(shiftGroup.getGroupName())) { DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean); } + if (!StringUtils.isEmpty(shiftGroup.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getWorkCenterCode(), "workCenterCode", packBean); + } return packBean; } From 74224b20acf9b0a41e4db7ff99dca1fe258fc25c Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 26 Nov 2019 13:39:18 +0800 Subject: [PATCH 02/37] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=B8=BB=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonCellGroupCfg.java | 18 +++++- .../i3plus/pojo/andon/bean/AndonManageQueue.java | 4 ++ .../i3plus/pojo/andon/model/AndonBoardModel.java | 44 +++++++++++++ .../pojo/andon/model/AndonMenuInterfaceModel.java | 75 ++++++++++++++++++++++ .../pojo/andon/model/CellGroupStatusModel.java | 55 ++++++++++++++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 46 +++++++++++++ 6 files changed, 241 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java index d9d47c3..c194faf 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.Interceptor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -41,7 +42,6 @@ public class AndonCellGroupCfg extends BaseBean { @ApiParam(value = "工作单元组") private String cellGroup; - @Column(name = "GROUP_CODE") @ApiParam(value = "分组代码") private String groupCode; @@ -49,4 +49,20 @@ public class AndonCellGroupCfg extends BaseBean { @Column(name = "GROUP_NAME") @ApiParam(value = "分组名称") private String groupName; + + @Column(name = "HORIZONTAL_AXIS") + @ApiParam(value = "横坐标") + private Float horizontalAxis ; + + @Column(name = "VERTICAL_AXIS") + @ApiParam(value = "纵坐标") + private Float verticalAxis; + + @Column(name = "ABNORMAL_SRC") + @ApiParam(value = "异常图片") + private String abnormalSrc; + + @Column(name = "NORMAL_SRC") + @ApiParam(value = "正常图片") + private String normalSrc; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 82ff8c5..ea05280 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -111,6 +111,10 @@ public class AndonManageQueue extends BaseManageQueue { private Double avgSignTime; @Transient + @ApiParam(value = "解决时长", example = "0") + private Long resolveTime; + + @Transient @ApiParam(value = "平均解决时长", example = "0") private Double avgResolveTime; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index cee23af..608849c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -15,12 +15,30 @@ import java.io.Serializable; @Data public class AndonBoardModel { + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("安灯任务编号") + private String andonOrderNo; + @ApiParam("安灯类型") private String alarmCode; @ApiParam("安灯类型名称") private String alarmName; + @ApiParam("故障时长 单位：分钟") + private Long exceptionTimeCount; + + @ApiParam("响应时长 单位：分钟") + private Long responseTimeCount; + + @ApiParam("解决时长 单位：分钟") + private Long resetTimeCount; + @ApiParam("安灯正常处理的次数") private Integer inTime; @@ -30,6 +48,19 @@ public class AndonBoardModel { @ApiParam("安灯总次数") private Integer totalTime; + @ApiParam("安灯类型百分比") + private float propagation; + + @ApiParam("事件描述代码") + private String acCode; + + @ApiParam("事件描述详情") + private String acDesc; + + @ApiParam("工位运行状态") + private String cellStatus; + + public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; } @@ -42,5 +73,18 @@ public class AndonBoardModel { return inTime == null ? 0 : inTime; } + public double getExceptionCountVal() { + return exceptionTimeCount == null ? 0 : exceptionTimeCount; + } + + public double getResponseTimeCountVal() { + return responseTimeCount == null ? 0 : responseTimeCount; + } + + public double getResetTimeCountVal() { + return resetTimeCount == null ? 0 : resetTimeCount; + } + + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java new file mode 100644 index 0000000..adaea75 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 安灯主界面Model + * @Reference: + * @Author: Crish + * @CreateDate:2019-11-22-13:44 + * @Modify: + **/ +@Data +public class AndonMenuInterfaceModel{ + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("产线运行状态") + private String workCenterStatus; + + @ApiParam("安灯类型") + private String alarmCode; + + @ApiParam("安灯类型名称") + private String alarmName; + + @ApiParam("故障总时长 单位：分钟") + private Long exceptionTime; + + @ApiParam("当前安灯类型故障时长 单位：分钟") + private Long currentExceptionTime; + + @ApiParam("当前安灯类型故障比例") + private Double proportion; + + @ApiParam("当前工厂的产线故障统计") + private List andonWorkcenterList; + + @ApiParam("当前产线的所有故障统计") + private List alarmBrokenInfoList; + + @ApiParam("当前产线的未解决故障统计") + private List pendingSolveBrokenInfoList; + + @ApiParam("当前产线的响应时长top10") + private List responseInfoList; + + @ApiParam("当前产线的解决时长top10") + private List solveInfoList; + + @ApiParam("当前产线的异常时长top10") + private List exceptionInfoList; + + @ApiParam("当前产线的站点状态统计") + private List andonCellGroupStatusList; + + public double getExceptionTimeVal() { + return exceptionTime == null ? 0 : exceptionTime; + } + + public double getCurrentExceptionTimeVal() { + return currentExceptionTime == null ? 0 : currentExceptionTime; + } + + public double getProportionVal() { + return proportion == null ? 0 : proportion; + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java new file mode 100644 index 0000000..d5ac0ff --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.andon.model; + +/** + * @Description: 站点统计分组model + * @Reference: + * @Author: Crish + * @CreateDate:2019-11-22-16:02 + * @Modify: + **/ + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import java.util.List; + +/** + * 工位分组配置model + */ +@Data +public class CellGroupStatusModel{ + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("安灯类型") + private String groupCode; + + @ApiParam("安灯类型名称") + private String groupName; + + @ApiParam("安灯类型名称") + private String workCellCode; + + @ApiParam("安灯类型名称") + private String workCellName; + + @ApiParam("站点运行状态") + private String cellGroupStatus; + + @ApiParam(value = "横坐标") + private Float horizontalAxis ; + + @ApiParam(value = "纵坐标") + private Float verticalAxis; + + @ApiParam(value = "异常图片") + private String abnormalSrc; + + @ApiParam(value = "正常图片") + private String normalSrc; + + @ApiParam("当前站点下的工位故障统计") + private List andonBoardModelList; +} 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 6b88127..afcbeff 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 @@ -13,6 +13,52 @@ import org.apache.commons.lang3.StringUtils; public class AndonEnumUtil { /** + * 安灯主界面产线或者站点运行状态 + * 正常 = 10，故障 = 20 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RUNNING_STATUS{ + RUNNING("10","正常"), + STOP("20","故障"); + + private String value; + private String description; + + RUNNING_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value,val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * 安灯配置表分组列枚举 * 10-是，20-否 */ From e8274624268191560a9eab0dbe933429417ced06 Mon Sep 17 00:00:00 2001 From: gcj Date: Tue, 26 Nov 2019 15:21:51 +0800 Subject: [PATCH 03/37] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java | 4 ++++ 2 files changed, 7 insertions(+) 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 591b77b..5703187 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 @@ -147,6 +147,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("目的库存地代码") public String destAreaNo; + @Column(name = "LOT_NO") + @ApiParam("批次") + public String lotNo; @Transient @ApiParam("实际批次") private String actualLot; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java index 3d90a3d..042c111 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java @@ -42,6 +42,10 @@ public class WmsVendorPart extends BaseBean { @ApiParam(value = "供应商物料号") private String vendorPartNo; + @Column(name = "MAX_AMOUNT") + @ApiParam(value = "供应商月提供最大数量") + private Double maxAmount; + @Transient @ApiParam("物料名称") private String partName; From d0e6d30a9ebaf7083bfc89a46c95e17a30178607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 26 Nov 2019 15:54:42 +0800 Subject: [PATCH 04/37] =?UTF-8?q?#6639=20=E3=80=90VDA=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=A2=86=E6=96=99-FIFO=E8=B7=B3=E8=BF=87-=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java | 4 ---- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java index 6af3b68..c9a988d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java @@ -69,10 +69,6 @@ public class PrintOrderDataModel implements Serializable { @Transient public String vendorEmail; - @ApiParam(value = "标题") - @Transient - public String title; - public int getBusiDataType() { if (busiDataType != null) { return busiDataType.intValue(); 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 8ea05e4..fc098a8 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 @@ -175,6 +175,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("物料编号") public String partNo; + @ApiParam(value = "标题") + @Transient + public String title; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } From d4f963ee70eb10d7e3f1119ac170c35711f10e73 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 26 Nov 2019 18:05:05 +0800 Subject: [PATCH 05/37] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java | 12 +++++++++--- .../estsh/i3plus/pojo/aps/model/StatisticReportReponse.java | 13 +++++++++++++ .../cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 1 - 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java index aa9b938..7116296 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java @@ -1,7 +1,10 @@ package cn.estsh.i3plus.pojo.aps.model; -import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.annotations.Api; import lombok.Data; @@ -16,9 +19,12 @@ import java.util.Date; **/ @Data @Api("报表分页查询参数") -public class ReportPager extends Pager { - private String filter; // 物料筛选条件 +public class ReportPager extends APSPager { + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) private Date begin; // 统计开始时间 + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) private Date end; // 统计结束时间 private ApsEnumUtil.MATERIAL_REPORT_TYPE type; private ApsEnumUtil.REPORT_TIME_SPAN span; // 统计时间间隔 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java new file mode 100644 index 0000000..91a36ab --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Data +public class StatisticReportReponse { + private List headers = new ArrayList<>(); + private List> datas = new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 1f6c237..f1c1054 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -84,7 +84,6 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MATERIAL_REPORT_TYPE { - PRODUCE("PRODUCE", "生产"), PURCHASE("PURCHASE", "采购"), INVENTORY("INVENTORY", "库存"); From 06e969af1b050b3d629aeb0eb64b4f61cbdbd8e1 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 26 Nov 2019 18:22:16 +0800 Subject: [PATCH 06/37] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=B8=BB=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/model/AndonMenuInterfaceModel.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java index adaea75..7903dc6 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java @@ -47,7 +47,7 @@ public class AndonMenuInterfaceModel{ private List alarmBrokenInfoList; @ApiParam("当前产线的未解决故障统计") - private List pendingSolveBrokenInfoList; + private List pendingSolveBrokenInfoList; @ApiParam("当前产线的响应时长top10") private List responseInfoList; @@ -72,4 +72,18 @@ public class AndonMenuInterfaceModel{ public double getProportionVal() { return proportion == null ? 0 : proportion; } + + @Override + public String toString() { + return "AndonMenuInterfaceModel{" + + "workCenterCode='" + workCenterCode + '\'' + + ", workCenterName='" + workCenterName + '\'' + + ", workCenterStatus='" + workCenterStatus + '\'' + + ", alarmCode='" + alarmCode + '\'' + + ", alarmName='" + alarmName + '\'' + + ", exceptionTime=" + exceptionTime + + ", currentExceptionTime=" + currentExceptionTime + + ", proportion=" + proportion + + '}'; + } } \ No newline at end of file From cba2cda2d4df825453430d7afcb0ffa304c9bd6e Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 26 Nov 2019 20:08:16 +0800 Subject: [PATCH 07/37] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=B8=BB=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E8=B5=8B=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java | 14 +++++++------- .../i3plus/pojo/andon/model/AndonMenuInterfaceModel.java | 6 +++--- .../i3plus/pojo/andon/model/CellGroupStatusModel.java | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index 608849c..819fdd7 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -31,25 +31,25 @@ public class AndonBoardModel { private String alarmName; @ApiParam("故障时长 单位：分钟") - private Long exceptionTimeCount; + private Long exceptionTimeCount = 0L; @ApiParam("响应时长 单位：分钟") - private Long responseTimeCount; + private Long responseTimeCount = 0L; @ApiParam("解决时长 单位：分钟") - private Long resetTimeCount; + private Long resetTimeCount = 0L; @ApiParam("安灯正常处理的次数") - private Integer inTime; + private Integer inTime = 0; @ApiParam("安灯超时次数") - private Integer overTime; + private Integer overTime = 0; @ApiParam("安灯总次数") - private Integer totalTime; + private Integer totalTime = 0; @ApiParam("安灯类型百分比") - private float propagation; + private float propagation = 0; @ApiParam("事件描述代码") private String acCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java index 7903dc6..cad9398 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java @@ -32,13 +32,13 @@ public class AndonMenuInterfaceModel{ private String alarmName; @ApiParam("故障总时长 单位：分钟") - private Long exceptionTime; + private Long exceptionTime = 0L; @ApiParam("当前安灯类型故障时长 单位：分钟") - private Long currentExceptionTime; + private Long currentExceptionTime = 0L; @ApiParam("当前安灯类型故障比例") - private Double proportion; + private Double proportion = 0D; @ApiParam("当前工厂的产线故障统计") private List andonWorkcenterList; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java index d5ac0ff..42af00f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java @@ -39,10 +39,10 @@ public class CellGroupStatusModel{ private String cellGroupStatus; @ApiParam(value = "横坐标") - private Float horizontalAxis ; + private Float horizontalAxis = 0f; @ApiParam(value = "纵坐标") - private Float verticalAxis; + private Float verticalAxis = 0f; @ApiParam(value = "异常图片") private String abnormalSrc; From 1d66ce2612827aab73bccbe544c68b184de1c7a4 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 26 Nov 2019 20:52:35 +0800 Subject: [PATCH 08/37] =?UTF-8?q?=E3=80=90VDA=E6=8E=A8=E8=8D=90=E5=85=A5?= =?UTF-8?q?=E5=BA=93-=E5=85=A5=E5=BA=93=E6=88=90=E5=8A=9F-=E6=97=A0?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BF=A1=E6=81=AF=E3=80=91bug6645?= 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 | 1 + 1 file changed, 1 insertion(+) 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 d94d784..9b00052 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 @@ -228,6 +228,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result); if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){ ArrayList numList = new ArrayList<>(); numList.add(0); From 6959d126a03b686f997cc9a658db05452fc6f51e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 26 Nov 2019 20:53:10 +0800 Subject: [PATCH 09/37] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 29 +++++++++++++++++++++- 1 file changed, 28 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 5821577..23cb6b4 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 @@ -1298,7 +1298,14 @@ public class MesEnumUtil { MES_PACK_SPEC(80, "包装规格"), MES_PROD_PACK(90, "产品包装关系"), MES_PRODUCT_ENCODE_CFG(100, "产品编码配置"), - MES_BOM(110, "物料清单"); + MES_BOM(110, "物料清单"), + MES_PROD_CFG_TYPE(120, "产品配置类型"), + MES_CUSTOMER(130, "客户表"), + MES_CUSTOMER_PART(140, "客户零件关系表"), + MES_WORK_CENTER(150, "生产线"), + MES_WORK_CELL(160, "工位"), + MES_WC_EQUIPMENT(170, "工位设备关系表"), + MES_SHIFT(180, "班次"); private int value; private String description; @@ -1544,6 +1551,16 @@ public class MesEnumUtil { 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; + } + } /** @@ -3452,6 +3469,16 @@ public class MesEnumUtil { } return tmp; } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } } } From 3faa679cf91552fb95f7efad4a326372c9fb2b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 27 Nov 2019 11:42:19 +0800 Subject: [PATCH 10/37] =?UTF-8?q?Job=E6=B5=8B=E8=AF=95=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=B5=84=E6=BA=90=E5=88=9D=E5=A7=8B=E5=8C=96=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=EF=BC=88=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=EF=BC=89=20=E5=BC=82=E5=B8=B8=E6=97=A5=E5=BF=97=E6=8C=81?= =?UTF-8?q?=E4=B9=85=E5=8C=96bug=20OPC=E6=9C=8D=E5=8A=A1=20MQ=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 49 ++++++++++++++++++---- .../i3plus/pojo/lac/bean/LacCommandOperate.java | 9 ++-- .../pojo/platform/bean/SysLocaleResource.java | 10 ++++- .../pojo/platform/platbean/SysLogTaskTime.java | 8 +++- 4 files changed, 64 insertions(+), 12 deletions(-) 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 709d90a..4a5197c 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 @@ -110,6 +110,24 @@ public class CommonEnumUtil { } return null; } + public static int descriptionOfValue(String desc) { + int tmp = IMPP.value; + for (int i = 0; i < values().length; i++) { + if (values()[i].name().equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + public static int descOf(String desc) { + int tmp = IMPP.value; + for (int i = 0; i < values().length; i++) { + if (values()[i].name().equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -218,13 +236,15 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_LOCALE_RESOURCE_TYPE { - COMMON(1, "通用"), - EXCEPTION(2, "异常"), - EXCEPTION_DETAIL(3, "异常明细"), - EXCEPTION_SOLUTION(4, "解决方案"), - ENUM(5, "枚举"), - MENU(10, "功能权限"), - WEB(13, "前端"); + COMMON(10, "通用"), + EXCEPTION_DETAIL(20, "异常信息"), + EXCEPTION_SOLUTION(30, "解决方案"), + ENUM(40, "枚举"), + MENU(50, "功能权限"), + WEB(60, "前端"), + SYS_CONFIG(70, "系统参数"), + SYS_DICTIONARY(80, "系统字典"), + MISSING(90, "缺失"); private int value; private String description; @@ -251,6 +271,21 @@ public class CommonEnumUtil { } return tmp; } + public static int descOf(String desc) { + int tmp = COMMON.value; + 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); + } + public static int descriptionOfValue(String val) { + return descOf(val); + } } /** diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java index 80c0b0d..178579f 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java @@ -30,10 +30,13 @@ public class LacCommandOperate { public LacCommandOperate(){} - public LacCommandOperate(Long operateObjId,LacEnumUtil.OPERATE_COMMAND operateCommand){ + public LacCommandOperate(Long operateObjId,Integer operate){ this.operateObjId = operateObjId; - this.operateCommand = operateCommand.getValue(); - this.operateObjType = operateCommand.getOperateObjType().getValue(); + LacEnumUtil.OPERATE_COMMAND operate_command = LacEnumUtil.OPERATE_COMMAND.valueOf(operate); + if(operate_command!=null) { + this.operateCommand = operate_command.getValue(); + this.operateObjType = operate_command.getOperateObjType().getValue(); + } } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 0e39670..be1fccc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -1,12 +1,12 @@ package cn.estsh.i3plus.pojo.platform.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; 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 javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; @@ -30,7 +30,9 @@ import javax.persistence.Transient; public class SysLocaleResource extends BaseBean { private static final long serialVersionUID = -2397207310100672746L; + @Column(name="resource_type") + @AnnoOutputColumn(refClass = CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.class, refForeignKey = "value", value = "description") @ApiParam(value = "资源类型",example = "1",access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE") private Integer resourceType; @@ -62,8 +64,14 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "资源Value",example = "通过resourceType，languageId和key获取") private String resourceValue; + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp") + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description",required = false) + private Integer softType; + //系统自带需要有初始化表，只能修改value，无法删除。 @Column(name="is_system") @ApiParam(value = "是否系统参数",example = "2") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer isSystem; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index cb59c67..d679862 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.platform.platbean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -9,7 +11,6 @@ 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.Index; @@ -48,6 +49,10 @@ public class SysLogTaskTime extends BaseBean { @ApiParam(value ="调度服务器端口") private String schedulerServerPort; + @Column(name="TaskThreadId") + @ApiParam(value ="任务线程id") + private String taskThreadId; + @Column(name="NAME") @ApiParam(value ="任务名称") private String name; @@ -80,6 +85,7 @@ public class SysLogTaskTime extends BaseBean { @Column(name="TASK_STATUS") @ApiParam(value ="任务完成情况(枚举：1正常，2失败)") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer taskStatus; @Column(name="TASK_LOG_ERROR") From ad0389fb13f327d5f492485a4c7216e91027def5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 27 Nov 2019 12:01:33 +0800 Subject: [PATCH 11/37] =?UTF-8?q?JOB=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index d679862..b301b3e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -51,7 +51,8 @@ public class SysLogTaskTime extends BaseBean { @Column(name="TaskThreadId") @ApiParam(value ="任务线程id") - private String taskThreadId; + @JsonSerialize(using = ToStringSerializer.class) + private Long taskThreadId; @Column(name="NAME") @ApiParam(value ="任务名称") From a0f1eab0f9f80c5d2090b85efb6d69a7f3e2e900 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 27 Nov 2019 13:04:32 +0800 Subject: [PATCH 12/37] =?UTF-8?q?Jenkins=20=E8=87=AA=E5=8A=A8=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E4=BB=A3=E7=A0=81=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java index 891996a..9bb77d3 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java @@ -16,7 +16,7 @@ import java.util.List; /** * @Description : 数据元素 - * @Reference : + * @Reference : Jenkins 自动合并代码测试 * @Author : alwaysfrin * @CreateDate : 2018-12-25 19:54 * @Modify: From 84d341aa87eee167692ddae69a10eb0cd548c6c9 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 27 Nov 2019 13:49:06 +0800 Subject: [PATCH 13/37] =?UTF-8?q?Jenkins=20=E8=87=AA=E5=8A=A8=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E4=BB=A3=E7=A0=81=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java index 9bb77d3..8662f2b 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java @@ -17,6 +17,8 @@ import java.util.List; /** * @Description : 数据元素 * @Reference : Jenkins 自动合并代码测试 + * @Reference : Jenkins 自动合并代码测试 + * @Reference : Jenkins 自动合并代码测试 * @Author : alwaysfrin * @CreateDate : 2018-12-25 19:54 * @Modify: From 987946b3eb84afb58b1d8398db3221f5f585c2cb Mon Sep 17 00:00:00 2001 From: jenkins <1677739127@qq.com> Date: Wed, 27 Nov 2019 14:17:19 +0800 Subject: [PATCH 14/37] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'pom.xml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b2c3eb..aea4d9c 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 2.9.2 - + org.projectlombok lombok From 0dddbb936c1aa5d4625ed32489a7d99eda2449a6 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 27 Nov 2019 14:36:13 +0800 Subject: [PATCH 15/37] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 15 +++++++++- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 26 +++++++--------- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 35 ---------------------- .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 3 +- .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 3 +- .../src/main/resources/relations/Work.xml | 4 ++- .../src/main/resources/relations/WorkPlan.xml | 2 -- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 1 + 8 files changed, 31 insertions(+), 58 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 5eee173..3c5303c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -149,6 +149,11 @@ public class Work extends BaseAPS { @FieldAnnotation(property = false) private Long parentWorkId; + @Column(name="MAIN_PLAN_ID") + @ApiParam(value ="主资源的工作计划") + @FieldAnnotation(property = false) + private Long mainPlanId; + public BaseOrder getOrder() { return BeanRelation.get(this, EWork.Order); } @@ -206,5 +211,13 @@ public class Work extends BaseAPS { return BeanRelation.list(this, EWork.PlanFeedbacks); } - public WorkPlan getWorkPlan() { return BeanRelation.get(this, EWork.WorkPlan); } + public WorkPlan getMainPlan() { return BeanRelation.get(this, EWork.MainPlan); } + + public void setMainPlan(WorkPlan plan) { + this.mainPlanId = plan != null ? plan.getId() : 0; + BeanRelation.set(this, EWork.MainPlan, plan); + } + + @JsonBackReference + public List getWorkPlans() { return BeanRelation.list(this, EWork.WorkPlans); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 09daae4..d63e4a4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -68,7 +68,7 @@ public class WorkPlan extends BaseAPS { @Column(name="PRODUCE_BEGIN") @ApiParam(value ="生产开始时间") @FieldAnnotation(modify = false) - @RippleAnnotation(dependence = {"Work.PrevRelations.PrevWork.WorkPlan.produceBegin", + @RippleAnnotation(dependence = {"MainWork.PrevRelations.PrevWork.MainPlan.produceBegin", "PrevPlan.produceBegin"}, method = "calcPositive") private Date produceBegin; @@ -100,7 +100,7 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") @FieldAnnotation(modify = false) - @RippleAnnotation(dependence = {"Work.PostRelations.PostWork.WorkPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock") + @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock") private Date lockBegin; @Column(name="LOCK_END") @@ -118,11 +118,6 @@ public class WorkPlan extends BaseAPS { @FieldAnnotation(property = false) private Long workResourceId; - @Column(name="MAIN_PLAN_ID") - @ApiParam(value ="主计划对象id") - @FieldAnnotation(property = false) - private Long mainPlanId; - @Column(name="FURNACE_PLAN_ID") @ApiParam(value ="炉资源计划对象id") @FieldAnnotation(property = false) @@ -149,19 +144,18 @@ public class WorkPlan extends BaseAPS { BeanRelation.set(this, EWorkPlan.WorkResource, workResource); } - public WorkPlan getMainPlan() { return BeanRelation.get(this, EWorkPlan.MainPlan); } - - public void setMainPlan(WorkPlan plan) { - this.mainPlanId = plan != null ? plan.getId() : 0l; - BeanRelation.set(this, EWorkPlan.MainPlan, plan); - } - - public List getAssPlans() { return BeanRelation.list(this, EWorkPlan.AssPlans); } - public FurnacePlan getFurnacePlan() { return BeanRelation.get(this, EWorkPlan.FurnacePlan); } public void setFurnacePlan(FurnacePlan plan) { this.furnacePlanId = plan != null ? plan.getId() : 0; BeanRelation.set(this, EWorkPlan.FurnacePlan, plan); } + + public Work getMainWork() { + return BeanRelation.get(this, EWorkPlan.MainWork); + } + + public void setMainWork(Work work) { + + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index a6aa5e5..0cd8116 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -312,10 +312,6 @@ public class BeanRelation { } } - public static void setOne(BaseBean bean, Enum holder, BaseBean relaBean) { - get(bean).get(holder).add(relaBean); - } - /** * 移除关联 * @@ -359,37 +355,6 @@ public class BeanRelation { } /** - * 删除对象 - * - * @param bean - */ -// public static void delete(BaseBean bean) { -// if (bean == null) { -// return; -// } -// BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); -// List> ownerSigns = beanInfo.getOwnerHolders(); -// for (Enum holder : ownerSigns) { -// Class relaCls = beanInfo.getRelationInfo(holder).getBeanInfo().getBeanClass(); -// List relaBeans = new ArrayList<>(list(bean, holder)); -// for (BaseBean relaBean : relaBeans) { -// //MemoryManager.delete(relaBean); -// } -// } -// -// List> normalSigns = beanInfo.getNormalSigns(); -// for (Enum holder : normalSigns) { -// Enum reverseHolder = beanInfo.getReverseHolder(holder); -// List relaBeans = new ArrayList<>(list(bean, holder)); -// for (BaseBean relaBean : relaBeans) { -// if (reverseHolder != null) { -// remove(relaBean, reverseHolder, bean); -// } -// } -// } -// } - - /** * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。 * @param bean * @param fun diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 47da0e1..240fc04 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -10,5 +10,6 @@ public enum EWork { PostRelations, // 后关联 Operation, // 工序 PlanFeedbacks, // 工作计划反馈 - WorkPlan // 关联的为主资源的计划 + MainPlan, // 关联的为主资源的计划 + WorkPlans, // 关联的工作计划 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java index 490bddc..025e156 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -2,10 +2,9 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EWorkPlan { Work, + MainWork, Resource, WorkResource, - MainPlan, // 关联的为主资源的工作计划 - AssPlans, // 关联的为副资源的工作计划 PrevPlan, PostPlan, FurnacePlan, diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index ef8abd5..7e7253e 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -12,7 +12,9 @@ - + + + diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml index 1adb280..49eb584 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -2,8 +2,6 @@ - - \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index f1c1054..f5e1d7f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -85,6 +85,7 @@ public class ApsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MATERIAL_REPORT_TYPE { PURCHASE("PURCHASE", "采购"), + PRODUCE("PRODUCE", "生产"), INVENTORY("INVENTORY", "库存"); private String value; From 26e7f975bf842e6d68af9547aa7b2b9891cba276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 27 Nov 2019 15:47:54 +0800 Subject: [PATCH 16/37] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=99=A8=E6=94=AF=E6=8C=81IN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java | 4 ++-- .../i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java | 10 +++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java index f913d0f..c629367 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java @@ -21,13 +21,13 @@ public @interface AnnoOutputColumn { public String name() default ""; // 关系对象显示的字段 - public String value() default ""; + public String value() default "description"; // 显示格式 public FORMAT format() default FORMAT.STRING; // 关联关系对象的Key - public String refForeignKey() default ""; + public String refForeignKey() default "value"; // 关系对象 public Class refClass() default Object.class; 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 fdd5391..b4f4a10 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 @@ -484,7 +484,8 @@ public class BlockSoftSwitchEnumUtil { MAP(40,"字典"), LIST(50,"列表"), JAVA_OBJECT(60,"Java Object"), - JAVA_DYNAMIC_OBJECT(61,"Java Dynamic Object"); + JAVA_DYNAMIC_OBJECT(61,"Java Dynamic Object"), + ARRAY(70,"数组"); private int value; private String description; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 772bee5..6257a7b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -1,6 +1,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 com.thoughtworks.xstream.annotations.XStreamAlias; @@ -8,13 +10,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; 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; import javax.persistence.Transient; -import java.util.List; /** * @Description : 适配器出入参 @@ -44,6 +46,7 @@ public class BsSuitCaseParam extends BaseBean { @Column(name = "PARAM_TYPE_ID") @ApiParam(value = "参数类型，枚举(出,入)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.PARAM_TYPE.class) private Integer paramTypeId; @Column(name = "PARAM_NAME") @@ -56,8 +59,13 @@ public class BsSuitCaseParam extends BaseBean { @Column(name = "PARAM_VAL_TYPE_ID") @ApiParam(value = "参数值类型") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE.class) private Integer paramValTypeId; + public int getParamValTypeIdVal() { + return paramValTypeId == null ? NumberUtils.INTEGER_MINUS_ONE : paramValTypeId.intValue(); + } + @Column(name = "PARAM_SORT") @ApiParam(value = "参数参数排序") private Integer paramSort; From 19c0c1deb514229348aca564c15404d73134613e Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 27 Nov 2019 16:31:49 +0800 Subject: [PATCH 17/37] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1211?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesPartObject.java | 4 ++ .../mes/repository/IMesPartObjectRepository.java | 14 ------- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 46 +++++++++++++++++++++- 3 files changed, 48 insertions(+), 16 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IMesPartObjectRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java index 12ae9a6..0dc5011 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java @@ -41,6 +41,10 @@ public class MesPartObject extends BaseBean { @ApiParam("物料名称") private String objectName; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + @Transient @ApiParam("产品条码") private String productSn; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IMesPartObjectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IMesPartObjectRepository.java deleted file mode 100644 index c26afa5..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IMesPartObjectRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesPartObject; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\25 15:07 - * @Modify: - **/ -public interface IMesPartObjectRepository 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 d125255..cb22a95 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 @@ -1854,8 +1854,8 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); } - if (!StringUtils.isEmpty(mesProduceSn.getWorkCellCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCellCode(), "workCellCode", packBean); + if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean); } if (mesProduceSn.getSnStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); @@ -1863,6 +1863,10 @@ public class MesHqlPack { if (mesProduceSn.getQcStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean); } + DdlPreparedPack.timeBuilder( + mesProduceSn.getCreateDateTimeStart(), + mesProduceSn.getCreateDateTimeEnd(), + "createDatetime", packBean, true); return packBean; } @@ -1889,6 +1893,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesProdBindRecord.getWorkCellCode())) { DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getWorkCellCode(), "workCellCode", packBean); } + if (!StringUtils.isEmpty(mesProdBindRecord.getLotNo())) { + DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getLotNo(), "lotNo", packBean); + } if (mesProdBindRecord.getIsBindKey() != null) { DdlPreparedPack.getNumEqualPack(mesProdBindRecord.getIsBindKey(), "isBindKey", packBean); } @@ -1992,4 +1999,39 @@ public class MesHqlPack { return packBean; } + /** + * 条码履历报表 + * @param mesProduceSnTravel + * @param organizeCode + * @return + */ + public static DdlPackBean getMesProduceSnTravel(MesProduceSnTravel mesProduceSnTravel, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSnTravel, organizeCode); + if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkOrderNo(), "workOrderNo", packBean); + } + if (!StringUtils.isEmpty(mesProduceSnTravel.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesProduceSnTravel.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getSerialNumber(), "serialNumber", packBean); + } + if (!StringUtils.isEmpty(mesProduceSnTravel.getProductSn())) { + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getProductSn(), "productSn", packBean); + } + if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCellCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCellCode(), "workCellCode", packBean); + } + if (mesProduceSnTravel.getSnStatus() != null) { + DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getSnStatus(), "snStatus", packBean); + } + if (mesProduceSnTravel.getQcStatus() != null) { + DdlPreparedPack.getNumEqualPack(mesProduceSnTravel.getQcStatus(), "qcStatus", packBean); + } + DdlPreparedPack.timeBuilder( + mesProduceSnTravel.getCreateDateTimeStart(), + mesProduceSnTravel.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + return packBean; + } } From c6ff8f109ccdd04f99d07cd4efea6ea03347fd6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 27 Nov 2019 16:58:13 +0800 Subject: [PATCH 18/37] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsFile.java | 61 ++++++++++++++++++++++ .../pojo/wms/repository/WmsFileRepository.java | 16 ++++++ 2 files changed, 77 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFileRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java new file mode 100644 index 0000000..2475688 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.wms.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 javax.persistence.UniqueConstraint; + +/** + * @Description : 附件表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-11-26 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_FILE", + uniqueConstraints = {@UniqueConstraint(columnNames = {"FILE_NAME", "REF_SRC", "REF_TYPE"})}) +@Api("附件信息") +public class WmsFile extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592712L; + @Column(name="FILE_NAME") + @ApiParam("文件名称") + private String fileName; + + @Column(name="FILE_SIZE") + @ApiParam(value = "文件大小(KB)", example = "0") + private Integer fileSize = 0; + + @Column(name="FILE_TYPE") + @ApiParam("文件类型") + private String fileType; + + @Column(name="RESOURCE_ID") + @ApiParam("资源编号") + private String resourceId; + + @Column(name="FILE_URL") + @ApiParam("下载地址") + private String fileUrl; + + @Column(name="REF_SRC") + @ApiParam("关联单据编号") + private String refSrc; + + @Column(name = "关联单据类型") + @ApiParam(value = "REF_TYPE") + private String refType; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFileRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFileRepository.java new file mode 100644 index 0000000..edcf195 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFileRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsFile; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jessica,chen + * @CreateDate : 2019-11-27 14:49 + * @Modify: + **/ +@Repository +public interface WmsFileRepository extends BaseRepository { +} From d819f7b6c72adb70f24fc9486421d50b3683587c Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 27 Nov 2019 18:04:38 +0800 Subject: [PATCH 19/37] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=88=86=E9=A1=B5=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/aps/bean/Material.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index f0bd577..b6842e5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -155,4 +155,24 @@ public class Material extends BaseCode { public List getOrders() { return BeanRelation.list(this, EMaterial.Orders); } + + @JsonBackReference + public List getSalesOrder() { + return BeanRelation.listByClass(this, SalesOrder.class, EMaterial.Orders); + } + + @JsonBackReference + public List getPurchaseOrders() { + return BeanRelation.listByClass(this, PurchaseOrder.class, EMaterial.Orders); + } + + @JsonBackReference + public List getInventories() { + return BeanRelation.listByClass(this, Inventory.class, EMaterial.Orders); + } + + @JsonBackReference + public List getProductOrders() { + return BeanRelation.listByClass(this, ProductOrder.class, EMaterial.Orders); + } } From 42d1a461a4ff52a9b0f7c70e0e7b1f0f192d8ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 27 Nov 2019 18:10:37 +0800 Subject: [PATCH 20/37] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=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/wms/bean/WmsFile.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java index 2475688..c37935e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java @@ -55,7 +55,7 @@ public class WmsFile extends BaseBean{ @ApiParam("关联单据编号") private String refSrc; - @Column(name = "关联单据类型") - @ApiParam(value = "REF_TYPE") + @Column(name = "REF_TYPE") + @ApiParam(value = "关联单据类型") private String refType; } \ No newline at end of file From d05a858bd12423c94b20c04e27dae390e6d141e3 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 27 Nov 2019 19:41:11 +0800 Subject: [PATCH 21/37] =?UTF-8?q?6565=20=E4=BF=AE=E6=94=B9fastdfs=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AE=8C=E6=88=90=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index 49f72e3..0cfa2c7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.model.mes; - import io.swagger.annotations.ApiParam; import lombok.Data; @@ -71,6 +70,10 @@ public class StationRequestBean implements Serializable { @ApiParam("托盘号") private String tray; + @ApiParam("完成数量") + private Integer finishCount; + @ApiParam("工步列表") private List stepList; + } From 7df617b290038bfc8251bf7aad0b93cbfc06c058 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 27 Nov 2019 20:07:34 +0800 Subject: [PATCH 22/37] =?UTF-8?q?=E3=80=90=E8=B4=A8=E6=A3=80=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E9=9C=80=E8=A6=81=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=8C=89=E7=85=A7ASN=E5=92=8C=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E6=98=8E=E7=BB=86=E4=B8=AD=E8=B4=A8=E4=B8=AD=E8=A6=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E3=80=91?= =?UTF-8?q?bug6651?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 7d79a3b..33ed3df 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -95,7 +95,23 @@ public class WmsQCMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isPart; + @Transient + @ApiParam(value = "零件号") + public String partNo; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } + + public WmsQCMaster () { + + } + + public WmsQCMaster (String orderNo, String vendorNo, String refType, String refSrc, String partNo) { + this.orderNo = orderNo; + this.vendorNo = vendorNo; + this.refType = refType; + this.refSrc = refSrc; + this.partNo = partNo; + } } From f038ed7234b6540ebbc68721d91ae3f8beff1a99 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 28 Nov 2019 09:16:17 +0800 Subject: [PATCH 23/37] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 51 +++++++++++++++++++++- .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 4 -- 2 files changed, 50 insertions(+), 5 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 23cb6b4..cb8dae6 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 @@ -1305,7 +1305,10 @@ public class MesEnumUtil { MES_WORK_CENTER(150, "生产线"), MES_WORK_CELL(160, "工位"), MES_WC_EQUIPMENT(170, "工位设备关系表"), - MES_SHIFT(180, "班次"); + MES_SHIFT(180, "班次"), + MES_SHIFT_GROUP(190, "班组"), + MES_WORK_CELL_PARAM_CFG(200, "工作单元参数配置"), + MES_PROCESS_BOM(210, "工序BOM表"); private int value; private String description; @@ -3481,4 +3484,50 @@ public class MesEnumUtil { } } + /** + * MesWorkCellParamCfg 工作单元参数配置 是否必须校验 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_PARAM_CFG_IS_CHECK { + + RUNNING(1, "是"), + STOPPED(2, "否"); + + private int value; + private String description; + + MES_WORK_CELL_PARAM_CFG_IS_CHECK(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/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index f41bd25..0cbb477 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -9,14 +8,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.Arrays; -import java.util.List; /** * @Description: From 55b07e8e75fbdceb5d4b742dc7569b9ed4edb5ab Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 28 Nov 2019 14:45:39 +0800 Subject: [PATCH 24/37] =?UTF-8?q?1256=20=E5=B7=A5=E5=BA=8Fbom=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=B7=A5=E4=BD=8Dbom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{MesProcessBom.java => MesStationBom.java} | 23 ++++--------- .../{ProcessBomModel.java => StationBomModel.java} | 6 ++-- ...epository.java => MesStationBomRepository.java} | 4 +-- .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 16 ++++----- .../{MesProcessBom.java => MesStationBom.java} | 23 +++---------- ...epository.java => MesStationBomRepository.java} | 4 +-- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 40 +++++++++++++++------- 7 files changed, 54 insertions(+), 62 deletions(-) rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/{MesProcessBom.java => MesStationBom.java} (91%) rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/{ProcessBomModel.java => StationBomModel.java} (78%) rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/{MesProcessBomRepository.java => MesStationBomRepository.java} (65%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{MesProcessBom.java => MesStationBom.java} (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/{MesProcessBomRepository.java => MesStationBomRepository.java} (66%) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java similarity index 91% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java index 8ac4a33..284358c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java @@ -27,9 +27,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROCESS_BOM") +@Table(name = "MES_STATION_BOM") @Api("工序物料清单") -public class MesProcessBom extends BaseBean { +public class MesStationBom extends BaseBean { @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; @@ -46,14 +46,6 @@ public class MesProcessBom extends BaseBean { @ApiParam("工作单元") private String workCellCode; - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - @Column(name = "ITEM_PART_NO") @ApiParam("子零件") private String itemPartNo; @@ -67,10 +59,6 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "子零件数量", example = "0") private Double qty; - @Transient - @ApiParam(value = "绑定数量") - private Double boundQty; - @Column(name = "IS_REPEAT") @ApiParam(value = "是否可重复") private Integer isRepeat; @@ -83,11 +71,15 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "是否投料配置") private Integer isFeed; - @Column(name = "is_BIND_KEY") + @Column(name = "IS_BIND_KEY") @ApiParam(value = "是否绑定关键件") private Integer isBindKey; @Transient + @ApiParam(value = "绑定数量") + private Double boundQty; + + @Transient @ApiParam("是否已绑定") private Boolean isBind; @@ -131,7 +123,6 @@ public class MesProcessBom extends BaseBean { public String toString() { return "MesProcessBom{" + "partNo='" + partNo + '\'' + - ", processCode='" + processCode + '\'' + ", itemPartNo='" + itemPartNo + '\'' + ", qty=" + qty + ", isRepeat=" + isRepeat + diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java similarity index 78% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java index 9708b49..e894595 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.model; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcessBom; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -16,8 +16,8 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor -@Api("工序BOM model") -public class ProcessBomModel extends MesProcessBom { +@Api("工位BOM model") +public class StationBomModel extends MesStationBom { @ApiParam("上料数量") private Long cellFeedQty; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java similarity index 65% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessBomRepository.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java index ac3d741..f5fd71f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessBomRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcessBom; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesProcessBomRepository extends BaseRepository { +public interface MesStationBomRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 8b6ac75..64e9d61 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -98,17 +98,17 @@ public class MesHqlPack { /** * 获取原材料扫描信息的对应工序BOM * - * @param mesProcessBom - * @param mesRawPartSn + * @param stationBom + * @param rawPartSn * @return */ - public static DdlPackBean getMesProcessBomRawPartSn(MesProcessBom mesProcessBom, MesRawPartSn mesRawPartSn) { - DdlPackBean packBean = getAllBaseData(mesProcessBom.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean); + public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { + DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); - DdlPreparedPack.getStringEqualPack(mesRawPartSn.getPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); return packBean; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 58f0644..233bf70 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -9,13 +9,11 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.Date; /** * @Description :工序物料清单 @@ -29,9 +27,9 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROCESS_BOM") +@Table(name = "MES_STATION_BOM") @Api("工序物料清单") -public class MesProcessBom extends BaseBean { +public class MesStationBom extends BaseBean { @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; @@ -48,15 +46,6 @@ public class MesProcessBom extends BaseBean { @ApiParam("工作单元") private String workCellCode; - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - @Column(name = "ITEM_PART_NO") @ApiParam("子零件") private String itemPartNo; @@ -69,10 +58,6 @@ public class MesProcessBom extends BaseBean { @ColumnDefault("0") @ApiParam(value = "子零件数量", example = "0") private Double qty; - - @Transient - @ApiParam(value = "绑定数量") - private Double boundQty; @Column(name = "IS_REPEAT") @ApiParam(value = "是否可重复") @@ -99,6 +84,9 @@ public class MesProcessBom extends BaseBean { @ApiParam("显示颜色") private String color; + @Transient + @ApiParam(value = "绑定数量") + private Double boundQty; public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; @@ -124,7 +112,6 @@ public class MesProcessBom extends BaseBean { public String toString() { return "MesProcessBom{" + "partNo='" + partNo + '\'' + - ", processCode='" + processCode + '\'' + ", itemPartNo='" + itemPartNo + '\'' + ", qty=" + qty + ", isRepeat=" + isRepeat + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStationBomRepository.java similarity index 66% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessBomRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStationBomRepository.java index 5be4ef2..baa7d28 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessBomRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStationBomRepository.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.MesProcessBom; +import cn.estsh.i3plus.pojo.mes.bean.MesStationBom; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesProcessBomRepository extends BaseRepository { +public interface MesStationBomRepository 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 cb22a95..23d69d6 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 @@ -746,25 +746,24 @@ public class MesHqlPack { /** * MES工序BOM信息查询条件封装 * - * @param processBom + * @param stationBom * @return */ - public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode); - DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean); - DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean); + public static DdlPackBean getStationBom(MesStationBom stationBom, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(stationBom, organizeCode); + DdlPreparedPack.getStringLikerPack(stationBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(stationBom.getItemPartNo(), "itemPartNo", packBean); return packBean; } - public static DdlPackBean getMesProcessBomExcludeById(MesProcessBom mesProcessBom, String org) { + public static DdlPackBean getStationBomExcludeById(MesStationBom stationBom, String org) { DdlPackBean packBean = getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getItemPartNo(), "itemPartNo", packBean); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean); - DdlPreparedPack.getNumEqualPack(mesProcessBom.getIsFeed(), "isFeed", packBean); - DdlPreparedPack.getNumNOEqualPack(mesProcessBom.getId(), "id", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getItemPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getNumEqualPack(stationBom.getIsFeed(), "isFeed", packBean); + DdlPreparedPack.getNumNOEqualPack(stationBom.getId(), "id", packBean); return packBean; } @@ -1621,6 +1620,7 @@ public class MesHqlPack { /** * 对象结构 + * * @param mesObjectCfg * @param organizeCode * @return @@ -1644,6 +1644,7 @@ public class MesHqlPack { /** * 数据对象 + * * @param mesDataObject * @param organizeCode * @return @@ -1667,6 +1668,7 @@ public class MesHqlPack { /** * 产品包装关系 + * * @param mesProdPack * @param organizeCode * @return @@ -1693,6 +1695,7 @@ public class MesHqlPack { /** * 产品编码配置 + * * @param mesProductEncodeCfg * @param organizeCode * @return @@ -1716,6 +1719,7 @@ public class MesHqlPack { /** * 客户订单 + * * @param mesCustOrder * @param organizeCode * @return @@ -1756,6 +1760,7 @@ public class MesHqlPack { /** * 模板配置 + * * @param mesLabelTemplate * @param organizeCode * @return @@ -1773,6 +1778,7 @@ public class MesHqlPack { /** * 关键动作 + * * @param mesKeyAction * @param organizeCode * @return @@ -1796,6 +1802,7 @@ public class MesHqlPack { /** * 动作接口配置 + * * @param mesActionIf * @param organizeCode * @return @@ -1813,6 +1820,7 @@ public class MesHqlPack { /** * 接口清单 + * * @param mesIf * @param organizeCode * @return @@ -1836,6 +1844,7 @@ public class MesHqlPack { /** * 过程条码报表 + * * @param mesProduceSn * @param organizeCode * @return @@ -1872,6 +1881,7 @@ public class MesHqlPack { /** * 物料追溯 + * * @param mesProdBindRecord * @param organizeCode * @return @@ -1914,6 +1924,7 @@ public class MesHqlPack { /** * 物料追溯 + * * @param ifPackageDetail * @param organizeCode * @return @@ -1935,6 +1946,7 @@ public class MesHqlPack { /** * 维修记录 + * * @param mesRepairRecord * @param organizeCode * @return @@ -1971,6 +1983,7 @@ public class MesHqlPack { /** * 过程质量检测数据 + * * @param mesQcCheckData * @param organizeCode * @return @@ -2001,6 +2014,7 @@ public class MesHqlPack { /** * 条码履历报表 + * * @param mesProduceSnTravel * @param organizeCode * @return From 91ec41b3c0f4d01eb32430b599da0ab62b891417 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 28 Nov 2019 16:45:16 +0800 Subject: [PATCH 25/37] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E6=8E=89=E7=B4=A2=E5=BC=95=E4=BF=A1=E6=81=AF=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/wms/bean/WmsTransQuan.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index d5e6146..651b336 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -23,13 +23,13 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_TRANS_QUAN", indexes = { +@Table(name = "WMS_TRANS_QUAN"/*, indexes = { @Index(columnList = "WH_NO"), @Index(columnList = "ZONE_NO"), @Index(columnList = "LOCATE_NO"), @Index(columnList = "REF_SRC"), @Index(columnList = "ORGANIZE_CODE") -}) +}*/) @Api("库存交易信息") public class WmsTransQuan extends BaseBean { From c8f23ba640d72ed6f2acf962e04c26cb5423a245 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 28 Nov 2019 16:46:57 +0800 Subject: [PATCH 26/37] =?UTF-8?q?=E3=80=90=09=E5=BA=93=E5=AD=98=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=97=A0=E6=B3=95=E7=9C=8B=E5=88=B0=E5=AF=84?= =?UTF-8?q?=E5=94=AE=E9=9B=B6=E4=BB=B6=E3=80=91=E3=80=90bug6331=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java | 6 +----- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index a138300..338d1d1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -42,7 +42,7 @@ public class SwebProcurementPlanOrder extends BaseBean { private String vendorName; @Column(name = "PART_NO") - @ApiParam(value = "物料名称") + @ApiParam(value = "物料编号") private String partNo; @Column(name = "PART_NAME") @@ -53,8 +53,4 @@ public class SwebProcurementPlanOrder extends BaseBean { @ApiParam(value = "是否寄售") private Integer consignment=2; - @Column(name = "organize_code") - @ApiParam(value = "组织代码") - private String organizeCode; - } 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 9b00052..d823254 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 @@ -163,8 +163,8 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean); - DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean); DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean); From 7a379fb5ab563ad7c7bbe2b155825922079646d6 Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 28 Nov 2019 17:52:59 +0800 Subject: [PATCH 27/37] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1211?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=B4=A8=E9=87=8F=E6=95=B0=E6=8D=AE=E9=A6=96?= =?UTF-8?q?=E6=A3=80=E5=AF=BC=E5=87=BA=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesQcCheckData.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java index 495fec2..586e215 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java @@ -94,4 +94,28 @@ public class MesQcCheckData extends BaseBean { @ApiParam("客户代码") private String custCode; + @Transient + @ApiParam("班次") + private String shiftCode; + + @Transient + @ApiParam("班组") + private String shiftGroup; + + @Transient + @ApiParam("班长") + private String squadLeader; + + @Transient + @ApiParam("工作单元名称") + private String workCellName; + + @Transient + @ApiParam("物料名称") + private String partNoName; + + public MesQcCheckData(String createDatetime, String createUser) { + super.createDatetime = createDatetime; + super.createUser = createUser; + } } From 04009f02e0d67c9a8b1456ecfec5abe8dcf3a2ff Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 28 Nov 2019 19:40:14 +0800 Subject: [PATCH 28/37] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-aps/pom.xml | 4 ++++ .../cn/estsh/i3plus/pojo/aps/annotation/MainKey.java | 20 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 3 +++ .../estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java | 7 +++++++ .../estsh/i3plus/pojo/aps/bean/FurnaceSetting.java | 3 +++ .../cn/estsh/i3plus/pojo/aps/common/BaseCode.java | 3 +++ .../estsh/i3plus/pojo/aps/validator/InsertGroup.java | 4 ++++ .../i3plus/pojo/aps/validator/MainKeyValidator.java | 14 ++++++++++++++ 8 files changed, 58 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/MainKey.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/InsertGroup.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index b6adafd..c052a9d 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -17,6 +17,10 @@ i3plus.pojo i3plus-pojo-base + + org.hibernate.validator + hibernate-validator + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/MainKey.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/MainKey.java new file mode 100644 index 0000000..105400d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/MainKey.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.aps.annotation; + +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.MainKeyValidator; + +import javax.validation.Constraint; +import javax.validation.Payload; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@Constraint(validatedBy={MainKeyValidator.class}) +public @interface MainKey { + String message() default "主键重复"; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 0dfe904..9115264 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -13,6 +13,8 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.MappedSuperclass; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; import java.util.Date; import java.util.List; @@ -37,6 +39,7 @@ public class BaseOrder extends BaseCode { @Column(name="COUNT") @ApiParam(value ="数量") @FieldAnnotation(notEmpty = true) + @Min(0) private Double count; @Column(name="PRIORITY") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java index cdf99a2..ea84c13 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.validation.constraints.Min; /** * @Description :炉资源容量限制 @@ -30,17 +33,21 @@ public class FurnaceCapacity extends BaseAPS { @Column(name="RES_CODES") @ApiParam(value ="资源编码") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) private String resCodes; @Column(name="STAND_CODE") @ApiParam(value ="标准工序编码") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "StandOperation") private String standCode; @Column(name="MATERIAL_CODE") @ApiParam(value ="物料编码") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Material") private String materialCode; @Column(name="CAPACITY") @ApiParam(value ="容量限制") + @Min(0) private Double capacity; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java index af4ca6f..40835b2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,6 +32,7 @@ public class FurnaceSetting extends BaseAPS { @Column(name="RES_CODES") @ApiParam(value ="资源编码") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) private String resCodes; @Column(name="SAME_MATERIAL") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java index 638f867..e311e89 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.aps.common; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,6 +20,7 @@ import javax.persistence.MappedSuperclass; @Data @EqualsAndHashCode(callSuper = true) @MappedSuperclass +@MainKey(groups = {InsertGroup.class}) public abstract class BaseCode extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/InsertGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/InsertGroup.java new file mode 100644 index 0000000..2efcf07 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/InsertGroup.java @@ -0,0 +1,4 @@ +package cn.estsh.i3plus.pojo.aps.validator; + +public interface InsertGroup { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java new file mode 100644 index 0000000..15c92bf --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.aps.validator; + +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; + +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; + +public class MainKeyValidator implements ConstraintValidator { + @Override + public boolean isValid(BaseBean bean, ConstraintValidatorContext constraintValidatorContext) { + return false; + } +} From 99b66e459d339508db96da6a125b311fe62fc6bc Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 28 Nov 2019 20:10:55 +0800 Subject: [PATCH 29/37] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1221?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 163 ++++++++++++++++++++- .../i3plus/pojo/mes/pcn/model/RequestModel.java | 10 ++ .../estsh/i3plus/pojo/mes/bean/MesStationBom.java | 4 +- .../estsh/i3plus/pojo/mes/model/RequestModel.java | 18 +++ 4 files changed, 187 insertions(+), 8 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 cb8dae6..3673841 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 @@ -1308,7 +1308,7 @@ public class MesEnumUtil { MES_SHIFT(180, "班次"), MES_SHIFT_GROUP(190, "班组"), MES_WORK_CELL_PARAM_CFG(200, "工作单元参数配置"), - MES_PROCESS_BOM(210, "工序BOM表"); + MES_STATION_BOM(210, "工位BOM表"); private int value; private String description; @@ -1461,10 +1461,10 @@ public class MesEnumUtil { } /** - * mes 工位类型 + * mes 工位Bom 是否可重复 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_IS_REPEAT { + public enum MES_STATION_BOM_IS_REPEAT { REPEATABLE(1, "可重复"), NOT_REPEAT(2, "不可重复"); @@ -1472,7 +1472,7 @@ public class MesEnumUtil { private int value; private String description; - MES_IS_REPEAT(int value, String description) { + MES_STATION_BOM_IS_REPEAT(int value, String description) { this.value = value; this.description = description; } @@ -1486,8 +1486,8 @@ public class MesEnumUtil { } // 根据value返回枚举类型,主要在switch中使用 - public static MES_IS_REPEAT getByValue(int value) { - for (MES_IS_REPEAT mesInsertExcel : values()) { + public static MES_STATION_BOM_IS_REPEAT getByValue(int value) { + for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { return mesInsertExcel; } @@ -1506,6 +1506,157 @@ public class MesEnumUtil { 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; + } + + } + + /** + * mes 工位Bom 是否检查 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_STATION_BOM_IS_CHECK { + + REPEATABLE(1, "是"), + NOT_REPEAT(2, "否"); + + private int value; + private String description; + + MES_STATION_BOM_IS_CHECK(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; + } + + } + + /** + * mes 工位Bom 是否投料配置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_STATION_BOM_IS_FEED { + + REPEATABLE(1, "是"), + NOT_REPEAT(2, "否"); + + private int value; + private String description; + + MES_STATION_BOM_IS_FEED(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; + } + + } + + /** + * mes 工位Bom 是否绑定关键件 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_STATION_BOM_IS_BIND_KEY { + + REPEATABLE(1, "是"), + NOT_REPEAT(2, "否"); + + private int value; + private String description; + + MES_STATION_BOM_IS_BIND_KEY(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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java index bec442b..45bf859 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java @@ -33,6 +33,8 @@ public class RequestModel { private Integer destStatus; // 目的状态 + private List orderNoList;//工单编号 + public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { this.queueOrderList = queueOrderList; this.currentSeq = currentSeq; @@ -101,6 +103,14 @@ public class RequestModel { this.queueOrderList = queueOrderList; } + public void setOrderNoList(List orderNoList) { + this.orderNoList = orderNoList; + } + + public List getOrderNoList() { + return orderNoList; + } + public Double getCurrentSeq() { return currentSeq == null ? 0.0d : currentSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 233bf70..a0ab37f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -16,7 +16,7 @@ import javax.persistence.Table; import javax.persistence.Transient; /** - * @Description :工序物料清单 + * @Description :工位物料清单 * @Reference : * @Author : jack.jia * @CreateDate : 2019-04-02 @@ -28,7 +28,7 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_STATION_BOM") -@Api("工序物料清单") +@Api("工位物料清单") public class MesStationBom extends BaseBean { @Column(name = "PART_NO") @ApiParam("零件号") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java index 91b5e18..1bada8a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java @@ -32,6 +32,10 @@ public class RequestModel { private Integer destStatus; // 目的状态 + private List orderNoList;//工单编号 + + private List requestBeanList;//工单下达 + public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { this.queueOrderList = queueOrderList; this.currentSeq = currentSeq; @@ -84,6 +88,20 @@ public class RequestModel { this.queueOrderList = queueOrderList; } + public void setOrderNoList(List orderNoList) { + this.orderNoList = orderNoList; + } + + public List getOrderNoList() { + return orderNoList; + } + + public void setRequestBeanList(List requestBeanList) { + this.requestBeanList = requestBeanList; + } + + public List getRequestBeanList() { return requestBeanList; } + public Double getCurrentSeq() { return currentSeq == null ? 0.0d : currentSeq; } From 3c9183e42233f325b80df1a3ceac482d42971737 Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 28 Nov 2019 20:19:32 +0800 Subject: [PATCH 30/37] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1256?= =?UTF-8?q?=E5=B7=A5=E5=BA=8FBOM=E6=94=B9=E4=B8=BA=E5=B7=A5=E4=BD=8DBOM?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesStationBom.java | 2 +- .../i3plus/pojo/mes/pcn/model/DefectModel.java | 49 ++++++++++++++++++++++ ...rocessBomModel.java => MesStationBomModel.java} | 8 ++-- .../estsh/i3plus/pojo/mes/bean/MesStationBom.java | 2 +- .../estsh/i3plus/pojo/mes/model/ProdOrgModel.java | 4 ++ 5 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/{MesProcessBomModel.java => MesStationBomModel.java} (91%) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java index 284358c..36a7f61 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java @@ -121,7 +121,7 @@ public class MesStationBom extends BaseBean { @Override public String toString() { - return "MesProcessBom{" + + return "MesStationBom{" + "partNo='" + partNo + '\'' + ", itemPartNo='" + itemPartNo + '\'' + ", qty=" + qty + diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java new file mode 100644 index 0000000..83a9451 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\28 19:50 + * @Modify: + **/ +@Data +public class DefectModel { + + private Long id; + + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("缺陷类型名称") + private String defectTypeName; + + @ApiParam("缺陷位置") + private String defectLocation; + + @ApiParam("缺陷类型子集") + private List mesDefectList; + public DefectModel() { + + } + + public DefectModel(Long id, String defectCode, String defectName, String defectType, String defectTypeName) { + this.id = id; + this.defectCode = defectCode; + this.defectName = defectName; + this.defectType = defectType; + this.defectTypeName = defectTypeName; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java similarity index 91% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java index 86e92b4..e6504ec 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java @@ -11,7 +11,7 @@ import lombok.Data; * @Modify: **/ @Data -public class MesProcessBomModel { +public class MesStationBomModel { private Long id; @ApiParam("子物料编码") @@ -40,11 +40,11 @@ public class MesProcessBomModel { @ApiParam("报废数") private Integer scrapQty; - public MesProcessBomModel() { + public MesStationBomModel() { } - public MesProcessBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + public MesStationBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { this.id = id; this.itemPartNo = itemPartNo; this.itemPartName = itemPartName; @@ -59,7 +59,7 @@ public class MesProcessBomModel { this.parentPartName = parentPartName; } - public MesProcessBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { this.itemPartNo = itemPartNo; this.itemPartName = itemPartName; this.qty = qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 233bf70..b66d940 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -110,7 +110,7 @@ public class MesStationBom extends BaseBean { @Override public String toString() { - return "MesProcessBom{" + + return "MesStationBom{" + "partNo='" + partNo + '\'' + ", itemPartNo='" + itemPartNo + '\'' + ", qty=" + qty + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java index 2d5ffd2..b668562 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -66,4 +66,8 @@ public class ProdOrgModel extends BaseBean { @Transient @ApiParam("工位类型") private Integer workCellType; + + @Transient + @ApiParam("序号") + private Integer seq; } From 0e2b13d52f9bf21942be0384617f0e099a8a5bb5 Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 28 Nov 2019 20:30:32 +0800 Subject: [PATCH 31/37] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1258?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 214 +++++++++++++++++++++ 1 file changed, 214 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 360c881..5bfb46b 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 @@ -12,6 +12,220 @@ import org.apache.commons.lang3.StringUtils; **/ public class MesPcnEnumUtil { + + /** + * mes 工位Bom 是否可重复 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_STATION_BOM_IS_REPEAT { + + REPEATABLE(1, "可重复"), + NOT_REPEAT(2, "不可重复"); + + private int value; + private String description; + + MES_STATION_BOM_IS_REPEAT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + // 根据value返回枚举类型,主要在switch中使用 + public static MES_STATION_BOM_IS_REPEAT getByValue(int value) { + for (MES_STATION_BOM_IS_REPEAT mesInsertExcel : values()) { + if (mesInsertExcel.getValue() == value) { + return mesInsertExcel; + } + } + return null; + } + + + 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; + } + + } + + /** + * 系统配置表枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONFIG_TYPE { + FASTDFS_SAVE_PATH(10, "SAVE_PATH", ""), + NGINX_HOST(20, "NGINX_HOST", ""), + MES_STATION_SOCKET(30, "mes_station_socket", ""), + GATEWAY_IP(40, "GATEWAY_HOST", ""), + UPDATE_SYNC_TIME(50, "SYNC_DATA_URL", "UPDATE_SYNC_TIME"), + PCN_PULL(60, "SYNC_DATA_URL", "PCN_PULL"), + PCN_PUSH(70, "SYNC_DATA_URL", "PCN_PUSH"), + FDFS_DOWNLOAD(80, "SYNC_DATA_URL", "FDFS_DOWNLOAD"), + REWORK_REPAIR(90, "REWORK_REPAIR", ""), + OPC_LINK_SERVER_URL(100, "OPC_LINK", "OPC_LINK_SERVER_URL"), + OPC_LINK_USERNAME(110, "OPC_LINK", "OPC_LINK_USERNAME"), + OPC_LINK_PASSWORD(120, "OPC_LINK", "OPC_LINK_PASSWORD"), + OPC_LINK_REALM(130, "OPC_LINK", "OPC_LINK_REALM"), + OPC_LINK_CALLBACK(140, "OPC_LINK", "OPC_LINK_CALLBACK"), + SUPPLY_SWITCH(150, "SUPPLY_SWITCH", ""), + PCN_LOGIN(160, "PCN_LOGIN", ""), + PCN_MENU(170, "PCN_MENU", ""), + PCN_MODULE(180, "PCN_MODULE", ""), + PCN_LOGOUT(190, "PCN_LOGOUT", ""); + + + private int value; + private String code; + private String description; + + CONFIG_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 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; + } + } + + /** + * pcn 动作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_ACTION_TYPE { + + BIND(10, "绑定"), + UNTYING(20, "解绑"); + + private int value; + private String description; + + MES_ACTION_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + // 根据value返回枚举类型,主要在switch中使用 + public static MES_ACTION_TYPE getByValue(int value) { + for (MES_ACTION_TYPE mesInsertExcel : values()) { + if (mesInsertExcel.getValue() == value) { + return mesInsertExcel; + } + } + return null; + } + + + 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; + } + + } + + /** + * pcn 是否是关键件 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_IS_BIND_KEY { + + IS_BIND_KEY(1, "是"), + NO_BIND_KEY(2, "否"); + + private int value; + private String description; + + MES_IS_BIND_KEY(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + // 根据value返回枚举类型,主要在switch中使用 + public static MES_IS_BIND_KEY getByValue(int value) { + for (MES_IS_BIND_KEY mesInsertExcel : values()) { + if (mesInsertExcel.getValue() == value) { + return mesInsertExcel; + } + } + return null; + } + + + 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; + } + + } + /** * 接口同步状态 */ From 64bfbb5013a850b27aaf17ee0fd3e2506f482e1c Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 29 Nov 2019 14:25:17 +0800 Subject: [PATCH 32/37] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=E5=B7=A5=E4=BD=9C=E5=9D=97=E8=BF=9E=E7=BA=BF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/ExcludeImportExport.java | 18 ++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/annotation/MainKey.java | 8 +++++++- .../java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 2 ++ .../cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 2 +- .../java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java | 2 ++ .../cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java | 4 +++- .../java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/model/BeanModel.java | 16 ++++++++++++++++ .../i3plus/pojo/aps/model/GanttCalendarModel.java | 1 + .../cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java | 11 +++++++++++ .../i3plus/pojo/aps/validator/MainKeyValidator.java | 2 +- .../estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 4 ++-- 21 files changed, 82 insertions(+), 8 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BeanModel.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java new file mode 100644 index 0000000..7e24878 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.aps.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @Description : 用于注解不需要进行导入导出的bean对象 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-29 + * @Modify: + **/ +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExcludeImportExport { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/MainKey.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/MainKey.java index 105400d..565a8b4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/MainKey.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/MainKey.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.aps.annotation; -import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.MainKeyValidator; import javax.validation.Constraint; @@ -10,6 +9,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * @Description : 主键校验注解 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-29 + * @Modify: + **/ @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @Constraint(validatedBy={MainKeyValidator.class}) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 9115264..d569b69 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BaseCode; @@ -29,6 +30,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @MappedSuperclass @Api("订单基类") +@ExcludeImportExport public class BaseOrder extends BaseCode { @Column(name="MATERIAL_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index 3759481..a0f6d02 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; @@ -21,6 +22,7 @@ import javax.persistence.MappedSuperclass; @EqualsAndHashCode(callSuper = true) @MappedSuperclass @Api("规则参数基类") +@ExcludeImportExport public class BaseRule extends BaseAPS { @Column(name="CODE") @ApiParam(value ="规则编码") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java index b8f05fb..122226c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; @@ -17,6 +18,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @Api("BOM树") +@ExcludeImportExport public class BomTree extends BaseAPS { @ApiParam(value ="物料类型") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index ca0c1d9..a93133b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.base.bean.BaseBean; @@ -32,6 +33,7 @@ import java.sql.JDBCType; @EqualsAndHashCode(callSuper = true) @Table(name="APS_FIELD_INFO") @Api("字段信息") +@ExcludeImportExport public class FieldInfo extends BaseCode { @Column(name="CLASS_NAME") @ApiParam(value ="所属类简称") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java index 493c332..0c6a9a5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; @@ -21,6 +22,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @Api("订单树") +@ExcludeImportExport public class OrderTree extends BaseAPS { @ApiParam(value ="物料编码") private String material; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index 1539067..ed4827d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; @@ -29,6 +30,7 @@ import java.util.List; @Entity @Table(name = "APS_PARENT_WORK") @Api("父工作") +@ExcludeImportExport public class ParentWork extends BaseAPS { @Column(name="count") @ApiParam(value ="数量") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index 620ba31..860e0a3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java @@ -24,7 +24,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_PLAN_FEEDBACK") -@Api("物料") +@Api("工作反馈") public class PlanFeedback extends BaseAPS { @Column(name="WORK_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index b8b6869..830d392 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -27,7 +27,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_PRODUCT_ROUTING") -@Api("物料") +@Api("工艺路线") public class ProductRouting extends BaseCode { @Column(name="MATERIAL_ID") @ApiParam(value ="物料") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index e12badd..8d11194 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -24,7 +24,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_PURCHASE_ORDER") -@Api("工艺路线") +@Api("采购订单") public class PurchaseOrder extends BaseOrder { @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java index 1aa5caa..df02228 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; @@ -26,6 +27,7 @@ import javax.persistence.Table; @Entity @Table(name = "APS_RULE_DETAIL") @Api("规则明细") +@ExcludeImportExport public class RuleDetail extends BaseAPS { @Column(name="TYPE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 670f56a..9c126d1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.ERuleGroup; @@ -26,6 +27,7 @@ import java.util.List; @Entity @Table(name = "APS_RULE_GROUP") @Api("规则组合") +@ExcludeImportExport public class RuleGroup extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java index 53a30a4..fbe37f0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -21,7 +22,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_SERIAL_NUMBER") -@Api("取消计划规则") +@Api("流水号") +@ExcludeImportExport public class SerialNumber extends BaseAPS { @Column(name="NUMBER") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 1be31d5..18d4ace 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.common; +import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -22,6 +23,7 @@ import java.util.Map; **/ @Data @MappedSuperclass +@ExcludeImportExport public abstract class BaseAPS extends BaseBean { @JsonIgnore private transient Map customFields = new HashMap<>(); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java index e311e89..03a9bcf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.common; +import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; @@ -21,6 +22,7 @@ import javax.persistence.MappedSuperclass; @EqualsAndHashCode(callSuper = true) @MappedSuperclass @MainKey(groups = {InsertGroup.class}) +@ExcludeImportExport public abstract class BaseCode extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BeanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BeanModel.java new file mode 100644 index 0000000..a4f0ee1 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BeanModel.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +/** + * @Description : 返回给界面的Bean对象信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-29 + * @Modify: + **/ +@Data +public class BeanModel { + private String key; + private String name; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index 06540a5..3fcd451 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -19,5 +19,6 @@ public class GanttCalendarModel { private Date end_date; private String color; private Long id; + private Long workId; private String text; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java new file mode 100644 index 0000000..f085c30 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +@Data +public class GanttLineModel { + private long id; + private long source; + private long target; + private int type; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java index 15c92bf..73ba5d0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/MainKeyValidator.java @@ -9,6 +9,6 @@ import javax.validation.ConstraintValidatorContext; public class MainKeyValidator implements ConstraintValidator { @Override public boolean isValid(BaseBean bean, ConstraintValidatorContext constraintValidatorContext) { - return false; + return true; } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index f5e1d7f..3217940 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -446,8 +446,8 @@ public class ApsEnumUtil { NONE("NONE", "不限制"), NO_PO("NO_PO", "未计划"), NO_PLAN("NO_PLAN", "计划完毕"), - NO_POR("NO_POR", ""), - NO_PPRS("NO_PPRS", ""); + NO_POR("NO_POR", "指示完毕"), + NO_PPRS("NO_PPRS", "已确认"); private String value; private String description; From 7004ad09719ddaf666827e81aab918945bd3f697 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 29 Nov 2019 14:31:51 +0800 Subject: [PATCH 33/37] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1211?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=B4=A8=E9=87=8F=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/IfRawPartDataModel.java | 2 +- .../i3plus/pojo/mes/model/QcCheckDataModel.java | 116 +++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 24 +++++ 3 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java index 65b038b..a55a07f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java @@ -57,7 +57,7 @@ public class IfRawPartDataModel extends BaseBean { private String supplierCode; @ApiParam("工厂代码") - private String organizationCode; + private String organizeCode; @ApiParam("同步状态") private Integer syncStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java new file mode 100644 index 0000000..d958a07 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java @@ -0,0 +1,116 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\29 11:34 + * @Modify: + **/ +@Data +public class QcCheckDataModel { + + private Long id; + public String organizeCode; + public String createUser; + public String createDatetime; + + @ApiParam("检测id") + private String checkId; + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("检测类型") + private Integer checkType; + + @ApiParam("检测项") + private String checkItem; + + @ApiParam("检测标准") + private String checkStandard; + + @ApiParam("检测指导") + private String checkGuide; + + @ApiParam("频率") + private String checkFrequency; + + @ApiParam("检测值") + private String checkValue; + + @ApiParam("判定结果") + private String checkResult; + + @ApiParam("产品条码") + private String sn; + + @ApiParam("产品数量") + private Integer qty; + + @ApiParam("备注") + private String memo; + + @ApiParam("工单号") + private String orderNo; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("班次") + private String shiftCode; + + @ApiParam("班组") + private String shiftGroupName; + + @ApiParam("班长") + private String squadLeader; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("物料名称") + private String partNoName; + + public QcCheckDataModel() { + + } + + public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String checkId, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String checkValue, String checkResult, String sn, Integer qty, String memo, String orderNo, String custCode, String shiftCode, String shiftGroupName, String squadLeader, String workCellName, String partNoName) { + this.id = id; + this.organizeCode = organizeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.checkId = checkId; + this.partNo = partNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkGuide = checkGuide; + this.checkFrequency = checkFrequency; + this.checkValue = checkValue; + this.checkResult = checkResult; + this.sn = sn; + this.qty = qty; + this.memo = memo; + this.orderNo = orderNo; + this.custCode = custCode; + this.shiftCode = shiftCode; + this.shiftGroupName = shiftGroupName; + this.squadLeader = squadLeader; + this.workCellName = workCellName; + this.partNoName = partNoName; + } +} 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 23d69d6..ae7e52e 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 @@ -2048,4 +2048,28 @@ public class MesHqlPack { "createDatetime", packBean, true); return packBean; } + + /** + * 物料对象 + * + * @param partObject + * @param organizeCode + * @return + */ + public static DdlPackBean getMesPartObject(MesPartObject partObject, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partObject, organizeCode); + if (!StringUtils.isEmpty(partObject.getPartNo())) { + DdlPreparedPack.getStringLikerPack(partObject.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(partObject.getObjectCode())) { + DdlPreparedPack.getStringLikerPack(partObject.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(partObject.getObjectName())) { + DdlPreparedPack.getStringLikerPack(partObject.getObjectName(), "objectName", packBean); + } + if (!StringUtils.isEmpty(partObject.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(partObject.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } } From 402b09e82eb422b2fe3061a72e8fb6df3a07fb2b Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 29 Nov 2019 15:06:04 +0800 Subject: [PATCH 34/37] =?UTF-8?q?=E3=80=90EU=E7=9B=98=E7=82=B9=E3=80=91?= =?UTF-8?q?=E3=80=90=20317-EU=E7=9B=98=E7=82=B9-=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E6=9F=A5=E8=AF=A2=E3=80=91=E3=80=901148EU?= =?UTF-8?q?=E7=9B=98=E7=82=B9-=E7=9B=98=E7=82=B9=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=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/base/enumutil/WmsEnumUtil.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/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 69259c5..dbb02ed 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 @@ -823,7 +823,7 @@ public class WmsEnumUtil { VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"), VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"), VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"), - VDA_SN_("VDA_SN_MERGE", "VDA条码合并"), + VDA_SN_MERGE("VDA_SN_MERGE", "VDA条码合并"), VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"), VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"), VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), From a35171a41d58b1360da1825e2d228a687c6c0402 Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 29 Nov 2019 15:54:54 +0800 Subject: [PATCH 35/37] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 ++- .../estsh/i3plus/pojo/wms/bean/WmsPickCount.java | 53 ++++++++++++++++++++++ .../wms/repository/WmsPickCountRepository.java | 17 +++++++ 3 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.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 69259c5..0a776ba 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 @@ -644,7 +644,8 @@ public class WmsEnumUtil { VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"), KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"), - FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"); + FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), + KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"); private int value; private String code; @@ -827,7 +828,8 @@ public class WmsEnumUtil { VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"), VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"), VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), - VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"); + VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"), + KT_PICK_RC("KT_PICK_RC", "坤泰拣货"); private String value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java new file mode 100644 index 0000000..69e19ef --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPickCount.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description :供应商物料每月数量 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-11-27 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PICK_COUNT") +@Api("供应商物料每月数量") +public class WmsPickCount extends BaseBean { + + private static final long serialVersionUID = 4849044986767609486L; + @Column(name = "YEAR") + @ApiParam(value = "年") + private String year; + + @Column(name = "MONTH") + @ApiParam(value = "月") + private String month; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + private String vendorNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料号") + private String partNo; + + @Column(name = "QTY") + @ApiParam(value = "数量") + private Double qty; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.java new file mode 100644 index 0000000..a62056a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPickCountRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPickCount; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(拣货数量) + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-06 13:40 + * @Modify: + **/ +@Repository +public interface WmsPickCountRepository extends BaseRepository{ + +} From 831daa4964cb085b2d165914236b44da27aeae0d Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Fri, 29 Nov 2019 15:56:12 +0800 Subject: [PATCH 36/37] =?UTF-8?q?=E3=80=90#1241=20KT-=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF-=E5=A2=9E=E5=8A=A0=E9=81=93=E5=8F=A3?= =?UTF-8?q?=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/WmsPOMaster.java | 4 ++++ 1 file changed, 4 insertions(+) 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 34d1a36..12dff4c 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 @@ -159,6 +159,10 @@ public class WmsPOMaster extends BaseBean { @Transient private List orderNoList; + @Column(name = "DOCK") + @ApiParam("道口") + public String dock; + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; } From fa8a88c6d05ae88a231f8fcccf0f2b060279c88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 29 Nov 2019 19:23:55 +0800 Subject: [PATCH 37/37] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E6=8F=90=E4=BA=A4=E5=90=8E=E5=A6=82=E6=9E=9C=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=AD=A5=E9=AA=A4=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=B9=E6=B3=95=E5=8C=85=E5=90=AB=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E5=80=BC=E5=88=99=E5=8F=A0=E5=8A=A0=E5=9C=A8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=8F=90=E7=A4=BA=E6=B6=88=E6=81=AF=E5=90=8E+?= =?UTF-8?q?=E7=BB=99=E5=9F=BA=E7=B1=BBBaseBean=E7=9A=84isdeleted,isvalid?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C=E7=BB=99?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E5=AE=9E=E4=BD=93=E5=8A=A0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E8=AF=95=E8=AF=95=E6=B0=B4+WmsCsDetailsModel=E7=B1=BB?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=B8=A5=E9=87=8D=E4=B8=8D=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=8C=83=EF=BC=8C=E5=B7=B2=E7=A7=BB=E8=87=B3Pojo-Mode?= =?UTF-8?q?l=E9=A1=B9=E7=9B=AE=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 7 +-- .../pojo/model/wms}/WmsCSOrderDetailsModel.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 52 +++++++++++----------- .../pojo/wms/bean/snapshot/WmsCheckPoint.java | 2 +- 4 files changed, 30 insertions(+), 33 deletions(-) rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio => i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms}/WmsCSOrderDetailsModel.java (95%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 08085ad..ef05abd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -2,10 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; @@ -65,12 +62,12 @@ public abstract class BaseBean implements Serializable { // @AnnoOutputColumn(hidden = true) public String organizeCode; - @Column(name="IS_VALID") + @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; - @Column(name="IS_DELETED") + @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否已删除",example = "2") @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java similarity index 95% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java index 9a5fb95..5940720 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean.iotio; +package cn.estsh.i3plus.pojo.model.wms; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index 9efc5aa..1cb16f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -22,96 +22,96 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="AMP_JIS_REC") +@Table(name = "AMP_JIS_REC") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="AMP_JIS收货",description = "AMP_JIS收货") -public class AmpJisRec extends BaseBean{ +@Api(value = "AMP_JIS收货", description = "AMP_JIS收货") +public class AmpJisRec extends BaseBean { private static final long serialVersionUID = 4460727160153551089L; - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("JIS单号") public String orderNo; - @Column(name="PART_NO") + @Column(name = "PART_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; - @Column(name="UNIT") + @Column(name = "UNIT", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("单位") public String unit; - @Column(name="SN") + @Column(name = "SN", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("条码") public String sn; /** * 状态:10=新建,20=已处理,30=处理出错 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS", columnDefinition = "int default 0", nullable = false) @ApiParam(value = "状态", example = "10") public Integer orderStatus; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam(value = "供应商编码", example = "10") public String vendorNo; - @Column(name="REMARK") + @Column(name = "REMARK", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("备注") public String remark; - @Column(name="SRC") + @Column(name = "SRC", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("单据来源") public String src; - @Column(name="SHIPPING_FLAG") + @Column(name = "SHIPPING_FLAG", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("特殊发货标志") public String shippingFlag; - @Column(name="ERROR_MESSAGE") + @Column(name = "ERROR_MESSAGE", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("错误信息") public String errorMessage; - @Column(name="AREA_NO") + @Column(name = "AREA_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("ERP库存地") public String areaNo; - @Column(name="CAR_NO") + @Column(name = "CAR_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("车号") public String carNo; - @Column(name="VIN") + @Column(name = "VIN", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("VIN号") public String vin; - @Column(name="SHIPPING_TIME") + @Column(name = "SHIPPING_TIME", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("发运时间") public String shippingTime; - @Column(name="SID") + @Column(name = "SID", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("sid") public String sid; - @Column(name="IS_LOCK") - @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" ) + @Column(name = "IS_LOCK", columnDefinition = "int default 0", nullable = false) + @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定") public Integer isLock; - @Column(name="ERP_SYNC_FLAG") - @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) + @Column(name = "ERP_SYNC_FLAG", columnDefinition = "int default 0", nullable = false) + @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败") public Integer erpSyncFlag; - public AmpJisRec(Long id,String partNo, String partNameRdd,String vendorNo,Double qty,String unit){ - this.id= id; + public AmpJisRec(Long id, String partNo, String partNameRdd, String vendorNo, Double qty, String unit) { + this.id = id; this.partNo = partNo; this.partNameRdd = partNameRdd; this.vendorNo = vendorNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java index 738ffbc..1a5b744 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java @@ -21,7 +21,7 @@ public class WmsCheckPoint extends BaseBean { private static final long serialVersionUID = 5589497687871639189L; - @Column(name="SNAPSHOT_TIME") + @Column(name="SNAPSHOT_TIME", columnDefinition="varchar(225) default ''",nullable=false) @ApiParam("快照时间") public String snapshotTime; }