yun-zuoyi
wynne1005 4 years ago
commit 44f61e1525

@ -39,7 +39,7 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Api("去去去去去去去去去安灯记录")
@Api("安灯记录")
public class AndonManageRecord extends BaseManageQueue implements Serializable {
private static final long serialVersionUID = 4667499369694353351L;

@ -19,6 +19,7 @@ public class ImppEnumUtil {
public enum ORGANIZE_YTPE {
TYPE_GROUP(1, "集团", "集团"),
TYPE_DIVISION(4, "事业部", "事业部"),
TYPE_COMPANY(2, "公司", "公司"),
TYPE_FACTORY(3, "工厂", "工厂");

@ -8383,4 +8383,52 @@ public class MesEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCE_CATEGORY_NAME {
FL("FL", "前左"),
FR("FR", "前右"),
RL("RL", "后左"),
RR("RR", "后右");
private String description;
private String value;
PRODUCE_CATEGORY_NAME(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -9215,7 +9215,9 @@ public class WmsEnumUtil {
FIVE_SECONDs("0/5 * * * * ?", "FIVE_SECONDs", "五秒一次"),
TWENTY_SECONDS("0/20 * * * * ?", "TWENTY_SECONDS", "二十秒一次"),
EVERY_DAY("0 0 0 * * ?", "EVERY_DAY", "每天零点"),
EVERY_HOUR("0 0 * * * ?", "EVERY_HOUR", "每小时");
EVERY_HOUR("0 0 * * * ?", "EVERY_HOUR", "每小时"),
NINE_AND_NINTEEN("0 0 9,21 * * ?", "NINE_AND_NINTEEN", "早上九点晚上九点");
private String value;
private String code;

@ -1,47 +0,0 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @CreateDate: 2020/10/13
* @Author: simon.song
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_BOARD_IMAGE")
@Api("MES_看板图片")
public class MesBoardImage extends BaseBean implements Serializable {
private static final long serialVersionUID = -3511836584646450267L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "IMAGE_URL")
@ApiParam("图片路径")
private String imageUrl;
}

@ -76,4 +76,16 @@ public class MesNumberRule extends BaseBean implements Serializable {
@ApiParam("拼接固定字符,多个逗号分隔")
private String spiltRule;
public Integer getBeginVal() {
return this.beginVal == null ? 1 : this.beginVal;
}
public Integer getSerialnoIncrement() {
return this.serialnoIncrement == null ? 1 : this.serialnoIncrement;
}
public Integer getSerialnoLength() {
return this.serialnoLength == null ? 1 : this.serialnoLength;
}
}

@ -180,5 +180,5 @@ public class MesPart extends BaseBean implements Serializable {
@Transient
@ApiParam("是否绑定关键件")
private Integer isBingKey;
private Integer isBindKey;
}

@ -47,6 +47,14 @@ public class MesProdCfgDetail extends BaseBean implements Serializable {
@ApiParam("是否虚零件")
private Integer isVirtual;
@Column(name = "IS_LEFT_PART")
@ApiParam("是否左零件")
private Integer isLeftPart;
@Column(name = "PRINTER_NAME")
@ApiParam("打印机名称")
private String printerName;
@Transient
@ApiParam("零件名称")
private String partName;

@ -236,6 +236,18 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("物料版本号")
private String versionNo;
@Transient
@ApiParam("配方内容")
private String formulaContent;
@Transient
@ApiParam("分组队列编号")
private String queueGroupNo;
@Transient
@ApiParam("组内编号")
private Integer groupNo;
public MesProduceSn() {
}

@ -190,6 +190,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
@ApiParam("条码类型名称")
private String snTypeName;
@Transient
@ApiParam("节拍时间")
private Integer cycleTime;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

@ -0,0 +1,76 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/3/4 7:16 PM
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_QUARANTINE_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PART_NO")
})
@Api("隔离记录表")
public class MesQuarantineRecord extends BaseBean {
private static final long serialVersionUID = -4667731056014803186L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("零件名称")
private String partName;
@Column(name = "QTY")
@ApiParam("用量")
private Integer qty;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "DC_CODE")
@ApiParam("缺陷原因代码")
private String dcCode;
@Column(name = "REPAIR_CODE")
@ApiParam("维修代码")
private String repairCode;
@Column(name = "QUARANTINE_NO")
@ApiParam("隔离单号")
private String quarantineNo;
@Column(name = "SCRAP_No")
@ApiParam("报废单号")
private String scrapNo;
}

@ -8,12 +8,7 @@ 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.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -74,4 +69,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
@Column(name = "PART_COLOR_VALUE")
@ApiParam("零件色值")
private String partColorValue;
@Transient
@ApiParam("物料名称")
private String partName;
}

@ -0,0 +1,148 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-16-17:36
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_QUEUE_ORDER_DETAIL_RECORD", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "QUEUE_GROUP_NO"),
@Index(columnList = "PRODUCE_CATEGORY_CODE")
})
@Api("生产队列明细记录表")
public class MesQueueOrderDetailRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 7840873844253353896L;
@Column(name = "ORDER_NO")
@ApiParam("主队列编号")
private String orderNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "SEQ", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("队列明细序号")
private Double seq;
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "WORK_TYPE")
@ApiParam("生产类型")
private String workType;
@Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品位置")
private String produceCategoryCode;
@Column(name = "PRODUCE_CATEGORY_NAME_RDD")
@ApiParam("产品位置名称")
private String produceCategoryNameRdd;
@Column(name = "PPT_CODE")
@ApiParam("产品类型名称")
private String pptCode;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@Column(name = "GROUP_NO")
@ApiParam("组内编号")
private Integer groupNo;
@Column(name = "IS_GROUP_PRINTED")
@ApiParam("料架是否已打印")
private Integer isGroupPrinted = 2;
@Column(name = "PRODUCE_COLOR")
@ApiParam("产品颜色")
private String produceColor;
@Column(name = "PRODUCE_COLOR_CODE")
@ApiParam("产品颜色代码")
private String produceColorCode;
@Column(name = "OPTION_CODE")
@ApiParam("选项代码")
private String optionCode;
@Column(name = "ASSY_NO")
@ApiParam("组件编号")
private String assyNo;
@Column(name = "FORMULA_CONTENT")
@ApiParam("配方内容")
private String formulaContent;
@Column(name = "FINSIH_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("已生产数量")
private Double finsihQty;
@Column(name = "GROUP_SIDE")
@ApiParam("料架摆放位置")
private String groupSide;
@Column(name = "GROUP_SEQ")
@ApiParam("分组序号")
private String groupSeq;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "IS_EMPTY")
@ApiParam("是否放空")
private Integer isEmpty;
@Column(name = "JIS_BACKFLUSH_STATUS")
@ApiParam("回冲标识")
private String jisBackflushStatus;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
}

@ -115,9 +115,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
public MesStateMachineStatus() {
}
public MesStateMachineStatus(String smCode, String statusCode, String nextStatus, String statusName, String nextStatusName, Integer triggerType,
public MesStateMachineStatus(Long id, String smCode, String statusCode, String nextStatus, String statusName, String nextStatusName, Integer triggerType,
String triggerEvent, String triggerWhere, Long triggerAmgId, Long inAmgId, Long outAmgId, Integer statusType, Integer seq,
Integer isInit, String routeCode, String processCode) {
this.id = id;
this.smCode = smCode;
this.statusCode = statusCode;
this.nextStatus = nextStatus;

@ -35,6 +35,9 @@ public class BypassModel {
@ApiParam("状态")
private String status;
@ApiParam("检测结果")
private Integer result;
@ApiParam("颜色")
private String color;

@ -20,6 +20,8 @@ public class SnPrintDataModel {
@ApiParam("打印数据")
private List<StepPrintSnModel> valueList;
@ApiParam("打印数据")
private List<StepPrintSnModel> templateData;
@ApiParam("打印模板及参数")
private MesLabelTemplate labelTemplate;

@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Transient;
/**
@ -147,4 +148,15 @@ public class StepPrintSnModel extends MesProduceSn {
private String tgPartDesc;
@ApiParam("泰国过程条码截取前11位")
private String snTop11;
@ApiParam("缺陷代码")
private String defectCode;
@ApiParam("缺陷原因代码")
private String dcCode;
@ApiParam("维修代码")
private String repairCode;
@ApiParam("质量代码")
private String qcCode;
@ApiParam("打印机名称")
private String printerName;
}

@ -93,6 +93,10 @@ public class StepResult<T> {
return new StepResult<>(true, data, "");
}
public static <T> StepResult<T> getNewSuccessData(T data, String nextTriggerEvent) {
return new StepResult<>(true, data, "", nextTriggerEvent);
}
public static <T> StepResult<T> getSuccessData(Collection<T> data, String msg) {
return new StepResult<T>(true, data, msg);
}
@ -126,6 +130,13 @@ public class StepResult<T> {
this.msg = msg;
}
public StepResult(boolean isCompleted, T data, String msg, String nextTriggerEvent) {
this.isCompleted = isCompleted;
this.data = data;
this.msg = msg;
this.nextTriggerEvent = nextTriggerEvent;
}
public StepResult(boolean isCompleted, Collection<T> dataCollection, String msg) {
this.isCompleted = isCompleted;
this.dataCollection = dataCollection;

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardImage;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @CreateDate: 2020/10/13
* @Author: simon.song
*/
@Repository
public interface MesBoardImageRepository extends BaseRepository<MesBoardImage, Long> {
}

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesQuarantineRecord;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/3/4 7:38 PM
* @Modify:
*/
public interface MesQuarantineRecordRepository extends BaseRepository<MesQuarantineRecord, Long> {
}

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderDetailRecord;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/2/26 10:18 AM
* @Modify:
*/
public interface MesQueueOrderDetailRecordRepository extends BaseRepository<MesQueueOrderDetailRecord, Long> {
}

@ -1906,6 +1906,9 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) {
DdlPreparedPack.getStringLikerPack(mesDataObject.getFieldPk(), "fieldPk", packBean);
}
if (!StringUtils.isEmpty(mesDataObject.getDsCode())) {
DdlPreparedPack.getStringLikerPack(mesDataObject.getDsCode(), "dsCode", packBean);
}
return packBean;
}
@ -2120,7 +2123,7 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) {
DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean);
DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);

@ -159,6 +159,6 @@ public class WmsActionResponseBean<Obj> implements Serializable {
}
public int getIsResetVal() {
return this.isReset == null ? 0 : this.isReset;
return this.isReset == null ? 2 : this.isReset;
}
}

@ -57,6 +57,9 @@ public class WmsTaskInfoModel implements Serializable {
@ApiParam(value = "源存储区代码")
private String srcZoneNo;
@ApiParam(value = "目标存储区代码")
private String destZoneNo;
@ApiParam(value = "创建日期")
public String createDatetime;

@ -48,7 +48,7 @@ public class BsSuitCase extends BaseBean {
if(caseTypeId == null) {
return -1;
}
return caseTypeId.intValue();
return caseTypeId;
}
public String getCaseTypeTxt() {
@ -69,7 +69,7 @@ public class BsSuitCase extends BaseBean {
if(suitTypeId == null){
return -1;
}
return suitTypeId.longValue();
return suitTypeId;
}
@Column(name = "SUIT_TYPE_NAME_RDD")
@ -109,7 +109,7 @@ public class BsSuitCase extends BaseBean {
if(isNeedCertification==null){
return CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
}
return isNeedCertification.intValue();
return isNeedCertification;
}
@Column(name = "IS_SAVE_EMPTY_MSG")
@ -250,6 +250,22 @@ public class BsSuitCase extends BaseBean {
@ApiParam(value = "绑定业务脚本Code")
private String bindBusiScriptCode;
@Column(name = "IS_SUPPORT_RETRY")
@ApiParam(value = "是否支持重试")
private Integer isSupportRetry;
public int getIsSupportRetryVal() {
return isSupportRetry == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isSupportRetry;
}
@Column(name = "RETRY_INTERVAL")
@ApiParam(value = "重试间隔s")
private Integer retryInterval;
public int getRetryIntervalVal() {
return isSupportRetry == null ? 10: isSupportRetry;
}
@Transient
@ApiParam(value = "适配器套件明细")
private Object bsSuitCaseDetail;

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@ -60,6 +61,16 @@ public class BsSuitCaseREST extends BaseBean {
return isRequestBody == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isRequestBody;
}
//CommonEnumUtil.HTTP_METHOD_TYPE
@Column(name = "RETRY_STRATEGY")
@ApiParam(value = "重试策略")
@AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_REST_RETRY_STRATEGY.class)
private Integer retryStrategy;
public int getRetryStrategyVal() {
return retryStrategy == null ? BlockSoftSwitchEnumUtil.BS_REST_RETRY_STRATEGY.HTTP_STATUS_CODE.getValue() : retryStrategy;
}
@Transient
@ApiParam(value = "请求头转换")
private List<BsSuitCaseParam> requestHeaderList;

@ -7,8 +7,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
@ -16,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
import javax.persistence.Transient;
@ -117,9 +117,9 @@ public class SapDocFgSum extends BaseBean {
@ApiParam(value = "备注")
private String errorMsg;
@Transient
@ApiParam(value = "生产线")
private String lineNo;
@Column(name = "LINE_NO")
@ApiParam("生产线")
public String lineNo;
@JsonSerialize(using = ToStringSerializer.class)
@Transient
@ -210,4 +210,13 @@ public class SapDocFgSum extends BaseBean {
this.isLock = isLock;
this.effStartTime = effStartTime;
}
//wdfd.partNo,wdfd.lineNo,sum(wdfd.qty),sum(wdfd.createDatetime)
public SapDocFgSum(String partNo, String lineNo, Double qty, String createDatetime) {
this.partNo = partNo;
this.lineNo = lineNo;
this.qty = qty;
this.createDatetime = createDatetime;
}
}

@ -77,4 +77,15 @@ public class SwebProcurementPlanOrder extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
private Integer consignment=2;
@Column(name = "EXP_DATE")
@ApiParam(value = "过期日期")
private String expDate;
@Column(name = "ITEM")
@ApiParam("行号")
private Integer item;
@Column(name = "START_DATE")
@ApiParam(value = "起始日期")
private String startDate;
}

@ -1,8 +1,10 @@
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;
@ -53,5 +55,6 @@ public class WmsBhChildDetectionItem extends BaseBean {
@Column(name = "VALUE_TYPE")
@ApiParam("值类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class)
private Integer valueType;
}

@ -86,6 +86,10 @@ public class WmsCSOrderMaster extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer isSyncErp;
@Column(name = "CS_LOCATE")
@ApiParam("盘点中库位")
public String cslocate;
@Transient
@ApiParam(value = "盘点明细集")
public List<WmsCSOrderDetails> wmsCSOrderDetailsList;

@ -486,6 +486,11 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("项目名称")
String prodCfgTypeName;
@Transient
@ApiParam("完成时间")
public String complateDateTime;

@ -377,4 +377,9 @@ public class WmsMoveMaster extends BaseBean {
public int getBusiTypeCodeVal() {
return this.busiTypeCode == null ? 0 : this.busiTypeCode.intValue();
}
public WmsMoveMaster(String createDatetime, String createUser) {
this.createDatetime = createDatetime;
this.createUser = createUser;
}
}

@ -7,18 +7,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
/**
* @Description :
* @Description :
* @Reference :
* @Author : puxiao.liao
* @CreateDate : 2020-08-19 14:50

@ -1,8 +1,10 @@
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;
@ -62,11 +64,13 @@ public class WmsPartItemCheck extends BaseBean {
@Column(name = "VALUE_TYPE")
@ApiParam("子检测箱值类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class)
private Integer valueType;
@Column(name = "STANDARD")
@ApiParam("标准值")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_PART_CHECK_STD")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_PART_CHECK_STD.class)
private Integer standard;
@Column(name = "MAX")

@ -243,6 +243,10 @@ public class WmsStockQuan extends BaseBean {
return this.lockVersion == null ? 0 : this.lockVersion;
}
public boolean getShowNoDiffStock() {
return this.showNoDiffStock == null ? false : this.showNoDiffStock;
}
public WmsStockQuan() {
}

Loading…
Cancel
Save