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
Jack.lv 6 years ago
parent 6c6710dd67 8822f4f22f
commit 296db97c72
15 changed files with 160 additions and 162 deletions
Show Stats Download Patch File Download Diff File

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

@ -455,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;

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

@ -843,6 +843,16 @@ public class WmsEnumUtil {
}
return tmp;
}
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].code.equals(code)) {
return values()[i];
}
}
return null;
}
}
/**

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_FULFIL.getValue()){
HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result);
}else {
HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_FULFIL.getValue(),"templateStatus",result);
}
HqlPack.getStringLikerPack(template.getName(),"name",result);
// 添加默认排序

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

@ -1,6 +1,7 @@
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;
@ -25,90 +26,78 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_DOC_ASN_DETAILS")
@Table(name = "WMS_DOC_ASN_DETAILS")
@Api("ASN订单明细信息")
public class WmsASNMasterDetails extends BaseBean {
public class WmsASNMasterDetails extends WmsOrderDetailsModel {
@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")
@Column(name = "PO_ITEM")
@ApiParam("PO行号")
public String poItem;
@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;
/**
* 状态: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 + '\'' +
'}';
}
}

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

@ -1,6 +1,7 @@
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;
@ -24,51 +25,32 @@ 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 {
public class WmsCSOrderDetails extends WmsOrderDetailsModel {
@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 +59,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 +67,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;
}

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

@ -1,6 +1,7 @@
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;
@ -26,26 +27,7 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_DOC_MOVEMENT_DETAILS")
@Api("移库单明细表")
public class WmsDocMovementDetails 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;
public class WmsDocMovementDetails extends WmsOrderDetailsModel {
@Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码")
@ -71,10 +53,6 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("目标库位代码")
public String destLocateNo;
@Column(name = "QTY")
@ApiParam(value = "需求数量", example = "1")
private Double qty;
@Column(name = "PRINT_QTY")
@ApiParam(value = "条码打印数量", example = "1")
private Double printQty;

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

@ -88,7 +88,7 @@ public class WmsDocMovementMaster extends BaseBean {
@Column(name = "PART_NAME")
@ApiParam(value = "物料名称")
private String partName;
private String partNameRdd;
@Column(name = "QTY")
@ApiParam(value = "数量", example = "1")

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

@ -1,6 +1,7 @@
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;
@ -24,77 +25,53 @@ 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 {
public class WmsPOMasterDetails extends WmsOrderDetailsModel {
@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")
@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;
}

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

@ -1,6 +1,7 @@
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;
@ -27,15 +28,7 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_QC_DETAILS")
@Api("质检单明细信息")
public class WmsQCDetails extends BaseBean {
@Column(name="ORDER_NO")
@ApiParam("单号")
public String orderNo;
@Column(name="ITEM")
@ApiParam("行号")
public String item;
public class WmsQCDetails extends WmsOrderDetailsModel {
/**
* 状态:N=正常,C=行取消
@ -48,9 +41,6 @@ public class WmsQCDetails extends BaseBean {
@ApiParam("备注")
public String reMark;
@Column(name="PLAN_QTY")
@ApiParam(value = "应检数量", example = "0")
public Double planQty;
@Column(name="FACT_QTY")
@ApiParam(value = "实检数量", example = "0")
@ -73,15 +63,4 @@ public class WmsQCDetails extends BaseBean {
@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;
}

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

@ -83,4 +83,8 @@ public class WmsQCMaster extends BaseBean {
@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=已处理

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

@ -51,4 +51,7 @@ public class WmsTaskSrc extends BaseBean {
@Column(name = "TRANS_CODE")
@ApiParam("默认交易类型")
public String transCode;
@Column(name = "IS_ONE_STEP")
@ApiParam("是否一步法")
public Integer isOneStep;
}

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

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails;
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 : 单据明细Model
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-03-07 19:18
* @Modify:
**/
@Data
@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;
}

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

@ -50,7 +50,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);
@ -183,7 +183,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);
@ -574,7 +574,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);
@ -991,7 +991,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);

Write Preview
Loading…
Cancel
Save