Merge remote-tracking branch 'origin/master'

# Conflicts:
#	modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java
yun-zuoyi
alwaysfrin 7 years ago
commit a34c1e9f63

@ -1,5 +1,4 @@
package cn.estsh.i3plus.pojo.wms.bean;
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;

@ -1,52 +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 org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-09-04 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="T_WMS_CUSTOMER_SENDTO")
@Api("客户发往地信息")
public class CustomerSendTo extends BaseBean {
@Column(name="CUSTOMER_ID")
@ApiParam("客户端编号")
public String customerId;
@Column(name="PART_ID")
@ApiParam("零件编号")
public String partId;
@Column(name="CUSTOMER_PARTNO")
@ApiParam("客户零件号")
public String customerPartNo;
@Column(name="ERP_PARTNO")
@ApiParam("ERP零件号")
public String ERPPartNo;
@Column(name="CUSTOMER_SENDTO_CODE")
@ApiParam("客户发往地代码")
public String customerSendToCode;
@Column(name="CUSTOMER_SENDTO_NAME")
@ApiParam("客户发往地名称")
public String customerSendToName;
}

@ -1,41 +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 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-01 11:45
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="T_INTERFACE_DEVICE")
@Api("接口驱动类信息")
public class InterfaceDevice extends BaseBean {
@Column(name="device_name")
@ApiParam("驱动名称")
private String deviceName;
@Column(name="device_classname")
@ApiParam("驱动类名称")
private String deviceClassName;
@Column(name="status")
@ApiParam("状态 【0-禁用 1-正常】")
private Integer status;
}

@ -1,100 +0,0 @@
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 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-01 11:56
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="T_INTERFACE_TYPE")
@Api("接口类型信息")
public class InterfaceType extends BaseBean {
@Column(name="tp_id")
@ApiParam("接口编号")
@JsonSerialize(using = ToStringSerializer.class)
private Long tpId;
@Column(name="tp_typ")
@ApiParam("接口类型")
private String tpTyp;
@Column(name="pb_no")
@ApiParam("发布方编码")
private String pbNo;
@Column(name="tp_no")
@ApiParam("接口编码")
private String tpNo;
@Column(name="tp_desc")
@ApiParam("接口主题描述")
private String tpDesc;
@Column(name="mes_tab")
@ApiParam("接口业务表")
private String mesTab;
@Column(name="mes_group")
@ApiParam("业务表的分组条件")
private String mesGroup;
@Column(name="mes_pk")
@ApiParam("业务表主键")
private String mesPk;
@Column(name="act_type")
@ApiParam("业务类型")
private Integer actType;
@Column(name="act_desc")
@ApiParam("业务描述")
private String actDesc;
@Column(name="device_id")
@ApiParam("驱动类编号")
@JsonSerialize(using = ToStringSerializer.class)
private Long deviceId;
@Column(name="request_url")
@ApiParam("服务器请求路径")
private String requestUrl;
@Column(name="cfile_path")
@ApiParam("客户文件路径")
private String cfilePath;
public Long getTpId() {
if(tpId != null) {
return tpId.longValue();
}else{
return tpId;
}
}
public Long getDeviceId() {
if(deviceId != null) {
return deviceId.longValue();
}else{
return deviceId;
}
}
}

@ -1,36 +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 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-10-31 15:18
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="T_WMS_ORG_WAREHOUSE")
@Api("工厂仓库组织关系表")
public class RefOrgWareHouse extends BaseBean {
@Column(name="ORG_ID")
@ApiParam("组织编号")
public String orgId;
@Column(name="WAREHOUSE_ID")
@ApiParam("仓库编号")
public String storeId;
}

@ -1,36 +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 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-10-31 15:18
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="T_WMS_USER_WAREHOUSE")
@Api("用户仓库关系表")
public class RefUserWareHouse extends BaseBean {
@Column(name="USER_ID")
@ApiParam("用户编号")
public String userId;
@Column(name="WAREHOUSE_ID")
@ApiParam("仓库编号")
public String storeId;
}

@ -1,60 +0,0 @@
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 org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-09-04 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="WH_STOCK_AREA")
@Api("仓库区域")
public class StockArea extends BaseBean {
@Column(name="AREA_CODE")
@ApiParam("仓库区域代码")
public String areaCode;
@Column(name="AREA_NAME")
@ApiParam("仓库区域名称")
public String areaName;
@Column(name="WH_ID")
@ApiParam(value = "仓库编号", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
public Long whId;
@Column(name="WH_CODE_RDD")
@ApiParam("仓库代码")
public String whCodeRdd;
@Column(name="WH_NAME_RDD")
@ApiParam("仓库名称")
public String whNameRdd;
public Long getWhId() {
if(whId != null) {
return whId.longValue();
}else{
return whId;
}
}
}

@ -1,59 +0,0 @@
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 org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-09-04 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="WH_STOCK_LOC")
@Api("仓库库位")
public class StockLocation extends BaseBean {
@Column(name="LOC_CODE")
@ApiParam("仓库库位代码")
public String locCode;
@Column(name="LOC_NAME")
@ApiParam("仓库库位名称")
public String locName;
@Column(name="AREA_ID")
@ApiParam(value = "库区编号", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
public Long areaId;
@Column(name="AREA_CODE_RDD")
@ApiParam("库区代码")
public String areaCodeRdd;
@Column(name="AREA_NAME_RDD")
@ApiParam("库区名称")
public String areaNameRdd;
public Long getAreaId() {
if(areaId != null) {
return areaId.longValue();
}else{
return areaId;
}
}
}

@ -0,0 +1,60 @@
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 org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : ASN
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="WMS_DOC_ASN_MASTER")
@Api("ASN主表信息")
public class WmsASNMaster extends BaseBean {
@Column(name="ORDER_NO")
@ApiParam("订单号")
public String orderNo;
/**
* :REG=,
* SUB=,TAR=,TAP=
*/
@Column(name="TYPE")
@ApiParam("单据类型")
public String type;
@Column(name="STATUS")
@ApiParam("状态")
public String status;
@Column(name="VENDOR_NO")
@ApiParam("供应商编号")
public String vendorNo;
@Column(name="VERSION")
@ApiParam("版本")
public String version;
@Column(name="SRC")
@ApiParam("单据来源")
public String src;
@Column(name="PO_NO")
@ApiParam("PO单号")
public String poNo;
}

@ -0,0 +1,103 @@
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 org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : ASN
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@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")
@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="PO_ITEM")
@ApiParam("PO行号")
public String poItem;
@Column(name="UNIT")
@ApiParam("单位")
public String unit;
@Column(name="ZDATE")
@ApiParam("计划交货日期")
public String zDate;
@Column(name="ZTIME")
@ApiParam("计划交货时间")
public String zTime;
@Column(name="STATUS")
@ApiParam("状态")
public String status;
@Column(name="PACKAGE")
@ApiParam("包装名称")
public String pageAge;
/**
* :0=,1=
*/
@Column(name="IS_FREE")
@ApiParam(value = "是否免费", example = "1")
public Integer isFree;
@Column(name="DOCK")
@ApiParam("道口")
public String dock;
@Column(name="SN_1D")
@ApiParam("一维条码")
public String snOneBarCode;
@Column(name="SN_2D")
@ApiParam("二维条码")
public String snTwoBarCode;
@Column(name="GROUP_NO")
@ApiParam("组条码")
public String groupNo;
@Column(name="ERP_WH_NO")
@ApiParam("默认收货库存地")
public String erpWhNo;
@Column(name="VENDOR_LOT_NO")
@ApiParam("供应商批次")
public String vendorLotNo;
}

@ -0,0 +1,92 @@
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 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
@Table(name="WMS_DOC_FG_INSTOCK")
@Api("产品入库信息")
public class WmsFGInStock extends BaseBean {
@Column(name="ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name="WO_NO")
@ApiParam("ERP工单号")
public String woNo;
@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")
@ApiParam("条码")
public String sn;
@Column(name="STATUS")
@ApiParam("状态")
public String status;
@Column(name="REMARK")
@ApiParam("备注")
public String reMark;
@Column(name="SRC")
@ApiParam("单据来源")
public String src;
@Column(name="ERP_WH_NO")
@ApiParam("默认收货库存地")
public String erpWhNo;
@Column(name="LINE_NO")
@ApiParam("生产线")
public String lineNo;
@Column(name="WH_NO")
@ApiParam("默认仓库")
public String whNo;
@Column(name="CUST_NO")
@ApiParam("客户编码")
public String custNo;
@Column(name="SHIPPING_FLAG")
@ApiParam("特殊发货标志")
public String shippingFlag;
@Column(name="LOT_NO")
@ApiParam("生产批次")
public String lotNo;
}

@ -103,11 +103,11 @@ public class WmsField extends BaseBean{
private String defaulter;
@Column(name = "ADD_STATUS")
@ApiParam("状态")
@ApiParam(value = "状态", example = "1")
private Integer addStatus;
@Column(name = "DATA_TYPE")
@ApiParam("数据类型")
@ApiParam(value = "数据类型", example = "1")
private Integer dataType;
@Column(name = "DATA_TYPE_NAME")
@ -115,11 +115,11 @@ public class WmsField extends BaseBean{
private String dataTypeName;
@Column(name = "DATA_SIZE")
@ApiParam("整数位长度")
@ApiParam(value = "整数位长度", example = "1")
private Integer dataSize;
@Column(name = "DATA_DECIMAL")
@ApiParam("小数位长度")
@ApiParam(value = "小数位长度", example = "1")
private Integer dataDecimal;
}

@ -0,0 +1,58 @@
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 io.swagger.models.auth.In;
import lombok.Data;
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 : jimmy.zeng
* @CreateDate : 2018-11-07 10:55
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_IB_CHECK_PLAN")
@DynamicInsert
@DynamicUpdate
@Api(value="抽点比例表",description = "抽点比例表")
public class WmsIbCheckPlan extends BaseBean{
@Column(name="PART_NO")
@ApiParam(value ="物料编码")
private String partNo;
@Column(name="PART_NAME")
@ApiParam(value ="物料名称")
private String partName;
@Column(name="START_DATE")
@ApiParam(value ="开始日期")
private String startDate;
@Column(name="END_DATE")
@ApiParam(value ="结束日期")
private String endDate;
@Column(name="LOT_QTY")
@ApiParam(value ="样本数量", example = "-1")
private Integer lotQty;
@Column(name="COUNTER")
@ApiParam(value ="已收货件数", example = "-1")
private Integer counter;
@Column(name="CHECK_COUNTER")
@ApiParam(value ="已抽点件数", example = "-1")
private Integer checkCounter;
}

@ -0,0 +1,81 @@
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 org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2018-11-07 10:35
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_LOCATE")
@DynamicInsert
@DynamicUpdate
@Api(value="库位表",description = "库位表")
public class WmsLocate extends BaseBean {
@Column(name="LOCATE_NO")
@ApiParam(value ="库位代码")
private String locateNo;
@Column(name="LOCATE_NAME")
@ApiParam(value ="库位名称")
private String locateName;
@Column(name="LOCATE_TYPE")
@ApiParam(value ="库位类型")
private String locateType;
@Column(name="WH_NO")
@ApiParam(value ="仓库代码")
private String whNo;
@Column(name="ZONE_NO")
@ApiParam(value ="存储区代码")
private String zoneNo;
@Column(name="X")
@ApiParam(value ="X", example = "-1")
private Integer x;
@Column(name="Y")
@ApiParam(value ="Y", example = "-1")
private Integer y;
@Column(name="Z")
@ApiParam(value ="Z", example = "-1")
private Integer z;
@Column(name="SEQ")
@ApiParam(value ="序号", example = "-1")
private Integer seq;
@Column(name="IS_EMPTY")
@ApiParam(value ="是否空库位", example = "-1")
private Integer isEmpty;
@Column(name="MAX_PACKAGE_QTY")
@ApiParam(value ="最大包装数量", example = "-1")
private Integer maxPackageQty;
@Column(name="MAX_PART_QTY")
@ApiParam(value ="最大零件数量", example = "-1")
private Integer maxPartQty;
@Column(name="STOCK_UNIT")
@ApiParam(value ="存放单位", example = "-1")
private String stockUnit;
}

@ -0,0 +1,40 @@
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 org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2018-11-07 10:51
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_LOCATE_PART")
@DynamicInsert
@DynamicUpdate
@Api(value="库位物料表",description = "库位物料表")
public class WmsLocatePart extends BaseBean{
@Column(name="LOCATE_NO")
@ApiParam(value ="库位代码")
private String locateNo;
@Column(name="PART_NO")
@ApiParam(value ="物料编码")
private String partNo;
@Column(name="PART_NAME")
@ApiParam(value ="物料名称")
private String partName;
}

@ -0,0 +1,115 @@
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 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
@Table(name="WMS_DOC_MOVEMENT_DETAILS")
@Api("库存移动单明细信息")
public class WmsMoveMentDetails 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="SRC_WH")
@ApiParam("发出库仓库")
public String srcWh;
@Column(name="DEST_WH")
@ApiParam("接收库仓库")
public String destWh;
@Column(name="PRINT_QTY")
@ApiParam("条码打印数量")
public String printQty;
@Column(name="FACT_QTY")
@ApiParam("操作完成数量")
public String factQty;
@Column(name="ZDATE")
@ApiParam("计划交货日期")
public String zDate;
@Column(name="ZTIME")
@ApiParam("计划交货时间")
public String zTime;
@Column(name="SRC_NO")
@ApiParam("源单号")
public String srcNo;
@Column(name="STATUS")
@ApiParam("状态")
public String status;
@Column(name="REMARK")
@ApiParam("备注")
public String reMark;
/**
* :0=,1=
*/
@Column(name="IS_FREE")
@ApiParam(value = "是否免费", example = "1")
public Integer isFree;
@Column(name="PICK_QTY")
@ApiParam(value = "已配数量", example = "0")
public Double pickQty;
@Column(name="OUT_QTY")
@ApiParam(value = "已提交数量", example = "0")
public Double outQty;
@Column(name="INLINE_QTY")
@ApiParam(value = "已上线数量", example = "0")
public Double inLineQty;
@Column(name="REJECT_QTY")
@ApiParam(value = "退料数量", example = "0")
public Double rejectQty;
@Column(name="REJECT_POST_QTY")
@ApiParam(value = "退料提交数量", example = "0")
public Double rejectPostQty;
}

@ -0,0 +1,99 @@
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 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
@Table(name="WMS_DOC_MOVEMENT_MASTER")
@Api("库存移动单主表信息")
public class WmsMoveMentMaster extends BaseBean {
@Column(name="ORDER_NO")
@ApiParam("单号")
public String orderNo;
/**
* :IN=,OUT=,MOVE=
*/
@Column(name="MOVE_TYPE")
@ApiParam("移动类型")
public String moveType;
/**
* :RC=,QC=,IN=,ZI=,ZO=,
* VJ=退,CJ=退,WP=,WJ=退,
* MI=,MO=,SO=
*/
@Column(name="TYPE")
@ApiParam("业务类型")
public String type;
/**
* :0=,10=
* ,20=,90=,91=
*/
@Column(name="STATUS")
@ApiParam("状态")
public String status;
@Column(name="CUSTOMER_NO")
@ApiParam("客户编号")
public String customerNo;
@Column(name="VENDOR_NO")
@ApiParam("供应商编号")
public String vendorNo;
@Column(name="VERSION")
@ApiParam("版本")
public String version;
@Column(name="SRC")
@ApiParam("单据来源")
public String src;
@Column(name="SRC_NO")
@ApiParam("关联单据")
public String srcNo;
@Column(name="ERP_ORDERNO")
@ApiParam("ERP单号")
public String erpOrderNo;
/**
* :WO=
*/
@Column(name="ORDER_TYPE")
@ApiParam("单据类型")
public String orderType;
@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;
}

@ -0,0 +1,60 @@
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 org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : PO
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name="WMS_DOC_PO_MASTER")
@Api("PO主表信息")
public class WmsPOMaster extends BaseBean {
@Column(name="ORDER_NO")
@ApiParam("订单号")
public String orderNo;
/**
* :REG=,
* SUB=,TAR=,TAP=
*/
@Column(name="TYPE")
@ApiParam("单据类型")
public String type;
@Column(name="STATUS")
@ApiParam("状态")
public String status;
@Column(name="VENDOR_NO")
@ApiParam("供应商编号")
public String vendorNo;
@Column(name="VERSION")
@ApiParam("版本")
public String version;
@Column(name="SRC")
@ApiParam("单据来源")
public String src;
@Column(name="IS_ASN")
@ApiParam("是否有ASN")
public String isAsn;
}

@ -0,0 +1,95 @@
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 org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : PO
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@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")
@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="PRINT_QTY")
@ApiParam("条码打印数量")
public String printQty;
@Column(name="RC_QTY")
@ApiParam("收货数量")
public String rcQty;
@Column(name="PASS_QTY")
@ApiParam("质检合格数量")
public String passQty;
@Column(name="NG_QTY")
@ApiParam("质检不合格数量")
public String ngQty;
@Column(name="UNIT")
@ApiParam("单位")
public String unit;
@Column(name="ZDATE")
@ApiParam("计划交货日期")
public String zDate;
@Column(name="ZTIME")
@ApiParam("计划交货时间")
public String zTime;
@Column(name="WH_NO")
@ApiParam("默认入库仓库代码")
public String whNo;
@Column(name="STATUS")
@ApiParam("状态")
public String status;
@Column(name="SNP")
@ApiParam("标准包装")
public String snp;
/**
* :0=,1=
*/
@Column(name="IS_FREE")
@ApiParam(value = "是否免费", example = "1")
public Integer isFree;
}

@ -0,0 +1,72 @@
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 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
@Table(name="WMS_DOC_SHIPPING")
@Api("产品发运信息")
public class WmsShopping extends BaseBean {
@Column(name="ORDER_NO")
@ApiParam("发运单号")
public String orderNo;
@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")
@ApiParam("条码")
public String sn;
@Column(name="STATUS")
@ApiParam("状态")
public String status;
@Column(name="REMARK")
@ApiParam("备注")
public String reMark;
@Column(name="SRC")
@ApiParam("单据来源")
public String src;
@Column(name="CUST_NO")
@ApiParam("客户编码")
public String custNo;
@Column(name="SHIPPING_FLAG")
@ApiParam("特殊发货标志")
public String shippingFlag;
}

@ -4,6 +4,7 @@ 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.ApiModelProperty;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.hibernate.annotations.DynamicInsert;
@ -64,7 +65,7 @@ public class WmsStockQuant extends BaseBean{
private String unit;
@Column(name="QIT")
@ApiParam(value ="库存数")
@ApiParam(value ="库存数", example = "0")
private Double qit;
@Column(name="ERP_WAREHOUSE")

@ -78,7 +78,7 @@ public class WmsTrans extends BaseBean{
@ApiParam(value ="库位代码")
private String locCode;
@ApiParam(value ="目标库位id")
@ApiParam(value ="目标库位id",example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private transient Long targetLocId;

@ -62,7 +62,7 @@ public class WmsTransRcd extends BaseBean{
private String transCode;
@Column(name="DATASOURCE")
@ApiParam(value ="数据来源")
@ApiParam(value ="数据来源", example = "1")
private Integer dataSource;
@Column(name="UNIT")
@ -83,7 +83,7 @@ public class WmsTransRcd extends BaseBean{
@JsonSerialize(using = ToStringSerializer.class)
private Long groupId;
@ApiParam(value ="库存数")
@ApiParam(value ="库存数", example = "0")
private transient Double qit;

@ -26,12 +26,20 @@ import javax.persistence.Table;
@Api(value="交易类型表",description = "交易类型表")
public class WmsTransType extends BaseBean{
@Column(name="TRANS_CODE")
@ApiParam(value ="交易代码")
private String transCode;
@Column(name="TRANS_TYPE_CODE")
@ApiParam(value ="类型编号")
private String transTypeCode;
@Column(name="TRANS_NAME")
@ApiParam(value ="交易名称")
private String transName;
@Column(name="TRANS_TYPE_NAME")
@ApiParam(value ="类型名称")
private String transTypeName;
@Column(name="SEQ")
@ApiParam(value ="序号", example = "-1")
private Integer seq;
@Column(name="PROG_CODE")
@ApiParam(value ="处理程序")
private String progCode;
}

@ -1,20 +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.FactoryStore;
import cn.estsh.i3plus.pojo.wms.bean.WareHouse;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-09-13 9:47
* @Modify:
**/
@Repository
public interface FactoryStoreRepository extends BaseRepository<FactoryStore, Long> {
}

@ -1,15 +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.StockArea;
import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
/**
* @Description :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2018-11-04 12:02
* @Modify:
**/
public interface StockAreaRepository extends BaseRepository<StockArea, Long> {
}

@ -1,15 +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.StockArea;
import cn.estsh.i3plus.pojo.wms.bean.StockLocation;
/**
* @Description :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2018-11-04 14:33
* @Modify:
**/
public interface StockLocationRepository extends BaseRepository<StockLocation, Long> {
}

@ -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.WmsASNMasterDetails;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 9:47
* @Modify:
**/
@Repository
public interface WmsASNMasterDetailsRepository extends BaseRepository<WmsASNMasterDetails, Long> {
}

@ -1,16 +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.InterfaceDevice;
import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-01 15:13
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 9:47
* @Modify:
**/
@Repository
public interface InterfaceDeviceRepository extends BaseRepository<InterfaceDevice, Long> {
public interface WmsASNMasterRepository extends BaseRepository<WmsASNMaster, Long> {
}

@ -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.WmsFGInStock;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 9:47
* @Modify:
**/
@Repository
public interface WmsFGInStockRepository extends BaseRepository<WmsFGInStock, Long> {
}

@ -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.WmsIbCheckPlan;
/**
* @Description :
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2018-11-07 11:17
* @Modify:
**/
public interface WmsIbCheckPlanRepository extends BaseRepository<WmsIbCheckPlan, Long> {
}

@ -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.WmsLocatePart;
/**
* @Description :
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2018-11-07 11:16
* @Modify:
**/
public interface WmsLocatePartRepository extends BaseRepository<WmsLocatePart, Long> {
}

@ -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.WmsLocate;
/**
* @Description :
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2018-11-07 11:14
* @Modify:
**/
public interface WmsLocateRepository extends BaseRepository<WmsLocate, Long> {
}

@ -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.WmsMoveMentDetails;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 9:47
* @Modify:
**/
@Repository
public interface WmsMoveMentDetailsRepository extends BaseRepository<WmsMoveMentDetails, Long> {
}

@ -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.WmsMoveMentMaster;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 9:47
* @Modify:
**/
@Repository
public interface WmsMoveMentMasterRepository extends BaseRepository<WmsMoveMentMaster, Long> {
}

@ -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.WmsPOMasterDetails;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 9:47
* @Modify:
**/
@Repository
public interface WmsPOMasterDetailsRepository extends BaseRepository<WmsPOMasterDetails, Long> {
}

@ -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.WmsPOMaster;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 9:47
* @Modify:
**/
@Repository
public interface WmsPOMasterRepository extends BaseRepository<WmsPOMaster, Long> {
}

@ -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.WmsShopping;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : silliter.yuan
* @CreateDate : 2018-11-06 9:47
* @Modify:
**/
@Repository
public interface WmsShoppingRepository extends BaseRepository<WmsShopping, Long> {
}

@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.wms.sqlpack;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.wms.bean.*;
import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice;
import cn.estsh.i3plus.pojo.wms.bean.WareHouse;
import cn.estsh.i3plus.pojo.wms.bean.WmsTrans;
import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
@ -47,18 +46,6 @@ public class WmsHqlPack {
}
/**
*
* @return
*/
public static String packHqlInterfaceDevice(InterfaceDevice interfaceDevice){
StringBuffer sb = new StringBuffer();
//驱动类名称
HqlPack.getStringEqualPack(interfaceDevice.getDeviceClassName(),"deviceClassName",sb);
return null;
}
/**
*
* @param wmsObject
* @return
@ -102,8 +89,8 @@ public class WmsHqlPack {
//查询参数封装
HqlPack.getNumEqualPack(wmsTransType.getIsValid(),"isValid",result);
HqlPack.getStringLikerPack(wmsTransType.getTransCode(),"transCode",result);
HqlPack.getStringLikerPack(wmsTransType.getTransName(),"transName",result);
HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(),"transTypeCode",result);
HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(),"transTypeName",result);
return result.toString();
}

Loading…
Cancel
Save