I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/dev' into test

Browse Source
yun-zuoyi
Silliter 6 years ago
parent adfe3cb2e6 201f960d08
commit cc4484a562
71 changed files with 1987 additions and 1019 deletions
Show Stats Download Patch File Download Diff File

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

@ -365,7 +365,11 @@ public class BlockReportEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TEMPLATE_TYPE {
TABLE(1, "表格", "表格模板");
TABLE(1, "表格", "表格模板"),
ECHARTS_PIE(10, "饼图", "实芯饼图"),
ECHARTS_BAR(20, "柱状图", "柱状图-向上具状图"),
ECHARTS_LINE(30, "折线图", "向右折线条图"),
ECHARTS_TREEMAP(40, "矩形图", "矩形图");
private int value;
private String name;
@ -419,6 +423,30 @@ public class BlockReportEnumUtil {
}
return tmp;
}
public static String[] getChartAttrs(TEMPLATE_TYPE type){
if(type != null){
// TABLE(1, "表格", "表格模板"),
// ECHARTS_PIE(10, "饼图", "实芯饼图"),
// ECHARTS_BAR(20, "柱状图", "柱状图-向上具状图"),
// ECHARTS_LINE(30, "折线图", "向右折线条图"),
// ECHARTS_TREEMAP(40, "矩形图", "矩形图");
if(type.equals(TEMPLATE_TYPE.TABLE)){ // Table 是可以编辑的 所以不需要指定列
return null;
}else if(type.equals(TEMPLATE_TYPE.ECHARTS_PIE)){ // 饼图 只需要名称 和值
return new String[]{"name","value"};
}else if(type.equals(TEMPLATE_TYPE.ECHARTS_BAR)){ // 饼图 只需要名称 和值
return new String[]{"name","value"};
}else if(type.equals(TEMPLATE_TYPE.ECHARTS_LINE)){ // 饼图 只需要名称 和值
return new String[]{"xAxis","name","value"};
}else if(type.equals(TEMPLATE_TYPE.ECHARTS_TREEMAP)){ // 饼图 只需要名称 和值
return new String[]{"name","value"};
}
}
return null;
}
}
/**
@ -427,9 +455,9 @@ public class BlockReportEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TEMPLATE_STYLE {
TABLE_LEFT(1, TEMPLATE_TYPE.TABLE, "text-left", "表单左对齐"),
TABLE_RIGHT(2, TEMPLATE_TYPE.TABLE, "text-center", "表单右对齐"),
TABLE_CENTER(3, TEMPLATE_TYPE.TABLE, "text-right", "表单居中");
TABLE_LEFT(1, TEMPLATE_TYPE.TABLE, "text-align: left!important;", "表单左对齐"),
TABLE_RIGHT(2, TEMPLATE_TYPE.TABLE, "text-align: right!important;", "表单右对齐"),
TABLE_CENTER(3, TEMPLATE_TYPE.TABLE, "text-align: center!important;", "表单居中");
private int value;
private TEMPLATE_TYPE group;

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

@ -0,0 +1,45 @@
package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* @Description : wms数据权限枚举
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-3-8 15:53
* @Modify:
**/
public class DataAuthEnumUtil {
/**
* 数据对象枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_OBJ_TYPE {
WAREHOUSE("10", "WAREHOUSE", "仓库对象"),
ZONE("20", "ZONE", "存储区对象"),
LOCATE("30", "LOCATE", "库位对象");
private String code;
private String description;
String value;
DATA_OBJ_TYPE(String value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public String getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
}

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

@ -1047,4 +1047,36 @@ public class ImppEnumUtil {
return tmp;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MESSAGE_RECEIVER_TYPE {
INTERNAL(1, "内部人员接收"),
EXTERNAL(2, "外部人员接收"),
URGENT(3, "紧急联系人接收");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private MESSAGE_RECEIVER_TYPE(int value, String description) {
this.value = value;
this.description = 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;
}
}
}

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

@ -11,6 +11,55 @@ 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;
}
}
/**
* 订单明细信息 是否免费
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -45,13 +94,46 @@ public class WmsEnumUtil {
}
/**
* 移库单主表：优先级
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRIORITY {
NORMAL(1, "正常"), URGENT(2, "紧急");
private int value;
private String description;
PRIORITY(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;
}
}
/**
* 订单明细信息 状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_DETAILS_STATUS {
NORMAL(1, "N", "正常"),
ANCEL(10, "C", "行取消"),
RECEIPTED(20, "R", "已收货");
NORMAL(10, "N", "正常"),
RECEIPTED(20, "R", "已完成"),
ANCEL(30, "C", "行取消");
private int value;
private String code;
@ -101,8 +183,8 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_SRC {
MNU(1, "MNU", "手工"),
ERP(2, "ERP", "ERP接口");
MNU(10, "MNU", "手工"),
ERP(20, "ERP", "ERP接口");
private int value;
private String code;
@ -152,10 +234,10 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_TYPE {
REG(1, "REG", "原物料采购"),
SUB(10, "SUB", "委外采购"),
TAR(20, "TAR", "多角贸易采购"),
TAP(30, "TAP", "多角代采购");
REG(10, "REG", "原物料采购"),
SUB(20, "SUB", "委外采购"),
TAR(30, "TAR", "多角贸易采购"),
TAP(40, "TAP", "多角代采购");
private int value;
private String code;
@ -201,22 +283,20 @@ public class WmsEnumUtil {
}
/**
* 主表信息 状态
* 移库单主表状态；质检单主表状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_STATUS {
CREATE(1, "新建"),
RECEIPT(10, "收货中"),
RECEIPT_FINISH(20, "收货完成"),
WAREHOUSING(30, "入库中"),
WAREHOUSING_FINISH(40, "入库完成"),
CLOSED(90, "已关闭"),
CANCELLED(91, "已取消");
public enum MASTER_ORDER_STATUS {
CREATE(10, "新建"),
RECEIPT(20, "处理中"),
RECEIPT_FINISH(30, "已完成"),
CLOSED(40, "已关闭"),
CANCELLED(50, "已取消");
private int value;
private String description;
ORDER_STATUS(int value, String description) {
MASTER_ORDER_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -251,16 +331,20 @@ public class WmsEnumUtil {
}
/**
* 交易状态
* 收货主表信息 状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRANS_STATUS {
CREATE(1, "创建"), FINISH(2, "完成"), FAIL(3, "失败");
public enum RC_ORDER_STATUS {
CREATE(10, "新建"),
RECEIPT(20, "收货中"),
RECEIPT_FINISH(30, "收货完成"),
CLOSED(40, "已关闭"),
CANCELLED(50, "已取消");
private int value;
private String description;
TRANS_STATUS(int value, String description) {
RC_ORDER_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -282,8 +366,63 @@ public class WmsEnumUtil {
}
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) {
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;
}
}
/**
* 消息队列，队列名称
@ -294,7 +433,7 @@ public class WmsEnumUtil {
public enum QUEUE_NAME {
SUCCESS_QUEUE(1, "wms_success_queue", "成功消息队列"),
FAIL_QUEUE(2, "wms_fail_queue", "成功消息队列");
PENDING_QUEUE(2, "wms_pending_queue", "待处理消息队列");
private int value;
private String name;
@ -393,7 +532,9 @@ public class WmsEnumUtil {
MANEUVER_LOCATE(30, "R", "机动库"),
COMBINATION_LOCATE(40, "D", "组合库"),
LINE_LOCATE(50, "L", "线边库"),
NC_LOCATE(60, "N", "NC库");
NC_LOCATE(60, "N", "NC库"),
SPILLAGE_LOCATE(70, "Y", "溢料库"),
TRANSIT_LOCATE(80, "T", "在途库");
private int value;
private String code;
@ -439,21 +580,17 @@ public class WmsEnumUtil {
}
/**
* 外部单据：移库单移动类型
* 库位状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_MOVE_TYPE {
IN_STORE(1, "IN", "入库"),
OUT_STORE(10, "OUT", "出库"),
MOVE_STORE(20, "MOVE", "移库");
public enum LOCATE_STATUS {
CREATE(10, "空库位"), FINISH(20, "非空"), FAIL(30, "已满");
private int value;
private String code;
private String description;
OUT_MOVEMENT_MOVE_TYPE(int value, String code, String description) {
LOCATE_STATUS(int value, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -465,10 +602,6 @@ 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++) {
@ -478,41 +611,22 @@ public class WmsEnumUtil {
}
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_BUSI_TYPE {
RECEIVE_GOODS(1, "RC", "收货"),
QUALITY_TESTING(10, "QC", "质检"),
IN_STORE(20, "IN", "入库"),
MIX_RECEIVE(30, "ZI", "杂收"),
MIX_SEND(40, "ZO", "杂发"),
SUPPLIER_RETURN_GOODS(50, "VJ", "供应商退货"),
CUSTOMER_RETURN_GOODS(60, "CJ", "客户退货"),
ORDER_PICKING_PART(70, "WP", "工单领料"),
ORDER_RETURN_PART(80, "WJ", "工单退料"),
MOVE_IN(90, "MI", "移库入库"),
MOVE_OUT(100, "MO", "移库出库"),
SEND(110, "SO", "发运");
public enum OUT_MOVEMENT_MOVE_TYPE {
IN_STORE(10, "IN", "入库"),
OUT_STORE(20, "OUT", "出库"),
MOVE_STORE(30, "MOVE", "移库");
private int value;
private String code;
private String description;
OUT_MOVEMENT_BUSI_TYPE(int value, String code, String description) {
OUT_MOVEMENT_MOVE_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -552,21 +666,33 @@ public class WmsEnumUtil {
}
/**
* 外部单据：移库单状态
* 移库单业务类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_STATUS {
CREATE(1, "新建"),
RECEIPT(10, "处理中"),
RECEIPT_FINISH(20, "已完成"),
CLOSED(90, "已关闭"),
CANCELLED(91, "已取消");
public enum OUT_MOVEMENT_BUSI_TYPE {
PRODUCTION_MATERIAS(10, "PROD_MATERIALS", "生产领料"),
CUSTOMER_SHPING(20, "CUS_SHPING", "客户发运"),
OUTWARD_SHIPMENT(30, "OUT_SHIPMENT", "委外发运"),
ALLOCATION(40, "ALLOCATION", "调拨"),
SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"),
SCATTERED_IN(60, "SCATTERED_IN", "零星入库"),
NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"),
SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),
CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"),
PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"),
INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"),
SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"),
RECEIVING_IN(130, "RECEIVING_IN", "收货入库"),
OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"),
NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库");
private int value;
private String code;
private String description;
OUT_MOVEMENT_STATUS(int value, String description) {
OUT_MOVEMENT_BUSI_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -578,6 +704,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++) {
@ -599,21 +729,22 @@ public class WmsEnumUtil {
}
}
/**
* 外部单据：移库单详情单位
* 物料：分类（ABC）
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_DETAILS_UNIT {
CREATE(1, "AA"),
RECEIPT(2, "BB"),
RECEIPT_FINISH(3, "CC"),
CLOSED(4, "DD"),
CANCELLED(5, "EE");
public enum PART_ABC {
A(1, "A"),
B(2, "B"),
C(3, "C"),
D(4, "D"),
E(5, "E");
private int value;
private String description;
OUT_MOVEMENT_DETAILS_UNIT(int value, String description) {
PART_ABC(int value, String description) {
this.value = value;
this.description = description;
}
@ -648,20 +779,17 @@ public class WmsEnumUtil {
}
/**
* 外部单据：移库单详情状态
* 外部单据：移库单单据类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_DETAILS_STATUS {
NORMAL(1, "N", "正常"),
CANCEL(2, "C", "取消");
public enum OUT_MOVEMENT_MASTER_ORDER_TYPE {
ORDER_PULL_PART(1, "工单配料");
private int value;
private String code;
private String description;
OUT_MOVEMENT_DETAILS_STATUS(int value, String code, String description) {
OUT_MOVEMENT_MASTER_ORDER_TYPE(int value, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -673,10 +801,6 @@ 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++) {
@ -699,21 +823,25 @@ public class WmsEnumUtil {
}
/**
* 物料：分类（ABC）
* 外部单据：移库单关联单据类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_ABC {
A(1, "A"),
B(2, "B"),
C(3, "C"),
D(4, "D"),
E(5, "E");
public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE {
ASN(10, "ASN", "ASN"),
PO(20, "PO", "PO"),
SO(30, "SO", "SO"),
MOVE(40, "MOVE", "MOVE"),
IN_STOCK(50, "IN_STOCK", "IN_STOCK"),
SHIPPING(60, "SHIPPING", "SHIPPING"),
QC(70, "QC", "QC"),
CS(80, "CS", "CS");
private int value;
private String code;
private String description;
PART_ABC(int value, String description) {
OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -725,6 +853,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++) {
@ -744,65 +876,29 @@ public class WmsEnumUtil {
}
return tmp;
}
}
/**
* 外部单据：移库单单据类型
*/
@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) {
public static OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE codeOf(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
if (values()[i].code.equals(code)) {
return values()[i];
}
}
return tmp;
return null;
}
}
/**
* 外部单据：移库单关联单据类型
* 作业任务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE {
ASN(1, "ASN"),
PO(10, "PO"),
SO(20, "SO");
public enum TASK_INFO_STATUS {
CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理");
private int value;
private String description;
OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE(int value, String description) {
TASK_INFO_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -827,16 +923,16 @@ public class WmsEnumUtil {
}
/**
* 作业任务状态
* 单据是否生成任务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TASK_INFO_STATUS {
CREATE(10, "创建"), FINISH(20, "待处理"), FAIL(30, "已处理");
public enum IS_GENERAL_TASK {
CREATE(10, "创建"), INIT(20, "初始化"), IS_GENERAL(30, "已生成"), NO_GENERAL(40, "不生成");
private int value;
private String description;
TASK_INFO_STATUS(int value, String description) {
IS_GENERAL_TASK(int value, String description) {
this.value = value;
this.description = description;
}
@ -862,20 +958,18 @@ public class WmsEnumUtil {
/**
* 业务表：库存条码状态
* 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_STATUS {
CREATE(1, "创建"),
RECEIVED(10, "已收货"),
QUALITY_TESTED(20, "已质检"),
PUTIN_STORE(30, "已入库"),
WAIT_OUT_STORE(40, "待出库"),
IS_OUT_STORE(50, "已出库"),
ON_THE_WAY(60, "在途"),
QUARANTINED(70, "已隔离"),
BREAK_BUG(80, "破包"),
FROZEN(90, "冻结"),
CANCEL(100, "作废");
QUALITY_CONTROL(10, "质检中"),
PRE_INSTOCK(20, "待入库"),
INSTOCKED(30, "入库"),
PICKED(40, "配料"),
OUT_STOCK(50, "出库"),
SCRAPED(60, "报废"),
COMMING(70, "在途");
private int value;
private String description;
@ -919,10 +1013,9 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_QC_STATUS {
CREATE(1, "未质检"),
RECEIVED(10, "质检合格"),
QUALITY_TESTED(20, "质检不合格"),
PUTIN_STORE(30, "已退货");
QUALIFIED(10, "合格"),
UNQUALIFIED(20, "不合格"),
QUAEANTINE(30, "隔离");
private int value;
private String description;
@ -1003,12 +1096,12 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_ORDER_STATUS {
CREATE(1, "创建"),
FROZEN(10, "已冻结"),
IN_INVENTORY(20, "盘点中"),
INVENTORY_FINISH(30, "盘点完成"),
THAWING(40, "已解冻"),
CLOSED(50, "已关闭");
CREATE(10, "创建"),
STARTING_INVENTORY(20, "开启盘点"),
IN_INVENTORY(30, "盘点中"),
INVENTORY_FINISH(40, "盘点完成"),
THAWING(50, "已解冻"),
CLOSED(60, "已关闭");
private int value;
private String description;
@ -1038,97 +1131,15 @@ public class WmsEnumUtil {
}
/**
* 盘点冻结 质检状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_STATUS {
NO_QC(1, "未质检"),
IN_QC(10, "质检中"),
QUALIFIED_QC(20, "质检合格"),
DISQUALIFIED_QC(30, "质检不合格"),
RETURN_GOODS(40, "已退货");
private int value;
private String description;
QC_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;
}
}
/**
* 盘点冻结 条码状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SN_STATUS {
CREATE(1, "创建"),
RECEIVE_GOODS(10, "已收货"),
QUALITY_TESTING(20, "已质检"),
IN_STORE(30, "已入库"),
WAIT_STORE(40, "待出库"),
OUT_STORE(50, "已出库"),
ON_PASSAGE(60, "在途"),
QUARANTINE(70, "已隔离"),
BALE_BROKEN(80, "破包"),
FROZEN(90, "冻结"),
RETURN_GOODS(100, "取消冻结");
private int value;
private String description;
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;
}
}
/**
* 盘点冻结 处理状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_TRANS_STATUS {
CREATE(1, "已创建"),
INVENTORY(5, "已盘"),
FROZEN(10, "已冻结"),
THAWING(20, "已解冻"),
RETURN_GOODS(30, "取消冻结");
CREATE(10, "已创建"),
INVENTORY(20, "已盘"),
FROZEN(30, "已冻结"),
THAWING(40, "已解冻"),
RETURN_GOODS(50, "取消冻结");
private int value;
private String description;
@ -1162,7 +1173,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_ITEM_STATUS {
CREATE(1, "创建"),FINISH(10, "已处理");
CREATE(1, "创建"), FINISH(10, "已处理");
private int value;
private String description;
@ -1192,11 +1203,14 @@ public class WmsEnumUtil {
}
/**
* 库存移动单状态 状态:1=创建,10=待处理,20=已处理
* 库存移动单状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MOVE_ORDER_STATUS {
CREATE(1, "创建"),BE_HANDLE(10, "待处理"),FINISH(20, "已处理");
CREATE(10, "创建"),
BE_HANDLE(20, "待处理"),
FINISH(30, "已处理"),
HANDLE_ERROR(40, "处理出错");
private int value;
private String description;
@ -1231,7 +1245,10 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_INFO_TYPE {
FEED(1, "进料检验"), ONLINE(10, "在线检验"), EMDPRODUCT(30, "成品检验"), SHIPMENTS(40, "出货检验");
FEED(10, "进料检验"),
ONLINE(20, "在线检验"),
EMDPRODUCT(30, "成品检验"),
SHIPMENTS(40, "出货检验");
private int value;
private String description;
@ -1265,11 +1282,11 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_INFO_STATUS {
CREATE(1, "创建"),
FINISH(5, "待处理"),
FAIL(10, "已完成"),
CLOSE(90, "已关闭"),
CANCEL(91, "已取消");
CREATE(10, "新建"),
FINISH(20, "待处理"),
FAIL(30, "已完成"),
CLOSE(40, "已关闭"),
CANCEL(50, "已取消");
private int value;
private String description;
@ -1338,9 +1355,9 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALD_EXECUTE_STATUS {
NORMAL(1, "创建"),
PROCESSING(10, "处理中"),
COMPLETED(20, "已完成");
NORMAL(10, "创建"),
PROCESSING(20, "处理中"),
COMPLETED(30, "已完成");
private int value;
private String description;
@ -1369,40 +1386,6 @@ public class WmsEnumUtil {
}
/**
* 是否
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRUE_OR_FALSE {
CHARGING(1, "是"), GRATIS(2, "否");
private int value;
private String description;
TRUE_OR_FALSE(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;
}
}
/**
* 作业流程动作类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -1631,7 +1614,7 @@ public class WmsEnumUtil {
PROCESS_INITIALIZATION(20, "流程初始化组件"),
PROCESS_END(30, "流程结束组件"),
DETAIL_PROCESS(40, "明细处理组件"),
BACK_DISPLAY(50, "回显示组件");
BACK_DISPLAY(50, "回显方法");
private int value;
private String description;
@ -1661,44 +1644,6 @@ public class WmsEnumUtil {
}
/**
* 作业步骤处理组件类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ACTION_MODULE_TYPE {
HANDLE(10, "流程处理组件"),
INIT(20, "流程初始化组件"),
END(30, "流程结束组件"),
DETAILS(40, "明细处理组件"),
SHOW(50, "回显示组件");
private int value;
private String description;
ACTION_MODULE_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;
}
}
/**
* 条码类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -1733,9 +1678,10 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 流程明细动作类型
* 10=交互动作,20=后台动作,30=提交动作
* 10=交互动作,20=后台动作,30=提交动作
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GROUP_VALUE_TYPE {
@ -1815,6 +1761,8 @@ public class WmsEnumUtil {
OP_SEQ("OP_SEQ", "作业类型序号"),
TRAN_SEQ("TRAN_SEQ", "交易类型序号"),
STEP_SEQ("STEP_SEQ", "步骤调用序号"),
MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"),
QC_ORDER_NO("QC_ORDER_NO", "质检单单号"),
ORDER_NO("ORDER_NO", "盘点主表序号");
private String code;
@ -1870,8 +1818,6 @@ public class WmsEnumUtil {
}
}
/**
* 可选项类型枚举
*/
@ -1902,6 +1848,4 @@ public class WmsEnumUtil {
return description;
}
}
}

5
modules/i3plus-pojo-model/pom.xml
Unescape Escape View File

@ -29,6 +29,11 @@
<artifactId>i3plus-pojo-report</artifactId>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-wms</artifactId>
</dependency>
</dependencies>

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

@ -1,28 +0,0 @@
package cn.estsh.i3plus.pojo.model.wms;
import lombok.Data;
/**
* @Description : 流程管家模型
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-28 15:50
* @Modify:
**/
@Data
public class ActionButlerModel {
private String orderNo;
private String sn;
private String aLId;
private String userNo;
private String fixNo;
private String barCode;
private String funCallName;
}

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

@ -23,4 +23,19 @@ public class TransSnModle extends BaseComponetsParam{
@ApiParam(value = "是否分组")
public int isGroup;
@ApiParam(value = "物料")
public String partNo;
@ApiParam(value = "分组编号")
public String packageNo;
/**
* 针对抽点
*/
public double cpQty;
/**
* 供应商批次
*/
public String dateCode;
}

21
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java
Unescape Escape View File

@ -0,0 +1,21 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails;
import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description : 库存移动明细模型
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2019-03-06 15:50
* @Modify:
**/
@Data
public class WmsMoveDetailsModel implements Serializable {
private WmsMoveDetails details;
private List<WmsMoveSn> moveSn;
}

20
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java
Unescape Escape View File

@ -0,0 +1,20 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMaster;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description : 库存移动单模型
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2019-03-06 15:50
* @Modify:
**/
@Data
public class WmsMoveMasterModel implements Serializable {
private WmsMoveMaster moveMaster;
private List<WmsMoveDetailsModel> moveDetails;
}

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

@ -55,6 +55,10 @@ public class SysConfig extends BaseBean {
@ApiParam(value ="参数值")
private String configValue;
@Column(name="CONFIG_VALUE_OPTION")
@ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{key:'',value:''}")
private String configValueOption;
@Column(name="CONFIG_DESCRIPTION")
@ApiParam(value ="参数描述")
private String configDescription;

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

@ -55,8 +55,12 @@ public class SysMessage extends BaseBean {
@ApiParam(value ="发送者名称" )
private String messageSenderNameRdd;
@Column(name="MESSAGE_RECEIVER_TYPE")
@ApiParam(value ="收件人类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1")
private Integer messageReceiverType;
@Column(name="MESSAGE_RECEIVERS_ID")
@ApiParam(value ="发送者id" )
@ApiParam(value ="收件者id" )
private String messageReceiversId;
@Column(name="MESSAGE_RECEIVERS_NAME_RDD")

27
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -408,6 +408,7 @@ public class CoreHqlPack {
HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result);
// not
HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result);
// 添加默认排序
HqlPack.getOrderDefault(dictionary);
@ -425,9 +426,9 @@ public class CoreHqlPack {
// and
HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
// not
HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
HqlPack.getNumNOEqualPack(dictionary.getParentId(),"parentId",result);
// 添加默认排序
HqlPack.getOrderDefault(dictionary);
@ -604,7 +605,13 @@ public class CoreHqlPack {
return result.toString();
}
/**
* 大小区间比较
* @param columnName
* @param min
* @param max
* @return
*/
public static String packHqlByInterval(String columnName,Object min,Object max){
StringBuffer result = new StringBuffer();
@ -613,4 +620,20 @@ public class CoreHqlPack {
return result.toString();
}
/**
* 字典信息查询id集合中是否存在默认数据
* @param ids
* @return
*/
public static String packHqlSysDictionaryByIdsAndIsDefault(Long[] ids) {
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getInPack(StringUtils.join(ids,","),"id",result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result);
return result.toString();
}
}

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

@ -64,6 +64,11 @@ public class BrPojoAttr extends BaseBean {
@ApiParam(value ="属性别名")
private String attrNameAlias;
@Column(name="PARENT_ID")
@ApiParam(value ="上级ID",example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
@Column(name="ATTR_TYPE")
@ApiParam(value ="属性类型",example = "-1")
private Integer attrType;
@ -76,6 +81,10 @@ public class BrPojoAttr extends BaseBean {
@ApiParam(value ="数据类型",example = "-1")
private Integer dataType;
@Column(name="CHART_ATTR_NAME")
@ApiParam(value ="图标属性名称")
private String chartAttrName;
@Column(name="AGGREGATION_TYPE")
@ApiParam(value ="聚合类型",example = "-1")
private Integer aggregationType;

8
modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.report.sqlpack;
import cn.estsh.i3plus.pojo.base.enumutil.BlockReportEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.report.bean.*;
@ -76,7 +77,12 @@ public class ReportHqlPack {
// 查询参数封装
HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result);
HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result);
if(template.getTemplateStatus() != null &&
template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue()){
HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result);
}else {
HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result);
}
HqlPack.getStringLikerPack(template.getName(),"name",result);
// 添加默认排序

9
modules/i3plus-pojo-wms/pom.xml
Unescape Escape View File

@ -16,13 +16,12 @@
<dependencies>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-model</artifactId>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>i3plus.platform</groupId>-->
<!--<artifactId>i3plus-platform-common</artifactId>-->
<!--</dependency>-->
</dependencies>

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

@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description : ASN订单主表
@ -24,11 +26,11 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_ASN_MASTER")
@Table(name = "WMS_DOC_ASN_MASTER")
@Api("ASN主表信息")
public class WmsASNMaster extends BaseBean {
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@ -36,7 +38,7 @@ public class WmsASNMaster extends BaseBean {
* 单据类型:REG=原物料采购,
* SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购
*/
@Column(name="ASN_TYPE")
@Column(name = "ASN_TYPE")
@ApiParam("单据类型")
public String asnType;
@ -44,23 +46,35 @@ public class WmsASNMaster extends BaseBean {
* 状态:1=新建,10=收货中,20=收货完成,
* 30=入库中,40=入库完成,90=已关闭,91=已取消
*/
@Column(name="ASN_STATUS")
@Column(name = "ASN_STATUS")
@ApiParam(value = "状态", example = "0")
public Integer asnStatus;
@Column(name="VENDOR_NO")
@Column(name = "VENDOR_NO")
@ApiParam("供应商编号")
public String vendorNo;
@Column(name="VERSION")
@Column(name = "VERSION")
@ApiParam("版本")
public String version;
@Column(name="SRC")
@Column(name = "SRC")
@ApiParam("单据来源")
public String src;
@Column(name="PO_NO")
@Column(name = "PO_NO")
@ApiParam("PO单号")
public String poNo;
@Column(name = "CONTAINER_NO")
@ApiParam("集装箱号")
public String containerNo;
@Column(name = "IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
@Transient
@ApiParam(value = "单据明细集合")
public List<WmsASNMasterDetails> wmsASNMasterDetailsList;
}

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

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.List;
/**
* @Description : ASN订单明细信息
@ -24,89 +25,101 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_ASN_DETAILS")
@Table(name = "WMS_DOC_ASN_DETAILS")
@Api("ASN订单明细信息")
public class WmsASNMasterDetails extends BaseBean {
@Column(name="ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name="ITEM")
@ApiParam("行号")
public String item;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name = "ITEM")
@ApiParam("行号")
public Integer item;
@Column(name = "QTY")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Column(name="PO_ITEM")
@ApiParam("PO行号")
public String poItem;
@Column(name="UNIT")
@Column(name = "UNIT")
@ApiParam("单位")
public String unit;
@Column(name="ZDATE")
@Column(name = "ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name = "PO_ITEM")
@ApiParam("PO行号")
public String poItem;
@Column(name = "ZDATE")
@ApiParam("计划交货日期")
public String zDate;
@Column(name="ZTIME")
@Column(name = "ZTIME")
@ApiParam("计划交货时间")
public String zTime;
/**
* 状态:N=正常,C=行取消,R=已收货
*/
@Column(name="ITEM_STATUS")
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
public Integer itemStatus;
@Column(name="PACKAGE")
@Column(name = "PACKAGE")
@ApiParam("包装名称")
public String packAge;
/**
* 是否免费:0=计费,1=免费
*/
@Column(name="IS_FREE")
@Column(name = "IS_FREE")
@ApiParam(value = "是否免费", example = "1")
public Integer isFree;
@Column(name="DOCK")
@Column(name = "DOCK")
@ApiParam("道口")
public String dock;
@Column(name="SN_1D")
@Column(name = "SN_1D")
@ApiParam("一维条码")
public String snOneBarCode;
@Column(name="SN_2D")
@Column(name = "SN_2D")
@ApiParam("二维条码")
public String snTwoBarCode;
@Column(name="GROUP_NO")
@Column(name = "GROUP_NO")
@ApiParam("组条码")
public String groupNo;
@Column(name="ERP_WH_NO")
@Column(name = "ERP_WH_NO")
@ApiParam("默认收货库存地")
public String erpWhNo;
@Column(name="VENDOR_LOT_NO")
@Column(name = "VENDOR_LOT_NO")
@ApiParam("供应商批次")
public String vendorLotNo;
@Column(name="REC_QTY")
@Column(name = "REC_QTY")
@ApiParam(value = "已收数量", example = "0")
public Double recQty;
@Override
public String toString() {
return "WmsASNMasterDetails{" +
"recQty=" + recQty +
", partNo='" + partNo + '\'' +
", partNameRdd='" + partNameRdd + '\'' +
", item=" + item +
", qty=" + qty +
", unit='" + unit + '\'' +
", orderNo='" + orderNo + '\'' +
'}';
}
}

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

@ -1,7 +1,5 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
import cn.estsh.i3plus.pojo.model.wms.OptionModel;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -45,7 +43,7 @@ public class WmsActionResponseBean<Obj> {
public List<String> informations;
@ApiParam("可选项")
public List<OptionModel> options;
public List<WmsOptionModel> options;
@ApiParam("选中的明细数据")
public Obj details;

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

@ -76,4 +76,8 @@ public class WmsAreaOwner extends BaseBean {
@Transient
@ApiParam(value = "库位名称")
private String locateName;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
private String custNo;
}

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

@ -1,70 +0,0 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :元数据按钮信息表
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-11-02 9:33
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_BUTTON")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="元数据按钮信息表",description = "元数据按钮信息表")
public class WmsButton extends BaseBean {
@Column(name = "CODE")
@ApiParam(value = "元数据编码")
private String code;
@Column(name = "NAME")
@ApiParam(value = "按钮名称")
private String name;
@Column(name = "ICON")
@ApiParam(value = "图标")
private String icon;
@Column(name = "UI")
@ApiParam(value = "按钮UI路径")
private String ui;
@Column(name = "BS")
@ApiParam(value = "按钮BS路径")
private String bs;
@Column(name = "URL")
@ApiParam(value = "服务端URL")
private String url;
@Column(name = "ORDER_NUM")
@ApiParam(value = "排序号",example = "1")
private Integer orderNum;
@Column(name = "GROUP_NUM")
@ApiParam(value = "分组号",example = "1")
private Integer groupNum;
@Column(name = "IS_BASE")
@ApiParam(value = "是否基础功能",example = "2")
private Integer isBase;
@Column(name = "IS_HIDE")
@ApiParam(value = "是否删除",example = "2")
private Integer isHide;
}

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

@ -24,51 +24,55 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_CS_DETAILS")
@Table(name = "WMS_DOC_CS_DETAILS")
@Api("盘点单冻结信息")
public class WmsCSOrderDetails extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name = "ITEM")
@ApiParam("行号")
public Integer item;
@Column(name = "QTY")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Column(name = "UNIT")
@ApiParam("单位")
public String unit;
@Column(name="ORDER_NO")
@ApiParam("单号")
@Column(name = "ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name="WH_NO")
@Column(name = "WH_NO")
@ApiParam("仓库代码")
public String whNo;
@Column(name="ZONE_NO")
@Column(name = "ZONE_NO")
@ApiParam("存储区编号")
public String zoneNo;
@Column(name="LOCATE_NO")
@Column(name = "LOCATE_NO")
@ApiParam("库位编号")
public String locateNo;
@Column(name="PART_NO")
@ApiParam("物料代码")
public String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="SN")
@Column(name = "SN")
@ApiParam("条码")
public String sn;
@Column(name="QTY")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Column(name="UNIT")
@ApiParam("单位")
public String unit;
/**
* 质检状态:1=未质检,10=质检中,20=质检合格,
* 30=质检不合格,40=已退货
*/
@Column(name="QC_STATUS")
@Column(name = "QC_STATUS")
@ApiParam(value = "质检状态", example = "1")
public Integer qcStatus;
@ -77,7 +81,7 @@ public class WmsCSOrderDetails extends BaseBean {
* 30=已入库,40=待出库,50=已出库,
* 60=在途,70=已隔离,80=破包,90=冻结,100=作废
*/
@Column(name="SN_STATUS")
@Column(name = "SN_STATUS")
@ApiParam(value = "条码状态", example = "1")
public Integer snStatus;
@ -85,7 +89,7 @@ public class WmsCSOrderDetails extends BaseBean {
* 处理状态:1=已创建,5=已盘,10=已冻结
* ,20=已解冻,30=取消冻结
*/
@Column(name="TRANS_STATUS")
@Column(name = "TRANS_STATUS")
@ApiParam(value = "处理状态", example = "1")
public Integer transStatus;
}

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

@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description : 盘点单主表信息
@ -24,11 +26,11 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_CS_ORDER")
@Table(name = "WMS_DOC_CS_ORDER")
@Api("盘点单主表信息")
public class WmsCSOrderMaster extends BaseBean {
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("单号")
public String orderNo;
@ -36,19 +38,28 @@ public class WmsCSOrderMaster extends BaseBean {
* 单据类型:10=日常盘点,20=月度盘点,
* 30=季度盘点,40=年度盘点
*/
@Column(name="ORDER_TYPE")
@Column(name = "ORDER_TYPE")
@ApiParam(value = "单据类型", example = "10")
public Integer orderType;
@Column(name="ORDER_STATUS")
@ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中 30-盘点完成 40-已解冻 50-已关闭)", example = "1" )
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态 (1-创建 10-已冻结 20-盘点中 30-盘点完成 40-已解冻 50-已关闭)", example = "1")
public Integer orderStatus;
@Column(name="ACTION_PERSENT")
@Column(name = "ACTION_PERSENT")
@ApiParam("盘点进度")
public String actionPersent;
@Column(name="REMARK")
@Column(name = "REMARK")
@ApiParam("备注")
public String reMark;
@Column(name = "IS_INVENTORY")
@ApiParam(value = "是否允许清点", example = "1")
public Integer isInventory;
@Transient
@ApiParam(value = "盘点明细集")
public List<WmsCSOrderDetails> wmsCSOrderDetailsList;
}

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

@ -39,4 +39,8 @@ public class WmsCSPart extends BaseBean {
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="IS_ADJUST")
@ApiParam(value = "调整标识", example = "1")
public Integer isAdjust;
}

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

@ -29,6 +29,14 @@ import javax.persistence.Transient;
@Api("抽点记录信息")
public class WmsCheckFactRecord extends BaseBean {
@Column(name = "REF_TYPE")
@ApiParam(value = "关联单据类型")
private String refType;
@Column(name = "REF_SRC")
@ApiParam(value = "关联单据编号")
private String refSrc;
@Column(name="PO_NO")
@ApiParam("采购单号")
public String poNo;

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

@ -0,0 +1,61 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : wms系统参数配置
* @Reference :
* @Author : siliter
* @CreateDate : 2019-03-07 09:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_CONFIG")
@Api(value="系统配置",description = "WMS系统配置")
public class WmsConfig extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@Column(name="CONFIG_TYPE")
@ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1")
private Integer configType;
@Column(name="CONFIG_CODE")
@ApiParam(value ="参数代码")
private String configCode;
// 枚举 ImppEnumUtil.SYS_CONFIG_GROUP
@Column(name="CONFIG_GROUP")
@ApiParam(value ="参数组")
private Integer configGroup;
// 枚举 ImppEnumUtil.SYS_VALUE_TYPE
@Column(name="CONFIG_VALUE_TYPE")
@ApiParam(value ="参数值类型")
private String configValueType;
@Column(name="CONFIG_VALUE")
@ApiParam(value ="参数值")
private String configValue;
@Column(name="CONFIG_DESCRIPTION")
@ApiParam(value ="参数描述")
private String configDescription;
}

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

@ -0,0 +1,59 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :作业步骤类型信息
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-22 9:33
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_DATA_AUTH")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="数据权限信息",description = "数据权限信息")
public class WmsDataAuth extends BaseBean {
@Column(name = "ROLE_CODE")
@ApiParam(value = "角色编号")
private String roleCode;
@Column(name = "DATA_OBJ")
@ApiParam(value = "数据对象")
private String dataObj;
@Column(name = "DATA_OBJ_VALUE")
@ApiParam(value = "数据对象值")
private String dataObjValue;
@Column(name = "ADD_OP")
@ApiParam(value = "新增操作", example = "0")
private Integer addOp;
@Column(name = "DEL_OP")
@ApiParam(value = "删除操作", example = "0")
private Integer delOp;
@Column(name = "UPD_OP")
@ApiParam(value = "修改操作", example = "0")
private Integer updOp;
@Column(name = "QUERY_OP")
@ApiParam(value = "查询操作", example = "0")
private Integer queryOp;
}

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

@ -13,7 +13,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :移库单详情实体(用于转储类业务)
* @Description :移库单明细实体(用于转储类业务)
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2018-11-13 16:06
@ -25,48 +25,60 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_MOVEMENT_DETAILS")
@Api("移库单详情表")
@Api("移库单明细表")
public class WmsDocMovementDetails extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam(value = "单号")
private String orderNo;
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name = "ITEM")
@ApiParam(value = "行号", example = "1")
private Integer item;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name = "PART_NO")
@ApiParam(value = "物料编码")
private String partNo;
@Column(name = "ITEM")
@ApiParam("行号")
public Integer item;
@Column(name = "PART_NAME")
@ApiParam(value = "物料名称")
private String partName;
@Column(name = "QTY")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Column(name = "UNIT")
@ApiParam(value = "单位")
private String unit;
@ApiParam("单位")
public String unit;
@Column(name = "SRC_WH")
@ApiParam(value = "发出库仓库")
private String srcWh;
@Column(name = "ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name = "DEST_WH")
@ApiParam(value = "接收库仓库")
private String destWh;
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")
public String srcWhNo;
@Column(name = "QTY")
@ApiParam(value = "需求数量", example = "1")
private Double qty;
@Column(name = "SRC_ZONE_NO")
@ApiParam("源存储区代码")
public String srcZoneNo;
@Column(name = "SRC_LOCATE_NO")
@ApiParam("源库位代码")
public String srcLocateNo;
@Column(name = "DEST_WH_NO")
@ApiParam("目标仓库代码")
public String destWhNo;
@Column(name = "DEST_ZONE_NO")
@ApiParam("目标存储区代码")
public String destZoneNo;
@Column(name = "DEST_LOCATE_NO")
@ApiParam("目标库位代码")
public String destLocateNo;
@Column(name = "PRINT_QTY")
@ApiParam(value = "条码打印数量", example = "1")
private Double printQty;
@Column(name = "FACT_QTY")
@ApiParam(value = "操作完成数量", example = "1")
private Double factQty;
@Column(name = "ZDATE")
@ApiParam(value = "计划日期")
private String zdate;
@ -97,22 +109,22 @@ public class WmsDocMovementDetails extends BaseBean {
private String remark;
@Column(name = "PICK_QTY")
@ApiParam(value = "已配数量", example = "1")
@ApiParam(value = "已拣货数量", example = "1")
private Double pickQty;
@Column(name = "OUT_QTY")
@ApiParam(value = "已提交数量", example = "1")
@ApiParam(value = "已出库数量", example = "1")
private Double outQty;
@Column(name = "INLINE_QTY")
@ApiParam(value = "已上线数量", example = "1")
private Double inlineQty;
@Column(name = "REC_QTY")
@ApiParam(value = "已收货数量", example = "1")
private Double recQty;
@Column(name = "REJECT_QTY")
@ApiParam(value = "退料数量", example = "1")
private Double rejectQty;
@Column(name = "SRC_AREA_NO")
@ApiParam("源库存地代码")
public String srcAreaNo;
@Column(name = "REJECT_POST_QTY")
@ApiParam(value = "退料提交数量", example = "1")
private Double rejectPostQty;
@Column(name = "DEST_AREA_NO")
@ApiParam("目的库存地代码")
public String destAreaNo;
}

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

@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :移库单实体(用于转储类业务)
@ -42,7 +44,7 @@ public class WmsDocMovementMaster extends BaseBean {
* MI=移库入库,MO=移库出库,SO=发运
*/
@Column(name = "BUSI_TYPE")
@ApiParam(value = "业务类型", example = "1")
@ApiParam("业务类型")
public Integer busiType;
/**
@ -70,7 +72,7 @@ public class WmsDocMovementMaster extends BaseBean {
*/
@Column(name = "REF_TYPE")
@ApiParam(value = "关联单据类型")
private Integer refType;
private String refType;
@Column(name = "REF_NO")
@ApiParam(value = "关联单据")
@ -80,23 +82,27 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam(value = "ERP单号")
private String erpSrcNo;
/**
* 单据类型::1=工单配料
*/
@Column(name = "ORDER_TYPE")
@ApiParam(value = "单据类型")
private Integer orderType;
@Column(name = "PART_NO")
@ApiParam(value = "物料编码")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "物料名称")
private String partName;
private String partNameRdd;
@Column(name = "QTY")
@ApiParam(value = "数量", example = "1")
private Double qty;
@Column(name = "IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
@Column(name = "PRIORITY")
@ApiParam(value = "优先级", example = "1")
public Integer priority;
@Transient
@ApiParam(value = "移库单明细集合")
private List<WmsDocMovementDetails> wmsDocMovementDetailsList;
}

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

@ -0,0 +1,67 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 移库单条码表
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-11-28 15:20
* @Modify:
* 2018-12-10 10:39:46 Test
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_MOVEMENT_SN")
@Api("移库条码信息")
public class WmsDocMovementSn extends BaseBean {
@Column(name="ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name="ITEM")
@ApiParam("行号")
public String item;
@Column(name="PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@ApiParam(value = "数量", example = "0")
public Double qty;
@Column(name="UNIT")
@ApiParam("单位")
public String unit;
/**
* 状态:同库存条码状态一致
*/
@Column(name="SN_STATUS")
@ApiParam(value = "状态", example = "10")
public Integer snStatus;
@Column(name="SN")
@ApiParam("条码")
public String sn;
}

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

@ -1,127 +0,0 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 元数据字段表
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-02 10:00
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_FIELD")
@Api("元数据字段表")
public class WmsField extends BaseBean{
@Column(name = "OBJECT_CODE")
@ApiParam("对象编码")
private String objectCode;
@Column(name = "FIELD_NUM")
@ApiParam(value = "表单分组序号",example = "-1")
private Integer fieldNum;
@Column(name = "ORDER_NUM")
@ApiParam(value = "排序索引",example = "-1")
private Integer orderNum;
@Column(name = "FIELD_SET")
@ApiParam("表单分组")
private String fieldSet;
@Column(name = "TABLE_NAME")
@ApiParam("字段表名")
private String tableName;
@Column(name = "FIELD_EN")
@ApiParam("英文名")
private String fieldEn;
@Column(name = "FIELD_CN")
@ApiParam("中文名")
private String fieldCn;
@Column(name = "TYPE")
@ApiParam("控件类型")
private String type;
@Column(name = "EXP")
@ApiParam("控件表达式")
private String exp;
@Column(name = "IS_QUERY")
@ApiParam(value = "是否可查询", example = "2")
private Integer isQuery;
@Column(name = "IS_SHOW")
@ApiParam(value = "是否可显", example = "1")
private Integer isShow;
@Column(name = "IS_DISABLE")
@ApiParam(value = "是否禁用", example = "2")
private Integer isDisable;
@Column(name = "IS_ORDER")
@ApiParam(value = "是否可排序", example = "1")
private Integer isOrder;
@Column(name = "IS_EDIT")
@ApiParam(value = "是否可编辑字段", example = "1")
private Integer isEdit;
@Column(name = "IS_REQURIED")
@ApiParam(value = "是否必填", example = "1")
private Integer isRequried;
@Column(name = "IS_MULTIPLE")
@ApiParam(value = "是否多选项", example = "2")
private Integer isMultiple;
@Column(name = "PLACEHOLDER")
@ApiParam("输入提示")
private String placeholder;
@Column(name = "VALIDATOR")
@ApiParam(value = "是否可编辑字段", example = "2")
private Integer validator;
@Column(name = "DEFAULTER")
@ApiParam("默认值")
private String defaulter;
@Column(name = "ADD_STATUS")
@ApiParam(value = "状态", example = "1")
private Integer addStatus;
@Column(name = "DATA_TYPE")
@ApiParam(value = "数据类型", example = "1")
private Integer dataType;
@Column(name = "DATA_TYPE_NAME")
@ApiParam("数据类型名称")
private String dataTypeName;
@Column(name = "DATA_SIZE")
@ApiParam(value = "整数位长度", example = "1")
private Integer dataSize;
@Column(name = "DATA_DECIMAL")
@ApiParam(value = "小数位长度", example = "1")
private Integer dataDecimal;
}

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

@ -37,7 +37,7 @@ public class WmsLocate extends BaseBean {
private String locateName;
/**
* 1=收货库,10=基础库,20=机动库,30=组合库,40=线边库,50=NC库
* 库位类型:10=收货库,20=基础库,30=机动库,40=组合库,50=线边库,60=NC库，70=溢料,80=在途库位
*/
@Column(name="LOCATE_TYPE")
@ApiParam(value ="库位类型")
@ -67,9 +67,9 @@ public class WmsLocate extends BaseBean {
@ApiParam(value ="序号", example = "-1")
private Integer seq;
@Column(name="IS_EMPTY")
@ApiParam(value ="是否空库位", example = "-1")
private Integer isEmpty;
@Column(name="STATUS")
@ApiParam(value ="库位状态", example = "-1")
private Integer status;
@Column(name="MAX_PACKAGE_QTY")
@ApiParam(value ="最大包装数量", example = "-1")
@ -83,4 +83,15 @@ public class WmsLocate extends BaseBean {
@ApiParam(value ="存放单位")
private String stockUnit;
@Column(name="LINE_CODE")
@ApiParam(value ="生产线")
private String lineCode;
@Column(name="BOX_QTY")
@ApiParam(value ="箱数", example = "-1")
private Integer boxQty;
@Column(name="PART_QTY")
@ApiParam(value ="零件数", example = "-1")
private Integer partQty;
}

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

@ -39,4 +39,16 @@ public class WmsLocatePart extends BaseBean{
@Column(name="PART_NAME_RDD")
@ApiParam(value ="物料名称")
private String partNameRdd;
@Column(name = "PULL_QTY")
@ApiParam(value = "拉动数量", example = "0")
private Double pullQty;
@Column(name = "MAX")
@ApiParam(value = "最大值", example = "0")
private Double max;
@Column(name = "MIN")
@ApiParam(value = "最小值", example = "0")
private Double min;
}

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

@ -53,24 +53,24 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam("客户编号")
public String custNo;
@Column(name="QTY")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Column(name="TRANS_QTY")
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
@Column(name="REJECT_QTY")
@ApiParam(value = "不合格处理数量", example = "0")
public Double rejectQty;
@Column(name="UNIT")
@ApiParam("单位")
public String unit;
@Column(name="SRC_WH_NO")
@ApiParam("仓库代码")
@ApiParam("源仓库代码")
public String srcWhNo;
@Column(name="SRC_ZONE_NO")
@ApiParam("存储区代码")
@ApiParam("源存储区代码")
public String srcZoneNo;
@Column(name="SRC_LOCATE_NO")
@ -101,7 +101,7 @@ public class WmsMoveDetails extends BaseBean {
*/
@Column(name="REF_TYPE")
@ApiParam("关联单据类型")
public Integer refType;
public String refType;
@Column(name="REF_SRC")
@ApiParam("关联单号")
@ -123,9 +123,8 @@ public class WmsMoveDetails extends BaseBean {
this.finishedCounts = finishedCounts;
}
public WmsMoveDetails(String partNo, double qty ,double transQty){
public WmsMoveDetails(String partNo, double transQty){
this.partNo = partNo;
this.qty = qty;
this.transQty = transQty;
}

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

@ -24,26 +24,38 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_MOVE_MASTER")
@Table(name = "WMS_MOVE_MASTER")
@Api("库存移动单主表信息")
public class WmsMoveMaster extends BaseBean {
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("单号")
public String orderNo;
/**
* 状态:1=创建,10=待处理,20=已处理
*/
@Column(name="ORDER_STATUS")
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态", example = "0")
public Integer orderStatus;
@Column(name="REMARK")
@Column(name = "REMARK")
@ApiParam("备注")
public String reMark;
@Column(name = "TRANS_TYPE_CODE")
@ApiParam(value = "交易类型代码")
private String transTypeCode;
@Column(name = "ERROR_MESSAGE")
@ApiParam(value = "错误信息")
private String errorMessage;
@Column(name="IS_URGENT")
@ApiParam(value = "是否紧急", example = "0")
public Integer isUrgent;
@Column(name = "CAR_NO")
@ApiParam(value = "车牌号")
private String carNo;
}

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

@ -72,14 +72,30 @@ public class WmsMoveSn extends BaseBean {
@ApiParam("容器编号")
public String packAgeNo;
@Column(name="QTY")
@ApiParam(value = "已收数量", example = "0")
public Double qty;
@Column(name="SRC_QTY")
@ApiParam(value = "源数量", example = "0")
public Double srcQty;
@Column(name="SRC_WH_NO")
@ApiParam("源仓库代码")
public String srcWhNo;
@Column(name="SRC_ZONE_NO")
@ApiParam("源存储区代码")
public String srcZoneNo;
@Column(name="SRC_LOCATE_NO")
@ApiParam("源库位代码")
public String srcLocateNo;
@Column(name="DEST_WH_NO")
@ApiParam("目标仓库代码")
public String destWhNo;
@Column(name="DEST_ZONE_NO")
@ApiParam("目标存储区代码")
public String destZoneNo;
@Column(name="DEST_LOCATE_NO")
@ApiParam("目标库位代码")
public String destLocateNo;
@ -92,6 +108,30 @@ public class WmsMoveSn extends BaseBean {
@Transient
private Long finishedCounts;
@Column(name="DEST_QTY")
@ApiParam(value = "目标数量", example = "0")
public Double destQty;
@Column(name="QTY")
@ApiParam(value = "数量", example = "0")
public Double qty;
@Column(name="SRC_QC_STATUS")
@ApiParam(value = "源质量状态", example = "1")
public Integer srcQcStatus;
@Column(name="SRC_SN_STATUS")
@ApiParam(value = "源条码状态", example = "1")
public Integer srcSnStatus;
@Column(name="DEST_QC_STATUS")
@ApiParam(value = "目的质量状态", example = "1")
public Integer descQcStatus;
@Column(name="DEST_SN_STATUS")
@ApiParam(value = "目的条码状态", example = "1")
public Integer destSnStatus;
public WmsMoveSn(){}
public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){

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

@ -1,93 +0,0 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-02 10:37
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_OBJECT")
@Api("元数据信息表")
public class WmsObject extends BaseBean {
@Column(name = "CODE")
@ApiParam("对象编码")
private String code;
@Column(name = "NAME")
@ApiParam("对象名称")
private String name;
@Column(name = "VIEW_NAME")
@ApiParam("查询数据视图")
private String viewName;
@Column(name = "TABLE_NAME")
@ApiParam("保存数据主表")
private String tableName;
@Column(name = "PK_NAME")
@ApiParam("主键")
private String pkName;
@Column(name = "DATA_SOURCE")
@ApiParam("数据源")
private String dataSource;
@Column(name = "IS_SINGLE")
@ApiParam(value = "是否单选", example = "1")
private Integer isSingle;
@Column(name = "IS_CELL_EDIT")
@ApiParam(value = "是否可行内编辑", example = "2")
private Integer isCellEdit;
@Column(name = "IS_SHOW_NUM")
@ApiParam(value = "是否显示行号", example = "1")
private Integer isShowNum;
@Column(name = "IS_FIRST_LOAD")
@ApiParam(value = "是否初始加载", example = "1")
private Integer isFirstLoad;
@Column(name = "FILTER")
@ApiParam("初始数据过滤条件")
private String filter;
@Column(name = "DEFAULT_ORDER")
@ApiParam("默认排序字段(desc)")
private String defaultOrder;
@Column(name = "BIZ_INTERCEPT")
@ApiParam("自定义业务拦截")
private String bizIntercept;
@Transient
@ApiParam("元数据字段列表")
private List<WmsField> fiedList;
@Transient
@ApiParam("自定义按钮列表")
private List<WmsButton> btnList;
}

76
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.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 com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -11,6 +13,9 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
import java.util.Map;
/**
* @Description : 作业类型
@ -24,15 +29,15 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_OP_TYPE")
@Table(name = "WMS_OP_TYPE")
@Api("作业类型")
public class WmsOpType extends BaseBean{
public class WmsOpType extends BaseBean {
@Column(name="OP_TYPE_CODE")
@Column(name = "OP_TYPE_CODE")
@ApiParam("类型编号")
private String opTypeCode;
@Column(name="OP_TYPE_NAME")
@Column(name = "OP_TYPE_NAME")
@ApiParam("类型名称")
private String opTypeName;
@ -40,8 +45,65 @@ public class WmsOpType extends BaseBean{
@ApiParam(value = "序号", example = "0")
private Integer seq;
@Column(name="PROG_CODE")
@ApiParam("处理程序")
private String proCode;
@Column(name = "TM_ID")
@ApiParam(value = "交易处理组件ID", example = "0")
private Integer tmId;
@Column(name = "DATA_SRC")
@ApiParam("数据来源")
private String dataSrc;
@Column(name = "ORDER_MIN")
@ApiParam(value = "单据处理下限", example = "0")
private Integer orderMin;
@Column(name = "ORDER_MAX")
@ApiParam(value = "单据处理上限", example = "0")
private Integer orderMax;
@Column(name = "CYCLE_MINS")
@ApiParam(value = "处理周期(分钟)", example = "0")
private Integer cycleMins;
@Column(name = "LAST_TRANS_TIME")
@ApiParam(value = "末次处理时间")
public String lastTransTime;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "末次处理时间", example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String lastTransTimeStr;
@Column(name = "IS_SPLIT")
@ApiParam(value = "是否拆分单据", example = "0")
private Integer isSplit;
@Column(name = "SPLIT_RULE")
@ApiParam(value = "拆分规则")
public String splitRule;
@Column(name = "IS_MERGE")
@ApiParam(value = "是否合并单据", example = "0")
private Integer isMerge;
@Column(name = "MERGE_RULE")
@ApiParam(value = "合并规则")
public String mergeRule;
@Column(name = "IS_AUTO_CLOSE")
@ApiParam(value = "任务未完是否关闭", example = "0")
private Integer isAutoClose;
@Column(name = "USE_TIME")
@ApiParam(value = "标准工时(每箱)", example = "0")
private Integer userTime;
@Column(name = "IS_MULITI")
@ApiParam(value = "是否允许多人操作", example = "0")
private Integer isMuliti;
@Transient
@ApiParam(value = "单据集")
private List<Map<String, List>> orderList;
}

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

@ -1,13 +1,11 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.model.wms.OptionModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @Description : PDA传输到后台的实体bean对象

4
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java → modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java
Unescape Escape View File

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.model.wms;
package cn.estsh.i3plus.pojo.wms.bean;
import lombok.Data;
@ -10,7 +10,7 @@ import lombok.Data;
* @Modify:
**/
@Data
public class OptionModel {
public class WmsOptionModel {
private String code;

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

@ -74,4 +74,8 @@ public class WmsPOMaster extends BaseBean {
@Transient
@ApiParam("供应商名称")
private String vendorName;
@Column(name="IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
}

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

@ -24,77 +24,76 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_PO_DETAILS")
@Table(name = "WMS_DOC_PO_DETAILS")
@Api("PO订单明细信息")
public class WmsPOMasterDetails extends BaseBean {
@Column(name="ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name="ITEM")
@ApiParam("行号")
public String item;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name="PART_NAME_RDD")
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="QTY")
@Column(name = "ITEM")
@ApiParam("行号")
public Integer item;
@Column(name = "QTY")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Column(name="PRINT_QTY")
@Column(name = "UNIT")
@ApiParam("单位")
public String unit;
@Column(name = "ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name = "PRINT_QTY")
@ApiParam(value = "条码打印数量", example = "0")
public Double printQty;
@Column(name="RC_QTY")
@Column(name = "RC_QTY")
@ApiParam(value = "收货数量", example = "0")
public Double rcQty;
@Column(name="PASS_QTY")
@Column(name = "PASS_QTY")
@ApiParam(value = "质检合格数量", example = "0")
public Double passQty;
@Column(name="NG_QTY")
@Column(name = "NG_QTY")
@ApiParam(value = "质检不合格数量", example = "0")
public Double ngQty;
@Column(name="UNIT")
@ApiParam("单位")
public String unit;
@Column(name="ZDATE")
@Column(name = "ZDATE")
@ApiParam("计划交货日期")
public String zDate;
@Column(name="ZTIME")
@Column(name = "ZTIME")
@ApiParam("计划交货时间")
public String zTime;
@Column(name="WH_NO")
@ApiParam("默认入库仓库代码")
public String whNo;
@Column(name = "ERP_WH_NO")
@ApiParam("默认收货库存地")
public String erpWhNo;
/**
* 状态:10 N=正常,20 C=行取消
*/
@Column(name="ITEM_STATUS")
@Column(name = "ITEM_STATUS")
@ApiParam("状态")
public String itemStatus;
@Column(name="SNP")
@Column(name = "SNP")
@ApiParam("标准包装")
public String snp;
/**
* 是否免费:0=计费,1=免费
*/
@Column(name="IS_FREE")
@Column(name = "IS_FREE")
@ApiParam(value = "是否免费", example = "1")
public Integer isFree;
}

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

@ -40,7 +40,7 @@ public class WmsPackage extends BaseBean {
@ApiParam("上级包装编号")
public String parentPackageNo;
@Column(name="SN")
@ApiParam("条码")
public String sn;
@Column(name="PACKAGE_QTY")
@ApiParam(value = "包装件数", example = "1")
public Integer packageQty;
}

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

@ -106,4 +106,8 @@ public class WmsPart extends BaseBean {
@Column(name="LOT_CHECK_RULE")
@ApiParam(value ="批次校验规则")
private String lotCheckRule;
@Column(name="IN_LOCATE_NO")
@ApiParam(value ="默认入库库位")
private String inLocateNo;
}

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

@ -25,63 +25,64 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_QC_DETAILS")
@Table(name = "WMS_QC_DETAILS")
@Api("质检单明细信息")
public class WmsQCDetails extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name="ORDER_NO")
@ApiParam("单号")
public String orderNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="ITEM")
@Column(name = "ITEM")
@ApiParam("行号")
public String item;
public Integer item;
@Column(name = "QTY")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Column(name = "UNIT")
@ApiParam("单位")
public String unit;
@Column(name = "ORDER_NO")
@ApiParam("订单号")
public String orderNo;
/**
* 状态:N=正常,C=行取消
*/
@Column(name="ITEM_STATUS")
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
public Integer itemStatus;
@Column(name="REMARK")
@Column(name = "REMARK")
@ApiParam("备注")
public String reMark;
@Column(name="PLAN_QTY")
@ApiParam(value = "应检数量", example = "0")
public Double planQty;
@Column(name="FACT_QTY")
@Column(name = "FACT_QTY")
@ApiParam(value = "实检数量", example = "0")
public Double factQty;
@Column(name="PASS_QTY")
@Column(name = "PASS_QTY")
@ApiParam(value = "合格数量", example = "0")
public Double passQty;
@Column(name="REJECT_QTY")
@Column(name = "REJECT_QTY")
@ApiParam(value = "不合格数量", example = "0")
public Double rejectQty;
@Column(name="QC_USER")
@Column(name = "QC_USER")
@ApiParam("检验员")
public String qcUser;
@Column(name="QC_TIME")
@Column(name = "QC_TIME")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="检验时间",example = "2000-01-01 01:00:00")
@ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
public String qcTime;
@Column(name="PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name="UNIT")
@ApiParam("单位")
public String unit;
}

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

@ -25,11 +25,11 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_QC_MASTER")
@Table(name = "WMS_QC_MASTER")
@Api("质检单主表信息")
public class WmsQCMaster extends BaseBean {
@Column(name="ORDER_NO")
@Column(name = "ORDER_NO")
@ApiParam("单号")
public String orderNo;
@ -37,50 +37,54 @@ public class WmsQCMaster extends BaseBean {
* 业务类型:IQC=进料检验,IPQC=在线检验,
* FQC=成品检验,OQC=出货检验
*/
@Column(name="ORDER_TYPE")
@Column(name = "ORDER_TYPE")
@ApiParam(value = "业务类型", example = "0")
public Integer orderType;
/**
* 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消
*/
@Column(name="ORDER_STATUS")
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态", example = "1")
public Integer orderStatus;
@Column(name="REMARK")
@Column(name = "REMARK")
@ApiParam("备注")
public String reMark;
@Column(name="CUSTOMER_NO")
@Column(name = "CUSTOMER_NO")
@ApiParam("客户编号")
public String customerNo;
@Column(name="VENDOR_NO")
@Column(name = "VENDOR_NO")
@ApiParam("供应商编号")
public String vendorNo;
@Column(name="VERSION")
@Column(name = "VERSION")
@ApiParam(value = "版本", example = "1")
public Integer version;
@Column(name="PO_NO")
@ApiParam("采购单号")
public String poNo;
@Column(name = "REF_TYPE")
@ApiParam("关联单号类型")
public String refType;
@Column(name="ASN_NO")
@ApiParam("ASN单号")
public String asnNo;
@Column(name = "REF_SRC")
@ApiParam("关联单号")
public String refSrc;
@Column(name="IB_NO")
@Column(name = "IB_NO")
@ApiParam("入库单号")
public String ibNo;
@Transient
@ApiParam(value ="客户简称")
@ApiParam(value = "客户简称")
private String custName;
@Transient
@ApiParam(value = "供应商简称")
private String VendorDesc;
@Column(name = "IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
public Integer isTask;
}

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

@ -34,7 +34,7 @@ public class WmsQCTrans extends BaseBean {
@Column(name="ITEM")
@ApiParam("行号")
public String item;
public Integer item;
/**
* 状态:1=创建,10=已处理

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

@ -56,8 +56,31 @@ public class WmsStockQuan extends BaseBean {
@ApiParam(value = "可用数量", example = "0")
public Double qty;
@Column(name = "TOTAL_QTY")
@ApiParam(value = "总数量", example = "0")
private Double totalQty;
@Column(name = "FAIL_QTY")
@ApiParam(value = "不合格数量", example = "0")
private Double failQty;
@Column(name = "HOLD_QTY")
@ApiParam(value = "隔离数量", example = "0")
private Double holdQty;
@Column(name = "QC_QTY")
@ApiParam(value = "质检中数量", example = "0")
private Double qcQty;
@Column(name = "RIN_QTY")
@ApiParam(value = "待入库数量", example = "0")
private Double rinQty;
@Column(name = "FREEZE_QTY")
@ApiParam(value = "冻结数量", example = "0")
private Double freezeQty;
@Column(name = "CONSIGN_QTY")
@ApiParam(value = "寄售数量", example = "0")
private Double consignQty;
@Column(name = "LOCK_QTY")
@ApiParam(value = "锁定数量", example = "0")
private Double lockQty;
}

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

@ -51,7 +51,7 @@ public class WmsStockSn extends BaseBean {
private String partNameRdd;
@Column(name = "LOT_NO")
@ApiParam("批次编码")
@ApiParam("收货日期（批次编码）")
public String lotNo;
@Column(name = "DATE_CODE")
@ -98,14 +98,13 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "数量", example = "0")
private Double qty;
/**
* 1=未质检,10=质检合格,20=质检不合格,30=已退货
* 质量状态:10=合格,20=不合格,30=隔离
*/
@Column(name = "QC_STATUS")
@ApiParam(value = "质检状态", example = "0")
private Integer qcStatus;
/**
* :1=创建,10=已收货,20=已质检,30=已入库,40=待出库,50=已出库,
* 60=在途,70=已隔离,80=破包,90=冻结,100=作废
* 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
*/
@Column(name = "SN_STATUS")
@ApiParam(value = "条码状态", example = "0")
@ -125,10 +124,14 @@ public class WmsStockSn extends BaseBean {
* 1=ASN,10=PO,20=SO
*/
@Column(name = "REF_TYPE")
@ApiParam(value = "关联单据类型", example = "0")
private Integer refType;
@ApiParam(value = "关联单据类型")
private String refType;
@Column(name = "REF_SRC")
@ApiParam(value = "关联单号")
private String refSrc;
@Column(name = "CUST_SN")
@ApiParam(value = "客户条码")
private String custSn;
}

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

@ -0,0 +1,120 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 作业任务明细信息
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_TASK_DETAILS")
@Api("作业任务明细信息")
public class WmsTaskDetails extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam(value = "单号")
private String orderNo;
@Column(name = "ITEM")
@ApiParam(value = "行号", example = "1")
private Integer item;
@Column(name = "PART_NO")
@ApiParam(value = "物料编码")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "物料名称")
private String partName;
@Column(name = "UNIT")
@ApiParam(value = "单位")
private String unit;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
private String custNo;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编号")
private String vendorNo;
@Column(name = "QTY")
@ApiParam(value = "需求数量", example = "1")
private Double qty;
@Column(name = "TRANS_QTY")
@ApiParam(value = "处理数量", example = "1")
private Double transQty;
@Column(name = "ZDATE")
@ApiParam(value = "计划日期")
private String zdate;
@Column(name = "ZTIME")
@ApiParam(value = "计划时间")
private String ztime;
@Column(name = "SRC_WH_NO")
@ApiParam(value = "源仓库代码")
private String srcWhNo;
/**
* 状态:N=正常,C=行取消
*/
@Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
private Integer itemStatus;
@Column(name = "SRC_ZONE_NO")
@ApiParam(value = "源存储区代码")
private String srcZoneNo;
@Column(name = "SRC_LOCATE_NO")
@ApiParam(value = "源库位代码")
private String srcLocateNo;
@Column(name = "DEST_ZONE_NO")
@ApiParam(value = "目的存储区代码")
private String destZoneNo;
@Column(name = "DEST_LOCATE_NO")
@ApiParam(value = "目的库位代码")
private String destLocateNo;
@Column(name = "DEST_WH_NO")
@ApiParam(value = "目的存储区代码")
private String destWhNo;
@Column(name = "REF_TYPE")
@ApiParam(value = "关联单据类型")
private String refType;
@Column(name = "REF_SRC")
@ApiParam(value = "关联单据编号")
private String refSrc;
@Column(name = "SRC_AREA_NO")
@ApiParam("源库存地代码")
public String srcAreaNo;
@Column(name = "DEST_AREA_NO")
@ApiParam("目的库存地代码")
public String destAreaNo;
}

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

@ -24,34 +24,42 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_TASK")
@Table(name = "WMS_TASK")
@Api("作业任务表")
public class WmsTaskInfo extends BaseBean {
@Column(name="MOVE_NO")
@Column(name = "ORDER_NO")
@ApiParam("单号")
public String orderNo;
@Column(name = "MOVE_NO")
@ApiParam("移动单号")
public String moveNo;
@Column(name="USER_NO")
@Column(name = "USER_NO")
@ApiParam("作业人员")
public String userNo;
@Column(name="OP_TYPE_CODE")
@Column(name = "OP_TYPE_CODE")
@ApiParam("作业类型")
public String opTypeCode;
@Column(name="REMARK")
@Column(name = "REMARK")
@ApiParam("备注")
public String reMark;
/**
* 状态:1=创建,10=待处理,20=已处理
*/
@Column(name="TASK_STATUS")
@Column(name = "TASK_STATUS")
@ApiParam(value = "任务状态", example = "1")
public Integer taskStatus;
@Column(name="TRANS_TYPE_CODE")
@Column(name = "TRANS_TYPE_CODE")
@ApiParam("交易类型")
private String transTypeCode;
@Column(name = "PRE_USE_TIME")
@ApiParam(value = "预计作业时间(分钟)", example = "1")
public Integer preUseTime;
}

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

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 作业任务数据来源信息
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_TASK_SRC")
@Api("作业任务表")
public class WmsTaskSrc extends BaseBean {
@Column(name = "OP_TYPE_CODE")
@ApiParam("作业类型编号")
public String opTypeCode;
@Column(name = "DATA_SRC")
@ApiParam("数据来源")
public String dataSrc;
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
public Integer busiType;
@Column(name = "PRIORITY")
@ApiParam("优先级")
public Integer priority;
@Column(name = "IS_SN")
@ApiParam("是否有条码")
public Integer isSn;
@Column(name = "TRANS_CODE")
@ApiParam("默认交易类型")
public String transCode;
@Column(name = "IS_ONE_STEP")
@ApiParam("是否一步法")
public Integer isOneStep;
}

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

@ -35,7 +35,7 @@ public class WmsTempOrderLock extends BaseBean {
*/
@Column(name="BIZ_TYPE")
@ApiParam("业务类型")
public String bizType;
public Integer bizType;
@Column(name="ORDER_NO")
@ApiParam("单号")

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

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : 交易处理组件表
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2018-11-01 11:57
* @Modify:
**/
@Data
@Entity
@Table(name = "WMS_TRANS_MODULE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "交易处理组件表", description = "交易处理组件表")
public class WmsTransModule extends BaseBean {
@Column(name = "TM_NAME")
@ApiParam(value = "组件名称")
private String tmName;
@Column(name = "TM_DESC")
@ApiParam(value = "组件描述")
private String tmDesc;
@Column(name = "CALL_CLASS")
@ApiParam(value = "实现类")
private String callClass;
@Column(name = "TM_TYPE")
@ApiParam(value = "组件类型", example = "-1")
private Integer tmType;
}

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

@ -28,57 +28,71 @@ import javax.persistence.Table;
@Api("库存交易信息")
public class WmsTransQuan extends BaseBean {
@Column(name = "TRANS_NO")
@ApiParam(value = "事务编号")
private String transNo;
@Column(name = "WH_NO")
@ApiParam("仓库代码")
public String whNo;
@ApiParam(value = "仓库代码")
private String whNo;
@Column(name = "ZONE_NO")
@ApiParam("存储区编号")
public String zoneNo;
@ApiParam(value = "存储区编号")
private String zoneNo;
@Column(name = "LOCATE_NO")
@ApiParam("库位编号")
public String locateNo;
@ApiParam(value = "库位编号")
private String locateNo;
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@ApiParam(value = "零件编号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name = "SN")
@ApiParam("条码")
public String sn;
@ApiParam(value = "零件名称")
private String partNameRdd;
@Column(name = "UNIT")
@ApiParam("单位")
public String unit;
/**
* 关联交易类型表
*/
@Column(name = "TRANS_CODE")
@ApiParam(value = "交易类型代码")
public String transCode;
@ApiParam(value = "单位")
private String unit;
@Column(name = "QTY")
@ApiParam(value = "交易数量", example = "0")
public Double qty;
@ApiParam(value = "交易数量", example = "1")
private Double qty;
@Column(name = "TRANS_NO")
@ApiParam(value = "事务编号", example = "1")
public Long transNo;
@Column(name = "REJECT_QTY")
@ApiParam(value = "不合格交易数量", example = "1")
private Double rejectQty;
@Column(name = "TRANS_STATUS")
@ApiParam(value = "状态", example = "10")
private Integer transStatus;
/**
* ASN,PO,SO
*/
@Column(name = "REF_TYPE")
@ApiParam(value = "关联单据类型", example = "1")
public Integer refType;
@ApiParam(value = "关联单据类型")
private String refType;
@Column(name = "BUSI_TYPE")
@ApiParam(value = "业务类型", example = "10")
private Integer busiType;
@Column(name = "REF_SRC")
@ApiParam(value = "关联单号")
public String refSrc;
private String refSrc;
@Column(name = "TRANS_CODE")
@ApiParam(value = "交易代码")
private String transCode;
@Column(name = "MOVE_NO")
@ApiParam(value = "库存移动单号")
private String moveNo;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编号")
private String vendorNo;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
private String custNo;
}

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

@ -68,7 +68,19 @@ public class WmsTransSn extends BaseBean {
@ApiParam(value = "交易数量", example = "0")
public Double qty;
@Column(name="REJECT_QTY")
@ApiParam(value = "不合格交易数量", example = "0")
public Double rejectQty;
@Column(name="TRANS_NO")
@ApiParam("事务编号")
public Long transNo;
public String transNo;
@Column(name = "QC_STATUS")
@ApiParam(value = "质检状态", example = "0")
private Integer qcStatus;
@Column(name = "SN_STATUS")
@ApiParam(value = "条码状态", example = "0")
private Integer snStatus;
}

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

@ -52,4 +52,17 @@ public class WmsTransType extends BaseBean {
@ApiParam("中文流程名称")
private String agNameC;
@Column(name = "TRANS_TYPE_DESC")
@ApiParam(value = "类型说明")
private String transTypeDesc;
@Column(name = "TM_ID")
@ApiParam(value = "交易处理组件", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long tmId;
@Column(name = "OP_TYPE_ID")
@ApiParam(value = "作业类型编号", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long opTypeId;
}

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

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.util.List;
/**
* @Description : 单据明细Model
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-03-07 19:18
* @Modify:
**/
@Data
@Entity
//以子类table为准
@javax.persistence.Inheritance(strategy= InheritanceType.TABLE_PER_CLASS)
@JsonInclude(value = JsonInclude.Include.NON_EMPTY)
@Api("单据明细Model")
public class WmsOrderDetailsModel extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料编码")
public String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
public String partNameRdd;
@Column(name = "ITEM")
@ApiParam("行号")
public Integer item;
@Column(name = "QTY")
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Column(name = "UNIT")
@ApiParam("单位")
public String unit;
@Column(name = "ORDER_NO")
@ApiParam("订单号")
public String orderNo;
}

23
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderMasterModel.java
Unescape Escape View File

@ -0,0 +1,23 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
/**
* @Description : 单据Model
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-03-07 19:18
* @Modify:
**/
@Data
@Api("单据Model")
public class WmsOrderMasterModel extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam("订单号")
public String orderNo;
}

14
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsButtonRepository.java
Unescape Escape View File

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsButton;
/**
* @Description :对象持久层仓用方法控制(元数据按钮按钮信息)
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-11-02 10:22
* @Modify:
**/
public interface WmsButtonRepository extends BaseRepository<WmsButton,Long> {
}

14
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsConfig;
/**
* @Description : 系统配置
* @Reference :
* @Author : amy
* @CreateDate : 2019-03-07 10:00
* @Modify:
**/
public interface WmsConfigRepository extends BaseRepository<WmsConfig, Long> {
}

19
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataAuthRepository.java
Unescape Escape View File

@ -0,0 +1,19 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WareHouse;
import cn.estsh.i3plus.pojo.wms.bean.WmsDataAuth;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @Description : wms数据权限
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-03-08 14:47
* @Modify:
**/
@Repository
public interface WmsDataAuthRepository extends BaseRepository<WmsDataAuth, Long> {
}

14
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementSnRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementSn;
/**
* @Description : 移库单条码
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2019-03-07 11:44
* @Modify:
**/
public interface WmsDocMovementSnRepository extends BaseRepository<WmsDocMovementSn, Long> {
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldRepository.java
Unescape Escape View File

@ -1,16 +0,0 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsField;
import org.springframework.stereotype.Service;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-02 11:24
* @Modify:
**/
@Service
public interface WmsFieldRepository extends BaseRepository<WmsField, Long> {
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsObjectRepository.java
Unescape Escape View File

@ -1,16 +0,0 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsObject;
import org.springframework.stereotype.Service;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-02 11:23
* @Modify:
**/
@Service
public interface WmsObjectRepository extends BaseRepository<WmsObject, Long> {
}

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

@ -5,7 +5,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsOpType;
import org.springframework.stereotype.Repository;
/**
* @Description : 作业类型
* @Description : 作业类型DAO层
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:46

17
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskDetailsRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsTaskDetails;
import cn.estsh.i3plus.pojo.wms.bean.WmsTaskInfo;
import org.springframework.stereotype.Repository;
/**
* @Description : 对象持久层公用方法控制(作业任务明细信息)
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-03-06 17:16
* @Modify:
**/
@Repository
public interface WmsTaskDetailsRepository extends BaseRepository<WmsTaskDetails, Long> {
}

17
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsOpType;
import cn.estsh.i3plus.pojo.wms.bean.WmsTaskSrc;
import org.springframework.stereotype.Repository;
/**
* @Description : 作业任务数据来源DAO层
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-03-06 14:41
* @Modify:
**/
@Repository
public interface WmsTaskSrcRepository extends BaseRepository<WmsTaskSrc, Long> {
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsTransModule;
import org.springframework.stereotype.Repository;
/**
* @Description : 对象持久层仓用方法控制
* @Reference :
* @Author : siliter
* @CreateDate : 2019-03-06 9:47
* @Modify:
**/
@Repository
public interface WmsTransModuleRepository extends BaseRepository<WmsTransModule, Long> {
}

61
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNCheckRule.java
Unescape Escape View File

@ -0,0 +1,61 @@
package cn.estsh.i3plus.pojo.wms.rules;
/**
* @Description : 纯POJO，WMS PDA 操作前的条码状态检查
* @Reference :
* @Author : rock.yu
* @CreateDate : 2019-03-06 19:26
* @Modify:
**/
public class WmsSNCheckRule {
// 交易类型代码
private int transTypeCode;
// 业务类型代码
private int busiTypeCode;
// 条码状态代码
private int snStatusCode;
// 质量状态代码
private int qcStatusCode;
// 匹配结果，默认为匹配失败
private boolean result = false;
public int getTransTypeCode() {
return transTypeCode;
}
public void setTransTypeCode(int transTypeCode) {
this.transTypeCode = transTypeCode;
}
public int getBusiTypeCode() {
return busiTypeCode;
}
public void setBusiTypeCode(int busiTypeCode) {
this.busiTypeCode = busiTypeCode;
}
public int getSnStatusCode() {
return snStatusCode;
}
public void setSnStatusCode(int snStatusCode) {
this.snStatusCode = snStatusCode;
}
public int getQcStatusCode() {
return qcStatusCode;
}
public void setQcStatusCode(int qcStatusCode) {
this.qcStatusCode = qcStatusCode;
}
public boolean isResult() {
return result;
}
public void setResult(boolean result) {
this.result = result;
}
}

82
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java
Unescape Escape View File

@ -0,0 +1,82 @@
package cn.estsh.i3plus.pojo.wms.rules;
/**
* @Description : 纯POJO，WMS 获取条码下一步的状态
* @Reference :
* @Author : rock.yu
* @CreateDate : 2019-03-07 16:40
* @Modify:
**/
public class WmsSNNextStatusRule {
// 交易类型代码
private int transTypeCode;
// 业务类型代码
private int busiTypeCode;
// 一步法操作
private boolean oneStep;
// 免检
private boolean skipQC;
// 自动入库
private boolean defaultInStock;
// 原条码状态
private int srcSNStatusCode;
// 目的条码状态
private int destSNStatusCode;
public int getTransTypeCode() {
return transTypeCode;
}
public void setTransTypeCode(int transTypeCode) {
this.transTypeCode = transTypeCode;
}
public int getBusiTypeCode() {
return busiTypeCode;
}
public void setBusiTypeCode(int busiTypeCode) {
this.busiTypeCode = busiTypeCode;
}
public int getDestSNStatusCode() {
return destSNStatusCode;
}
public void setDestSNStatusCode(int destSNStatusCode) {
this.destSNStatusCode = destSNStatusCode;
}
public int getSrcSNStatusCode() {
return srcSNStatusCode;
}
public void setSrcSNStatusCode(int srcSNStatusCode) {
this.srcSNStatusCode = srcSNStatusCode;
}
public boolean isOneStep() {
return oneStep;
}
public void setOneStep(boolean oneStep) {
this.oneStep = oneStep;
}
public boolean isSkipQC() {
return skipQC;
}
public void setSkipQC(boolean skipQC) {
this.skipQC = skipQC;
}
public boolean isDefaultInStock() {
return defaultInStock;
}
public void setDefaultInStock(boolean defaultInStock) {
this.defaultInStock = defaultInStock;
}
}

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

@ -2,11 +2,19 @@ package cn.estsh.i3plus.pojo.wms.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.DataAuthEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.base.tool.SqlPack;
import cn.estsh.i3plus.pojo.wms.bean.*;
import com.google.common.base.Strings;
import org.apache.commons.lang3.StringUtils;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
/**
* @Description : 仓库管理对象封装
* @Reference :
@ -47,7 +55,7 @@ public class WmsHqlPack {
//查询参数封装
HqlPack.getStringLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
HqlPack.getStringLikerPack(wmsPOMasterDetails.getItem(), "item", result);
HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result);
HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result);
@ -74,7 +82,27 @@ public class WmsHqlPack {
return result.toString();
}
/**
* 查询任务合并的移库单明细 查询条件封装
*
* @param orderNos
* @return
*/
public static String packWmsOrderDetailsByOrderNos(List<String> orderNos) {
StringBuffer result = new StringBuffer();
StringBuffer orderNoStr = new StringBuffer();
for (int i = 0; i < orderNos.size(); i++) {
if (i == orderNos.size()) {
orderNoStr.append("'" + orderNos.get(i) + "'");
} else {
orderNoStr.append("'" + orderNos.get(i) + "',");
}
}
result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() +
"and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() +
"and model.orderNo in (" + orderNos + ")" + " order by model.partNo,model.orderNo");
return result.toString();
}
/**
* 库存移动单查询封装
*
@ -160,7 +188,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
HqlPack.getStringLikerPack(wmsPart.getPartName(), "partNameRdd", result);
HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
@ -227,7 +255,7 @@ public class WmsHqlPack {
HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
HqlPack.getNumEqualPack(wmsLocate.getIsEmpty(), "isEmpty", result);
HqlPack.getNumEqualPack(wmsLocate.getStatus(), "status", result);
getStringBuilderPack(wmsLocate, result);
@ -323,7 +351,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
HqlPack.getStringEqualPack(wmsOpType.getProCode(), "proCode", result);
HqlPack.getNumEqualPack(wmsOpType.getTmId(), "tmId", result);
HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result);
getStringBuilderPack(wmsOpType, result);
@ -378,8 +406,37 @@ public class WmsHqlPack {
return result.toString();
}
/**
* 查询满足处理周期的作业类型 查询条件封装
*
* @param wmsOpType
* @return
*/
public static String packHqlWmsOpTypeTime(WmsOpType wmsOpType) {
StringBuffer result = new StringBuffer();
getStringBuilderPack(wmsOpType, result);
result.append(" and isnull(model.lastTransTime) or timestampdiff(Minute,nvl(model.lastTransTime,'2000'),now()) >= model.cycleMins");
return result.toString();
}
/**
* 作业任务数据来源 查询条件封装
*
* @param wmsTaskSrc
* @return
*/
public static String packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) {
StringBuffer result = new StringBuffer();
//作业类型代码
HqlPack.getStringLikerPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result);
getStringBuilderPack(wmsTaskSrc, result);
return result.toString();
}
/**
* 存储区信息 查询条件封装
*
* @param wmsZones
@ -522,7 +579,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsASNMasterDetails.getItem(), "item", result);
HqlPack.getNumEqualPack(wmsASNMasterDetails.getItem(), "item", result);
HqlPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result);
HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result);
HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result);
@ -704,7 +761,7 @@ public class WmsHqlPack {
// 订单号
HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result);
// 业务类型
HqlPack.getStringEqualPack(wmsTempOrderLock.getBizType(), "bizType", result);
HqlPack.getNumEqualPack(wmsTempOrderLock.getBizType(), "bizType", result);
// 物料代码
HqlPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result);
@ -757,11 +814,11 @@ public class WmsHqlPack {
* @param tranNo
* @return
*/
public static String packWmsTransSn(Long tranNo) {
public static String packWmsTransSn(String tranNo) {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getNumEqualPack(tranNo, "transNo", result);
HqlPack.getStringEqualPack(tranNo, "transNo", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
@ -799,7 +856,6 @@ public class WmsHqlPack {
//查询参数封装
HqlPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result);
HqlPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result);
HqlPack.getStringEqualPack(wmsPackage.getSn(), "sn", result);
HqlPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result);
getStringBuilderPack(wmsPackage, result);
@ -899,10 +955,10 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
//业务类型
HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
//采购单号
HqlPack.getStringEqualPack(wmsQCMaster.getPoNo(), "poNo", result);
//ASN单号
HqlPack.getStringEqualPack(wmsQCMaster.getAsnNo(), "asnNo", result);
//关联单据类型
HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
//关联单据号
HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
//入库单号
HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result);
@ -940,7 +996,7 @@ public class WmsHqlPack {
//单号
HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result);
//行号
HqlPack.getStringEqualPack(wmsQCTrans.getItem(), "item", result);
HqlPack.getNumEqualPack(wmsQCTrans.getItem(), "item", result);
getStringBuilderPack(wmsQCTrans, result);
@ -1238,4 +1294,106 @@ public class WmsHqlPack {
return result.toString();
}
/**
* 根据条件查询库存条码信息
* @param wmsStockSn
* @return
*/
public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsStockSn.getSn(),"sn", result);
HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(),"locateNo", result);
HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(),"snStatus", result);
HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(),"qcStatus", result);
getStringBuilderPack(wmsStockSn, result);
return result.toString();
}
/**
* 根据条件模糊查询库存条码信息
* @param wmsStockSn
* @return
*/
public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(wmsStockSn.getSn(),"sn", result);
getStringBuilderPack(wmsStockSn, result);
HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
return result.toString();
}
/**
* 根据条件查询库存信息
* @param wmsStockQuan
* @return
*/
public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(),"partNo", result);
HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(),"locateNo", result);
getStringBuilderPack(wmsStockQuan, result);
return result.toString();
}
/**
* 根据用户角色id列表查询数据权限信息
* @param roleIds
* @return
*/
public static String packHqlWmsDataAuth(List<String> roleIds) {
StringBuffer result = new StringBuffer();
String data = String.join(",", roleIds);
// 参数数组 [1,2,3] -> "1,2,3"
HqlPack.getInPack(data,"roleCode",result);
getStringBuilderPack(new WmsDataAuth(), result);
return result.toString();
}
/**
* 根据权限数据拼查询任务详情sql
* @param groupDataAuth
* @return
*/
public static String packHqlWmsTaskDetail(Map<String ,List<WmsDataAuth>> groupDataAuth) {
StringBuffer result = new StringBuffer();
Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
String warehouse = DataAuthEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue();
String locate = DataAuthEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue();
String zone = DataAuthEnumUtil.DATA_OBJ_TYPE.ZONE.getValue();
//拼sql
entries.stream().filter(o->!Strings.isNullOrEmpty(o.getKey())).forEach(o->{
List<WmsDataAuth> value = o.getValue();
List<String> vList = value.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList());
String data = String.join(",", vList);
if(warehouse.equals(o.getKey())){
// 参数数组 [1,2,3] -> "1,2,3"
HqlPack.getInPack(data,"destWhNo",result);
}
if(locate.equals(o.getKey())){
// 参数数组 [1,2,3] -> "1,2,3"
HqlPack.getInPack(data,"destLocateNo",result);
}
if(zone.equals(o.getKey())){
// 参数数组 [1,2,3] -> "1,2,3"
HqlPack.getInPack(data,"destZoneNo",result);
}
});
getStringBuilderPack(new WmsDataAuth(), result);
return result.toString();
}
/**
* 给定字段动态in sql
* @param columnName
* @param vals
* @return
*/
public static String packHqlAndIn(BaseBean bean,String columnName,List<String> vals) {
StringBuffer result = new StringBuffer();
String data = String.join(",", vals);
HqlPack.getInPack(data,columnName,result);
getStringBuilderPack(bean, result);
return result.toString();
}
}

Write Preview
Loading…
Cancel
Save