diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/.DS_Store differ diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 3240a9a..c8eddfd 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -1,6 +1,46 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; -import cn.estsh.i3plus.pojo.andon.bean.*; +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule; +import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleParam; +import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute; +import cn.estsh.i3plus.pojo.andon.bean.AndonActor; +import cn.estsh.i3plus.pojo.andon.bean.AndonActorRule; +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmDetailType; +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmResponseCfg; +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute; +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; +import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCast; +import cn.estsh.i3plus.pojo.andon.bean.AndonBroadCastCfg; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventMethod; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventPhenomenon; +import cn.estsh.i3plus.pojo.andon.bean.AndonCellGroupCfg; +import cn.estsh.i3plus.pojo.andon.bean.AndonConfig; +import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalCfg; +import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalMaintenCfg; +import cn.estsh.i3plus.pojo.andon.bean.AndonEventCause; +import cn.estsh.i3plus.pojo.andon.bean.AndonEventMethod; +import cn.estsh.i3plus.pojo.andon.bean.AndonEventPhenoMenon; +import cn.estsh.i3plus.pojo.andon.bean.AndonHaltCfg; +import cn.estsh.i3plus.pojo.andon.bean.AndonHaltType; +import cn.estsh.i3plus.pojo.andon.bean.AndonKnowledgeBase; +import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue; +import cn.estsh.i3plus.pojo.andon.bean.AndonManageRecord; +import cn.estsh.i3plus.pojo.andon.bean.AndonMessageRecord; +import cn.estsh.i3plus.pojo.andon.bean.AndonMessageType; +import cn.estsh.i3plus.pojo.andon.bean.AndonPLC; +import cn.estsh.i3plus.pojo.andon.bean.AndonQueueAttach; +import cn.estsh.i3plus.pojo.andon.bean.AndonResponse; +import cn.estsh.i3plus.pojo.andon.bean.AndonResponseObject; +import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute; +import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail; +import cn.estsh.i3plus.pojo.andon.bean.MesArea; +import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; +import cn.estsh.i3plus.pojo.andon.bean.MesShift; +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -788,7 +828,9 @@ public class AndonHqlPack { DdlPreparedPack.getNumNOEqualPack(mesArea.getId(),"id",result); } - DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(),"areaCode",result); + if (mesArea != null) { + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; @@ -805,7 +847,9 @@ public class AndonHqlPack { DdlPreparedPack.getNumNOEqualPack(mesWorkCenter.getId(),"id",result); } - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(),"workCenterCode",result); + if (mesWorkCenter != null) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; @@ -822,7 +866,9 @@ public class AndonHqlPack { DdlPreparedPack.getNumNOEqualPack(mesWorkCell.getId(),"id",result); } - DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(),"workCellCode",result); + if (mesWorkCell != null) { + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; @@ -839,7 +885,9 @@ public class AndonHqlPack { DdlPreparedPack.getNumNOEqualPack(mesEquipment.getId(),"id",result); } - DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(),"equipmentCode",result); + if (mesEquipment != null) { + DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; @@ -857,7 +905,9 @@ public class AndonHqlPack { DdlPreparedPack.getStringNoEqualPack(mesShift.getWorkCenterCode(),"workCenterCode",result); } - DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(),"shiftCode",result); + if (mesShift != null) { + DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(), "shiftCode", result); + } DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); return result; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 26e9d6c..96ba229 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -43,9 +43,4 @@ public abstract class BaseAPS extends BaseBean { public void setCustomField(String code, Object value) { customFields.put(code, value); } - - @Override - public boolean equals(Object obj) { - return this == obj; - } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index 2fa0ef7..0e529ea 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -77,7 +77,7 @@ public class DateDuration { * @return */ public long getTimeInMillis() { - return this.time * 1000; + return this.time * 1000l; } @Override @@ -153,7 +153,7 @@ public class DateDuration { * @return */ public long getTimeInMillis(double amount) { - return this.getTime(amount) * 1000; + return this.getTime(amount) * 1000l; } private void parse() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java index 35cc4ba..027f459 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java @@ -12,7 +12,7 @@ import java.text.SimpleDateFormat; import java.util.Date; public class CustomDateDeserializer extends JsonDeserializer { - public static SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @Override public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java index 8b8780d..6bfd17f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java @@ -9,7 +9,7 @@ import java.text.SimpleDateFormat; import java.util.Date; public class CustomDateSerializer extends JsonSerializer { - public static SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @Override public void serialize(Date date, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 01a61f8..a01bd74 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3118,7 +3118,8 @@ public class MesEnumUtil { EXEC(10, "执行方法"), COMPLETE(20, "完成方法"), - HNC_ISSUED(30,"队列自动下达"); + HNC_ISSUED(30,"队列自动下达"), + LABEL_PROPERTIES(40,"标签属性查询方法"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index bb07db9..7b4d582 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -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 { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index f1d9061..2e3d875 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -20,7 +20,13 @@ import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.UUID; /** * @Description : 自定义持久化接口实现 @@ -1579,8 +1585,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep } Query query = entityManager.createQuery(queryString.toString()); - for (String key : packBean.getHqlPreparedMap().keySet()) { - query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + if (packBean != null) { + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key)); + } } return query.getResultList(); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 3009cfa..9a6e187 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -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 列名 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index 2a23858..793f30f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -42,6 +42,10 @@ public class MesLabelTemplate extends BaseBean implements Serializable { @ApiParam(value = "模板内容") private String templateContent; + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + @ApiParam(value = "第二个模板内容") private String otherTemplateContent; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 184df4f..dc2d752 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -108,6 +108,58 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("组件编号") private String assyNo; + @Transient + @ApiParam("Vin") + private String vinCode; + + @Transient + @ApiParam("条码状态") + private Integer snStatus; + + @Transient + @ApiParam("开始时间") + private String startTime; + + @Transient + @ApiParam("结束时间") + private String endTime; + + @Transient + @ApiParam("过程标签模板") + private String processLabelTemplate; + + @Transient + @ApiParam("产品标签模板") + private String prodLabelTemplate; + + @Transient + @ApiParam("等级代码") + private String gradeCode; + + @Transient + @ApiParam("标志值集合") + private String flagValueList; + + @Transient + @ApiParam("质量标志值") + private String qcFlagValue; + + @Transient + @ApiParam("3C认证编码") + private String cccCode; + + @Transient + @ApiParam("条码标签描述") + private String labelDesc; + + @Transient + @ApiParam("打印时间") + private String printTime; + + @Transient + @ApiParam("年度型") + private String modelYear; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } @@ -132,4 +184,25 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { this.seq = seq; this.serialNumber = serialNumber; } + + public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode, + Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime, + String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) { + this.orderNo = orderNo; + this.vinCode = vinCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.produceCategoryCode = produceCategoryCode; + this.status = status; + this.serialNumber = serialNumber; + this.seq = seq; + this.isGroupPrinted = isGroupPrinted; + this.createDatetime = createDatetime; + this.processLabelTemplate = processLabelTemplate; + this.prodLabelTemplate = prodLabelTemplate; + this.optionCode = optionCode; + this.produceColor = produceColor; + this.gradeCode = gradeCode; + this.assyNo = assyNo; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index e1599ec..d2e6a0b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -126,6 +126,10 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("半成品条码") private String halfProductSn; + @Transient + @ApiParam("主任务编号") + private String orderNo; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java index 1e4ee99..9a9ab5c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -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; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java new file mode 100644 index 0000000..5a96543 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java @@ -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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java new file mode 100644 index 0000000..ba0e85d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java @@ -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; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java index 6a4eee3..cc4a269 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -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("子检测项代码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index dc5f9e6..b9bb342 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -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 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index bf21ffc..235fd54 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -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") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java index 2747b2b..57acbe8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -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("样本数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index 35dfe84..b6099d9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -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("子检测项代码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java new file mode 100644 index 0000000..82917a0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java @@ -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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java new file mode 100644 index 0000000..9adf080 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSnTrans.java @@ -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 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() { + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 2698900..3ba3899 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -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; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java index a181556..eff8e6c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java @@ -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; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java index 3ff22dd..a13a31f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -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() { + + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java index 45776dc..178a0ea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java @@ -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() { } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java index f26fe08..6458aab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java @@ -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 { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java index 479bc1f..46b0a13 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java @@ -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 { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java index 9f03900..ba061d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java @@ -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 { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java index f6df34c..4704193 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; +import javax.persistence.Entity; /** * @Description : 零件自动采购单信息 @@ -14,6 +14,7 @@ import javax.persistence.Column; * @Modify: **/ @Data +@Entity @Api("收货追踪地图信息") public class WmsAutoPurchasePartModel { @ApiParam("合同号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java index 62e107f..cfbb3d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java @@ -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 WmsReportTransDetailModel extends BaseBean { private static final long serialVersionUID = 1547988564672291041L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java index fb58af7..1d7b583 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.java @@ -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 WmsReportTransMasterModel extends BaseBean { private static final long serialVersionUID = 5696795930973637987L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java index dfae656..82f88b0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java @@ -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; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java index 8757863..0d424ac 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java @@ -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 WmsVendorDelayDetailModel extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java index 4b6314c..a3fd7c8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -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 WmsVendorDelayMasterModel extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java new file mode 100644 index 0000000..c12772b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java @@ -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 { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsStockSnExtBhRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsStockSnExtBhRepository.java new file mode 100644 index 0000000..8276f93 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsStockSnExtBhRepository.java @@ -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 { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java new file mode 100644 index 0000000..682a78e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java @@ -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 { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnTransRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnTransRepository.java new file mode 100644 index 0000000..9430b0f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnTransRepository.java @@ -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 { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index b6e03ad..c7611a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2216,8 +2216,8 @@ public class WmsHqlPack { if (wmsProdCfgType != null) { DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result); DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result); + DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result); } - DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // getStringBuilderPack(wmsProdCfgType, 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; + } } diff --git a/sonar-project.properties b/sonar-project.properties index 55e4e84..932bdd9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -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=./