yun-zuoyi
柯裕 6 years ago
commit 1f50fecf80

@ -302,7 +302,7 @@ public class CommonEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USER_STATUS { public enum USER_STATUS {
// NORMAL(1, "fa fa-success cell-fa fa-check", "正常"), // EMPTY(1, "fa fa-success cell-fa fa-check", "正常"),
// FREEZE(2, "冻结", "冻结_FREEZE"), // FREEZE(2, "冻结", "冻结_FREEZE"),
// ABERRANT(3, "异常", "异常_ABERRANT"), // ABERRANT(3, "异常", "异常_ABERRANT"),
// RESIGNATION(4, "离职", "离职_RESIGNATION"), // RESIGNATION(4, "离职", "离职_RESIGNATION"),

@ -11,54 +11,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
**/ **/
public class WmsEnumUtil { public class WmsEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SPLIT_OR_MERGE_RULE {
WH(10, "WH", "仓库"), ZONE(20, "ZONE", "存储区"), PART(30, "PART", "物料");
private int value;
private String code;
private String description;
SPLIT_OR_MERGE_RULE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(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++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/** /**
* *
@ -127,57 +79,7 @@ public class WmsEnumUtil {
} }
} }
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_DETAILS_STATUS {
NORMAL(10, "N", "正常"),
RECEIPTED(20, "R", "已完成"),
ANCEL(30, "C", "行取消");
private int value;
private String code;
private String description;
ORDER_DETAILS_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(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++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/** /**
* *
@ -232,14 +134,15 @@ public class WmsEnumUtil {
} }
} }
/** /**
* * (ASN,PO,MOVE,QC)
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MASTER_ORDER_STATUS { public enum MASTER_ORDER_STATUS {
CREATE(10, "新建"), CREATE(10, "新建"),
RECEIPT(20, "处理中"), RECEIPT(20, "处理中"),
RECEIPT_FINISH(30, "已完成"), RECEIPT_FINISH(30, "已处理"),
CLOSED(40, "已关闭"), CLOSED(40, "已关闭"),
CANCELLED(50, "已取消"); CANCELLED(50, "已取消");
@ -281,21 +184,22 @@ public class WmsEnumUtil {
} }
/** /**
* * PO
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RC_ORDER_STATUS { public enum ORDER_DETAILS_STATUS {
CREATE(10, "新建"), CREATE(10, "N", "创建"),
RECEIPT(20, "收货中"), RECEIPTED(20, "R", "已完成"),
RECEIPT_FINISH(30, "收货完成"), CANCEL(30, "C", "行取消"),
CLOSED(40, "已关闭"), PRINTED(40, "C", "已打印");
CANCELLED(50, "已取消");
private int value; private int value;
private String code;
private String description; private String description;
RC_ORDER_STATUS(int value, String description) { ORDER_DETAILS_STATUS(int value, String code, String description) {
this.value = value; this.value = value;
this.code = code;
this.description = description; this.description = description;
} }
@ -307,50 +211,8 @@ public class WmsEnumUtil {
return description; return description;
} }
public static String valueOf(int val) { public String getCode() {
String tmp = null; return code;
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++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* PO
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SN_DETAILS_STATUS {
CREATE(10, "新建"),
WAREHOUSING(30, "已打印"),
RECEIPT_FINISH(20, "已收货");
private int value;
private String description;
SN_DETAILS_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
} }
public static String valueOf(int val) { public static String valueOf(int val) {
@ -374,9 +236,8 @@ public class WmsEnumUtil {
} }
} }
/** /**
* *
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCT_INSTOCK_STATUS { public enum PRODUCT_INSTOCK_STATUS {
@ -471,7 +332,7 @@ public class WmsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOCATE_STATUS { public enum LOCATE_STATUS {
CREATE(10, "空库位"), FINISH(20, "非空"), FAIL(30, "已满"); EMPTY(10, "空库位"), NOT_EMPTY(20, "非空"), FULL(30, "已满");
private int value; private int value;
private String description; private String description;
@ -501,7 +362,7 @@ public class WmsEnumUtil {
} }
/** /**
* *
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_MOVE_TYPE { public enum OUT_MOVEMENT_MOVE_TYPE {
@ -666,54 +527,10 @@ public class WmsEnumUtil {
} }
/** /**
* *
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_MASTER_ORDER_TYPE {
ORDER_PULL_PART(1, "工单配料");
private int value;
private String description;
OUT_MOVEMENT_MASTER_ORDER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(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++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
*
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE { public enum LINK_ORDER_TYPE {
ASN(10, "ASN", "ASN"), ASN(10, "ASN", "ASN"),
PO(20, "PO", "PO"), PO(20, "PO", "PO"),
SO(30, "SO", "SO"), SO(30, "SO", "SO"),
@ -726,7 +543,7 @@ public class WmsEnumUtil {
private String code; private String code;
private String description; private String description;
OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE(int value, String code, String description) { LINK_ORDER_TYPE(int value, String code, String description) {
this.value = value; this.value = value;
this.code = code; this.code = code;
this.description = description; this.description = description;
@ -764,7 +581,7 @@ public class WmsEnumUtil {
return tmp; return tmp;
} }
public static OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE codeOf(String code) { public static LINK_ORDER_TYPE codeOf(String code) {
int tmp = 1; int tmp = 1;
for (int i = 0; i < values().length; i++) { for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) { if (values()[i].code.equals(code)) {
@ -843,45 +660,6 @@ public class WmsEnumUtil {
} }
} }
/**
* ASN 10=,20=,30=40=,50=
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ASN_STATUS {
CREATE(10, "新建"),
RECEIPT(20, "收货中"),
RECEIPT_FINISH(30, "收货完成"),
CLOSED(40, "已关闭"),
CANCELLED(50, "已取消");
private int value;
private String description;
ASN_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/** /**
* *
@ -889,14 +667,14 @@ public class WmsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_STATUS { public enum STOCK_SN_STATUS {
CREATE(1, "创建"), CREATE(10,"创建"),
QUALITY_CONTROL(10, "质检中"), QUALITY_CONTROL(20, "质检中"),
PRE_INSTOCK(20, "待入库"), PRE_INSTOCK(30, "待入库"),
INSTOCKED(30, "入库"), INSTOCKED(40, "入库"),
PICKED(40, "配料"), PICKED(50, "配料"),
OUT_STOCK(50, "出库"), OUT_STOCK(60, "出库"),
FRAZE(60, "报废"), FRAZE(70, "报废"),
COMMING(70, "在途"); COMMING(80, "在途");
private int value; private int value;
private String description; private String description;
@ -940,7 +718,7 @@ public class WmsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_QC_STATUS { public enum STOCK_SN_QC_STATUS {
NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"); NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离");
private int value; private int value;
private String code; private String code;
@ -983,6 +761,7 @@ public class WmsEnumUtil {
} }
return tmp; return tmp;
} }
public static STOCK_SN_QC_STATUS codeOf(Integer value) { public static STOCK_SN_QC_STATUS codeOf(Integer value) {
int tmp = 1; int tmp = 1;
for (int i = 0; i < values().length; i++) { for (int i = 0; i < values().length; i++) {
@ -1113,7 +892,7 @@ public class WmsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_ITEM_STATUS { public enum CS_ITEM_STATUS {
CREATE(1, "创建"), FINISH(10, "已处理"); CREATE(10, "创建"), FINISH(20, "已处理");
private int value; private int value;
private String description; private String description;
@ -1256,12 +1035,12 @@ public class WmsEnumUtil {
} }
/** /**
* *
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_ITEM_STATUS { public enum QC_ITEM_STATUS {
NORMAL(1, "正常"), NORMAL(10, "创建"),
CANCELLATION(10, "行取消"); CANCELLATION(20, "行取消");
private int value; private int value;
private String description; private String description;
@ -1543,42 +1322,6 @@ public class WmsEnumUtil {
} }
} }
/**
* PO
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PO_SN_STATUS {
FOUND(10, "创建"),
PRINTED(20, "已打印"),
RECEIPTED(30, "已收货");
private int value;
private String description;
PO_SN_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/** /**
* *

@ -38,7 +38,7 @@ public class WmsASNMaster extends BaseBean {
@ApiParam("单据类型") @ApiParam("单据类型")
public String asnType; public String asnType;
@Column(name = "ASN_STATUS") @Column(name = "MASTER_ORDER_STATUS")
@ApiParam(value = "状态", example = "0") @ApiParam(value = "状态", example = "0")
public Integer asnStatus; public Integer asnStatus;
@ -83,14 +83,6 @@ public class WmsASNMaster extends BaseBean {
private String sendUser; private String sendUser;
@Transient @Transient
@ApiParam(value = "收货人")
private String rcUser;
@Transient
@ApiParam(value = "发货日期") @ApiParam(value = "发货日期")
private String sendDate; private String sendDate;
@Transient
@ApiParam(value = "收货日期")
private String rcDate;
} }

@ -100,9 +100,9 @@ public class WmsASNMasterDetails extends BaseBean {
@ApiParam("组条码") @ApiParam("组条码")
public String groupNo; public String groupNo;
@Column(name = "ERP_WH_NO") @Column(name = "ERP_AREA_NO")
@ApiParam("默认收货库存地") @ApiParam("默认收货库存地")
public String erpWhNo; public String erpAreaNo;
@Column(name = "VENDOR_LOT_NO") @Column(name = "VENDOR_LOT_NO")
@ApiParam("供应商批次") @ApiParam("供应商批次")

@ -81,4 +81,11 @@ public class WmsCSFactTrans extends BaseBean {
@Column(name="REMARK") @Column(name="REMARK")
@ApiParam(value = "备注") @ApiParam(value = "备注")
public String reMark; public String reMark;
public WmsCSFactTrans(){}
public WmsCSFactTrans(double factQty, String partNo){
this.factQty = factQty;
this.partNo = partNo;
}
} }

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient;
/** /**
* @Description : * @Description :
@ -94,7 +95,21 @@ public class WmsCSOrderDetails extends BaseBean {
@ApiParam(value = "处理状态", example = "1") @ApiParam(value = "处理状态", example = "1")
public Integer transStatus; public Integer transStatus;
//虚拟字段(实盘数量、剩余数量)
@Transient
public Double factQty;
@Transient
public Double surplusQty;
public Double getQty() { public Double getQty() {
return this.qty == null ? 0 : this.qty; return this.qty == null ? 0 : this.qty;
} }
public WmsCSOrderDetails(){}
public WmsCSOrderDetails(double qty, String partNo){
this.qty = qty;
this.partNo = partNo;
}
} }

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient;
/** /**
* @Description :() * @Description :()
@ -138,4 +139,12 @@ public class WmsDocMovementDetails extends BaseBean {
@Column(name = "DEST_AREA_NO") @Column(name = "DEST_AREA_NO")
@ApiParam("目的库存地代码") @ApiParam("目的库存地代码")
public String destAreaNo; public String destAreaNo;
@Transient
@ApiParam("推荐批次")
private String recommondLot;
@Transient
@ApiParam("推荐库位")
private String recommondLocateNo;
} }

@ -126,14 +126,6 @@ public class WmsDocMovementMaster extends BaseBean {
private String sendUser; private String sendUser;
@Transient @Transient
@ApiParam(value = "收货人")
private String rcUser;
@Transient
@ApiParam(value = "发货日期") @ApiParam(value = "发货日期")
private String sendDate; private String sendDate;
@Transient
@ApiParam(value = "收货日期")
private String rcDate;
} }

@ -76,9 +76,9 @@ public class WmsFGInStock extends BaseBean {
@ApiParam("单据来源") @ApiParam("单据来源")
public String src; public String src;
@Column(name="ERP_WH_NO") @Column(name="ERP_AREA_NO")
@ApiParam("默认收货库存地") @ApiParam("默认收货库存地")
public String erpWhNo; public String erpAreaNo;
@Column(name="LINE_NO") @Column(name="LINE_NO")
@ApiParam("生产线") @ApiParam("生产线")

@ -101,14 +101,6 @@ public class WmsPOMaster extends BaseBean {
private String sendUser; private String sendUser;
@Transient @Transient
@ApiParam(value = "收货人")
private String rcUser;
@Transient
@ApiParam(value = "发货日期") @ApiParam(value = "发货日期")
private String sendDate; private String sendDate;
@Transient
@ApiParam(value = "收货日期")
private String rcDate;
} }

@ -165,4 +165,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "二维码内容") @ApiParam(value = "二维码内容")
@Transient @Transient
public String barCode; public String barCode;
public WmsStockSn(){}
public WmsStockSn(String partNo){
this.partNo = partNo;
}
} }

@ -85,6 +85,13 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam(value = "状态", example = "1") @ApiParam(value = "状态", example = "1")
private Integer itemStatus; private Integer itemStatus;
public Integer getItemStatus(){
if(itemStatus == null) {
return null;
}
return itemStatus.intValue();
}
@Column(name = "SRC_ZONE_NO") @Column(name = "SRC_ZONE_NO")
@ApiParam(value = "源存储区代码") @ApiParam(value = "源存储区代码")
private String srcZoneNo; private String srcZoneNo;

@ -161,8 +161,8 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer(); StringBuffer result = new StringBuffer();
//查询参数封装 //查询参数封装
HqlPack.getInPack(String.join(",", WmsEnumUtil.RC_ORDER_STATUS.CREATE.getValue() + "", HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "",
WmsEnumUtil.RC_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result); WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result);
HqlPack.getNumEqualPack(wmsPOMaster.getIsPart(),"isPart", result); HqlPack.getNumEqualPack(wmsPOMaster.getIsPart(),"isPart", result);
HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
@ -639,7 +639,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result);
HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result);
HqlPack.getStringEqualPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result);
HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpAreaNo(), "erpAreaNo", result);
HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result);
getStringBuilderPack(wmsASNMasterDetails, result); getStringBuilderPack(wmsASNMasterDetails, result);
@ -666,7 +666,7 @@ public class WmsHqlPack {
HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result); HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result);
HqlPack.getStringLikerPack(wmsFGInStock.getReMark(), "reMark", result); HqlPack.getStringLikerPack(wmsFGInStock.getReMark(), "reMark", result);
HqlPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result); HqlPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result);
HqlPack.getStringEqualPack(wmsFGInStock.getErpWhNo(), "erpWhno", result); HqlPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result);
HqlPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result); HqlPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result);
HqlPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result); HqlPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result);
HqlPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result); HqlPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result);

Loading…
Cancel
Save