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)
public enum MES_PCN_TASK_STATUS {
OPEN(1, "OPEN"),
CLOSE(2, "CLOSE");
OPEN(1, "开启"),
CLOSE(2, "关闭");
private int value;
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;
}
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;
}
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) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -953,6 +973,16 @@ public class WmsEnumUtil {
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) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -1166,6 +1196,16 @@ public class WmsEnumUtil {
}
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)
public enum ALD_EXECUTE_STATUS {
NORMAL(10, "创建"),
CREATE(10, "创建"),
PROCESSING(20, "处理中"),
COMPLETED(30, "已完成");
private int value;
@ -2759,7 +2799,7 @@ public class WmsEnumUtil {
public enum STOCK_LEVEL_STATUS {
LOW("LOW", "低于最低库存"),
HIGH("HIGH", "高于最高库存"),
NORMAL("NORMAL", "安全库存");
NORMAL("CREATE", "安全库存");
private String value;
private String description;

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

@ -42,6 +42,7 @@ public class WmsActionLog extends BaseBean {
@ApiParam(value = "交易类型编号")
public String transTypeCode;
@Transient
@Column(name = "MOVE_NO")
@ApiParam(value = "移动单单号")
public String moveNo;
@ -52,12 +53,8 @@ public class WmsActionLog extends BaseBean {
public Long agId;
//get单独处理
public Long getAgId() {
if(agId != null) {
return agId.longValue();
}else{
return agId;
}
public long getAgIdVal() {
return agId == null ? 0 : agId.longValue();
}
@Column(name = "AL_NAME_RDD")

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)
public Long alId;
@Column(name = "AL_NAME_RDD")
@ApiParam(value = "流程名称")
public String agNameRdd;
@Column(name = "AG_ID")
@ApiParam(value = "流程ID")
public Long agId;
@Column(name = "SEQ")
@ApiParam(value = "序号", example = "1")
@ -113,6 +113,9 @@ public class WmsActionLogDetails extends BaseBean {
@ApiParam(value = "作业流程明细ID", example = "1")
public Long agdId;
@Column(name="MOVE_NO")
@ApiParam(value = "移动单单号")
public String moveNo;
public Long getAsId() {
if (asId != null) {
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;
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 com.alibaba.fastjson.annotation.JSONField;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -104,6 +107,7 @@ public class WmsMoveDetails extends BaseBean {
*/
@Column(name="ITEM_STATUS")
@ApiParam(value = "状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
public Integer itemStatus;
@Column(name="REF_ITEM")
@ -147,23 +151,39 @@ public class WmsMoveDetails extends BaseBean {
@Transient
@ApiParam("业务类型编码")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
private Integer busiTypeCode;
@Transient
@ApiParam("生产线")
private String workCenterCode;
@Transient
private String fPartNo;
@ApiParam("父物料编码")
private String fpartNo;
@Transient
private String fPartName;
@ApiParam("父物料名称")
private String fpartName;
@Transient
@ApiParam("数量")
private Double qty;
@Transient
@ApiParam("创建时间")
private String createDateTime;
/* @JSONField(name="fPartNo")
public String getfPartNo() {
return fPartNo;
}
@JSONField(name="fPartName")
public String getfPartName() {
return fPartName;
}*/
public WmsMoveDetails(){}
public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
@ -195,8 +215,8 @@ public class WmsMoveDetails extends BaseBean {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.workCenterCode = workCenterCode;
this.fPartNo = fPartNo;
this.fPartName = fPartName;
this.fpartNo = fPartNo;
this.fpartName = fPartName;
this.unit = unit;
this.qty = qty;
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;
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 WmsMoveMaster extends BaseBean {
*/
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态", example = "0")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
public Integer orderStatus;
@Column(name = "REMARK")
@ -65,6 +68,7 @@ public class WmsMoveMaster extends BaseBean {
@Column(name = "BUSI_TYPE_CODE")
@ApiParam(value = "业务类型编码")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
private Integer busiTypeCode;
@Column(name = "REF_ORDER_NO")
@ -77,6 +81,7 @@ public class WmsMoveMaster extends BaseBean {
@Transient
@ApiParam("状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
private Integer itemStatus;
@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;
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;
@ -66,6 +68,7 @@ public class WmsMoveSn 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")
@ -129,18 +132,22 @@ public class WmsMoveSn extends BaseBean {
@Column(name="SRC_QC_STATUS")
@ApiParam(value = "源质量状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
public Integer srcQcStatus;
@Column(name="SRC_SN_STATUS")
@ApiParam(value = "源条码状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer srcSnStatus;
@Column(name="DEST_QC_STATUS")
@ApiParam(value = "目的质量状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description")
public Integer descQcStatus;
@Column(name="DEST_SN_STATUS")
@ApiParam(value = "目的条码状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer destSnStatus;
@Column(name="DATE_CODE")
@ -157,9 +164,9 @@ public class WmsMoveSn extends BaseBean {
@Transient
@ApiParam("业务类型编码")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
private Integer busiTypeCode;
@Transient
@ApiParam(value = "交易类型代码")
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")
@Column(name = "IQC")
@ApiParam(value = "收货检验否", example = "1")
@ApiParam(value = "是否免检", example = "1")
private Integer iqc;
@Column(name = "MIN")

8
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.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description : 产品发运信息
@ -63,6 +64,10 @@ public class WmsShipping extends BaseBean {
@ApiParam(value = "状态", example = "10")
public Integer orderStatus;
@Transient
@ApiParam(value = "状态")
public List<Integer> orderStatusList;
@Column(name = "REMARK")
@ApiParam("备注")
public String remark;
@ -111,7 +116,8 @@ public class WmsShipping extends BaseBean {
@ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败")
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) {
this.id = id;

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;
}
public WmsZones(String zoneNo,String areaNo){
this.zoneNo = zoneNo;
this.areaNo = areaNo;
}
public WmsZones(){}
}

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

@ -53,7 +53,6 @@ public class WmsHqlPack {
}
/**
*
* @param wmsFix
* @return
*/
@ -77,6 +76,7 @@ public class WmsHqlPack {
/**
* 单位换算 分页查询
*
* @return
*/
public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert) {
@ -175,6 +175,7 @@ public class WmsHqlPack {
/**
* 移库单号集合查询条件封装
*
* @param orderNoList
* @param organizeCode
* @return
@ -616,6 +617,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsShipping.getSn(), "sn", result);
//发运状态
DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result);
//发运状态集合
DdlPreparedPack.getInPackList(wmsShipping.getOrderStatusList(), "orderStatus", result);
//特殊发货标志
DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result);
//单据来源
@ -1305,6 +1308,10 @@ public class WmsHqlPack {
//查询参数封装
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);
@ -1323,6 +1330,9 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", 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);
@ -2272,7 +2282,7 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsActionLogByActionLog(WmsActionLog actionLog) {
DdlPackBean packBean = new DdlPackBean();
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.getFixNo(), "fixNo", packBean);
DdlPreparedPack.getNumEqualPack(actionLog.getAgId(), "agId", packBean);
@ -2332,6 +2342,7 @@ public class WmsHqlPack {
/**
* 单位换算 分页查询
*
* @return
*/
public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize) {

Write Preview
Loading…
Cancel
Save