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

Merge remote-tracking branch 'remotes/origin/dev'

Browse Source
yun-zuoyi
crish 6 years ago
parent a22e2c61dc 8a5337daad
commit 5e06022e51
18 changed files with 451 additions and 18 deletions
Show Stats Download Patch File Download Diff File

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

@ -103,6 +103,12 @@ public class AndonManageQueue extends BaseBean {
@AnnoOutputColumn(hidden = true)
public String callTime;
@Column(name="CLOSE_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="撤销时间",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String closeTime;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="呼叫时间，查询开始时间", example = "2018-01-01 01:00:00")
@ -129,6 +135,10 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "呼叫人")
private String callUser;
@Column(name = "CLOSE_USER")
@ApiParam(value = "撤销人")
private String closeUser;
@Transient
@ApiParam(value = "呼叫人名字")
private String callUserName;
@ -203,6 +213,10 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "事件方法描述")
private String emNameRdd;
@Column(name = "CLOSE_CAUSE")
@ApiParam(value = "撤销原因")
private String closeCause;
@Column(name = "EM_DESC")
@ApiParam(value = "事件具体方法")
private String emDesc;

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

@ -3,10 +3,13 @@ package cn.estsh.i3plus.pojo.andon.sqlpack;
import cn.estsh.i3plus.pojo.andon.bean.*;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
/**
@ -17,6 +20,69 @@ import org.apache.commons.lang3.StringUtils;
* @Modify:
**/
public class AndonHqlPack {
/***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 Start ***********/
/**
* 工作单元呼叫原因配置查询条件封装
* @param andonCellAlarmCause
* @return
*/
public static DdlPackBean getAndonCellAlarmCause(AndonCellAlarmCause andonCellAlarmCause) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getAcCode(), "acCode", packBean);
DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getAlarmCode(), "alarmCode", packBean);
return packBean;
}
/**
* 工作单元事件方法配置查询条件封装
* @param andonEventMethod
* @return
*/
public static DdlPackBean getAndonCellEventMethod(AndonCellEventMethod andonEventMethod) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventMethod.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventMethod.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventMethod.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventMethod.getEmCode(), "emCode", packBean);
return packBean;
}
/**
* 工作单元事件原因查询封装
* @param andonEventCause
* @return
*/
public static DdlPackBean getAndonCellEventCause(AndonCellEventCause andonEventCause) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventCause.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventCause.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventCause.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventCause.getEcCode(), "ecCode", packBean);
return packBean;
}
/**
* 工作单元事件现象查询条件封装
* @param andonEventPhenoMenon
* @return
*/
public static DdlPackBean getAndonCellEventPhenomenon(AndonCellEventPhenomenon andonEventPhenoMenon) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getEpmCode(), "epmCode", packBean);
return packBean;
}
/***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/
/**
* genju 安灯队列参数查询安灯队列
* @param andonManageQueue

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

@ -713,4 +713,50 @@ public class AndonEnumUtil {
return tmp;
}
}
/**
* 接口调用标识
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ANDON_CALL_TYPE{
MANAGE("10","管理界面"),
QUEUE ("20","队列");
private String value;
private String description;
ANDON_CALL_TYPE(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 (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

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

@ -12,6 +12,80 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* mes工作单元参数类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_WORK_CELL_PARAM_TYPE {
NUMBER(10, "数值"),
STRING(20, "字符串");
private int value;
private String description;
MES_WORK_CELL_PARAM_TYPE(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;
}
}
/**
* mes工作单元参数模式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_WORK_CELL_PARAM_MODEL {
PUBLIC(10, "公用"),
JIT(20, "JIT生产"),
WORK_ORDER(30, "工单生产"),
OTHER(99, "其他");
private int value;
private String description;
MES_WORK_CELL_PARAM_MODEL(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;
}
}
/**
* mes条码生成规则最大值后是否循环
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@ -12,8 +12,45 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesPcnEnumUtil {
/**
* mes-pcn定时任务状态
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PCN_TASK_STATUS{
OPEN(1,"OPEN"),
CLOSE(2,"CLOSE");
private int value;
private String description;
MES_PCN_TASK_STATUS(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;
}
}
/**
* mes-pcn定时任务同步结果状态
* 10.
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PCN_TASK_SYNC_STATUS{

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

@ -37,6 +37,10 @@ public class MesPcnTask extends BaseBean {
@ApiParam("任务名称")
private String taskName;
@Column(name="TASK_GROUP_NAME")
@ApiParam("任务组名称")
private String taskGroupName;
@Column(name="TASK_DESCRIPTION")
@ApiParam("任务描述")
private String taskDescription;
@ -61,6 +65,10 @@ public class MesPcnTask extends BaseBean {
@ApiParam("PCN节点名称")
private String pcnName;
@Column(name="PCN_CODE")
@ApiParam("PCN节点名称代码")
private String pcnCode;
@Column(name="TASK_CYCLE_EXPS")
@ApiParam("任务周期表达式")
private String taskCycleExps;
@ -69,7 +77,15 @@ public class MesPcnTask extends BaseBean {
@ApiParam("任务周期描述")
private String taskCycleDescription;
@Column(name="TASK_STATUS")
@ApiParam("任务状态")
private Integer taskStatus;
public int getTaskTypeVal() {
return this.taskType == null ? 0 : this.taskType;
}
public int getTaskStatusVal() {
return this.taskStatus == null ? 0 : this.taskStatus;
}
}

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

@ -43,7 +43,7 @@ public class MesPcnTaskLog extends BaseBean {
@Column(name="ERROR_CONTENT")
@ApiParam("异常内容")
private String errorContent;
private Long errorContent;
public int getSyncStatusVal() {
return this.syncStatus == null ? 0 : this.syncStatus;

46
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java
Unescape Escape View File

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.mes.pcn.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :工作单元参数
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-30
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_PARAM")
@Api("mes工作单元参数")
public class MesWorkCellParam extends BaseBean {
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_NAME")
@ApiParam("参数名称")
private String paramName;
@Column(name = "PARAM_TYPE")
@ApiParam("参数类型")
private Integer paramType;
@Column(name = "PARAM_MODEL")
@ApiParam("参数模式")
private Integer paramModel;
}

16
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellParam;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-30
* @Modify:
**/
@Repository
public interface MesWorkCellParamRepository extends BaseRepository<MesWorkCellParam, Long> {
}

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

@ -37,6 +37,10 @@ public class MesPcnTask extends BaseBean {
@ApiParam("任务名称")
private String taskName;
@Column(name="TASK_GROUP_NAME")
@ApiParam("任务组名称")
private String taskGroupName;
@Column(name="TASK_DESCRIPTION")
@ApiParam("任务描述")
private String taskDescription;
@ -61,6 +65,10 @@ public class MesPcnTask extends BaseBean {
@ApiParam("PCN节点名称")
private String pcnName;
@Column(name="PCN_CODE")
@ApiParam("PCN节点名称代码")
private String pcnCode;
@Column(name="TASK_CYCLE_EXPS")
@ApiParam("任务周期表达式")
private String taskCycleExps;
@ -69,7 +77,15 @@ public class MesPcnTask extends BaseBean {
@ApiParam("任务周期描述")
private String taskCycleDescription;
@Column(name="TASK_STATUS")
@ApiParam("任务状态")
private Integer taskStatus;
public int getTaskTypeVal() {
return this.taskType == null ? 0 : this.taskType;
}
public int getTaskStatusVal() {
return this.taskStatus == null ? 0 : this.taskStatus;
}
}

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

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :工作单元参数
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-30
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_PARAM")
@Api("mes工作单元参数")
public class MesWorkCellParam extends BaseBean {
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_NAME")
@ApiParam("参数名称")
private String paramName;
@Column(name = "PARAM_TYPE")
@ApiParam("参数类型")
private Integer paramType;
@Column(name = "PARAM_MODEL")
@ApiParam("参数模式")
private Integer paramModel;
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellParam;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-08-30
* @Modify:
**/
@Repository
public interface MesWorkCellParamRepository extends BaseRepository<MesWorkCellParam, Long> {
}

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

@ -507,14 +507,17 @@ public class MesHqlPack {
}
public static DdlPackBean getMesEventByEventCode(String eventCode, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(org, "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
DdlPreparedPack.getStringEqualPack(eventCode, "eventCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
return packBean;
}
public static DdlPackBean getMesActionByActionCode(MesAction mesAction, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean);
return packBean;
}
@ -567,10 +570,10 @@ public class MesHqlPack {
}
public static DdlPackBean getMesMethodByMethodCode(MesMethod mesMethod, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, organizeCode);
if (StringUtils.isNotEmpty(mesMethod.getMethodCode())) {
DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
}
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
return packBean;
}
@ -1076,6 +1079,27 @@ public class MesHqlPack {
}
/**
* MES工作单元参数查询条件封装
*
* @param workCellParam
* @return
*/
public static DdlPackBean getMesWorkCellParam(MesWorkCellParam workCellParam, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParam, organizeCode);
if (StringUtils.isNotEmpty(workCellParam.getParamCode())) {
DdlPreparedPack.getStringLikerPack(workCellParam.getParamCode(), "paramCode", packBean);
}
if (null != workCellParam.getParamType()) {
DdlPreparedPack.getNumEqualPack(workCellParam.getParamType(), "paramType", packBean);
}
if (null != workCellParam.getParamModel()) {
DdlPreparedPack.getNumEqualPack(workCellParam.getParamModel(), "paramModel", packBean);
}
return packBean;
}
/**
* MES工作单元队列查询条件封装
*
* @param workCellPoint
@ -1149,8 +1173,11 @@ public class MesHqlPack {
if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) {
DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
}
if (null != mesPcnTask.getTaskStatus()) {
DdlPreparedPack.getNumEqualPack(mesPcnTask.getTaskStatus(), "taskStatus", packBean);
}
packBean.setOrderByStr(mesPcnTask.orderBy());
return packBean;
}
}

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

@ -102,6 +102,10 @@ public class WmsLocate extends BaseBean {
@Transient
private String factory;
@Column(name = "ENCRYPTION_NO")
@ApiParam(value = "加密编码")
private String encryptionNo;
public Integer getMaxPackageQty() {
return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
}

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

@ -177,7 +177,8 @@ public class WmsMoveDetails extends BaseBean {
public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode
,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo,
String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo,
Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode){
Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode,
String createUser,String createDatetime){
this.organizeCode = organizeCode;
this.partNo = partNo;
this.orderNo = orderNo;
@ -199,5 +200,7 @@ public class WmsMoveDetails extends BaseBean {
this.vendorNo = vendorNo;
this.custNo = custNo;
this.busiTypeCode = busiTypeCode;
this.createUser = createUser;
this.createDatetime = createDatetime;
}
}

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

@ -142,7 +142,7 @@ public class WmsMoveMaster extends BaseBean {
public WmsMoveMaster(){};
public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode) {
String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc) {
this.id = id;
this.orderNo = orderNo;
this.organizeCode = organizeCode;
@ -160,5 +160,6 @@ public class WmsMoveMaster extends BaseBean {
this.rejectQty = rejectQty;
this.fixId = fixId;
this.busiTypeCode = busiTypeCode;
this.refSrc = refSrc;
}
}

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

@ -151,7 +151,9 @@ public class WmsMoveSn extends BaseBean {
@ApiParam("特殊批次")
public String fixLotNo;
@Column(name="VENDOR_NO")
@ApiParam("供应商编号")
private String vendorNo;
@Transient
@ApiParam("业务类型编码")
@ -171,10 +173,6 @@ public class WmsMoveSn extends BaseBean {
private String ZoneNo;
@Transient
@ApiParam("供应商编码")
private String vendorNo;
@Transient
@ApiParam("交易类型名称")
private String transTypeName;
@ -211,7 +209,8 @@ public class WmsMoveSn extends BaseBean {
}
public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,
String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn){
Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn,
String createUser,String createDatetime){
this.organizeCode=organizeCode;
this.orderNo=orderNo;
this.item=item;
@ -237,5 +236,7 @@ public class WmsMoveSn extends BaseBean {
this.destWhNo =destWhNo;
this.busiTypeCode = busiTypeCode;
this.sn = sn;
this.createUser = createUser;
this.createDatetime = createDatetime;
}
}

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

@ -109,6 +109,10 @@ public class WmsPOMaster extends BaseBean {
@ApiParam(value = "是否生成条码", example = "1")
public Integer isSn;
@Column(name = "CONTAINER_NO")
@ApiParam("集装箱号")
public String containerNo;
@Transient
@ApiParam(value = "工厂名称")
public String organizeName;

Write Preview
Loading…
Cancel
Save