From 66c627a698280fb5c3f32353986f6e984b08827a Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Sat, 19 Jun 2021 16:28:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B3=B0=E5=9B=BD?= =?UTF-8?q?=E6=89=AD=E7=9F=A9=E4=BA=A7=E7=BA=BF=E4=B8=93=E7=94=A8=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java index ca4c442..6978b10 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCarModel.java @@ -29,6 +29,10 @@ public class MesPartCarModel extends BaseBean implements Serializable { private static final long serialVersionUID = -4039513102671811231L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; From 5a354229f7eff78dfd8be23d6186b421aa0a1fd2 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 21 Jun 2021 09:54:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B3=B0=E5=9B=BD=E7=94=B5=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 ++- .../pojo/mes/bean/MesElectrotestingPrintData.java | 59 ++++++++++++++++++++++ .../MesElectrotestingPrintDataRepository.java | 16 ++++++ 3 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesElectrotestingPrintData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesElectrotestingPrintDataRepository.java 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 6c1626f..ba8f21d 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 @@ -2103,7 +2103,9 @@ public class MesEnumUtil { MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"), MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"), MES_PENDING_REPORT_TYPE(670, "pendingReportTypeExcelService", "待处理报工类型导入"), - MES_FAILURE_MODE_PARTS(680, "failureModePartsExcelService", "失效模式零件导入"); + MES_FAILURE_MODE_PARTS(680, "failureModePartsExcelService", "失效模式零件导入"), + MES_ELECTROTESTING_PRINT_DATA(690, "electrotestingPrintDataExcelService", "电检打印数据导入"); + private int value; private String service; @@ -5728,7 +5730,7 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum VALUE_TYPE { - + MANUAL_ASSIGNMENT("10", "手工赋值"), SPEL_EXPRESSION("20", "spel表达式"), FUNCTION_ASSIGNMENT("30", "函数赋值"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesElectrotestingPrintData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesElectrotestingPrintData.java new file mode 100644 index 0000000..5ecc961 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesElectrotestingPrintData.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description : 泰国电检打印数据 + * @Reference : + * @Author : dominic + * @CreateDate : 2021/6/16 14:15 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_ELECTROTESTING_PRINT_DATA") +@Api("MES_电检打印数据") +public class MesElectrotestingPrintData extends BaseBean implements Serializable { + private static final long serialVersionUID = 5179928838368157923L; + + @Column(name = "COLOUR_CODE") + @ApiParam("颜色代码") + private String colourCode; + + @Column(name = "VARIANT") + @ApiParam("型号") + private String variant; + + @Column(name = "PRODUCTION_NUMBER") + @ApiParam("产品号") + private String productionNumber; + + @Column(name = "COMMISSION_NUMBER") + @ApiParam("佣金号") + private String commissionNumber; + + @Column(name = "QAD_NO") + @ApiParam("位置号") + private String qadNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus = 10; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesElectrotestingPrintDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesElectrotestingPrintDataRepository.java new file mode 100644 index 0000000..43915c2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesElectrotestingPrintDataRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesElectrotestingPrintData; +import org.springframework.stereotype.Repository; + +/** + * @Description : 泰国电检打印数据 + * @Reference : + * @Author : dominic + * @CreateDate : 2021/6/16 14:27 + * @Modify: + **/ +@Repository +public interface MesElectrotestingPrintDataRepository extends BaseRepository { +} From 005d3ef8f940505cd6a1986e0c33edb891877a70 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 21 Jun 2021 11:18:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index b3c48f6..3918199 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -5,17 +5,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; 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.io.Serializable; /** @@ -31,7 +28,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PART") +@Table(name = "MES_PART", indexes = { + @Index(columnList = "PART_NO") +}) @Api("物料信息") public class MesPart extends BaseBean implements Serializable { private static final long serialVersionUID = -7731182105899332283L; From e0e1231e09f4c6a5b102296469de127a0976ac85 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 21 Jun 2021 17:39:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?16381=2019081-andon=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=A4=84=E7=90=86-=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/andon/bean/AndonMgnManageQueue.java | 548 +++++++++++++++++++++ .../repository/IAndonMgnManageQueueRepository.java | 13 + 2 files changed, 561 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMgnManageQueue.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMgnManageQueueRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMgnManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMgnManageQueue.java new file mode 100644 index 0000000..adc39e2 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMgnManageQueue.java @@ -0,0 +1,548 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import io.swagger.models.auth.In; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.beanutils.BeanUtils; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : 安灯队列 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_MANAGE_QUEUE", indexes = { + @Index(columnList = "WORK_CENTER_CODE", name = "ANDON_INDEX_WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE", name = "ANDON_INDEX_WORK_CELL_CODE"), + @Index(columnList = "ORGANIZE_CODE", name = "ANDON_INDEX_ORGANIZE_CODE"), + @Index(columnList = "ANDON_ORDER_NO", name = "ANDON_INDEX_ANDON_ORDER_NO"), + @Index(columnList = "ALARM_CODE", name = "ANDON_INDEX_ALARM_CODE"), + @Index(columnList = "STATUS_CODE", name = "ANDON_INDEX_STATUS_CODE"), + @Index(columnList = "ACTION_CODE", name = "ANDON_INDEX_ACTION_CODE"), + @Index(columnList = "EQUIPMENT_CODE", name = "ANDON_INDEX_EQUIPMENT_CODE") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Api("安灯队列") +public class AndonMgnManageQueue extends BaseManageQueue implements Serializable { + + private static final long serialVersionUID = 183865984747203897L; + + @Transient + @ApiParam(value ="触发事件") + private String triggerEvent; + + @Column(name = "ROUTE_CODE") + @ApiParam(value = "流程代码") + private String routeCode; + + @Column(name = "ROUTE_STATUS_CODE") + @ApiParam(value = "状态点代码") + private String routeStatusCode; + + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "1") + private Double seq; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间，查询开始时间", example = "2018-01-01 01:00:00") + public String callTimeStart; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间，查询结束时间", example = "2018-01-01 01:00:00") + public String callTimeEnd; + + @Transient + @ApiParam(value = "呼叫人名字") + private String callUserName; + + @Transient + @ApiParam(value = "响应人名字") + private String confirmUserName; + + @Column(name = "SOURCE_TYPE") + @ApiParam(value = "安灯来源类型") + private String sourceType = AndonEnumUtil.ALARM_SOURCE_TYPE.SOFT.getValue(); + + @Transient + @ApiParam(value = "解决人名字") + private String resetUserName; + + @Column(name = "IS_SHIFT_CALL") + @ApiParam(value = "是否转呼", example = "1") + private Integer isShiftCall; + + @Column(name="SHIFT_CALL_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="转呼时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String shiftCallTime; + + @Column(name = "RP_OBJECT_CODE") + @ApiParam(value = "转呼对象代码") + private String rpObjectCode; + + @Column(name = "SC_RESPONSE_CODE") + @ApiParam(value = "转呼响应方式") + private String scResponseCode; + + @Column(name = "SC_RP_LEVEL") + @ApiParam(value = "转呼通知等级") + private String scRpLevel; + + @Column(name = "SHIFT_CODE") + @ApiParam(value = "班次") + private String shiftCode; + + @Column(name = "PRODUCTION_NUM") + @ApiParam(value = "生产号") + private String productionNum; + + @Column(name = "MODEL") + @ApiParam(value = "车型") + private String model; + + @Column(name = "FAULT_CAUSE") + @ApiParam(value = "故障原因") + private String faultCause; + + @Column(name = "PROCESS_METHOD") + @ApiParam(value = "处理方法") + private String processMethod; + + @Column(name = "REPLACE_SPARE_PART") + @ApiParam(value = "更换备件") + private String replaceSparePart; + + @Column(name = "MAINTENANCE_SCORE") + @ApiParam(value = "维修评分") + private String maintenanceScore; + + @Column(name = "UNQUALIFIED_QTY") + @ApiParam(value = "不良品数量") + private Integer unqualifiedQty; + + @Column(name = "PREVENTIVE_MEASURES") + @ApiParam(value = "维修工程师预防性对策") + private String preventiveMeasures; + + @Column(name = "ENGINEER_SUGGESTION") + @ApiParam(value = "工艺工程师建议") + private String engineerSuggestion; + + @Column(name = "RESPONSE_SPEED") + @ApiParam(value = "响应速度") + private String responseSpeed; + + @Column(name = "REPAIR_SPEED") + @ApiParam(value = "修复速度") + private String repairSpeed; + + @Column(name = "MONTH") + @ApiParam(value = "月") + private Integer month; + + @Column(name = "WEEK") + @ApiParam(value = "周") + private Integer week; + + + @Transient + @ApiParam(value = "异常时长", example = "0") + private Long execptionTime; + + @Transient + @ApiParam(value = "响应时长", example = "0") + private Long signTime; + + @Transient + @ApiParam(value = "ANDON次数（用于报表统计）", example = "0") + private Long andonCount; + + @Transient + @ApiParam(value = "平均响应时长", example = "0") + private Double avgSignTime; + + @Transient + @ApiParam(value = "解决时长", example = "0") + private Long resolveTime; + + @Transient + @ApiParam(value = "平均解决时长", example = "0") + private Double avgResolveTime; + + @Transient + @ApiParam(value = "查询条件：ANDON状态") + private List statusList; + + @Transient + @ApiParam(value = "查询条件：ANDON状态") + private List typeList; + + @Transient + @ApiParam(value = "比例", example = "0") + private Double proportion; + + @Transient + @ApiParam(value = "当前比例（累加）", example = "0") + private Double currentProportion; + + @Transient + @ApiParam(value = "总次数（用于报表统计）", example = "0") + private Integer sumCount; + + @Column(name = "SEND_FLAG") + @ApiParam(value = "发送标志") + private String sendFlag; + + @Column(name = "SIGN_SEND_FLAG") + @ApiParam(value = "响应已通知标识") + private String signSendFlag; + + /** + * 1 = 是，2 = 否 + */ + @Transient + @ApiParam(value = "是否勾选加入自处理问题库", example = "2") + private Integer isDisposal; + + @Column(name = "ALARM_DETAIL_NAME_RDD") + @ApiParam(value = "安灯子类型名称") + private String alarmDetailNameRdd; + + @Column(name = "EPM_CODE") + @ApiParam(value = "事件现象代码") + private String epmCode; + + @Column(name = "EPM_NAME_RDD") + @ApiParam(value = "事件现象描述") + private String epmNameRdd; + + @Column(name = "IMPORTANCE_CODE") + @ApiParam(value = "重要等级代码") + private String importanceCode; + + @Column(name = "IMPORTANCE_NAME_RDD") + @ApiParam(value = "重要等级名称") + private String importanceNameRdd; + + @Column(name = "ORGANIZE_NAME_RDD") + @ApiParam(value = "组织名称") + private String organizeNameRdd; + + @Column(name = "REJECT_OPINION") + @ApiParam(value = "驳回意见") + private String rejectOpinion; + + @Column(name = "OPEN_INFO") + @ApiParam(value = "放行说明") + private String openInfo; + + @Column(name = "IS_OVER_TIME") + @ApiParam(value = "是否超时") + private Integer overTimeFlag; + + @Transient + @ApiParam(value = "安灯状态集合") + private List statusCodeList; + + @Transient + @ApiParam(value = "日发生次数") + private int dayTime; + + @Transient + @ApiParam(value = "周发生次数") + private int weekendsTime; + + @Transient + @ApiParam(value = "事件统计报表该事件描述的总次数") + private int acCodeTime; + + @ApiParam(value = "操作来源") + @Transient + private String operationFlag; + + // 安灯附属表 + @Transient + @ApiParam(value ="临时/纠正措施") + private String tempCorrectMethod; + + @Transient + @ApiParam(value ="预防/纠正措施") + private String preCorrectMethod; + + @Transient + @ApiParam(value ="客户") + private String customer; + + @Transient + @ApiParam(value ="零件号") + private String partNo; + + @Transient + @ApiParam(value ="零件名称") + private String partName; + + @Transient + @ApiParam(value ="报废数量") + private Double scrapNum; + + @Transient + @ApiParam(value ="批次") + private String lot; + + @Transient + @ApiParam(value ="零件数量") + private Double partNum; + + @Transient + @ApiParam(value ="设备名称") + private String deviceName; + + @Transient + @ApiParam(value ="是否更换备件") + private Integer isChangeBackup; + + @Transient + @ApiParam(value ="备件名称") + private String backupPartName; + + @Transient + @ApiParam(value ="规格型号") + private String scale; + + @Transient + @ApiParam(value ="当前件数") + private Integer currentProdNum; + + @Transient + @ApiParam(value ="生产累计件数") + private Integer totalProdNum; + + @Transient + @ApiParam(value ="安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value ="响应时长-分钟") + private Integer downtime; + + @Transient + @ApiParam(value ="故障时长-分钟") + private Integer brokenTime; + + @Transient + @ApiParam(value ="响应时长(分钟)") + private Double sumDowntime; + + @Transient + @ApiParam(value ="故障时长(分钟)") + private Double sumBrokenTime; + + @Transient + @ApiParam(value ="故障字符串") + private String faultStr; + + @Transient + @ApiParam(value ="百分比") + private Integer propagation; + + // 是否转呼 + public Integer getIsShiftCall() { + return this.isShiftCall == null ? 0 : this.isShiftCall; + } + + // 获取优先级别 + public Integer getPriorityLevel() { + return this.priorityLevel == null ? 0 : this.priorityLevel; + } + + /** + * 工位统计 构造函数 + * @param workCenterCode + * @param workCenterNameRdd + * @param workCellCode + * @param workCellNameRdd + * @param equipmentCode + * @param equipmentNameRdd + * @param shiftCode + * @param shiftNameRdd + * @param alarmCode + * @param andonCount + */ + public AndonMgnManageQueue(String workCenterCode, String workCenterNameRdd, String workCellCode, String workCellNameRdd, + String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, + String alarmCode, Long andonCount, String callTime, String resetTime) { + this.workCenterCode = workCenterCode; + this.workCenterNameRdd = workCenterNameRdd; + this.workCellNameRdd = workCellNameRdd; + this.workCellCode = workCellCode; + this.equipmentCode = equipmentCode; + this.equipmentNameRdd = equipmentNameRdd; + this.shiftCode = shiftCode; + this.shiftNameRdd = shiftNameRdd; + this.alarmCode = alarmCode; + this.andonCount = andonCount; + this.callTime = callTime; + this.resetTime = resetTime; + } + + /** + * 原因统计 使用Java内存计算（获取原始数据） + * @param acCode + * @param acNameRdd + * @param workCenterCode + * @param workCenterNameRdd + * @param workCellCode + * @param workCellNameRdd + * @param alarmCode + * @param ecCode + * @param ecNameRdd + * @param emCode + * @param emNameRdd + * @param callTime + * @param confirmTime + * @param resetTime + */ + public AndonMgnManageQueue(String acCode, String acNameRdd, String workCenterCode, String workCenterNameRdd, String workCellCode, String workCellNameRdd, String alarmCode, String ecCode, String ecNameRdd, String emCode, String emNameRdd, String callTime, String confirmTime, String resetTime){ + this.acCode = acCode; + this.acNameRdd = acNameRdd; + this.workCenterCode = workCenterCode; + this.workCenterNameRdd = workCenterNameRdd; + this.workCellCode = workCellCode; + this.workCellNameRdd = workCellNameRdd; + this.alarmCode = alarmCode; + this.ecCode = ecCode; + this.ecNameRdd = ecNameRdd; + this.emCode = emCode; + this.emNameRdd = emNameRdd; + this.callTime = callTime; + this.confirmTime = confirmTime; + this.resetTime = resetTime; + } + + /** + * 人员统计 使用Java内存计算（获取原始数据） + * @param organizeCode + * @param workCenterNameRdd + * @param workCellCode + * @param workCellNameRdd + * @param resetUser + * @param alarmCode + * @param callTime + * @param confirmTime + * @param resetTime + */ + public AndonMgnManageQueue(String organizeCode, String workCenterNameRdd, String workCellCode, String workCellNameRdd, String resetUser, String alarmCode, String callTime, String confirmTime, String resetTime){ + this.organizeCode = organizeCode; + this.workCenterNameRdd = workCenterNameRdd; + this.workCellCode = workCellCode; + this.workCellNameRdd = workCellNameRdd; + this.resetUser = resetUser; + this.alarmCode = alarmCode; + this.callTime = callTime; + this.confirmTime = confirmTime; + this.resetTime = resetTime; + } + + /** + * 统计分析柏拉图 使用JAVA内存计算（获取原始数据） + * @param workCenterNameRdd + * @param alarmCode + * @param ecCode + * @param ecNameRdd + * @param callTime + * @param confirmTime + * @param resetTime + */ + public AndonMgnManageQueue(String workCenterNameRdd, String alarmCode, String ecCode, String ecNameRdd, String callTime, String confirmTime, String resetTime){ + this.workCenterNameRdd = workCenterNameRdd; + this.ecNameRdd = ecNameRdd; + this.ecCode = ecCode; + this.alarmCode = alarmCode; + this.callTime = callTime; + this.confirmTime = confirmTime; + this.resetTime = resetTime; + } + + public AndonMgnManageQueue() { + } + + /** + * 安灯问题情况报表 + * @param organizeNameRdd + * @param workCenterNameRdd + * @param andonCount + */ + public AndonMgnManageQueue(String organizeNameRdd, String workCenterCode, String workCenterNameRdd, Long andonCount) { + this.organizeNameRdd = organizeNameRdd; + this.workCenterCode = workCenterCode; + this.workCenterNameRdd = workCenterNameRdd; + this.andonCount = andonCount; + } + + /** + * 工位统计报表查询 构造函数 + * @param workCenterCode + * @param workCenterNameRdd + * @param workCellCode + * @param workCellNameRdd + * @param equipmentCode + * @param equipmentNameRdd + * @param shiftCode + * @param shiftNameRdd + * @param alarmCode + * @param andonCount + */ + public AndonMgnManageQueue(String workCenterCode, String workCenterNameRdd, String workCellNameRdd, String workCellCode, + String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, + String alarmCode, Long andonCount) { + this.workCenterCode = workCenterCode; + this.workCenterNameRdd = workCenterNameRdd; + this.workCellNameRdd = workCellNameRdd; + this.workCellCode = workCellCode; + this.equipmentCode = equipmentCode; + this.equipmentNameRdd = equipmentNameRdd; + this.shiftCode = shiftCode; + this.shiftNameRdd = shiftNameRdd; + this.alarmCode = alarmCode; + this.andonCount = andonCount; + } + + + public static void main(String[] args) { + try { + List ds = new ArrayList(); + ds.add(new AndonMgnManageQueue()); + System.out.println(BeanUtils.describe(ds)); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } + } + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMgnManageQueueRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMgnManageQueueRepository.java new file mode 100644 index 0000000..dbf3408 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonMgnManageQueueRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonMgnManageQueue; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/6/18 5:14 PM + * @Modify: + */ +public interface IAndonMgnManageQueueRepository extends BaseRepository { +} From a63ce49a89199f0e4a716822250a3cddc4bcfa65 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 21 Jun 2021 18:02:32 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2?= 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 4d58a9e..ab02943 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 @@ -135,7 +135,9 @@ public class WmsHqlPack { //查询参数封装 // 该查询封装用于单据主表查询明细使用equal 精准查询 - DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + if (!StringUtil.isEmpty(wmsDocMovementDetails.getOrderNo())) { + DdlPreparedPack.getInPackList(Arrays.asList(wmsDocMovementDetails.getOrderNo().split(",")), "orderNo", result); + } DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result);