Merge branch 'test' into dev

yun-zuoyi
王杰 4 years ago
commit c6bc2e682a

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -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<Object> statusList;
@Transient
@ApiParam(value = "查询条件ANDON状态")
private List<Object> 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<String> 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();
}
}
}

@ -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;
}

@ -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<AndonMgnManageQueue, Long> {
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -109,6 +109,8 @@ public class BaseOrder extends BaseAPS {
@FieldAnnotation(modify = false)
private Integer delayTime;
private transient Date lastBegin;
@JsonBackReference
public List<Work> getWorks() {
return BeanRelation.list(this, EBaseOrder.Works);

@ -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;
}

@ -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<InterMediateDetail> getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); }
public List<InterMediateDetail> getDetails() { return BeanRelation.list(this, EInterMediateResult.Details); }
}

@ -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<RuleDetail> getDetails() { return BeanRelation.list(this, ERuleGroup.Details); }
}

@ -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")

@ -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<InterMediateResult> getEvaluateResult() { return BeanRelation.list(this, EWork.EvaluateResult); }
}

@ -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;

@ -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();

@ -15,4 +15,5 @@ public enum EWork {
SpecifyResource, // 指定资源
DynSplitWorks, // 动态拆分后的工作
OriginWork, // 动态拆分前的工作
EvaluateResult, // 资源评估结果
}

@ -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;
}
}

@ -11,6 +11,7 @@ import lombok.Data;
**/
@Data
public class RuleGroupProgress {
private Integer mainProgress;
private String message;
private Integer progress;
}

@ -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);
}
}

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="InterMediateResult">
<Relation field="Work" name="Work" type="MULTI_TO_ONE">
</Relation>
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE">
</Relation>
<Relation field="Details" name="InterMediateDetail" reverse="Result" type="ONE_TO_MULTI" owner="true">

@ -22,4 +22,6 @@
</Relation>
<Relation field="DynSplitWorks" name="Work" reverse="OriginWork" type="ONE_TO_MULTI">
</Relation>
<Relation field="EvaluateResult" name="InterMediateResult" reverse="Work" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -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;

@ -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;
@ -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;
}
}
}

@ -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;

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -13,6 +13,7 @@
<artifactId>i3plus-pojo-form</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -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;

@ -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("是否主数据")

@ -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;
}

@ -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;
}

@ -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<T> implements Serializable {
private static final long serialVersionUID = -1642626000860074060L;
@ -93,4 +100,8 @@ public class MdmSyncData implements Serializable {
@ApiParam("同步失败信息")
private String syncFailMessage;
@ApiParam("同步数据值")
private List<T> syncData;
}

@ -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<String> mdmSubscribeFields;
@Column(name = "INTERNAL_APP_NUM")
@ApiParam("内部订阅应用数量")
private Integer internalAppNum;

@ -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;
}

@ -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;
}

@ -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;
}

@ -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<MdmExternalApp, Long> {
}

@ -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<MdmMail, Long> {
}

@ -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<MdmSyncDataThrough, Long> {
}

@ -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<MdmField, Long> {
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -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"})
})

@ -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;

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;

@ -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;

@ -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;
}

@ -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;

@ -77,4 +77,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
@Transient
@ApiParam("收货日期")
private String receiptDate;
@Transient
@ApiParam("选配类型")
private Integer optionType;
}

@ -29,15 +29,12 @@ public class CosmaDefectModel {
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("缺陷代码集合")
private List<String> defectCodeList;
@ApiParam("缺陷代码")
private String defectCode;
@ApiParam("缺陷位置")
private String location;
@ApiParam("操作人")
private String userName;
@ApiParam("报废原因")
private String scrapCode;
}

@ -166,6 +166,9 @@ public class StationRequestBean implements Serializable {
@ApiParam("工步弹框状态")
private Boolean stepDialogStatus = false;
@ApiParam("按钮显示开关")
private Boolean buttonDisplay = true;
@ApiParam("是否按时完成")
private Integer isOnTimeComplete = 1;

@ -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;

@ -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;
}

@ -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<MesElectrotestingPrintData, Long> {
}

@ -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<MesFailureModeApproval, Long> {
}

@ -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<MesFailureModeParts, Long> {
}

@ -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<MesLockRecord, Long> {
}

@ -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<MesPendingReportType, Long> {
}

@ -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;
}
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -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)

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -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;
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -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;

@ -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;

@ -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);

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-DEV-SNAPSHOT</version>
<version>1.0.0.1</version>
<modules>
<module>modules/i3plus-pojo-base</module>

@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
sonar.projectName=i3plus-pojo
# defaults to 'not provided'
sonar.projectVersion=1.0-DEV-SNAPSHOT
sonar.projectVersion=1.0.0.1
# Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./

Loading…
Cancel
Save