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/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index a8890ef..ff9e619 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.andon.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import java.io.Serializable; /** @@ -77,6 +78,18 @@ public class AndonBoardModel implements Serializable { @ApiParam("停线时间比率") private String downtimeRate; + @ApiParam("周") + private Integer week; + + @ApiParam(value = "事件原因代码") + public String ecCode; + + @ApiParam(value = "事件原因描述") + public String ecNameRdd; + + @ApiParam(value = "小时") + public String hour; + public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; } 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 { +} 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 3a8b8ff..b22eb80 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 @@ -109,6 +109,8 @@ public class BaseOrder extends BaseAPS { @FieldAnnotation(modify = false) private Integer delayTime; + private transient Date lastBegin; + @JsonBackReference public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 6a96b97..a4091af 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -49,8 +49,16 @@ public class HeuristicRule extends BaseRule { @FieldAnnotation(defaultValue = "true") private Boolean insertIdle; + @Column(name="WAITING_TIME") + @ApiParam(value ="最大等待时间") + private String waitingTime; + @Column(name="BATCH_PERIOD") @ApiParam(value ="组炉区间") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String batchPeriod; + + @Column(name="REVER_FLUSH_PLAN") + @ApiParam(value ="逆向刷新计划") + private Boolean reverFlushPlan = false; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java index 8368fd4..87d59be 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java @@ -33,7 +33,7 @@ public class InterMediateResult extends BaseAPS { private static final long serialVersionUID = -1869359887027950540L; @Column(name="WORK_ID") - @ApiParam(value ="工作") + @ApiParam(value ="工作编码") @FieldAnnotation(relation = "Work") private Long workId; @@ -63,5 +63,5 @@ public class InterMediateResult extends BaseAPS { } @JsonBackReference - public List getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); } + public List getDetails() { return BeanRelation.list(this, EInterMediateResult.Details); } } 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 28e424e..eb2a239 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,9 +1,11 @@ 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; import cn.estsh.i3plus.pojo.aps.holders.ERuleGroup; +import cn.estsh.i3plus.pojo.aps.model.RuleDetailModel; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -44,6 +46,9 @@ public class RuleGroup extends BaseAPS { @ApiParam(value ="当前执行的规则名称") private transient String curDetailName; + @FieldAnnotation(property = false) + private transient RuleDetailModel model; + @JsonBackReference public List getDetails() { return BeanRelation.list(this, ERuleGroup.Details); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index be15e07..7fce6f7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -63,6 +63,11 @@ public class StandOperation extends BaseAPS { @ApiParam(value ="分割余数") private Double remainder; + @Column(name="MIN_SPACE_TIME") + @ApiParam(value ="最小时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) + private String minSpaceTime; + @Column(name="COMB_TYPE") @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") 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 c7693dd..866ebe5 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 @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWork; +import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; @@ -18,6 +19,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; import java.util.List; @@ -164,6 +166,9 @@ public class Work extends BaseAPS { @ApiParam(value ="动态拆分工作ID") private Long originWorkId; + @ApiParam(value ="工作排序顺序") + private Integer workSeqNumber; + // 排程时，找插入位置的评估值 private transient double evaluateValue = 0; @@ -264,4 +269,7 @@ public class Work extends BaseAPS { this.originWorkId = work != null ? work.getId() : 0; BeanRelation.set(this, EWork.OriginWork, work); } + + @JsonBackReference + public List getEvaluateResult() { return BeanRelation.list(this, EWork.EvaluateResult); } } 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 decabfa..4125b4d 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 @@ -19,6 +19,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.util.Date; +import java.util.List; /** * @Description :工作计划 @@ -119,6 +120,12 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="打印时间") private Date printTime; + @ApiParam(value ="生产结束时间") + @FieldAnnotation(display = false) + @Transient + @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse") + private Date resProduceEnd; + @Transient @FieldAnnotation(property = false) private boolean hasCominbed = false; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index a5caf9e..35f5add 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -25,12 +25,12 @@ public class DateDuration { public static final double PRECISION = 0.00001; private String value; - private int time = 0; + private long time = 0; private double rate = 0.0; private boolean bValid = false; private int unit = 0; - public DateDuration(int value) { + public DateDuration(long value) { this.time = value; } @@ -65,7 +65,7 @@ public class DateDuration { * 对于无效的时间区间，返回0。单位为秒。 * @return */ - public int getTime() { + public long getTime() { return this.time; } @@ -73,7 +73,7 @@ public class DateDuration { * 设置新的时间区间。 * @return */ - public void setTime(int time) { + public void setTime(long time) { this.time = time; } @@ -144,7 +144,7 @@ public class DateDuration { * @param amount * @return */ - public int getTime(double amount) { + public long getTime(double amount) { if (amount < PRECISION) return getTime(); 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 70d265e..25c90c3 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 @@ -15,4 +15,5 @@ public enum EWork { SpecifyResource, // 指定资源 DynSplitWorks, // 动态拆分后的工作 OriginWork, // 动态拆分前的工作 + EvaluateResult, // 资源评估结果 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java new file mode 100644 index 0000000..6c0b455 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class RuleDetailModel { + @ApiParam(value ="主执行进度") + private Integer mainProcess = 0; + + @ApiParam(value ="总规则数") + private Integer mainSize = 0; + + @ApiParam(value ="当前执行进度") + private Integer curProcess = 0; + + @ApiParam(value ="总行数") + private Integer totalSize = 0; + + @ApiParam(value ="进度消息") + private String processMsg = ""; + + @ApiParam(value ="进度消息明细") + private String subMsg = ""; + + private Boolean finish = false; + + @ApiParam(value ="异常消息") + private String exception = ""; + + public void addProcess() { + this.curProcess += 1; + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java index 7344176..f3df9c1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java @@ -11,6 +11,7 @@ import lombok.Data; **/ @Data public class RuleGroupProgress { + private Integer mainProgress; private String message; private Integer progress; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java index 6c4e2ba..f7736e5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java @@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.tool; public class APSDoubleTool { public static boolean isZero(Double value) { - return (value == null) || (value > -0.000001 && value < 0.000001); + return (value == null) || (value > -0.0000001 && value < 0.0000001); } } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml index 6b7a99d..87c0210 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/InterMediateResult.xml @@ -1,7 +1,5 @@ - - 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 da892ce..5663143 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -22,4 +22,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 0d7160b..ec2bba5 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 @@ -444,6 +444,7 @@ public class ApsEnumUtil { PRODUCE_TIME("PRODUCE_TIME", "生产时间"), POST_SET_TIME("POST_SET_TIME", "后设置时间"), WORK_WAIT_TIME("WORK_WAIT_TIME", "工作等待时间"), + WAIT_TIME_LIMIT("WAIT_TIME_LIMIT", "等待时间限制"), RES_BALANCE("RES_BALANCE", "资源均衡度"), SAME_MATERIAL("SAME_MATERIAL", "相同物料"), SAME_ORDER("SAME_ORDER", "相同订单"), @@ -1291,7 +1292,9 @@ public class ApsEnumUtil { public enum SANLUX_OPERATION_TYPE { NORMAL("NORMAL", "正常工序"), FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"), - FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"); + FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"), + FOUR_COATING("FOUR_COATING", "四车间覆胶"), + FOUR_WRAPPING("FOUR_WRAPPING", "四车间包布"); private String value; private String description; 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 f4df909..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 @@ -2101,7 +2101,11 @@ public class MesEnumUtil { MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), MES_JISA(640, "jisaExcelService", "JISA导入"), MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"), - MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"); + MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"), + MES_PENDING_REPORT_TYPE(670, "pendingReportTypeExcelService", "待处理报工类型导入"), + MES_FAILURE_MODE_PARTS(680, "failureModePartsExcelService", "失效模式零件导入"), + MES_ELECTROTESTING_PRINT_DATA(690, "electrotestingPrintDataExcelService", "电检打印数据导入"); + private int value; private String service; @@ -4794,7 +4798,8 @@ public class MesEnumUtil { CANCEL(30, "取消"), OFFLINE(40, "下线"), SHIPMENT(50, "发运"), - SPECIAL(60, "特殊标识"); + SPECIAL(60, "特殊标识"), + FORCE_REPORT_WORK(70, "强制报工"); private int value; private String description; @@ -5725,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", "函数赋值"), @@ -8432,4 +8437,70 @@ public class MesEnumUtil { return tmp; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PENDING_REPORT_TYPE { + + IDENTIFICATION_TYPE(10, "鉴定类型"), + FAILURE_MODE(20, "失效模式"); + + private int value; + private String description; + + PENDING_REPORT_TYPE(int value, String description) { + this.value = value; + this.description = 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 int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PERSONNEL_LEVEL { + + ONE(10, "一级"), + TWO(20, "二级"); + + private int value; + private String description; + + PERSONNEL_LEVEL(int value, String description) { + this.value = value; + this.description = 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 int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } 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 b2a2d97..4557014 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 @@ -349,10 +349,11 @@ public class MesPcnEnumUtil { 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", ""), + PCN_LOGIN(160, "PCN_LOGIN", "PCN登陆"), + PCN_MENU(170, "PCN_MENU", "PCN菜单"), + PCN_MODULE(180, "PCN_MODULE", "PCN模块"), + PCN_LOGOUT(190, "PCN_LOGOUT", "PCN登出"), + PCN_UPDATE_PASSWORD(195, "PCN_UPDATE_PASSWORD", "PCN修改密码"), UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), PCN_SYS_ALL_LANGUAGE_URL(220, "PCN_SYS_ALL_LANGUAGE_URL", "PCN_SYS_ALL_LANGUAGE_URL"), 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 09a9a27..ce8d025 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 @@ -1838,7 +1838,9 @@ public class WmsEnumUtil { FINISH(20, "处理中"), FAIL(30, "已完成"), CLOSE(40, "已关闭"), - CANCEL(50, "已取消"); + CANCEL(50, "已取消"), + REJECT(60, "全部退货"), + SPECIAL(70, "全部特采"); private int value; private String description; @@ -1873,7 +1875,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_ITEM_STATUS { NORMAL(10, "正常"), - CANCELLATION(20, "已处理"); + CANCELLATION(20, "已处理"), + SPECIAL(30, "部分特采"); private int value; private String description; @@ -3399,7 +3402,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_PART_TYPE { RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品"), CONTAINER_PRODUCT(40, "容器"), - UTENSIL(50, "器具"); + UTENSIL(50, "器具"), + TRADE_PRODUCT(60,"贸易品"); private int value; private String description; diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/model/LogParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/model/LogParam.java new file mode 100644 index 0000000..8ca4320 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/model/LogParam.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.bsp.client.bean.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +import java.io.Serializable; + +/** + * @author ns + * @create 2021/6/19 0019 下午 16:46 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class LogParam implements Serializable { + private long logDateTime; + private long logId; + private int fromLineNum; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/model/MethodExcuteParam.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/model/MethodExcuteParam.java index 7e14ece..edfbf5d 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/model/MethodExcuteParam.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/model/MethodExcuteParam.java @@ -25,4 +25,10 @@ public class MethodExcuteParam implements Serializable { private Map jsonParamMap; @ApiParam(value = "调用方法参数列表", allowEmptyValue = true) private Object[] jsonParamArray; + @ApiParam("日志id") + private Integer logId; + @ApiParam("日志时间") + private String logDateTimeParam; + @ApiParam("调用的超时时间") + private Integer executorTimeout; } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/LogResult.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/LogResult.java new file mode 100644 index 0000000..71d6799 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/LogResult.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.bsp.client.bean.po; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +/** + * @author ns + * @create 2021/6/18 0018 上午 10:53 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ToString +@Api("查询方法日志的结果") +public class LogResult { + + @ApiParam("日志开始行号") + private int fromLineNum; + @ApiParam("日志结束行号") + private int toLineNum; + @ApiParam("日志内容") + private String logContent; + @ApiParam("日志是否结束") + private boolean isEnd; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/ParamDescription.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/ParamDescription.java index f37c059..cae7e39 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/ParamDescription.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/ParamDescription.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.Map; /** * @author ns @@ -39,4 +40,5 @@ public class ParamDescription implements Serializable { //是否可以为空 @ApiParam("参数是否可以为空") private Boolean allowEmptyValue; + } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/util/GsonTool.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GsonTool.java similarity index 97% rename from modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/util/GsonTool.java rename to modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GsonTool.java index 8fddf3a..63e2956 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/util/GsonTool.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GsonTool.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.bsp.common.util; +package cn.estsh.i3plus.pojo.bsp.common; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/util/HttpUtils.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java similarity index 96% rename from modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/util/HttpUtils.java rename to modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java index 2d28014..f1032b0 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/util/HttpUtils.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java @@ -1,6 +1,5 @@ -package cn.estsh.i3plus.pojo.bsp.common.util; +package cn.estsh.i3plus.pojo.bsp.common; -import cn.estsh.i3plus.pojo.bsp.common.ReturnT; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,10 +64,9 @@ public class HttpUtils { * @param url * @param timeout * @param requestObj - * @param returnTargClassOfT * @return */ - public static ReturnT postBody(String url, int timeout, Object requestObj, Class returnTargClassOfT) { + public static ReturnT postBody(String url, int timeout, Object requestObj) { HttpURLConnection connection = null; BufferedReader bufferedReader = null; try { diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java new file mode 100644 index 0000000..0614b68 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/21 10:40 + * @Modify: + **/ +@Data +@AllArgsConstructor +@Api("添加方法组") +public class MethodGroupModel { + + @ApiParam("方法组的名称") + private String methodGroupName; + @ApiParam("方法组的描述") + private String description; + @ApiParam("方法组层级列表") + private List methodLevel; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java new file mode 100644 index 0000000..13ca0b7 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/21 10:50 + * @Modify: + **/ +@Data +@AllArgsConstructor +@Api("添加方法组层级") +public class MethodLevelModel { + + @ApiParam("方法Id") + private Long methodId; + @ApiParam("方法层级") + private String level; + @ApiParam("参数列表") + List paramModels; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java new file mode 100644 index 0000000..5664d22 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/21 11:18 + * @Modify: + **/ +@Data +@AllArgsConstructor +@Api("添加方法组层级参数") +public class MethodLevelParamModel { + @ApiParam("根据出参生成，入参key = 层级 + methodId + 出参Name") + private String paramKey; + @ApiParam("对应本方法的入参名称") + private String paramValue; + @ApiParam("入参类型，用于校验数据类型") + private String type; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java index 4bac2c0..06899f1 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java @@ -14,7 +14,7 @@ import lombok.Data; **/ @Data @AllArgsConstructor -@Api("方法祖册参数") +@Api("方法注册参数") public class RegistryMethodParamInfo { @ApiParam("参数名") diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java new file mode 100644 index 0000000..1d3d656 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/18 11:03 + * @Modify: + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +@ApiModel("远程调用方法参数") +public class RequestModel { + @ApiModelProperty("执行方法的key") + private String methodHandlerKey; + @ApiModelProperty("方法的入参") + private Map jsonParamMap; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java index 77de389..8da6d03 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java @@ -43,7 +43,7 @@ public class ExecutorGroupRegistryInfo extends BaseBean implements Serializable private String type; @Column - @ApiModelProperty("执行器组路由策略") + @ApiModelProperty("执行器组路由策略,默认随机") private String routeStrategy; @Column(name = "UPDATE_TIME") diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java index b18a7f7..38e7baa 100644 --- a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java @@ -8,7 +8,9 @@ import lombok.*; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description : @@ -48,4 +50,8 @@ public class ExecutorRegistryMethodInfo extends BaseBean implements Serializable @ApiModelProperty("所属执行器的appName") private String appName; + @Transient + @ApiModelProperty("方法参数列表") + private List paramInfos; + } diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java new file mode 100644 index 0000000..f010070 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.po; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/18 14:31 + * @Modify: + **/ +@Entity +@Table(name = "METHOD_GROUP_INFO") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("方法组合") +public class MethodGroupInfo extends BaseBean implements Serializable { + + + private static final long serialVersionUID = -7868208264526298210L; + + @Column(name = "NAME") + @ApiModelProperty("方法组名称") + private String name; + + @Column(name = "DESCRIPTION") + @ApiModelProperty("方法组描述") + private String description; + + +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelInfo.java new file mode 100644 index 0000000..c1b4f15 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelInfo.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.po; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/18 14:46 + * @Modify: + **/ +@Entity +@Table(name = "METHOD_LEVEL_INFO") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("方法层级") +public class MethodLevelInfo extends BaseBean implements Serializable { + private static final long serialVersionUID = -6341443254774985571L; + + + @Column(name = "METHOD_GROUP_ID") + @ApiModelProperty("所属方法组的ID") + private Long methodGroupId; + + @Column(name = "LEVEL") + @ApiModelProperty("执行层级，相同层级可以并行执行") + private String level; + + @Column(name = "METHOD_ID") + @ApiModelProperty("当前层级的方法ID") + private Long methodId; + + @Transient + @ApiModelProperty("方法的参数关系列表") + private List paramInfoList; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelParamInfo.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelParamInfo.java new file mode 100644 index 0000000..23c0d46 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelParamInfo.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.po; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/18 15:08 + * @Modify: + **/ +@Entity +@Table(name = "METHOD_LEVEL_PARAM_INFO") +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel("方法层级参数关系") +public class MethodLevelParamInfo extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5700666543596399984L; + /** + * 来源 层级 + 参数名 + 方法Id + */ + @Column(name = "PARAM_KEY") + @ApiModelProperty("参数来源 层级 + 参数名 + 方法Id") + private String paramKey; + /** + * 对应方法的入参名称 + */ + @Column(name = "METHOD_PARAM_NAME") + @ApiModelProperty("对应当前方法的入参名称") + private String methodParamName; + + /** + * 对应的methodId + */ + @Column(name = "METHOD_ID") + @ApiModelProperty("对应的当前层级的方法Id") + private Long methodId; + + @Column(name = "METHOD_GROUP_ID") + @ApiModelProperty("对应方法组的Id") + private Long methodGroupId; + /** + * 原有方法的入参是否必须，做验证 + */ + @Column(name = "require") + @ApiModelProperty("原有方法的入参是否必须，做调用前验证") + private Integer require; + /** + * 参数类型，验证是否正确 + */ + @Column(name = "type") + @ApiModelProperty("参数类型验证") + private String type; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/screen/InvokeMethodGroupModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/screen/InvokeMethodGroupModel.java new file mode 100644 index 0000000..5ddca9e --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/screen/InvokeMethodGroupModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.screen; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/21 11:42 + * @Modify: + **/ +@Data +@AllArgsConstructor +@Api("调用方法组") +public class InvokeMethodGroupModel { + @ApiParam("方法组Id") + private Long methodGroupId; + @ApiParam("方法组入参") + private Map paramMap; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/screen/InvokeMethodModel.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/screen/InvokeMethodModel.java new file mode 100644 index 0000000..4d651d0 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/screen/InvokeMethodModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.bsp.server.bean.screen; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/21 9:44 + * @Modify: + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Api("通用界面单独调用方法") +public class InvokeMethodModel { + @ApiParam("调用方法的Id,或者方法组Id") + private Long id; + + @ApiParam("方法的入参map") + private Map params; +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodGroupInfoRepository.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodGroupInfoRepository.java new file mode 100644 index 0000000..f231404 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodGroupInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.bsp.server.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.bsp.server.bean.po.MethodGroupInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/21 10:25 + * @Modify: + **/ +@Repository +public interface MethodGroupInfoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLevelInfoRepository.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLevelInfoRepository.java new file mode 100644 index 0000000..bf29f09 --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLevelInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.bsp.server.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.bsp.server.bean.po.MethodLevelInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/21 10:26 + * @Modify: + **/ +@Repository +public interface MethodLevelInfoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLevelParamInfoRepository.java b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLevelParamInfoRepository.java new file mode 100644 index 0000000..37c8eea --- /dev/null +++ b/modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/MethodLevelParamInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.bsp.server.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.bsp.server.bean.po.MethodLevelParamInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/6/21 10:27 + * @Modify: + **/ +@Repository +public interface MethodLevelParamInfoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index a9e288f..712a842 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -13,6 +13,7 @@ i3plus-pojo-form jar + diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java index b549407..c24359e 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java @@ -34,10 +34,9 @@ public abstract class BaseMdmBean extends BaseBean { public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); @Column(name = "MDM_VERSION") - @ApiParam("mdm数据版本") + @ApiParam("当前版本") @JsonSerialize(using = ToStringSerializer.class) - @AnnoOutputColumn(hidden = true) - private Long mdmVersion; + public Long mdmVersion; public long getMdmVersionVal() { return mdmVersion == null ? 0 : mdmVersion; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java index a35e1f0..2b968fb 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java @@ -24,7 +24,7 @@ import javax.persistence.Transient; @ApiModel("MDM业务基础bean") public class BaseMdmBusiExtdBean extends BaseMdmBean { - private static final long serialVersionUID = 4267453020130810967L; + private static final long serialVersionUID = 4267453020130811234L; @Transient @ApiParam("是否主数据") diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java new file mode 100644 index 0000000..443e6b5 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import io.swagger.annotations.ApiModel; +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 : pantianhu + * @CreateDate : 2021-05-26 17:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MDM_FIELD") +@ApiModel("表字段") +public class MdmField extends BaseMdmBean { + + @Column(name="TABLE_NAME") + @ApiParam(value ="表名") + private String tableName; + + @Column(name="TABLE_DESCRIPTION") + @ApiParam(value ="表描述") + private String tableDescription; + + @Column(name="FIELD_NAME") + @ApiParam(value ="字段名称") + private String fieldName; + + @Column(name="FIELD_DESCRIPTION") + @ApiParam(value ="字段描述") + private String fieldDescription; + + @Column(name="SERVICE_NAME") + @ApiParam(value ="服务名称") + private String serviceName; + + @Column(name="SERVICE_CODE") + @ApiParam(value ="服务代码") + private String serviceCode; + + @Column(name="IS_SELECT") + @ApiParam(value ="是否选中") + private Integer isSelect; +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmMail.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmMail.java new file mode 100644 index 0000000..24b1806 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmMail.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mdm.bean.base; + +import io.swagger.annotations.ApiModel; +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 : pantianhu + * @CreateDate : 2021-05-29 15:17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MDM_MAIL") +@ApiModel("邮件配置") +public class MdmMail extends BaseMdmBean{ + @Column(name = "MESSAGE_SENDER_NAME_RDD") + @ApiParam(value = "发送者名称") + private String messageSenderNameRdd; + + @Column(name = "MESSAGE_RECEIVERS_NAME_RDD") + @ApiParam(value = "接受者名称") + private String messageReceiversNameRdd; + + @Column(name = "IS_SEND") + @ApiParam(value = "是否发送") + private Integer isSend; + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java index 0fe465f..0deccf1 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java @@ -3,10 +3,17 @@ package cn.estsh.i3plus.pojo.mdm.bean.base; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.hibernate.annotations.GenericGenerator; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; import java.io.Serializable; import java.util.List; @@ -19,7 +26,7 @@ import java.util.List; **/ @Data @ApiModel("数据中心同步数据") -public class MdmSyncData implements Serializable { +public class MdmSyncData implements Serializable { private static final long serialVersionUID = -1642626000860074060L; @@ -93,4 +100,8 @@ public class MdmSyncData implements Serializable { @ApiParam("同步失败信息") private String syncFailMessage; + + @ApiParam("同步数据值") + private List syncData; + } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java index b9cb717..e3eee60 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; @@ -41,6 +38,31 @@ public class MdmDataSubscribe extends BaseBean { @ApiParam("主数据名称") private String mdmName; + + @Column(name = "MDM_SUBSCRIBE") + @ApiParam("订阅对象") + private String mdmSubscribe; + + @Column(name = "MDM_SUBSCRIBE_TYPE") + @ApiParam("订阅类型") + private Integer mdmSubscribeType; + + @Column(name = "MDM_SUBSCRIBE_PERMISSIONS") + @ApiParam("订阅权限") + private String mdmSubscribePermissions; + + @Column(name = "MDM_SUBSCRIBE_FIELD") + @ApiParam("订阅字段") + @Lob + private String mdmSubscribeField; + + @Transient + @ApiParam("订阅字段保存List") + private List mdmSubscribeFields; + + + + @Column(name = "INTERNAL_APP_NUM") @ApiParam("内部订阅应用数量") private Integer internalAppNum; diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java index 8a05c07..5da00ee 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java @@ -31,19 +31,32 @@ public class MdmExternalApp extends BaseBean { private static final long serialVersionUID = -5344361274535836969L; @Column(name = "APP_NAME") - @ApiParam("应用名称") + @ApiParam("服务名称") private String appName; @Column(name = "APP_CODE") - @ApiParam("应用代码") + @ApiParam("服务代码") private String appCode; @Column(name = "CALL_TOKEN") @ApiParam("调用令牌") private String callToken; + @Column(name = "APP_BRIEF") + @ApiParam("服务简介") + private String appBrief; + @Column(name = "CALLBACK_URL") - @ApiParam("回调地址") + @ApiParam("回调接口") private String callbackUrl; + + @Column(name = "EMAIL") + @ApiParam("通知邮箱") + private String email; + + @Column(name = "OPERATE_TYPE") + @ApiParam("操作类型") + private String operateType; + } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java new file mode 100644 index 0000000..a1fd2c2 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmSyncDataThrough.java @@ -0,0 +1,111 @@ +package cn.estsh.i3plus.pojo.mdm.bean.master; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean; +import io.swagger.annotations.ApiModel; +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.Transient; +import java.util.List; + +/** + * @Description : 主数据齿轮 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-12 18:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MDM_SYNC_DATA_THROUGH") +@ApiModel("处理以通过中心同步数据") +public class MdmSyncDataThrough extends BaseMdmBean { + + private static final long serialVersionUID = -1642626000861174060L; + + @ApiParam("同步数据类型") + @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_SYNC_TYPE.class) + private Integer syncType; + + public int getSyncTypeVal() { + return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType; + } + + public String getSyncTypeTxt() { + return syncType == null ? "无" : MdmEnumUtil.MDM_SYNC_TYPE.valueOfDescription(syncType); + } + + @ApiParam("同步模块") + @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_SYNC_APP_TYPE.class) + private Integer syncAppType; + + public int getSyncAppTypeVal() { + return syncAppType == null ? MdmEnumUtil.MDM_SYNC_APP_TYPE.INTERNAL.getValue() : syncAppType; + } + + public String getSyncAppTypeTxt() { + return syncAppType == null ? "无" : MdmEnumUtil.MDM_SYNC_APP_TYPE.valueOfDescription(syncAppType); + } + + @ApiParam("同步模块") + private Long syncSoftType; + + @ApiParam("同步模块名称") + private String syncSoftTypeName; + + @ApiParam("是否是主数据") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isMasterData; + + public int getIsMasterDataVal() { + return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData; + } + + public String getIsMasterDataTxt() { + return isMasterData == null ? "无" : CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(isMasterData); + } + + @ApiParam("同步数据class") + private String syncDataClass; + + public String getSyncDataClassSimpleName() { + if (syncDataClass == null) { + return null; + } + + return syncDataClass.trim().substring(syncDataClass.trim().lastIndexOf(".") + 1); + } + + @ApiParam("同步数据id") + @AnnoOutputColumn(hidden = true) + private String syncDataId; + + @ApiParam("同步数据用户名") + private String syncDateUserName; + + @ApiParam("同步时间") + private String syncDateTime; + + @ApiParam("同步失败键") + private String syncFailKey; + + @ApiParam("同步失败时间") + private String syncFailDateTime; + + @ApiParam("同步失败信息") + private String syncFailMessage; + + +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java index 874d299..91cad4f 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java @@ -21,7 +21,7 @@ public class MdmHqlPack { public static DdlPackBean getMdmPackBean(BaseMdmBean mdmBean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean); + DdlPreparedPack.getNumEqualPack(mdmBean.getIsMdmPublished(), "isMdmPublished", ddlPackBean); DdlPreparedPack.getNumEqualPack(mdmBean.isValid, "isValid", ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java index 7d89f14..264f9ca 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java @@ -1,9 +1,14 @@ package cn.estsh.i3plus.pojo.mdm.repository.busi; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmExternalApp; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Set; + /** * @Description : * @Reference : @@ -13,4 +18,5 @@ import org.springframework.stereotype.Repository; **/ @Repository public interface MdmExternalAppRepository extends BaseRepository { + } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmMailRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmMailRepository.java new file mode 100644 index 0000000..12c5d04 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmMailRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mdm.repository.master; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.base.MdmMail; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-15 16:26 + * @Modify: + **/ +@Repository +public interface MdmMailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmSyncDataThroughRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmSyncDataThroughRepository.java new file mode 100644 index 0000000..1189a8d --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmSyncDataThroughRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mdm.repository.master; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear; +import cn.estsh.i3plus.pojo.mdm.bean.master.MdmSyncDataThrough; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-15 16:26 + * @Modify: + **/ +@Repository +public interface MdmSyncDataThroughRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java new file mode 100644 index 0000000..3ed4cc5 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/master/MdmfieldRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mdm.repository.master; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mdm.bean.base.MdmField; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : pantianhu + * @CreateDate : 2021-05-26 20:33 + * @Modify: + **/ +@Repository +public interface MdmfieldRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 64587ab..cc831dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -29,7 +29,8 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_PACKAGE_DETAIL", indexes = { @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "PART_NO") + @Index(columnList = "PART_NO"), + @Index(columnList = "PACKAGE_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "IF_CODE"}) }) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java index 70ef63e..58af48c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java @@ -4,15 +4,11 @@ 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 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.*; /** * @Description : MES_容器 @@ -40,6 +36,10 @@ public class MesContainer extends BaseBean { @ApiParam(value = "容器类型代码") private String ctCode; + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "产线代码") + private String workCenterCode; + @Column(name = "USE_STATUS") @ApiParam(value = "使用状态") private String useStatus; 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/bean/MesFailureModeApproval.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeApproval.java new file mode 100644 index 0000000..e957f35 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeApproval.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FAILURE_MODE_APPROVAL") +@Api("MES_失效模式审批人员") +public class MesFailureModeApproval extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式代码名称") + private String patternName; + + @Column(name = "DEPARTMENT_NAME_RDD") + @ApiParam("部门名称") + private String departmentNameRdd; + + @Column(name = "DEPARTMENT_ID") + @ApiParam("部门id") + private Long departmentId; + + @Column(name = "USER_NAME") + @ApiParam("人员名称") + private String userName; + + @Column(name = "USER_ID") + @ApiParam("人员id") + private Long userId; + + @Column(name = "PERSONNEL_LEVEL") + @ApiParam("人员级别") + private Integer personnelLevel; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeParts.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeParts.java new file mode 100644 index 0000000..0e91071 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeParts.java @@ -0,0 +1,54 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FAILURE_MODE_PARTS") +@Api("MES_失效模式零件") +public class MesFailureModeParts extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式代码名称") + private String patternName; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("零件名称") + private String partNameRdd; + + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("上限值") + private Double maximum = 0d; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java new file mode 100644 index 0000000..0e9d030 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java @@ -0,0 +1,67 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description :锁定记录 + * @Reference : + * @Author : dominic + * @CreateDate : 2021-06-10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_LOCK_RECORD") +@Api("mes锁定记录表") +public class MesLockRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5132229443235106976L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工位名称") + private String workCellName; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "LOCK_REASON") + @ApiParam("锁定原因") + private String lockReason; + + @Column(name = "EMPLOYEE_NUMBER") + @ApiParam("工号") + private String employeeNumber; + + @Column(name = "LOCK_STATUS") + @ColumnDefault("1") + @ApiParam("锁定状态") + private Integer lockStatus = 1; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index b463dcc..29b7d8d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -5,8 +5,6 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -77,4 +75,8 @@ public class MesPackageTravel extends BaseBean implements Serializable { @Column(name = "QR_CODE") @ApiParam("包装二维码") private String qrCode; + + @Column(name = "EMPLOYEE_NUMBER") + @ApiParam("员工编号") + private String employeeNumber; } 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; 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; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPendingReportType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPendingReportType.java new file mode 100644 index 0000000..6557e2c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPendingReportType.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PENDING_REPORT_TYPE") +@Api("MES_待处理报工类型") +public class MesPendingReportType extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式代码名称") + private String patternName; + + @Column(name = "REPORT_TYPE") + @ApiParam("类型") + private Integer reportType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 4721ce4..60ff8fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -4,8 +4,6 @@ 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 lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -162,6 +160,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("生产批次") private String lotNo; + @Column(name = "EMPLOYEE_NUMBER") + @ApiParam("员工编号") + private String employeeNumber; + @Transient @ApiParam("返回信息") private String resultMsg; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index 4ece2f1..0f467f2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -77,4 +77,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @Transient @ApiParam("收货日期") private String receiptDate; + + @Transient + @ApiParam("选配类型") + private Integer optionType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java index 9eeb99a..b195a30 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java @@ -29,15 +29,12 @@ public class CosmaDefectModel { @ApiParam("过程条码") private String serialNumber; - @ApiParam("缺陷代码集合") - private List defectCodeList; + @ApiParam("缺陷代码") + private String defectCode; @ApiParam("缺陷位置") private String location; @ApiParam("操作人") private String userName; - - @ApiParam("报废原因") - private String scrapCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 44c290b..62bf9dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -166,6 +166,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工步弹框状态") private Boolean stepDialogStatus = false; + @ApiParam("按钮显示开关") + private Boolean buttonDisplay = true; + @ApiParam("是否按时完成") private Integer isOnTimeComplete = 1; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java index be65d70..b849f71 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -8,6 +8,7 @@ import java.io.Serializable; /** * 产品履历报表-产品信息 + * * @author yumingxing * @version 1.0 * @date 2020/12/18 15:16 @@ -33,6 +34,9 @@ public class ProductSnModel implements Serializable { @ApiParam("CMS标签号") private String qrCode; + @ApiParam("料架号") + private String ctNo; + @ApiParam("产线") private String workCenterName; @@ -55,10 +59,8 @@ public class ProductSnModel implements Serializable { private String qcStatusName; - - - public ProductSnModel(String packageNo,String customerPartNo, String serialNumber, String partNo, - String qrCode, String workCenterName, String processName, + public ProductSnModel(String packageNo, String customerPartNo, String serialNumber, String partNo, + String qrCode, String ctNo, String workCenterName, String processName, String workCellName, String createDatetime, String createUser, Integer qcStatus) { this.packageNo = packageNo; @@ -66,6 +68,7 @@ public class ProductSnModel implements Serializable { this.serialNumber = serialNumber; this.partNo = partNo; this.qrCode = qrCode; + this.ctNo = ctNo; this.workCenterName = workCenterName; this.processName = processName; this.workCellName = workCellName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java new file mode 100644 index 0000000..b8506ca --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description : 报废率趋势model + * @Reference : + * @Author : dominic + * @CreateDate : 2021/6/17 19:12 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("报废率趋势model") +public class ScrapRateTrendReportModel { + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("修改时间") + private String modifyDatetime; + + @ApiParam("操作类型") + private Integer operateType; + + @ApiParam("报废原因") + private String scrapCode; +} 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 { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModeApprovalRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModeApprovalRepository.java new file mode 100644 index 0000000..21636c6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModeApprovalRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFailureModeApproval; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:53 + * @Modify: + **/ +public interface MesFailureModeApprovalRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModePartsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModePartsRepository.java new file mode 100644 index 0000000..db123d0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModePartsRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFailureModeParts; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Repository +public interface MesFailureModePartsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.java new file mode 100644 index 0000000..94c05a6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.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.MesLockRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : dominic + * @CreateDate : 2021/6/10 19:36 + * @Modify: + **/ +@Repository +public interface MesLockRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPendingReportTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPendingReportTypeRepository.java new file mode 100644 index 0000000..546c407 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPendingReportTypeRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPendingReportType; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Repository +public interface MesPendingReportTypeRepository 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 b759a7d..147360b 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 @@ -3825,4 +3825,21 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesDbDataCheck.getIsValid(), "isValid", packBean); return packBean; } + + public static DdlPackBean getMesPendingReportType(MesPendingReportType mesPendingReportType) { + DdlPackBean packBean = getAllBaseData(mesPendingReportType.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesPendingReportType.getPatternCode(), "patternCode", packBean); + DdlPreparedPack.getStringEqualPack(mesPendingReportType.getPatternName(), "patternName", packBean); + DdlPreparedPack.getNumEqualPack(mesPendingReportType.getReportType(), "reportType", packBean); + DdlPreparedPack.getNumEqualPack(mesPendingReportType.getIsValid(), "isValid", packBean); + return packBean; + } + + public static DdlPackBean getMesFailureModeParts(MesFailureModeParts mesFailureModeParts) { + DdlPackBean packBean = getAllBaseData(mesFailureModeParts.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesFailureModeParts.getPatternCode(), "patternCode", packBean); + DdlPreparedPack.getStringEqualPack(mesFailureModeParts.getPartNo(), "partNo", packBean); + DdlPreparedPack.getNumEqualPack(mesFailureModeParts.getIsValid(), "isValid", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 59afede..b05afcb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -99,6 +99,11 @@ public class SysMenu extends BaseBean { @AnnoOutputColumn(required = false) private String menuIcon; + @Column(name="MENU_BACKGROUND_IMAGE") + @ApiParam(value ="资源背景图片" , access ="资源背景图片") + @AnnoOutputColumn(required = false) + private String menuBackgroundImage; + @Column(name="MENU_DESCRIPTION") @ApiParam(value ="资源描述" , access ="配置描述") @AnnoOutputColumn(required = false) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java new file mode 100644 index 0000000..743fe36 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import lombok.Data; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.net.Socket; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/6/8 2:12 PM + * @Modify: + */ +@Data +public class MgnBjAblePickModel { + + private Socket socket = null; + + private String organizeCode; + private String areaNo; + private String clientInfo; + private String ip; + private Integer port; + private boolean isBackOff; + + private Integer timeout = 3000; + private Integer sleepTime = 2000; + + private DataOutputStream bw; + private DataInputStream br; +} 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 323b3f8..37fc2ec 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 @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -263,7 +263,9 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "收货日期时间") public String receiveDateTime; - + @Transient + @ApiParam("默认收货库存地") + private String erpAreaNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 37f3706..6ee40bf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -54,7 +54,6 @@ import java.util.List; @Inheritance(strategy = InheritanceType.JOINED) @Api(value = "库存条码信息", description = "库存条码信息") public class WmsStockSn extends BaseBean { - private static final long serialVersionUID = 4869307400585363697L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") @@ -1025,6 +1024,10 @@ public class WmsStockSn extends BaseBean { this.zoneNo = zoneNo; this.vendorNo = vendorNo; } + + + + public WmsStockSn(String partNo, Double qty) { this.partNo = partNo; this.qty = qty; 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 571116c..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); @@ -236,7 +238,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCostCenter(), "costCenter", packBean); DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getThirdRemake(), "thirdRemake", packBean); - + DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); @@ -484,6 +486,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); DdlPreparedPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); DdlPreparedPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); + DdlPreparedPack.getStringLikerPack(basVendor.getUserName(), "userName", result); DdlPreparedPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result); DdlPreparedPack.getNumEqualPack(basVendor.getVendorType(), "vendorType", result);