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

Merge branch 'test'

Browse Source
yun-zuoyi
wynne1005 5 years ago
parent 4921d55bda 9e236a06a1
commit 81b554fc8b
30 changed files with 663 additions and 67 deletions
Show Stats Download Patch File Download Diff File

BIN
.DS_Store vendored
View File

Binary file not shown.

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

@ -313,7 +313,8 @@ public class MesEnumUtil {
public enum TOOLING_ACTION_RECORD_TYPE {
REPLACE(10, "REPLACE", "更换"),
WAREHOUSE(20, "WAREHOUSE", "入库"),
Use(30, "Use", "领用");
Use(30, "Use", "领用"),
ERROR(40, "ERROR", "异常操作");
private int value;
private String code;

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

@ -6836,17 +6836,79 @@ public class WmsEnumUtil {
}
/**
* BH检测结果
* 仓库健康指标等级
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BH_TEST_RESULT_STATUS {
NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格");
public enum HEALTH_INDICATOR_LEVEL {
HEALTH(10, "HEALTH", "健康"),
SUB_HEALTH(20, "SUB_HEALTH", "亚健康"),
NO_HEALTH(30, "NO_HEALTH", "不健康");
private int value;
private String code;
private String description;
HEALTH_INDICATOR_LEVEL(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 软适配数据类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SOFT_DATA_FORM {
XML(10, "XML", "XML"), JSON(20, "JSON", "JSON");
private int value;
private String code;
private String description;
BH_TEST_RESULT_STATUS(int value, String code, String description) {
SOFT_DATA_FORM(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -6893,7 +6955,7 @@ public class WmsEnumUtil {
return tmp;
}
public static BH_TEST_RESULT_STATUS codeOf(Integer value) {
public static SOFT_DATA_FORM codeOf(Integer value) {
if (value == null) {
return null;
} else {
@ -6908,18 +6970,22 @@ public class WmsEnumUtil {
}
/**
* 仓库健康指标等级
* 产品条码事务类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum HEALTH_INDICATOR_LEVEL {
HEALTH(10, "HEALTH", "健康"),
SUB_HEALTH(20, "SUB_HEALTH", "亚健康"),
NO_HEALTH(30, "NO_HEALTH", "不健康");
public enum BACTH_TRANS_TYPE {
REPORT(10, "REPORT", "报工"),
UNTYING(20, "UNTYING", "解绑"),
CHECK(30, "CHECK", "检测"),
PICK(40, "REPAIR", "挑选"),
REPAIR(50, "REPAIR", "返修"),
BIND(60, "BIND", "绑定"),
OUTSTOCK(70, "OUTSTOCK", "出库");
private int value;
private String code;
private String description;
HEALTH_INDICATOR_LEVEL(int value, String code, String description) {
BACTH_TRANS_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -6965,20 +7031,82 @@ public class WmsEnumUtil {
}
return tmp;
}
public static BACTH_TRANS_TYPE codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* 业务表：BH类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BH_TYPE {
HOLD_LOCATE(10, "hold库位"),
QUALITY_CONTROL(20, "质检中"),
PRE_INSTOCK(30, "待入库");
private int value;
private String description;
BH_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static Integer descriptionOfValue(String desc) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 软适配数据类型
* BH库位类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SOFT_DATA_FORM {
XML(10, "XML", "XML"), JSON(20, "JSON", "JSON");
public enum BH_LOCATE_TYPE {
HOLD(10, "HOLD", "HOLD库位"),
WAIT_CHECK(20, "WAIT_CHECK", "待检测库位"),
WAIT_OUT(30, "WAIT_OUT", "待出库库位");
private int value;
private String code;
private String description;
SOFT_DATA_FORM(int value, String code, String description) {
BH_LOCATE_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -7025,7 +7153,7 @@ public class WmsEnumUtil {
return tmp;
}
public static SOFT_DATA_FORM codeOf(Integer value) {
public static BH_LOCATE_TYPE codeOf(Integer value) {
if (value == null) {
return null;
} else {

12
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
Unescape Escape View File

@ -569,7 +569,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public int listCount() {
try{
Long count = entityManager.createQuery("select count(distinct model) from " + persistentClass.getName() + " as model",Long.class)
Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model",Long.class)
.getSingleResult();
return count == null ? 0 : count.intValue();
}catch(NoResultException e){
@ -580,7 +580,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public int findByPropertyCount(String propertyName, Object value) {
try{
String queryString = "select count(distinct model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName;
String queryString = "select count(model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName;
Long count = entityManager.createQuery(queryString, Long.class)
.setParameter(propertyName, value)
.getSingleResult();
@ -612,7 +612,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append("select count(distinct model) from " + persistentClass.getName() + " as model");
queryString.append("select count(model) from " + persistentClass.getName() + " as model");
int size = propertyNames.length;
if (size > 0) {
@ -755,7 +755,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + " as model where 1=1 ");
queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 ");
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
@ -859,7 +859,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public int findByHqlWhereCount(String hqlWhere) {
StringBuffer queryString = new StringBuffer();
queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + " as model where 1=1 ");
queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 ");
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
@ -875,7 +875,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public int findByHqlWhereCount(DdlPackBean packBean) {
StringBuffer queryString = new StringBuffer();
queryString.append("select count(distinct model) from " + persistentClass.getSimpleName()
queryString.append("select count(model) from " + persistentClass.getSimpleName()
+ " as model where 1=1 " + packBean.getWhereAppend());
Query query = entityManager.createQuery(queryString.toString(), Long.class);

32
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -300,6 +300,16 @@ public class DdlPreparedPack {
}
/**
* 判断字段为空
*
* @param columnName 列名
* @param packBean
*/
public static void getStringNullPack(String columnName, DdlPackBean packBean) {
packBean.addColumnQuery(null, " and ( model." + columnName +
" is null or model." + columnName + " ='')", null);
}
/**
* 封装String对象成equal语句
*
* @param columnName 列名
@ -668,6 +678,28 @@ public class DdlPreparedPack {
}
/**
* 为空查询
*
* @param columnName
* @param packBean
*/
public static void getIsNull(String columnName, DdlPackBean packBean) {
packBean.addColumnQuery(columnName, " and (model." + columnName + " is null or model." + columnName + " = '')", null);
}
/**
* 不为空查询
*
* @param columnName
* @param packBean
*/
public static void getIsNotNull(String columnName, DdlPackBean packBean) {
packBean.addColumnQuery(columnName, " and (model." + columnName + " is not null and model." + columnName + " != '')", null);
}
/**
* 转换排序列
*
* @param columnName 列名

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

@ -63,15 +63,15 @@ public class MesEquipmentTooling extends BaseBean implements Serializable {
@ApiParam("更换结束时间")
private String endTime;
@Column(name = "USE_COUNT_MAX")
@ApiParam("最大使用次数")
private Integer useCountMax;
@Column(name = "REMIND_COUNT")
@ApiParam("提醒次数")
private Integer remindCount;
@Transient
@ApiParam("最大次数")
private Integer useCountMax;
@Transient
@ApiParam("按钮名称")
private String btnName;

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

@ -99,6 +99,9 @@ public class MesPlcModel implements Serializable {
@ApiParam("PLC类型")
private Integer plcType;
@ApiParam("默认赋值属性")
private String defaultRule;
public MesPlcModel() {
}
@ -106,7 +109,7 @@ public class MesPlcModel implements Serializable {
public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType) {
String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType, String defaultRule) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
@ -135,5 +138,6 @@ public class MesPlcModel implements Serializable {
this.objectCode = objectCode;
this.opcUrl = opcUrl;
this.plcType = plcType;
this.defaultRule = defaultRule;
}
}

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

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : BH检测大类表
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-05-23
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "QMS_CHECK_TYPE")
@Api("物料子检测项")
public class QmsCheckType extends BaseBean {
private static final long serialVersionUID = -4867744538301370899L;
@Column(name = "CHECK_TYPE_CODE")
@ApiParam("检测大类代码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String checkTypeCode;
@Column(name = "CHECK_TYPE_NAME")
@ApiParam("检测大类名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String checkTypeName;
@Column(name = "REMARK")
@ApiParam("备注")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String remark;
}

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

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : BH库存条码扩展表
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2020-05-22 13:22
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="QMS_STOCK_SN_EXT_BH")
@Api("BH检测大类表")
public class QmsStockSnExtBh extends BaseBean {
@Column(name="sn")
@ApiParam("条码")
private String sn;
@Column(name="BATCH_NO")
@ApiParam("BATCH号")
private String batchNo;
@Column(name="BH_TYPE")
@ApiParam("BH类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
private Integer bhType;
}

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

@ -31,10 +31,6 @@ import javax.persistence.Table;
public class WmsBhChildDetectionItem extends BaseBean {
private static final long serialVersionUID = -8005468634643773682L;
@Column(name = "CHECK_TYPE")
@ApiParam("检测大类")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
private Integer checkType;
@Column(name = "ITEM_CHECK_CODE")
@ApiParam("子检测项代码")

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

@ -156,6 +156,15 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
@ApiParam(value = "三维位置")
private String position;
/**
* BH库位类型:10:HOLD库位；20：待检测库位；30:待出库库位
*/
@Column(name = "BH_LOCATE_TYPE")
@ApiParam(value = "BH库位类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_LOCATE_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_LOCATE_TYPE.class, refForeignKey = "value", value = "description")
private Integer bhLocateType;
// 导入用
@ApiParam(value = "工厂")
@Transient

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

@ -272,7 +272,6 @@ public class WmsPart extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double curingTime = 0d;
@Column(name = "IS_RECYCLE", columnDefinition = "int default 2", nullable = false)
@ApiParam(value = "是否回收", example = "2")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")

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

@ -46,10 +46,10 @@ public class WmsPartCheckType extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String partName;
@Column(name = "CHECK_TYPE")
@Column(name = "CHECK_TYPE_CODE")
@ApiParam("检测大类")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
private Integer checkType;
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
public String checkTypeCode;
@Column(name = "SAMPLE_SIZE")
@ApiParam("样本数")

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

@ -41,10 +41,10 @@ public class WmsPartItemCheck extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String partNo;
@Column(name = "CHECK_TYPE")
@Column(name = "CHECK_TYPE_CODE")
@ApiParam("检测大类")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")
private Integer checkType;
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
public String checkTypeCode;
@Column(name = "CHECK_ITEM_CODE")
@ApiParam("子检测项代码")

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

@ -0,0 +1,91 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
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.Index;
import javax.persistence.Table;
/**
* @Description : 产品条码信息
* @Reference :
* @Author : puxiao.liao
* @CreateDate : 2020-05-23 11:00
* @Modify:
**/
@Data
@Entity
@Table(name = "WMS_SERIAL_SN", indexes = {
@Index(columnList = "BATCH_NO"),
@Index(columnList = "STOCK_SN"),
@Index(columnList = "PART_NO"),
@Index(columnList = "SERIAL_SN")
})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "产品条码信息", description = "产品条码信息")
public class WmsSerialSn extends BaseBean {
private static final long serialVersionUID = -2540413299274882785L;
@Column(name = "BATCH_NO")
@ApiParam(value = "BATCH号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String batchNo;
@Column(name = "STOCK_SN")
@ApiParam(value = "库存条码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String stockSn;
@Column(name = "SERIAL_SN")
@ApiParam(value = "产品条码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String serialSn;
@Column(name = "SRC_STOCK_SN")
@ApiParam(value = "源库存条码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String srcStockSn;
@Column(name = "BH_TYPE")
@ApiParam(value = "BH类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE")
private Integer bhType;
@Column(name = "PART_NO")
@ApiParam(value = "物料编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam(value = "物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
private String partNameRdd;
@Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double qty;
}

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

@ -0,0 +1,103 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description : 产品条码事务表
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2020-05-22 9:42
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_SERIAL_SN_TRANS")
@Api("产品条码事务表")
public class WmsSerialSnTrans extends BaseBean {
@Column(name = "BATCH_NO")
@ApiParam(value = "BATCH号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String batchNo;
@Column(name="SERIAL_SN")
@ApiParam("产品条码")
private String serialSn;
@Column(name="BH_TYPE")
@ApiParam("BH类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description")
private Integer bhType;
@Column(name = "PART_NO")
@ApiParam(value = "物料编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam(value = "物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName")
private String partNameRdd;
@Column(name="SRC_STOCK_SN")
@ApiParam("源库存条码")
private String srcStockSn;
@Column(name="DEST_STOCK_SN")
@ApiParam("目标库存条码")
private String destStockSn;
@Column(name="TRANS_TYPE")
@ApiParam("操作类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BACTH_TRANS_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description")
private Integer transType;
@Column(name = "IS_OK")
@ApiParam(value = "是否合格")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer isOk;
@Transient
@ApiParam("操作类型")
private List<Integer> transTypeLst;
public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) {
this.organizeCode = wmsSerialSn.getOrganizeCode();
this.batchNo = wmsSerialSn.getBatchNo();
this.serialSn = wmsSerialSn.getSerialSn();
this.bhType = wmsSerialSn.getBhType();
this.partNo = wmsSerialSn.getPartNo();
this.partNameRdd = wmsSerialSn.getPartNameRdd();
this.destStockSn = wmsSerialSn.getStockSn();
this.transType = transType;
}
public WmsSerialSnTrans() {
}
}

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

@ -410,7 +410,7 @@ public class WmsStockSn extends BaseBean {
@Transient
@ApiParam("大检测项类型")
public Integer checkType;
public String checkTypeCode;
@Transient
@ApiParam("样本数")
@ -592,4 +592,28 @@ public class WmsStockSn extends BaseBean {
this.modifyDatetime = modifyDatetime;
}
public WmsStockSn(WmsStockSn stockSn, String batchCode) {
this.organizeCode = stockSn.getOrganizeCode();
this.refSrc = stockSn.getRefSrc();
this.partNo = stockSn.getPartNo();
this.partNameRdd = stockSn.getPartNameRdd();
this.snType = stockSn.getSnType();
this.locateNo = stockSn.getLocateNo();
this.workCenterCode = stockSn.getWorkCenterCode();
this.packageNo = stockSn.getPackageNo();
this.shippingFlag = stockSn.getShippingFlag();
this.lotNo = stockSn.getLotNo();
this.dateCode = stockSn.getDateCode();
this.fixLotNo = stockSn.getFixLotNo();
this.leftCode = stockSn.getLeftCode();
this.qty = stockSn.getQty();
this.sn = stockSn.getSn();
this.createUser = stockSn.getCreateUser();
this.createDatetime = stockSn.getCreateDatetime();
this.modifyUser = stockSn.getModifyUser();
this.modifyDatetime = stockSn.getModifyDatetime();
this.refSrc = batchCode;
}
}

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

@ -48,21 +48,25 @@ public class WmsTestResultDetails extends BaseBean {
@ApiParam("物料名称")
public String partName;
@Column(name = "CHECK_TYPE")
@ApiParam("大检测项类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_CHECK_TYPE.class, refForeignKey = "value", value = "description")
public Integer checkType;
@Column(name = "CHECK_TYPE_CODE")
@ApiParam("检测大类")
public String checkTypeCode;
@Column(name = "qr_code")
@Column(name = "QR_CODE")
@ApiParam("二维码")
public String qrCode;
@Column(name = "is_qualified")
@Column(name = "IS_QUALIFIED")
@ApiParam("是否合格")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer isQualified;
@Column(name = "check_value")
@Column(name = "IS_FINISH")
@ApiParam("是否完成")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer isFinish;
@Column(name = "CHECK_VALUE")
@ApiParam("检测值")
public String checkValue;
@ -73,9 +77,9 @@ public class WmsTestResultDetails extends BaseBean {
public WmsTestResultDetails() {
}
public WmsTestResultDetails(String partNo, Integer checkType, String bhCode, Long checkSize) {
public WmsTestResultDetails(String partNo, String checkTypeCode, String bhCode, Long checkSize) {
this.partNo = partNo;
this.checkType = checkType;
this.checkTypeCode = checkTypeCode;
this.bhCode = bhCode;
this.checkSize = checkSize;
}

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

@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :检测结果汇总表
@ -65,7 +66,7 @@ public class WmsTestResultSummary extends BaseBean {
@Column(name = "REWORK_RESULT")
@ApiParam("返修结果")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer reworkResult;
@Column(name = "PICK_STATUS")
@ -75,7 +76,35 @@ public class WmsTestResultSummary extends BaseBean {
@Column(name = "PICK_RESULT")
@ApiParam("挑选结果")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_TEST_RESULT_STATUS.class, refForeignKey = "value", value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer pickResult;
@Transient
@ApiParam("BH类型")
private Integer bhType;
public WmsTestResultSummary(String organizeCode, String bhCode,
String workCenterCode, String partNo,
String partName, String flagNo, Integer isQualified,
Integer reworkStatus, Integer reworkResult, Integer pickStatus, Integer pickResult, Integer bhType) {
this.organizeCode = organizeCode;
this.bhCode = bhCode;
this.workCenterCode = workCenterCode;
this.partNo = partNo;
this.partName = partName;
this.flagNo = flagNo;
this.isQualified = isQualified;
this.reworkStatus = reworkStatus;
this.reworkResult = reworkResult;
this.pickStatus = pickStatus;
this.pickResult = pickResult;
this.bhType = bhType;
}
public WmsTestResultSummary() {
}
}

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

@ -6,7 +6,6 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@ -18,7 +17,6 @@ import javax.persistence.Id;
* @Modify:
**/
@Data
@Entity
public class AssignmentDto {
@Id
@ -69,4 +67,5 @@ public class AssignmentDto {
public AssignmentDto() {
}
}

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

@ -6,7 +6,6 @@ import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@ -17,7 +16,6 @@ import javax.persistence.Id;
* @CreateDate : 2020-04-21 2:37 下午
* @Modify:
**/
@Entity
@Data
@Api("窗口输出类")
public class WmsCustWindowDto {

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

@ -6,7 +6,6 @@ import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@ -18,7 +17,6 @@ import javax.persistence.Id;
* @Modify:
**/
@Data
@Entity
@Api("移动单效率(出参)")
public class WmsMoveMovementEffectivenessDto {

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

@ -6,7 +6,6 @@ import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@ -18,7 +17,6 @@ import javax.persistence.Id;
* @Modify:
**/
@Data
@Entity
@Api("静态盘点查询输出实体类")
public class WmsStockSnDto {

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

@ -5,8 +5,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Entity;
/**
* @Description : 静态盘点输出model
* @Reference :
@ -15,7 +13,6 @@ import javax.persistence.Entity;
* @Modify:
**/
@Data
@Entity
@Api("静态盘点查询输出model")
public class WmsStaticCsModel extends BaseBean {
private static final long serialVersionUID = 9039981061448266666L;

9
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.QmsCheckType;
import org.springframework.stereotype.Repository;
@Repository
public interface QmsCheckTypeRepository extends BaseRepository<QmsCheckType, Long> {
}

14
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsStockSnExtBhRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.QmsStockSnExtBh;
/**
* @Description : BH库存条码扩展表
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2020-05-22 13:24
* @Modify:
**/
public interface QmsStockSnExtBhRepository extends BaseRepository<QmsStockSnExtBh,Long> {
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn;
import org.springframework.stereotype.Repository;
/**
* @Description : 产品条码信息dao层
* @Reference :
* @Author : puxiao.liao
* @CreateDate : 2020-05-23 11:00
* @Modify:
**/
@Repository
public interface WmsSerialSnRepository extends BaseRepository<WmsSerialSn, Long> {
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnTransRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSnTrans;
import org.springframework.stereotype.Repository;
/**
* @Description : 产品条码事务表
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2020-05-22 9:43
* @Modify:
**/
@Repository
public interface WmsSerialSnTransRepository extends BaseRepository<WmsSerialSnTrans,Long> {
}

44
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -3146,7 +3146,7 @@ public class WmsHqlPack {
public static DdlPackBean packHqlBasImportTemplate(BasImportTemplate template) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result);
DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result);
DdlPreparedPack.getStringLikerPack(template.getTemplateCode(), "templateCode", result);
DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result);
getStringBuilderPack(template, result);
return result;
@ -3174,11 +3174,15 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsTestResultSummary.getBhCode(), "bhCode", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result);
DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkStatus(), "reworkStatus", result);
if (wmsTestResultSummary.getIsQualified() != null) {
DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getIsQualified(), "isQualified", result);
}
DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getBhCode(), "bhCode", result);
DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result);
if (StringUtils.isNotBlank(wmsTestResultSummary.getCreateDateTimeStart())) {
DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(),
@ -3206,7 +3210,7 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckType(), "checkType", result);
DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result);
if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) {
@ -3235,7 +3239,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(checkType.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(checkType.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(checkType.getCheckType(), "checkType", result);
DdlPreparedPack.getStringEqualPack(checkType.getCheckTypeCode(), "checkTypeCode", result);
getStringBuilderPack(checkType, result);
return result;
}
@ -3316,4 +3320,36 @@ public class WmsHqlPack {
getStringBuilderPack(healthVariableResult, result);
return result;
}
/**
* 产品条码事务查询条件
*
* @param wmsSerialSnTrans
* @return
*/
public static DdlPackBean packHqlWmsSerialSnTrans(WmsSerialSnTrans wmsSerialSnTrans) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsSerialSnTrans.getBatchNo(), "batchNo", packBean);
DdlPreparedPack.getInPackList(wmsSerialSnTrans.getTransTypeLst(), "transType", packBean);
getStringBuilderPack(wmsSerialSnTrans, packBean);
return packBean;
}
/**
* BH检测大类表查询条件
*
* @param qmsStockSnExtBh
* @return
*/
public static DdlPackBean packHqlQmsStockSnExtBh(QmsStockSnExtBh qmsStockSnExtBh) {
DdlPackBean packBean = new DdlPackBean();
/* DdlPreparedPack.getStringEqualPack(qmsStockSnExtBh.getBatchNo(), "batchNo", packBean);
DdlPreparedPack.getInPackList(wmsSerialSnTrans.getTransTypeLst(),"transType",packBean);
getStringBuilderPack(wmsSerialSnTrans, packBean);*/
return packBean;
}
}

2
sonar-project.properties
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save