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
crish 6 years ago
parent 89b0a4a68a f0fba5e23a
commit 8d8752b8b4
6 changed files with 90 additions and 3 deletions
Show Stats Download Patch File Download Diff File

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

@ -871,6 +871,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;
}
}
@ -1043,6 +1053,15 @@ 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;
}
}
/**
@ -1088,6 +1107,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;
}
}
/**
@ -1126,6 +1155,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;
}
}
/**
@ -1566,6 +1605,7 @@ public class WmsEnumUtil {
public String getDescription() {
return description;
}
}
/**
@ -2700,6 +2740,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;
}
}
@ -2985,6 +3035,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;
}
}
/**
@ -3307,6 +3367,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++) {

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

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;
}
}

Write Preview
Loading…
Cancel
Save