I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
yun-zuoyi
钮海涛 5 years ago
parent 1b6bbed47c b8c743896d
commit 56b1ae99a9
20 changed files with 204 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java
Unescape Escape View File

@ -34,7 +34,7 @@ public class AndonAlarmCause extends BaseBean implements Serializable {
private static final long serialVersionUID = 5837347497945981811L;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;

2
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java
Unescape Escape View File

@ -47,7 +47,7 @@ public class AndonEventCause extends BaseBean implements Serializable {
@AnnoOutputColumn(hidden = true)
private String parentEcCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;

2
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java
Unescape Escape View File

@ -47,7 +47,7 @@ public class AndonEventMethod extends BaseBean implements Serializable {
@ApiParam(value = "父阶方法代码")
private String parentEmCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;

8
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
Unescape Escape View File

@ -13,8 +13,6 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* @Description :
@ -65,18 +63,18 @@ public abstract class BaseBean implements Serializable {
this.id = id;
}
@Column(name="ORGANIZE_CODE", nullable = false)
@Column(name="ORGANIZE_CODE")
@ApiParam(value ="组织代码")
// @AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2)
public String organizeCode;
@Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
@Column(name="IS_VALID", columnDefinition = "int default 1")
@ApiParam(value = "有效性",example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
public Integer isValid; //CommonEnumUtil.IS_VAILD;
@Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false)
@Column(name="IS_DELETED", columnDefinition = "int default 2")
@ApiParam(value = "是否已删除",example = "2")
@AnnoOutputColumn(hidden = true)
//逻辑删除，软删除

6
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
Unescape Escape View File

@ -1331,7 +1331,8 @@ public class CommonEnumUtil {
// ELEMENT(700, "DICT_SELECT", "元素"),
DICTIONARY(800, "DICT_SELECT", "字典"),
CASCADE(900, "CASCADE", "级联"),
PICK_UP(1000, "PICK_UP", "拾取");
PICK_UP(1000, "PICK_UP", "拾取"),
INTERVAL(1100, "INTERVAL", "区间",SQL_WHERE.INTERVAL);
//FILE(400, "file", "文件"),
//IMAGE(410, "image", "image"),
//OFF(500, "color", "颜色"),
@ -1440,7 +1441,8 @@ public class CommonEnumUtil {
START_LIKE(41, " LIKE ", "前模糊"),
END_LIKE(52, " LIKE ", "后模糊"),
IN(50, " IN ", " in "),
BETWEEN(60, " BETWEEN ", "区间查询(逗号区分)"),;
BETWEEN(60, " BETWEEN ", "(between)区间查询(逗号区分)"),
INTERVAL(70, ">=And=< ", "(>= =<)区间查询(逗号区分)");
private int value;
private String code;

10
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -2355,7 +2355,8 @@ public class WmsEnumUtil {
MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"),
QC_ORDER_NO("QC_ORDER_NO", "质检单单号"),
CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"),
INITIALIZE_SN("INITIALIZE_SN", "库存初始化");
INITIALIZE_SN("INITIALIZE_SN", "库存初始化"),
IMPORT_DATA_MODEL_NO("IMPORT_DATA_MODEL_NO", "导入数据库文档模板单号");
private String code;
private String description;
@ -6437,7 +6438,12 @@ public class WmsEnumUtil {
DATE_FORMAT(4, "Date", "日期格式"),
FLOAT_FORMAT(5, "Float", "浮点格式"),
BOOL_FORMAT(6, "Boolean", "布尔格式"),
LONG_FORMAT(7, "LONG", "长整数格式");
LONG_FORMAT(7, "LONG", "长整数格式"),
BYTE_FORMAT(8, "Byte", "字节格式"),
BIGDECIMAL_FORMAT(9, "Bigdecimal", "BigDecimal格式"),
BLOB_FORMAT(10, "Blob", "BLOB格式"),
CLOB_FORMAT(11, "Clob", "CLOB格式"),
TIMESTAMP_FORMAT(12, "Timestamp", "时间戳格式");
private int value;
private String code;

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java
Unescape Escape View File

@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import java.io.Serializable;
import java.math.BigDecimal;
@ -94,7 +93,6 @@ public class IfDismantleRecord extends BaseBean implements Serializable {
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
@Lob
private String errorMessage;
@Column(name = "ACTION_CODE")

44
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java
Unescape Escape View File

@ -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: jokelin
* @Date: 2020/9/6 1:25 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BYPASS_MAPPING")
@Api("MES_BYPASS项映射关系")
public class MesBypassMapping extends BaseBean implements Serializable {
private static final long serialVersionUID = -6362769913660089402L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "BYPASS_SEQ")
@ApiParam("BYPASS项序号")
private Integer bypassSeq;
@Column(name = "CHECK_NAME")
@ApiParam("检测项描述")
private String checkName;
}

21
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java
Unescape Escape View File

@ -31,9 +31,9 @@ public class MesSnPhotoRelation extends BaseBean implements Serializable {
private static final long serialVersionUID = -3062206473345277360L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("条码")
@ApiParam("过程条码")
private String serialNumber;
//TODO 北京麦格纳使用，如要变更此字段需要更改对应业务代码
@Column(name = "PHOTO_PATH")
@ApiParam("照片路径")
private String photoPath;
@ -42,4 +42,21 @@ public class MesSnPhotoRelation extends BaseBean implements Serializable {
@ApiParam("照片名称")
private String photoName;
@Column(name = "PHOTO_URL")
@ApiParam("照片访问地址")
private String photoUrl;
@Column(name = "PHOTO_ORIGINAL_PATH")
@ApiParam("照片原始路径")
private String photoOriginalPath;
@Column(name = "PHOTO_TRANSFER_PATH")
@ApiParam("照片转存路径")
private String photoTransferPath;
@Column(name = "PHOTO_TARGET_PATH")
@ApiParam("照片目标路径")
private String photoTargetPath;
}

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java
Unescape Escape View File

@ -21,7 +21,7 @@ public class BypassModel {
private String bypassCode;
@ApiParam("检测项")
private String businessValue;
private String checkName;
@ApiParam("是否确认，1=已确认，2=未确认")
private String isVerify;
@ -29,4 +29,10 @@ public class BypassModel {
@ApiParam("生产数据ID")
private Long productDataId;
@ApiParam("BYPASS项序号")
private Integer bypassSeq;
@ApiParam("状态")
private String status;
}

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
Unescape Escape View File

@ -272,7 +272,7 @@ public class QueueOrderModel implements Serializable {
//getAlreadyQueueOrderModelNoSnMgn
public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo) {
String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo, String produceCategoryCode) {
this.id = id;
this.queueSeq = queueSeq;
this.queDetailSeq = queDetailSeq;
@ -288,6 +288,7 @@ public class QueueOrderModel implements Serializable {
this.vinCode = vinCode;
this.formulaContent = formulaContent;
this.queueGroupNo = queueGroupNo;
this.produceCategoryCode = produceCategoryCode;
}
//getAlreadyQueueOrderModelNoSn

13
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java
Unescape Escape View File

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBypassMapping;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/9/6 1:30 下午
* @Modify:
*/
public interface MesBypassMappingRepository extends BaseRepository<MesBypassMapping, Long> {
}

33
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -3291,6 +3291,39 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(snPhotoRelation.getPhotoName())) {
DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoName(), "photoName", packBean);
}
if (!StringUtils.isEmpty(snPhotoRelation.getPhotoPath())) {
DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoPath(), "photoPath", packBean);
}
if (!StringUtils.isEmpty(snPhotoRelation.getPhotoUrl())) {
DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoUrl", packBean);
}
if (!StringUtils.isEmpty(snPhotoRelation.getPhotoOriginalPath())) {
DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoOriginalPath", packBean);
}
if (!StringUtils.isEmpty(snPhotoRelation.getPhotoTransferPath())) {
DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoTransferPath", packBean);
}
if (!StringUtils.isEmpty(snPhotoRelation.getPhotoTargetPath())) {
DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoTargetPath", packBean);
}
return packBean;
}
/**
* MES_BYPASS项映射关系
*
* @param bypassMapping
* @param organizeCode
* @return
*/
public static DdlPackBean getBypassMapping(MesBypassMapping bypassMapping, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(bypassMapping, organizeCode);
if (!StringUtils.isEmpty(bypassMapping.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(bypassMapping.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(bypassMapping.getCheckName())) {
DdlPreparedPack.getStringLikerPack(bypassMapping.getCheckName(), "checkName", packBean);
}
return packBean;
}
}

3
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java
Unescape Escape View File

@ -45,4 +45,7 @@ public class BasBeanFieldInfoModel implements Serializable {
@ApiParam(value = "自增")
private String isFieldGeneric;
@ApiParam(value = "数据表描述")
private String tableDesc;
}

3
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java
Unescape Escape View File

@ -34,4 +34,7 @@ public class BasBeanInfoModel implements Serializable {
@ApiParam(value = "字段列表数据")
private List<BasBeanFieldInfoModel> fieldInfoModelList;
@ApiParam(value = "表名列表数据")
private List<BasBeanInfoModel> basBeanInfoModelList;
}

2
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java
Unescape Escape View File

@ -48,7 +48,7 @@ public class WmsActionResponseBean<Obj> implements Serializable {
public String errorMsg;
@ApiParam("提示信息")
public String message;
public String message = "";
@ApiParam("列表信息")
public List<WmsMessageStyleModel> informations;

10
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java
Unescape Escape View File

@ -103,4 +103,14 @@ public class WmsQCSNErrorList extends BaseBean {
@Column(name = "ERROR_DESC_RDD")
@ApiParam("不良描述")
private String errorDescRdd;
@Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "收货数量", example = "0")
public Double rcQty;
@Column(name = "QC_SCALE", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "质检比例", example = "0")
public String qcScale;
}

40
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCViewReport.java
Unescape Escape View File

@ -0,0 +1,40 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : MGN质检报表(通过查询视图实现)
* @Reference :
* @Author : puxiao.liao
* @CreateDate : 2020-09-01 14:37
* @Modify:
**/
@Data
@Api("质检报表")
public class WmsQCViewReport extends BaseBean {
private static final long serialVersionUID = 4905945381732744790L;
@ApiParam("单号")
private String orderNo;
@ApiParam("检验数量")
private double sampleQty;
@ApiParam("不合格数量")
private double rejectQty;
@ApiParam("检验员")
private String qcUser;
@ApiParam(value = "检验时间")
private String qcTime;
@ApiParam(value = "收货数量")
public Double rcQty;
@ApiParam(value = "质检比例")
public String qcScale;
}

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
Unescape Escape View File

@ -512,6 +512,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "单据")
private String orderNo;
@Transient
@ApiParam("物料库位")
private String partLocateNo;
public WmsStockSn() {
}

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java
Unescape Escape View File

@ -102,5 +102,11 @@ public class WmsTransType extends BaseBean {
}
public WmsTransType() {
}
public WmsTransType(String transTypeCode, String transTypeName) {
this.transTypeCode = transTypeCode;
this.transTypeName = transTypeName;
}
}

Write Preview
Loading…
Cancel
Save