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

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

Browse Source
yun-zuoyi
曾贞一 6 years ago
parent ceced4c4b6 c44a99eb40
commit 229587fcf3
21 changed files with 197 additions and 41 deletions
Show Stats Download Patch File Download Diff File

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

@ -770,6 +770,7 @@ public class MesEnumUtil {
STEP_LIST("stepList", "工步列表"),
STEP_CONTENT("stepContent", "工步内容"),
MODULE_CONTENT("moduleContent", "组件内容"),
CUSTOM_COMPONENT("customComponent", "定制内容"),
TASK_COMPLETE("taskComplete", "整个扫描完成");
private String value;
@ -807,6 +808,7 @@ public class MesEnumUtil {
TABLE("table", "表格"),
TEXT("text", "正常文本"),
EXP_TEXT("exp_text", "异常文本"),
FILE("file", "定制内容文件"),
IMAGE("image", "图片"),
BUTTON("button", "按钮");

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

@ -228,6 +228,10 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
@ -514,6 +518,10 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
@ -589,13 +597,7 @@ public class WmsEnumUtil {
}
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;
return valueOf(val);
}
}
@ -871,6 +873,10 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
@ -915,13 +921,7 @@ public class WmsEnumUtil {
}
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;
return valueOf(val);
}
public static int descOf(String desc) {
@ -975,13 +975,7 @@ public class WmsEnumUtil {
}
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;
return valueOf(val);
}
public static int descOf(String desc) {
@ -1043,6 +1037,10 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
@ -1088,6 +1086,10 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
@ -1126,6 +1128,10 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
@ -1199,13 +1205,7 @@ public class WmsEnumUtil {
}
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;
return valueOf(val);
}
}
@ -1281,6 +1281,10 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
@ -1566,6 +1570,7 @@ public class WmsEnumUtil {
public String getDescription() {
return description;
}
}
/**
@ -2700,6 +2705,10 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
@ -2985,6 +2994,10 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
@ -3089,6 +3102,10 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
@ -3307,6 +3324,10 @@ public class WmsEnumUtil {
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {

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

@ -54,6 +54,29 @@ public class DdlPreparedPack {
/**
* 封装日期
*
* @param startDate 开始日期
* @param endDate 结束日期
* @param columnName 列名
* @param isLeftContain 左闭？
* @param isRightContain 右闭？
* @param packBean HQL对象
*/
public static void timeBuilder(String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackBean packBean) {
if (isLeftContain) {
packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, startDate.trim());
} else {
packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, startDate.trim());
}
if (isRightContain) {
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, endDate.trim());
} else {
packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " < :m_s_" + columnName, endDate.trim());
}
}
/**
* 封装日期
*
* @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间）
* @param columnName HQL里对应的时间字段
* @param packBean 封装的HQL
@ -348,6 +371,18 @@ public class DdlPreparedPack {
}
/**
* 封装String对象成大于不等于语句
*
* @param columnName 列名
* @param packBean
*/
public static void getStringBiggerNotEqualPack(Object data, String columnName, DdlPackBean packBean) {
if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data);
}
}
/**
* 封装String对象成小于语句
*
* @param columnName 列名

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

@ -53,11 +53,11 @@ public class MesPcnSyncCfg extends BaseBean {
@ApiParam(value ="同步时间")
private String syncTime;
@Column(name="SYNC_PATTERN")//2、新增 1、修改
@Column(name="SYNC_PATTERN")//2.新增 1.修改
@ApiParam("同步方式")
private Integer syncPattern;
@Column(name="SYNC_TYPE")//1\pcn获取mes数据 2、pcn推送数据至mes
@Column(name="SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes
@ApiParam("同步类型")
private Integer syncType;
@ -66,6 +66,10 @@ public class MesPcnSyncCfg extends BaseBean {
@ApiParam(value ="上一同步时间")
private String lastSyncTime;
@Column(name="EXTRACT_GAP")
@ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
private Integer extractGap;
public int getSyncFrequencyVal() {
return this.syncFrequency == null ? 0 : this.syncFrequency;
}

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

@ -37,6 +37,10 @@ public class MesPcnSysUserOffline extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@Column(name = "USER_CODE")
@ApiParam(value = "用户编号", access = "用户编号")
private String userCode;
@Column(name = "USER_NAME")
@ApiParam(value = "用户名称", access = "账号名称")
private String userName;

19
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java
Unescape Escape View File

@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.beans.Transient;
import java.util.List;
/**
@ -19,4 +20,22 @@ import java.util.List;
public class StepPrintSnModel extends MesProduceSn {
@ApiParam("打印描述")
private String printDesc;
@ApiParam("条码")
private String barCode;
@ApiParam("物料号")
private String partNo;
@ApiParam("批次号")
private String batchNo;
@ApiParam("客户物料号")
private String boxQty;
@ApiParam("订单号")
private String orderNo;
@ApiParam("生产日期")
private String productionTime;
}

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

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
import org.apache.commons.lang3.StringUtils;
/**
@ -48,4 +49,18 @@ public class MesHqlPack {
}
return packBean;
}
/**
* 根据打印模板的模板代码查询模板信息
* @param organizeCode
* @param mesLabelTemplate
* @return
*/
public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
return packBean;
}
}

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

@ -83,4 +83,8 @@ public class MesESOP extends BaseBean {
@ApiParam("FILE_TYPE_NAME")
private String fileTypeName;
@Column(name="SYNC_TAG")
@ApiParam("SYNC_TAG")
private Integer syncTag=0;
}

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

@ -66,6 +66,11 @@ public class MesPcnSyncCfg extends BaseBean {
@ApiParam(value ="上一同步时间")
private String lastSyncTime;
@Column(name="EXTRACT_GAP")
@ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
private Integer extractGap;
public int getSyncFrequencyVal() {
return this.syncFrequency == null ? 0 : this.syncFrequency;
}

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

@ -31,6 +31,9 @@ public class MesActionMethodModel implements Serializable {
@ApiParam("函数代码")
private String methodCode;
@ApiParam("函数代码")
private String methodName;
@ApiParam("序号")
private Integer seq;

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

@ -265,13 +265,8 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
}
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
return packBean;
}
@ -513,6 +508,7 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
return packBean;
}
public static DdlPackBean getMesEventByEventName(MesEvent mesEvent) {
DdlPackBean packBean = getAllBaseData(mesEvent.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesEvent.getEventName(), "eventName", packBean);
@ -525,6 +521,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean);
return packBean;
}
public static DdlPackBean getMesActionByActionName(MesAction mesAction, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
DdlPreparedPack.getStringEqualPack(mesAction.getActionName(), "actionName", packBean);
@ -557,7 +554,6 @@ public class MesHqlPack {
* 函数分页获取封装
*
* @param mesMethod
* @param organizeCode
* @return
*/
public static DdlPackBean getMesMethod(MesMethod mesMethod) {
@ -574,6 +570,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
return packBean;
}
public static DdlPackBean getMesMethodByMethodName(MesMethod mesMethod) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesMethod.getMethodName(), "methodName", packBean);
@ -1173,6 +1170,7 @@ public class MesHqlPack {
/**
* 条码生成规则校验同一机构下条码规则唯一性
*
* @param numberRule
* @param id
* @param organizeCode

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

@ -1,6 +1,8 @@
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;
@ -78,6 +80,7 @@ public class WmsCSFactTrans extends BaseBean {
*/
@Column(name="ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
public Integer itemStatus;
@Column(name="REMARK")

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

@ -1,6 +1,8 @@
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;
@ -78,6 +80,7 @@ public class WmsCSOrderDetails extends BaseBean {
*/
@Column(name = "QC_STATUS")
@ApiParam(value = "质检状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
public Integer qcStatus;
/**
@ -87,6 +90,7 @@ public class WmsCSOrderDetails extends BaseBean {
*/
@Column(name = "SN_STATUS")
@ApiParam(value = "条码状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer snStatus;
/**
@ -94,6 +98,7 @@ public class WmsCSOrderDetails extends BaseBean {
*/
@Column(name = "TRANS_STATUS")
@ApiParam(value = "处理状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.CS_TRANS_STATUS.class,refForeignKey = "value",value = "description")
public Integer transStatus;
@Transient
@ -125,6 +130,7 @@ public class WmsCSOrderDetails extends BaseBean {
*/
@Transient
@ApiParam("差异类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description")
public Integer differenceType;
public Double getQty() {

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

@ -1,6 +1,8 @@
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;
@ -41,10 +43,12 @@ public class WmsCSOrderMaster extends BaseBean {
*/
@Column(name = "ORDER_TYPE")
@ApiParam(value = "单据类型", example = "10")
@AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_TYPE.class,refForeignKey = "value",value = "description")
public Integer orderType;
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态 (10-创建 20-开启盘点 30-盘点中 40-盘点完成 50-已解冻 60-已关闭)", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class,refForeignKey = "value",value = "description")
public Integer orderStatus;
@Column(name = "ACTION_PERSENT")
@ -57,14 +61,17 @@ public class WmsCSOrderMaster extends BaseBean {
@Column(name = "IS_INVENTORY")
@ApiParam(value = "是否允许清点", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
public Integer isInventory;
@Column(name = "IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
public Integer isTask;
@Column(name = "IS_PART")
@ApiParam(value = "是否散件")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
public Integer isPart;
@Column(name = "YEAR")
@ -73,6 +80,7 @@ public class WmsCSOrderMaster extends BaseBean {
@Column(name = "IS_SYNC_ERP")
@ApiParam("是否同步ERP: 1=已同步，2=未同步")
@AnnoOutputColumn(refClass = WmsEnumUtil.WMS_ERP_SYNC_FLAG.class,refForeignKey = "value",value = "description")
public Integer isSyncErp;
@Transient

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

@ -1,6 +1,8 @@
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;
@ -102,6 +104,7 @@ public class WmsDocMovementDetails extends BaseBean {
*/
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
private Integer itemStatus;
/**
@ -109,6 +112,7 @@ public class WmsDocMovementDetails extends BaseBean {
*/
@Column(name = "IS_FREE")
@ApiParam(value = "是否免费", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
public Integer isFree;
@Column(name = "REMARK")
@ -185,10 +189,12 @@ public class WmsDocMovementDetails extends BaseBean {
@Transient
@ApiParam("任务状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
private Integer isTask;
@Transient
@ApiParam("主表单据状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
private Integer orderMasterStatus;
public String getRecommondLot() {
@ -218,6 +224,7 @@ public class WmsDocMovementDetails extends BaseBean {
@Transient
@ApiParam("业务类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
public Integer busiType;
@Column(name = "IS_SN")

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

@ -1,6 +1,8 @@
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;
@ -43,6 +45,7 @@ public class WmsDocMovementMaster extends BaseBean {
*/
@Column(name = "MOVE_TYPE")
@ApiParam("移动类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class,refForeignKey = "value",value = "description")
public Integer moveType;
/**
* 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
@ -51,6 +54,7 @@ public class WmsDocMovementMaster extends BaseBean {
*/
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
public Integer busiType;
/**
@ -59,6 +63,7 @@ public class WmsDocMovementMaster extends BaseBean {
*/
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
public Integer orderStatus;
@Column(name = "CUST_NO")
@ -90,6 +95,7 @@ public class WmsDocMovementMaster extends BaseBean {
@Column(name = "IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
public Integer isTask;
@Column(name = "PRIORITY")
@ -117,6 +123,7 @@ public class WmsDocMovementMaster extends BaseBean {
@Column(name = "IS_PART")
@ApiParam(value = "是否散件", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
private Integer isPart;
@Column(name = "SRC_WH_NO")

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

@ -1,6 +1,8 @@
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;
@ -65,6 +67,7 @@ public class WmsDocMovementSn extends BaseBean {
*/
@Column(name="SN_STATUS")
@ApiParam(value = "操作状态", example = "10")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer snStatus;
@Column(name="SN")

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

@ -229,7 +229,7 @@ public class WmsMoveDetails extends BaseBean {
,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,
String createUser,String createDatetime,String modifyDatetime,String modifyUser){
String createUser,String createDatetime,String modifyUser,String modifyDatetime){
this.organizeCode = organizeCode;
this.partNo = partNo;
this.orderNo = orderNo;

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

@ -171,7 +171,7 @@ public class WmsMoveMaster extends BaseBean {
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 refSrc,
String createDatetime,String createUser,String modifyDatetime,String modifyUser) {
String createDatetime,String createUser,String modifyUser,String modifyDatetime) {
this.id = id;
this.orderNo = orderNo;
this.organizeCode = organizeCode;
@ -192,7 +192,7 @@ public class WmsMoveMaster extends BaseBean {
this.refSrc = refSrc;
this.createDatetime= createDatetime;
this.createUser = createUser;
this.modifyDatetime =modifyDatetime;
this.modifyUser =modifyUser;
this.modifyDatetime =modifyDatetime;
}
}

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

@ -1,6 +1,8 @@
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;
@ -40,6 +42,7 @@ public class WmsQCMaster extends BaseBean {
*/
@Column(name = "ORDER_TYPE")
@ApiParam(value = "业务类型", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class,refForeignKey = "value",value = "description")
public Integer orderType;
/**
@ -47,6 +50,7 @@ public class WmsQCMaster extends BaseBean {
*/
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
public Integer orderStatus;
@Column(name = "REMARK")
@ -83,9 +87,11 @@ public class WmsQCMaster extends BaseBean {
@Column(name = "IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
public Integer isTask;
@Column(name="IS_PART")
@ApiParam(value = "是否散件", example = "2")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
public Integer isPart;
}

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

@ -1,6 +1,8 @@
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;
@ -116,18 +118,21 @@ public class WmsStockSn extends BaseBean {
*/
@Column(name = "QC_STATUS")
@ApiParam(value = "质检状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
private Integer qcStatus;
/**
* 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
*/
@Column(name = "SN_STATUS")
@ApiParam(value = "条码状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
private Integer snStatus;
/**
* 1:已打印；2：未打印
*/
@Column(name = "PRINTED")
@ApiParam(value = "是否打印", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
private Integer printed;
@Column(name = "PDATE")
@ -155,6 +160,7 @@ public class WmsStockSn extends BaseBean {
@Column(name = "SN_TYPE")
@ApiParam(value = "条码类型", example = "10")
@AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class,refForeignKey = "value",value = "description")
private Integer snType = 10;
@ApiParam(value = "仓库名称")

Write Preview
Loading…
Cancel
Save