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
wei.peng 6 years ago
parent 045c68ee2e 3d8b3983c3
commit 7190c8ff6f
8 changed files with 90 additions and 284 deletions
Show Stats Download Patch File Download Diff File

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

@ -302,7 +302,7 @@ public class CommonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
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"),
// ABERRANT(3, "异常", "异常_ABERRANT"),
// RESIGNATION(4, "离职", "离职_RESIGNATION"),

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

@ -11,54 +11,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
**/
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)
public enum MASTER_ORDER_STATUS {
CREATE(10, "新建"),
RECEIPT(20, "处理中"),
RECEIPT_FINISH(30, "已完成"),
RECEIPT_FINISH(30, "已处理"),
CLOSED(40, "已关闭"),
CANCELLED(50, "已取消");
@ -281,21 +184,22 @@ public class WmsEnumUtil {
}
/**
* 收货主表信息 状态
* 订单明细状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RC_ORDER_STATUS {
CREATE(10, "新建"),
RECEIPT(20, "收货中"),
RECEIPT_FINISH(30, "收货完成"),
CLOSED(40, "已关闭"),
CANCELLED(50, "已取消");
public enum ORDER_DETAILS_STATUS {
CREATE(10, "N", "创建"),
RECEIPTED(20, "R", "已完成"),
CANCEL(30, "C", "行取消"),
PRINTED(40, "C", "已打印");
private int value;
private String code;
private String description;
RC_ORDER_STATUS(int value, String description) {
ORDER_DETAILS_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -307,6 +211,10 @@ public class WmsEnumUtil {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -329,19 +237,22 @@ public class WmsEnumUtil {
}
/**
* PO条码状态信息
* PO条码状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SN_DETAILS_STATUS {
CREATE(10, "新建"),
WAREHOUSING(30, "已打印"),
RECEIPT_FINISH(20, "已收货");
public enum PO_SN_STATUS {
CREATE(10, "N", "创建"),
RECEIPTED(20, "R", "已完成"),
CANCEL(30, "C", "行取消"),
PRINTED(40, "C", "已打印");
private int value;
private String code;
private String description;
SN_DETAILS_STATUS(int value, String description) {
PO_SN_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -353,6 +264,10 @@ public class WmsEnumUtil {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -374,9 +289,8 @@ public class WmsEnumUtil {
}
}
/**
* 产品入库的产品状态
* 产品入库，发运状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCT_INSTOCK_STATUS {
@ -471,7 +385,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOCATE_STATUS {
CREATE(10, "空库位"), FINISH(20, "非空"), FAIL(30, "已满");
EMPTY(10, "空库位"), NOT_EMPTY(20, "非空"), FULL(30, "已满");
private int value;
private String description;
@ -501,7 +415,7 @@ public class WmsEnumUtil {
}
/**
* 外部单据：移库单移动类型
* 移库单移动类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_MOVE_TYPE {
@ -666,54 +580,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)
public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE {
public enum LINK_ORDER_TYPE {
ASN(10, "ASN", "ASN"),
PO(20, "PO", "PO"),
SO(30, "SO", "SO"),
@ -726,7 +596,7 @@ public class WmsEnumUtil {
private String code;
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.code = code;
this.description = description;
@ -764,7 +634,7 @@ public class WmsEnumUtil {
return tmp;
}
public static OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE codeOf(String code) {
public static LINK_ORDER_TYPE codeOf(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
@ -843,45 +713,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 +720,14 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_STATUS {
CREATE(1, "创建"),
QUALITY_CONTROL(10, "质检中"),
PRE_INSTOCK(20, "待入库"),
INSTOCKED(30, "入库"),
PICKED(40, "配料"),
OUT_STOCK(50, "出库"),
FRAZE(60, "报废"),
COMMING(70, "在途");
CREATE(10,"创建"),
QUALITY_CONTROL(20, "质检中"),
PRE_INSTOCK(30, "待入库"),
INSTOCKED(40, "入库"),
PICKED(50, "配料"),
OUT_STOCK(60, "出库"),
FRAZE(70, "报废"),
COMMING(80, "在途");
private int value;
private String description;
@ -940,7 +771,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
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 String code;
@ -983,6 +814,7 @@ public class WmsEnumUtil {
}
return tmp;
}
public static STOCK_SN_QC_STATUS codeOf(Integer value) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -1113,7 +945,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_ITEM_STATUS {
CREATE(1, "创建"), FINISH(10, "已处理");
CREATE(10, "创建"), FINISH(20, "已处理");
private int value;
private String description;
@ -1256,12 +1088,12 @@ public class WmsEnumUtil {
}
/**
* 质检明细转态
* 质检明细状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_ITEM_STATUS {
NORMAL(1, "正常"),
CANCELLATION(10, "行取消");
NORMAL(10, "创建"),
CANCELLATION(20, "行取消");
private int value;
private String description;
@ -1543,42 +1375,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;
}
}
/**
* 组件类型
@ -1961,17 +1757,17 @@ public class WmsEnumUtil {
private String description;
private String code;
DATA_STATUS(int value, String code, String description){
DATA_STATUS(int value, String code, String description) {
this.value = value;
this.description = description;
this.code = code;
}
public int getValue () {
public int getValue() {
return value;
}
public String getDescription () {
public String getDescription() {
return description;
}
@ -1979,7 +1775,7 @@ public class WmsEnumUtil {
return code;
}
public static String valueOf (int val){
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
@ -2003,17 +1799,17 @@ public class WmsEnumUtil {
private String code;
private String description;
PRINT_TEMPLATE(int value, String code, String description){
PRINT_TEMPLATE(int value, String code, String description) {
this.value = value;
this.description = description;
this.code = code;
}
public int getValue () {
public int getValue() {
return value;
}
public String getDescription () {
public String getDescription() {
return description;
}
@ -2021,7 +1817,7 @@ public class WmsEnumUtil {
return code;
}
public static String valueOf (int val){
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
@ -2043,17 +1839,17 @@ public class WmsEnumUtil {
private String code;
private String description;
VERSION(int value, String code, String description){
VERSION(int value, String code, String description) {
this.value = value;
this.description = description;
this.code = code;
}
public int getValue () {
public int getValue() {
return value;
}
public String getDescription () {
public String getDescription() {
return description;
}
@ -2061,7 +1857,7 @@ public class WmsEnumUtil {
return code;
}
public static String valueOf (int val){
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
@ -2077,16 +1873,16 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PACKAGE_TYPE {
BOX(10 , "BOX", "BOX（盒）"),
CARTON(20 , "CARTON", "CARTON（箱）"),
PALLET(30 , "PALLET", "PALLET（栈板）"),
CONTAINER(40 , "PALLET", "PALLET（集装箱）");
BOX(10, "BOX", "BOX（盒）"),
CARTON(20, "CARTON", "CARTON（箱）"),
PALLET(30, "PALLET", "PALLET（栈板）"),
CONTAINER(40, "PALLET", "PALLET（集装箱）");
private String code;
private String description;
int value;
PACKAGE_TYPE(int value , String code, String description) {
PACKAGE_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;

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

@ -49,6 +49,13 @@ public class BfLayout extends BaseBean {
@ApiParam(value = "列数")
private Integer layoutColumnCount;
public Integer getLayoutColumnCount(){
if(this.layoutColumnCount == null) {
return null;
}
return layoutColumnCount.intValue();
}
@Column(name = "LAYOUT_REPORT_COUNT")
@ApiParam(value = "引用报表数量")
private Integer layoutReportCount;

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

@ -38,7 +38,7 @@ public class WmsASNMaster extends BaseBean {
@ApiParam("单据类型")
public String asnType;
@Column(name = "ASN_STATUS")
@Column(name = "MASTER_ORDER_STATUS")
@ApiParam(value = "状态", example = "0")
public Integer asnStatus;

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

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

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

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

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

@ -101,7 +101,7 @@ public class WmsPOMasterDetails extends BaseBean {
*/
@Column(name = "ITEM_STATUS")
@ApiParam("状态")
public String itemStatus;
public Integer itemStatus;
@Column(name = "SNP")
@ApiParam("标准包装")
@ -118,6 +118,10 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam(value = "散件收货输入数量", example = "0")
public Double inputRcQty;
@Transient
@ApiParam(value = "供应商批次")
public String dateCode;
public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; }
}

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

@ -60,7 +60,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result);
HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
@ -161,12 +161,11 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getInPack(String.join(",", WmsEnumUtil.RC_ORDER_STATUS.CREATE.getValue() + "",
WmsEnumUtil.RC_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result);
HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "",
WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result);
HqlPack.getNumEqualPack(wmsPOMaster.getIsPart(),"isPart", result);
HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
HqlPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
@ -640,7 +639,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result);
HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", 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);
getStringBuilderPack(wmsASNMasterDetails, result);
@ -667,7 +666,7 @@ public class WmsHqlPack {
HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result);
HqlPack.getStringLikerPack(wmsFGInStock.getReMark(), "reMark", 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.getWhNo(), "whNo", result);
HqlPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result);

Write Preview
Loading…
Cancel
Save