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
crish 6 years ago
parent c969631dbd 835245f8f4
commit 4ba25643d4
11 changed files with 176 additions and 82 deletions
Show Stats Download Patch File Download Diff File

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

@ -18,8 +18,8 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PCN_TASK_STATUS { public enum MES_PCN_TASK_STATUS {
OPEN(1, "OPEN"), OPEN(1, "开启"),
CLOSE(2, "CLOSE"); CLOSE(2, "关闭");
private int value; private int value;
private String description; private String description;

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

@ -586,6 +586,16 @@ public class WmsEnumUtil {
} }
return tmp; return tmp;
} }
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;
}
} }
@ -903,6 +913,16 @@ public class WmsEnumUtil {
return tmp; return tmp;
} }
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;
}
public static int descOf(String desc) { public static int descOf(String desc) {
int tmp = 1; int tmp = 1;
for (int i = 0; i < values().length; i++) { for (int i = 0; i < values().length; i++) {
@ -953,6 +973,16 @@ public class WmsEnumUtil {
return tmp; return tmp;
} }
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;
}
public static int descOf(String desc) { public static int descOf(String desc) {
int tmp = 1; int tmp = 1;
for (int i = 0; i < values().length; i++) { for (int i = 0; i < values().length; i++) {
@ -1166,6 +1196,16 @@ public class WmsEnumUtil {
} }
return tmp; return tmp;
} }
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;
}
} }
/** /**
@ -1320,7 +1360,7 @@ public class WmsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALD_EXECUTE_STATUS { public enum ALD_EXECUTE_STATUS {
NORMAL(10, "创建"), CREATE(10, "创建"),
PROCESSING(20, "处理中"), PROCESSING(20, "处理中"),
COMPLETED(30, "已完成"); COMPLETED(30, "已完成");
private int value; private int value;
@ -2759,7 +2799,7 @@ public class WmsEnumUtil {
public enum STOCK_LEVEL_STATUS { public enum STOCK_LEVEL_STATUS {
LOW("LOW", "低于最低库存"), LOW("LOW", "低于最低库存"),
HIGH("HIGH", "高于最高库存"), HIGH("HIGH", "高于最高库存"),
NORMAL("NORMAL", "安全库存"); NORMAL("CREATE", "安全库存");
private String value; private String value;
private String description; private String description;

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

@ -28,102 +28,99 @@ import javax.persistence.Transient;
@DynamicInsert @DynamicInsert
@DynamicUpdate @DynamicUpdate
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Table(name="WMS_ACTION_LOG") @Table(name = "WMS_ACTION_LOG")
@Api(value="作业记录表") @Api(value = "作业记录表")
public class WmsActionLog extends BaseBean { public class WmsActionLog extends BaseBean {
private static final long serialVersionUID = 8664373854844368861L; private static final long serialVersionUID = 8664373854844368861L;
@Column(name="TASK_NO") @Column(name = "TASK_NO")
@ApiParam(value = "作业任务编号", example = "1") @ApiParam(value = "作业任务编号", example = "1")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
public String taskNo; public String taskNo;
@Column(name="TRANS_TYPE_CODE") @Column(name = "TRANS_TYPE_CODE")
@ApiParam(value = "交易类型编号") @ApiParam(value = "交易类型编号")
public String transTypeCode; public String transTypeCode;
@Column(name="MOVE_NO") @Transient
@Column(name = "MOVE_NO")
@ApiParam(value = "移动单单号") @ApiParam(value = "移动单单号")
public String moveNo; public String moveNo;
@Column(name="AG_ID") @Column(name = "AG_ID")
@ApiParam(value = "作业流程编号", example = "1") @ApiParam(value = "作业流程编号", example = "1")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
public Long agId; public Long agId;
//get单独处理 //get单独处理
public Long getAgId() { public long getAgIdVal() {
if(agId != null) { return agId == null ? 0 : agId.longValue();
return agId.longValue();
}else{
return agId;
}
} }
@Column(name = "AL_NAME_RDD") @Column(name = "AL_NAME_RDD")
@ApiParam(value = "流程名称") @ApiParam(value = "流程名称")
public String agNameRdd; public String agNameRdd;
@Column(name="ACTION_USER_NAME") @Column(name = "ACTION_USER_NAME")
@ApiParam(value = "作业人员") @ApiParam(value = "作业人员")
public String actionUserName; public String actionUserName;
@Column(name="FIX_NO") @Column(name = "FIX_NO")
@ApiParam(value = "设备编号") @ApiParam(value = "设备编号")
public String fixNo; public String fixNo;
@Column(name="START_TIME") @Column(name = "START_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "开始作业时间") @ApiParam(value = "开始作业时间")
public String startTime; public String startTime;
@Column(name="END_TIME") @Column(name = "END_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "结束作业时间") @ApiParam(value = "结束作业时间")
public String endTime; public String endTime;
@Transient @Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="开始作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") @ApiParam(value = "开始作业时间查询用，查询起始日期", example = "2018-01-01 01:00:00")
public String startTimeStart; public String startTimeStart;
@Transient @Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="开始作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") @ApiParam(value = "开始作业时间查询用，查询结束日期", example = "2018-12-31 23:59:59")
public String startTimeEnd; public String startTimeEnd;
@Transient @Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="结束作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") @ApiParam(value = "结束作业时间查询用，查询起始日期", example = "2018-01-01 01:00:00")
public String endTimeStart; public String endTimeStart;
@Transient @Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="结束作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") @ApiParam(value = "结束作业时间查询用，查询结束日期", example = "2018-12-31 23:59:59")
public String endTimeEnd; public String endTimeEnd;
// 状态:1=创建,10=处理中,20=已完成 // 状态:1=创建,10=处理中,20=已完成
@Column(name="ACTION_STATUS") @Column(name = "ACTION_STATUS")
@ApiParam(value = "作业状态", example = "1") @ApiParam(value = "作业状态", example = "1")
public Integer actionStatus; public Integer actionStatus;
@Column(name="TOTAL_STEP") @Column(name = "TOTAL_STEP")
@ApiParam(value = "总步数", example = "1") @ApiParam(value = "总步数", example = "1")
public Integer totalStep; public Integer totalStep;
@Column(name="CURRENT_STEP") @Column(name = "CURRENT_STEP")
@ApiParam(value = "当前步骤", example = "1") @ApiParam(value = "当前步骤", example = "1")
public Integer currentStep; public Integer currentStep;
@Column(name="INIT_AM_ID") @Column(name = "INIT_AM_ID")
@ApiParam(value = "初始化组件编号", example = "0") @ApiParam(value = "初始化组件编号", example = "0")
public Long initAmId; public Long initAmId;
@Column(name="DETAILS_AM_ID") @Column(name = "DETAILS_AM_ID")
@ApiParam(value = "明细处理组件编号", example = "0") @ApiParam(value = "明细处理组件编号", example = "0")
public Long detailsAmId; public Long detailsAmId;
@Column(name="END_AM_ID") @Column(name = "END_AM_ID")
@ApiParam(value = "结束组件编号", example = "0") @ApiParam(value = "结束组件编号", example = "0")
public Long endAmId; public Long endAmId;

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

@ -36,9 +36,9 @@ public class WmsActionLogDetails extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
public Long alId; public Long alId;
@Column(name = "AL_NAME_RDD") @Column(name = "AG_ID")
@ApiParam(value = "流程名称") @ApiParam(value = "流程ID")
public String agNameRdd; public Long agId;
@Column(name = "SEQ") @Column(name = "SEQ")
@ApiParam(value = "序号", example = "1") @ApiParam(value = "序号", example = "1")
@ -113,6 +113,9 @@ public class WmsActionLogDetails extends BaseBean {
@ApiParam(value = "作业流程明细ID", example = "1") @ApiParam(value = "作业流程明细ID", example = "1")
public Long agdId; public Long agdId;
@Column(name="MOVE_NO")
@ApiParam(value = "移动单单号")
public String moveNo;
public Long getAsId() { public Long getAsId() {
if (asId != null) { if (asId != null) {
return asId.longValue(); return asId.longValue();

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

@ -1,6 +1,9 @@
package cn.estsh.i3plus.pojo.wms.bean; 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.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import com.alibaba.fastjson.annotation.JSONField;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
@ -104,6 +107,7 @@ public class WmsMoveDetails extends BaseBean {
*/ */
@Column(name="ITEM_STATUS") @Column(name="ITEM_STATUS")
@ApiParam(value = "状态", example = "0") @ApiParam(value = "状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
public Integer itemStatus; public Integer itemStatus;
@Column(name="REF_ITEM") @Column(name="REF_ITEM")
@ -147,23 +151,39 @@ public class WmsMoveDetails extends BaseBean {
@Transient @Transient
@ApiParam("业务类型编码") @ApiParam("业务类型编码")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
private Integer busiTypeCode; private Integer busiTypeCode;
@Transient @Transient
@ApiParam("生产线")
private String workCenterCode; private String workCenterCode;
@Transient @Transient
private String fPartNo; @ApiParam("父物料编码")
private String fpartNo;
@Transient @Transient
private String fPartName; @ApiParam("父物料名称")
private String fpartName;
@Transient @Transient
@ApiParam("数量")
private Double qty; private Double qty;
@Transient @Transient
@ApiParam("创建时间")
private String createDateTime; private String createDateTime;
/* @JSONField(name="fPartNo")
public String getfPartNo() {
return fPartNo;
}
@JSONField(name="fPartName")
public String getfPartName() {
return fPartName;
}*/
public WmsMoveDetails(){} public WmsMoveDetails(){}
public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){ public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
@ -195,8 +215,8 @@ public class WmsMoveDetails extends BaseBean {
this.partNo = partNo; this.partNo = partNo;
this.partNameRdd = partNameRdd; this.partNameRdd = partNameRdd;
this.workCenterCode = workCenterCode; this.workCenterCode = workCenterCode;
this.fPartNo = fPartNo; this.fpartNo = fPartNo;
this.fPartName = fPartName; this.fpartName = fPartName;
this.unit = unit; this.unit = unit;
this.qty = qty; this.qty = qty;
this.createDateTime = createDateTime; this.createDateTime = createDateTime;

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean; 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.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
@ -40,6 +42,7 @@ public class WmsMoveMaster extends BaseBean {
*/ */
@Column(name = "ORDER_STATUS") @Column(name = "ORDER_STATUS")
@ApiParam(value = "状态", example = "0") @ApiParam(value = "状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
public Integer orderStatus; public Integer orderStatus;
@Column(name = "REMARK") @Column(name = "REMARK")
@ -65,6 +68,7 @@ public class WmsMoveMaster extends BaseBean {
@Column(name = "BUSI_TYPE_CODE") @Column(name = "BUSI_TYPE_CODE")
@ApiParam(value = "业务类型编码") @ApiParam(value = "业务类型编码")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
private Integer busiTypeCode; private Integer busiTypeCode;
@Column(name = "REF_ORDER_NO") @Column(name = "REF_ORDER_NO")
@ -77,6 +81,7 @@ public class WmsMoveMaster extends BaseBean {
@Transient @Transient
@ApiParam("状态") @ApiParam("状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
private Integer itemStatus; private Integer itemStatus;
@Transient @Transient

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean; 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.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
@ -66,6 +68,7 @@ public class WmsMoveSn extends BaseBean {
*/ */
@Column(name="ITEM_STATUS") @Column(name="ITEM_STATUS")
@ApiParam(value = "状态", example = "1") @ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
public Integer itemStatus; public Integer itemStatus;
@Column(name="REMARK") @Column(name="REMARK")
@ -129,18 +132,22 @@ public class WmsMoveSn extends BaseBean {
@Column(name="SRC_QC_STATUS") @Column(name="SRC_QC_STATUS")
@ApiParam(value = "源质量状态", example = "1") @ApiParam(value = "源质量状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
public Integer srcQcStatus; public Integer srcQcStatus;
@Column(name="SRC_SN_STATUS") @Column(name="SRC_SN_STATUS")
@ApiParam(value = "源条码状态", example = "1") @ApiParam(value = "源条码状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer srcSnStatus; public Integer srcSnStatus;
@Column(name="DEST_QC_STATUS") @Column(name="DEST_QC_STATUS")
@ApiParam(value = "目的质量状态", example = "1") @ApiParam(value = "目的质量状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
public Integer descQcStatus; public Integer descQcStatus;
@Column(name="DEST_SN_STATUS") @Column(name="DEST_SN_STATUS")
@ApiParam(value = "目的条码状态", example = "1") @ApiParam(value = "目的条码状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer destSnStatus; public Integer destSnStatus;
@Column(name="DATE_CODE") @Column(name="DATE_CODE")
@ -157,9 +164,9 @@ public class WmsMoveSn extends BaseBean {
@Transient @Transient
@ApiParam("业务类型编码") @ApiParam("业务类型编码")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
private Integer busiTypeCode; private Integer busiTypeCode;
@Transient @Transient
@ApiParam(value = "交易类型代码") @ApiParam(value = "交易类型代码")
private String transTypeCode; private String transTypeCode;

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

@ -92,7 +92,7 @@ public class WmsPart extends BaseBean {
@ColumnDefault("2") @ColumnDefault("2")
@Column(name = "IQC") @Column(name = "IQC")
@ApiParam(value = "收货检验否", example = "1") @ApiParam(value = "是否免检", example = "1")
private Integer iqc; private Integer iqc;
@Column(name = "MIN") @Column(name = "MIN")

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

@ -13,6 +13,7 @@ import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient; import javax.persistence.Transient;
import java.util.List;
/** /**
* @Description : 产品发运信息 * @Description : 产品发运信息
@ -26,94 +27,99 @@ import javax.persistence.Transient;
@DynamicInsert @DynamicInsert
@DynamicUpdate @DynamicUpdate
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_SHIPPING") @Table(name = "WMS_DOC_SHIPPING")
@Api("产品发运信息") @Api("产品发运信息")
public class WmsShipping extends BaseBean { public class WmsShipping extends BaseBean {
private static final long serialVersionUID = 5760351204320621363L; private static final long serialVersionUID = 5760351204320621363L;
@Column(name="ORDER_NO") @Column(name = "ORDER_NO")
@ApiParam("发运单号") @ApiParam("发运单号")
public String orderNo; public String orderNo;
@Column(name="PART_NO") @Column(name = "PART_NO")
@ApiParam("物料编码") @ApiParam("物料编码")
public String partNo; public String partNo;
@Column(name="PART_NAME_RDD") @Column(name = "PART_NAME_RDD")
@ApiParam("物料名称") @ApiParam("物料名称")
public String partNameRdd; public String partNameRdd;
@Column(name="QTY") @Column(name = "QTY")
@ColumnDefault("0") @ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0") @ApiParam(value = "需求数量", example = "0")
public Double qty; public Double qty;
@Column(name="UNIT") @Column(name = "UNIT")
@ApiParam("单位") @ApiParam("单位")
public String unit; public String unit;
@Column(name="SN") @Column(name = "SN")
@ApiParam("条码") @ApiParam("条码")
public String sn; public String sn;
/** /**
* 状态:10=新建,20=已处理,30=处理出错 * 状态:10=新建,20=已处理,30=处理出错
*/ */
@Column(name="ORDER_STATUS") @Column(name = "ORDER_STATUS")
@ApiParam(value = "状态", example = "10") @ApiParam(value = "状态", example = "10")
public Integer orderStatus; public Integer orderStatus;
@Column(name="REMARK") @Transient
@ApiParam(value = "状态")
public List<Integer> orderStatusList;
@Column(name = "REMARK")
@ApiParam("备注") @ApiParam("备注")
public String remark; public String remark;
@Column(name="SRC") @Column(name = "SRC")
@ApiParam("单据来源") @ApiParam("单据来源")
public String src; public String src;
@Column(name="CUST_NO") @Column(name = "CUST_NO")
@ApiParam("客户编码") @ApiParam("客户编码")
public String custNo; public String custNo;
@Column(name="SHIPPING_FLAG") @Column(name = "SHIPPING_FLAG")
@ApiParam("特殊发货标志") @ApiParam("特殊发货标志")
public String shippingFlag; public String shippingFlag;
@Column(name="SHIPPING_TIME") @Column(name = "SHIPPING_TIME")
@ApiParam("发运时间") @ApiParam("发运时间")
public String shippingTime; public String shippingTime;
@Transient @Transient
@ApiParam(value ="客户简称") @ApiParam(value = "客户简称")
private String custName; private String custName;
@Transient @Transient
@ApiParam(value = "发往地简称") @ApiParam(value = "发往地简称")
private String flagName; private String flagName;
@Column(name="AREA_NO") @Column(name = "AREA_NO")
@ApiParam("ERP库存地") @ApiParam("ERP库存地")
public String areaNo; public String areaNo;
@Column(name="CAR_NO") @Column(name = "CAR_NO")
@ApiParam("车号") @ApiParam("车号")
public String carNo; public String carNo;
@Column(name="ERROR_MESSAGE") @Column(name = "ERROR_MESSAGE")
@ApiParam("错误信息") @ApiParam("错误信息")
public String errorMessage; public String errorMessage;
@Column(name="IS_LOCK") @Column(name = "IS_LOCK")
@ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" ) @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定")
public Integer isLock; public Integer isLock;
@Column(name="ERP_SYNC_FLAG") @Column(name = "ERP_SYNC_FLAG")
@ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败")
public Integer erpSyncFlag; public Integer erpSyncFlag;
public WmsShipping(){} public WmsShipping() {
}
public WmsShipping(Long id,Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit,String areaNo) { public WmsShipping(Long id, Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit, String areaNo) {
this.id = id; this.id = id;
this.partNo = partNo; this.partNo = partNo;
this.partNameRdd = partNameRdd; this.partNameRdd = partNameRdd;

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

@ -95,6 +95,11 @@ public class WmsZones extends BaseBean {
this.zoneNo = zoneNo; this.zoneNo = zoneNo;
} }
public WmsZones(String zoneNo,String areaNo){
this.zoneNo = zoneNo;
this.areaNo = areaNo;
}
public WmsZones(){} public WmsZones(){}
} }

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

@ -45,19 +45,18 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr); DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr);
if(StringUtils.isNotBlank(bean.getCreateDateTimeStart())&&StringUtils.isNotBlank(bean.getCreateDateTimeEnd())){ if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true); DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
} }
return hqlStr; return hqlStr;
} }
/** /**
*
* @param wmsFix * @param wmsFix
* @return * @return
*/ */
public static DdlPackBean packHqlWmsFix(WmsFix wmsFix){ public static DdlPackBean packHqlWmsFix(WmsFix wmsFix) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
//查询参数封装 //查询参数封装
@ -77,9 +76,10 @@ public class WmsHqlPack {
/** /**
* 单位换算 分页查询 * 单位换算 分页查询
*
* @return * @return
*/ */
public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){ public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
//查询参数封装 //查询参数封装
@ -175,11 +175,12 @@ public class WmsHqlPack {
/** /**
* 移库单号集合查询条件封装 * 移库单号集合查询条件封装
*
* @param orderNoList * @param orderNoList
* @param organizeCode * @param organizeCode
* @return * @return
*/ */
public static DdlPackBean packWmsDocMovementMasterByOrderNos(List<String> orderNoList,String organizeCode) { public static DdlPackBean packWmsDocMovementMasterByOrderNos(List<String> orderNoList, String organizeCode) {
DdlPackBean packBean = new DdlPackBean(); DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getInPack(orderNoList, "orderNo", packBean); DdlPreparedPack.getInPack(orderNoList, "orderNo", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
@ -616,6 +617,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsShipping.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsShipping.getSn(), "sn", result);
//发运状态 //发运状态
DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result);
//发运状态集合
DdlPreparedPack.getInPackList(wmsShipping.getOrderStatusList(), "orderStatus", result);
//特殊发货标志 //特殊发货标志
DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result); DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result);
//单据来源 //单据来源
@ -1305,6 +1308,10 @@ public class WmsHqlPack {
//查询参数封装 //查询参数封装
DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);
getStringBuilderPack(wmsCSOrderDetails, result); getStringBuilderPack(wmsCSOrderDetails, result);
@ -1323,6 +1330,9 @@ public class WmsHqlPack {
//查询参数封装 //查询参数封装
DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result);
getStringBuilderPack(wmsCSFactTrans, result); getStringBuilderPack(wmsCSFactTrans, result);
@ -2067,7 +2077,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result); DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{ DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{
DdlPreparedPack.getOrderColConvertType("item",CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result); DdlPreparedPack.getOrderColConvertType("item", CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result);
getStringBuilderPack(wmsCSRange, result); getStringBuilderPack(wmsCSRange, result);
return result; return result;
@ -2240,19 +2250,19 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
// 库位不为空 // 库位不为空
DdlPreparedPack.getStringNotNullPack( "locateNo", result); DdlPreparedPack.getStringNotNullPack("locateNo", result);
DdlPreparedPack.getStringNoEqualPack("","locateNo", result); DdlPreparedPack.getStringNoEqualPack("", "locateNo", result);
// 排除创建及出库状态条码 // 排除创建及出库状态条码
if(wmsStockSn.getSnStatus() != null){ if (wmsStockSn.getSnStatus() != null) {
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
} }
DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result); DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(), "snStatus", result);
DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result); DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(), "snStatus", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
//数量大于0 //数量大于0
DdlPreparedPack.getNumberBiggerPack(0,"qty",result); DdlPreparedPack.getNumberBiggerPack(0, "qty", result);
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
@ -2272,7 +2282,7 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsActionLogByActionLog(WmsActionLog actionLog) { public static DdlPackBean packHqlWmsActionLogByActionLog(WmsActionLog actionLog) {
DdlPackBean packBean = new DdlPackBean(); DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", packBean, false, false); DdlPreparedPack.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", packBean, false, false);
DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean); // DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean);
DdlPreparedPack.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", packBean); DdlPreparedPack.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", packBean);
DdlPreparedPack.getStringEqualPack(actionLog.getFixNo(), "fixNo", packBean); DdlPreparedPack.getStringEqualPack(actionLog.getFixNo(), "fixNo", packBean);
DdlPreparedPack.getNumEqualPack(actionLog.getAgId(), "agId", packBean); DdlPreparedPack.getNumEqualPack(actionLog.getAgId(), "agId", packBean);
@ -2282,13 +2292,13 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(actionLog.getIsValid(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(actionLog.getIsValid(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", packBean); DdlPreparedPack.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", packBean);
if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="") if ((actionLog.getStartTimeStart() != null && actionLog.getStartTimeStart() != "")
|| (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){ || (actionLog.getStartTimeEnd() != null && actionLog.getStartTimeEnd() != "")) {
DdlPreparedPack.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", packBean, true); DdlPreparedPack.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", packBean, true);
} }
if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "") if ((actionLog.getEndTimeStart() != null && actionLog.getEndTimeStart() != "")
|| (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){ || (actionLog.getEndTimeEnd() != null && actionLog.getEndTimeEnd() != "")) {
DdlPreparedPack.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", packBean, true); DdlPreparedPack.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", packBean, true);
} }
@ -2332,9 +2342,10 @@ public class WmsHqlPack {
/** /**
* 单位换算 分页查询 * 单位换算 分页查询
*
* @return * @return
*/ */
public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize){ public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
//查询参数封装 //查询参数封装

Write Preview
Loading…
Cancel
Save