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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
wei.peng 6 years ago
parent 03fe15e2f4 201f960d08
commit 6835593401
19 changed files with 429 additions and 163 deletions
Show Stats Download Patch File Download Diff File

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

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

@ -94,6 +94,39 @@ 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)
@ -250,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(50, "已关闭"),
CANCELLED(60, "已取消");
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;
}
@ -698,53 +729,6 @@ public class WmsEnumUtil {
}
}
/**
* 外部单据：移库单状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_STATUS {
CREATE(10, "新建"),
RECEIPT(20, "处理中"),
RECEIPT_FINISH(30, "已完成"),
CLOSED(40, "已关闭"),
CANCELLED(50, "已取消");
private int value;
private String description;
OUT_MOVEMENT_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;
}
}
/**
* 物料：分类（ABC）
@ -909,7 +893,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TASK_INFO_STATUS {
CREATE(10, "创建"), FINISH(20, "待处理"), FAIL(30, "已处理");
CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理");
private int value;
private String description;
@ -1261,8 +1245,8 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_INFO_TYPE {
FEED(1, "进料检验"),
ONLINE(10, "在线检验"),
FEED(10, "进料检验"),
ONLINE(20, "在线检验"),
EMDPRODUCT(30, "成品检验"),
SHIPMENTS(40, "出货检验");
@ -1777,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;

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

@ -29,4 +29,13 @@ public class TransSnModle extends BaseComponetsParam{
@ApiParam(value = "分组编号")
public String packageNo;
/**
* 针对抽点
*/
public double cpQty;
/**
* 供应商批次
*/
public String dateCode;
}

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

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -28,7 +27,30 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_ASN_DETAILS")
@Api("ASN订单明细信息")
public class WmsASNMasterDetails extends WmsOrderDetailsModel {
public class WmsASNMasterDetails 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;
@Column(name = "PO_ITEM")
@ApiParam("PO行号")

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

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -27,7 +26,30 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_CS_DETAILS")
@Api("盘点单冻结信息")
public class WmsCSOrderDetails extends WmsOrderDetailsModel {
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("订单号")
public String orderNo;
@Column(name = "WH_NO")
@ApiParam("仓库代码")

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;

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

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -27,7 +26,30 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_MOVEMENT_DETAILS")
@Api("移库单明细表")
public class WmsDocMovementDetails extends WmsOrderDetailsModel {
public class WmsDocMovementDetails 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;
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")

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

@ -55,13 +55,13 @@ public class WmsDocMovementSn extends BaseBean {
public String unit;
/**
* 状态:10 = 创建，20 = 已打印，30 = 已收货
* 状态:同库存条码状态一致
*/
@Column(name="SN_STATUS")
@ApiParam(value = "状态", example = "10")
public Integer snStatus;
@Column(name="SN_1D")
@ApiParam("一维条码")
public String snOneBarCode;
@Column(name="SN")
@ApiParam("条码")
public String sn;
}

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

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

@ -53,10 +53,6 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam("客户编号")
public String custNo;
@Transient
@ApiParam(value = "需求数量", example = "0")
public Double qty;
@Column(name="TRANS_QTY")
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
@ -127,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;
}

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

@ -76,10 +76,26 @@ public class WmsMoveSn extends BaseBean {
@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;

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

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -27,7 +26,30 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_PO_DETAILS")
@Api("PO订单明细信息")
public class WmsPOMasterDetails extends WmsOrderDetailsModel {
public class WmsPOMasterDetails 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;
@Column(name = "PRINT_QTY")
@ApiParam(value = "条码打印数量", example = "0")

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

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -26,41 +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 WmsOrderDetailsModel {
public class WmsQCDetails 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;
/**
* 状态: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="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;
}

32
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,47 +37,47 @@ 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

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

@ -24,7 +24,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_TASK_DETAILS")
@Table(name = "WMS_TASK_DETAILS")
@Api("作业任务明细信息")
public class WmsTaskDetails extends BaseBean {
@ -109,4 +109,12 @@ public class WmsTaskDetails extends BaseBean {
@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;
}

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

@ -28,81 +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 = "REJECT_QTY")
@ApiParam(value = "不合格交易数量", example = "0")
public Double rejectQty;
@ApiParam(value = "不合格交易数量", example = "1")
private Double rejectQty;
@Column(name = "TRANS_NO")
@ApiParam(value = "事务编号")
public String transNo;
@Column(name = "TRANS_STATUS")
@ApiParam(value = "状态", example = "10")
private Integer transStatus;
/**
* ASN,PO,SO
*/
@Column(name = "REF_TYPE")
@ApiParam(value = "关联单据类型")
public String refType;
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_STATUS")
@ApiParam(value = "状态", example = "1")
public Integer transStatus;
@Column(name = "TRANS_CODE")
@ApiParam(value = "交易代码")
private String transCode;
@Column(name = "ERROR_MESSAGE")
@ApiParam(value = "错误信息")
public String errorMessage;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
private String custNo;
@Column(name = "MOVE_NO")
@ApiParam(value = "库存移动单号")
private String moveNo;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编号")
private String vendorNo;
@Column(name="MOVE_NO")
@ApiParam("移动单号")
public String moveNo;
@Column(name = "CUST_NO")
@ApiParam(value = "客户编号")
private String custNo;
}

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

@ -2,6 +2,7 @@ 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;
@ -9,10 +10,7 @@ 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 javax.persistence.*;
import java.util.List;
/**
@ -23,6 +21,10 @@ import java.util.List;
* @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 {

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

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

@ -2,13 +2,18 @@ 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 : 仓库管理对象封装
@ -83,7 +88,7 @@ public class WmsHqlPack {
* @param orderNos
* @return
*/
public static String packHqlWmsDocMovementDetailsByOrderNos(List<String> orderNos) {
public static String packWmsOrderDetailsByOrderNos(List<String> orderNos) {
StringBuffer result = new StringBuffer();
StringBuffer orderNoStr = new StringBuffer();
for (int i = 0; i < orderNos.size(); i++) {
@ -950,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);
@ -1330,4 +1335,65 @@ public class WmsHqlPack {
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