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

Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

Browse Source
yun-zuoyi
陈思洁 5 years ago
parent a6ba3b6a5c 7353b79b9c
commit 3d0524ec1f
22 changed files with 404 additions and 64 deletions
Show Stats Download Patch File Download Diff File

62
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
Unescape Escape View File

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

5
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java
Unescape Escape View File

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

4
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
Unescape Escape View File

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

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java
Unescape Escape View File

@ -12,7 +12,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
public class CustomDateDeserializer extends JsonDeserializer<Date> {
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 {

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java
Unescape Escape View File

@ -9,7 +9,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
public class CustomDateSerializer extends JsonSerializer<Date> {
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 {

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

@ -705,7 +705,8 @@ public class MesEnumUtil {
BOARD("BOARD", "看板类型"),
EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象");
EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
private String value;
private String description;
@ -723,7 +724,7 @@ public class MesEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -932,7 +933,7 @@ public class MesEnumUtil {
return null;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -1015,7 +1016,7 @@ public class MesEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -3344,7 +3345,7 @@ public class MesEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -3383,7 +3384,7 @@ public class MesEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -5399,7 +5400,7 @@ public class MesEnumUtil {
return null;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -5522,7 +5523,7 @@ public class MesEnumUtil {
return null;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {

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

@ -369,8 +369,12 @@ public class MesPcnEnumUtil {
REPAIR("REPAIR", "处理措施"),
SCRAP("SCRAP", "报废原因"),
QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
WC_CHECK("WC_CHECK", "开线检查项");
WC_CHECK("WC_CHECK", "开线检查项"),
BOARD("BOARD", "看板类型"),
EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
private String value;
private String description;
@ -387,7 +391,7 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -1912,7 +1916,7 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -1951,7 +1955,7 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -2210,7 +2214,7 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(String val) {
public static String valueOfDescription(Integer val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -2343,7 +2347,7 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -3528,7 +3532,7 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -3718,4 +3722,39 @@ public class MesPcnEnumUtil {
}
}
/**
* 扭矩采集 黄枪规则(10-继续采集扭矩，20-发送下一个组合码)
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum YELLOW_GUN_RULE {
COLLECT_TORQUE(10, "继续采集扭矩"),
SEND_NEXT_GROUP_CODE(20, "发送下一个组合码");
private int value;
private String description;
YELLOW_GUN_RULE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

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

@ -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<T, ID extends Serializable> 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();

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

@ -99,4 +99,8 @@ public class IfPackageDetail extends BaseBean implements Serializable {
@Column(name = "CT_NO")
@ApiParam("容器编号")
private String ctNo;
@Column(name = "SN_TYPE")
@ApiParam("条码类型")
private String snType;
}

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

@ -110,6 +110,10 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("容器编号")
private String ctNo;
@Column(name = "SN_TYPE")
@ApiParam("条码类型")
private String snType;
public MesPackage() {
}

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

@ -88,14 +88,6 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@ApiParam("料架是否已打印")
private Integer isGroupPrinted = 2;
@Transient
@ApiParam("队列序号")
private Double queueSeq;
@Column(name = "FINSIH_QTY")
@ApiParam("已生产数量")
private Double finsihQty;
@Column(name = "PRODUCE_COLOR")
@ApiParam("产品颜色")
private String produceColor;
@ -109,6 +101,14 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
private String assyNo;
@Transient
@ApiParam("队列序号")
private Double queueSeq;
@Column(name = "FINSIH_QTY")
@ApiParam("已生产数量")
private Double finsihQty;
@Transient
@ApiParam("Vin")
private String vinCode;

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

@ -146,4 +146,19 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "CHECK_SCAN_COUNT")
@ApiParam("确认扫描次数")
private Integer checkScanCount;
@Column(name = "SEND_SEQ")
@ApiParam("组合码发送顺序")
private Integer sendSeq;
@Column(name = "YELLOW_GUN_RULE")
@ApiParam("黄枪规则")
private Integer yellowGunRule;
@Column(name = "IS_END_SEQ")
@ApiParam("是否截至顺序号")
private Integer isEndSeq;
}

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

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description:
* @Author: adair.song
* @Date: 2020/05/22 14:24
* @Modify:
*/
@Data
public class ProductInfoManageModel {
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("VIN号")
private String vinCode;
@ApiParam("车型")
private String prodCfgTypeCode;
@ApiParam("等级代码")
private String gradeCode;
@ApiParam("产品颜色")
private String produceColor;
@ApiParam("产品位置")
private String produceCategoryCode;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("产品条码")
private String productSn;
@ApiParam("队列明细序号")
private Double seq;
@ApiParam("条码状态")
private Integer snStatus;
@ApiParam("质量状态")
private Integer qcStatus;
@ApiParam("下线时间")
private String outWorkCenterTime;
@ApiParam("切换时间")
private String switchTime;
}

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

@ -0,0 +1,129 @@
package cn.estsh.i3plus.pojo.model.mes;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
import java.io.Serializable;
/**
* @Description : MES扭矩采集模型
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-05-22 11:53
* @Modify:
**/
@Data
@NoArgsConstructor
public class TorqueCollectionModel implements Serializable {
private static final long serialVersionUID = -6376845639746448495L;
@ApiParam("Vin")
private String vinCode;
@ApiParam("项目代码")
private String prodCfgTypeCode;
@ApiParam("等级代码")
private String gradeCode;
@ApiParam("颜色代码")
private String colorCode;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partName;
@ApiParam("PEST编码1")
private Integer pest1;
@ApiParam("PEST编码2")
private Integer pest2;
@ApiParam("PEST编码3")
private Integer pest3;
@ApiParam("PEST编码4")
private Integer pest4;
@ApiParam("PEST编码5")
private Integer pest5;
@ApiParam("PEST编码6")
private Integer pest6;
@ApiParam("PEST编码7")
private Integer pest7;
@ApiParam("PEST编码8")
private Integer pest8;
@ApiParam("扭矩枪编号")
private String torqueNo;
@ApiParam("PEST号")
private Integer pestNum;
@ApiParam("PEST数量")
private Integer pestCount;
/**
* 1-未采集， 2-已采集, 3-无需打扭矩
*/
@ApiParam("扭矩采集状态")
private Integer torqueStatus;
/**
* 1-未绑定，2-已绑定
*/
@ApiParam("关键件绑定状态")
private Integer bindKeyPartStatus;
@ApiParam("扭矩值")
private Integer torqueValue;
@ApiParam("确认扫描次数")
private Integer checkScanCount;
@ApiParam("组合码发送顺序")
private Integer sendSeq;
@ApiParam("黄枪规则")
private Integer yellowGunRule;
@ApiParam("是否截至顺序号")
private Integer isEndSeq;
@ApiParam("组合码")
private String groupCode;
public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode,
String colorCode, String partNo, String partName, Integer pest1, Integer pest2,
Integer pest3, Integer pest4, Integer pest5, Integer pest6, Integer pest7, Integer pest8,
String torqueNo, Integer checkScanCount, Integer sendSeq, Integer yellowGunRule, Integer isEndSeq, String groupCode) {
this.vinCode = vinCode;
this.prodCfgTypeCode = prodCfgTypeCode;
this.gradeCode = gradeCode;
this.colorCode = colorCode;
this.partNo = partNo;
this.partName = partName;
this.pest1 = pest1;
this.pest2 = pest2;
this.pest3 = pest3;
this.pest4 = pest4;
this.pest5 = pest5;
this.pest6 = pest6;
this.pest7 = pest7;
this.pest8 = pest8;
this.torqueNo = torqueNo;
this.checkScanCount = checkScanCount;
this.sendSeq = sendSeq;
this.yellowGunRule = yellowGunRule;
this.isEndSeq = isEndSeq;
this.groupCode = groupCode;
}
}

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

@ -76,6 +76,10 @@ public class QmsStockSnExtBh extends BaseBean {
public Integer pickStatus;
@Transient
@ApiParam("挑选状态")
public Integer pickResult;
@Transient
@ApiParam("物料号")
public String partNo;
@ -87,9 +91,7 @@ public class QmsStockSnExtBh extends BaseBean {
@ApiParam("客户发往地")
public String flagNo;
@Transient
@ApiParam("挑选状态")
public Integer pickResult;
@Transient
@ApiParam("二维码")
@ -114,6 +116,10 @@ public class QmsStockSnExtBh extends BaseBean {
this.bhType = bhType;
}
public QmsStockSnExtBh(String batchNo, Integer bhType) {
this.batchNo = batchNo;
this.bhType = bhType;
}
public QmsStockSnExtBh() {
}

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

@ -428,6 +428,35 @@ public class WmsStockSn extends BaseBean {
@ApiParam("BH类型")
private Integer bhType;
@Transient
@ApiParam("处理状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_WORK_STATUS.class, refForeignKey = "value", value = "description")
private Integer workStatus;
@Transient
@ApiParam("是否合格")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer isQualified;
@Transient
@ApiParam("返修状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
public Integer reworkStatus;
@Transient
@ApiParam("返修结果")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer reworkResult;
@Transient
@ApiParam("挑选状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
public Integer pickStatus;
@Transient
@ApiParam("挑选状态")
public Integer pickResult;
public WmsStockSn() {
}
@ -647,6 +676,22 @@ public class WmsStockSn extends BaseBean {
}
public WmsStockSn(String organizeCode, String batchNo, Integer bhType, String locateNo, String partNo,
String partNameRdd, String workCenterCode, String createUser, String createDatetime,
String modifyUser, String modifyDatetime) {
this.organizeCode = organizeCode;
this.batchNo = batchNo;
this.bhType = bhType;
this.locateNo = locateNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.workCenterCode = workCenterCode;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
}

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

@ -1,11 +1,10 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import cn.estsh.i3plus.pojo.base.common.Pager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
/**
* @Description : 零件自动采购单信息
* @Reference :
@ -14,8 +13,8 @@ import javax.persistence.Column;
* @Modify:
**/
@Data
@Api("收货追踪地图信息")
public class WmsAutoPurchasePartModel {
@Api("零件自动采购单信息")
public class WmsAutoPurchasePartModel extends Pager {
@ApiParam("合同号")
private String orderNo;
@ -29,7 +28,7 @@ public class WmsAutoPurchasePartModel {
private String unit;
@ApiParam("物料数量")
private Double qty;
private Integer qty;
@ApiParam("Erp库存地")
private String erpWarehouse;
@ -40,7 +39,7 @@ public class WmsAutoPurchasePartModel {
@ApiParam("供应商名称")
private String vendorName;
public WmsAutoPurchasePartModel(String partNo, String partName, Double qty, String warehouse) {
public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse) {
this.partNo = partNo;
this.partName = partName;
this.qty = qty;

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.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 WmsReportTransDetailModel extends BaseBean {
private static final long serialVersionUID = 1547988564672291041L;

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransMasterModel.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 WmsReportTransMasterModel extends BaseBean {
private static final long serialVersionUID = 5696795930973637987L;

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.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 WmsVendorDelayDetailModel extends BaseBean {

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.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 WmsVendorDelayMasterModel extends BaseBean {

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

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

Write Preview
Loading…
Cancel
Save