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
柯裕 6 years ago
parent 9a6a9018cf 9e65f08265
commit 8edf27d389
11 changed files with 140 additions and 147 deletions
Show Stats Download Patch File Download Diff File

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

@ -533,10 +533,10 @@ public class BlockReportEnumUtil {
LIKE_LEFT(6, "LIKE", "左模糊"),
LIKE_RIGHT(7, "LIKE", "右模糊"),
EQUAL(8, "=", "等于"),
EQUAL_NOT(9, "!=", "不等于"),
AND(10, "AND", "AND"),
OR(11, "OR", "OR"),
NOT(12, "NOT", "NOT"),
EQUAL_NOT(9, "<>", "不等于"),
// AND(10, "AND", "AND"),
// OR(11, "OR", "OR"),
// NOT(12, "NOT", "NOT"),
IS_NULL(13, "IS NULL", "IS NULL"),
IS_NOT_NULL(14, "IS NOT NULL", "IS NOT NULL");

104
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）
@ -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;

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

@ -35,6 +35,11 @@ public class SysRefTaskCyclePlan extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long taskCycleId;
@Column(name="TASK_PLAN_ID")
@ApiParam(value ="任务计划id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskPlanId;
@Column(name="TASK_PLAN_NAME")
@ApiParam(value ="任务计划名称")
private String taskPlanName;

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

@ -77,11 +77,12 @@ public class ReportHqlPack {
// 查询参数封装
HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",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);
if(template.getTemplateStatus() != null){
if(template.getTemplateStatus().intValue() == CommonEnumUtil.USER_STATUS.DISABLE.getValue()){
HqlPack.getNumEqualPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result);
}else {
HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result);
}
}
HqlPack.getStringLikerPack(template.getName(),"name",result);

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

@ -120,6 +120,10 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam(value = "已收货数量", example = "1")
private Double recQty;
@Column(name = "MOVE_QTY")
@ApiParam(value = "已移库数量", example = "1")
private Double moveQty;
@Column(name = "SRC_AREA_NO")
@ApiParam("源库存地代码")
public String srcAreaNo;

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

@ -49,10 +49,6 @@ public class WmsDocMovementSn extends BaseBean {
@ApiParam(value = "数量", example = "0")
public Double qty;
// @Column(name="TRANS_QTY")
// @ApiParam(value = "处理数量", example = "0")
// public Double transQty;
@Column(name="UNIT")
@ApiParam("单位")
@ -66,6 +62,6 @@ public class WmsDocMovementSn extends BaseBean {
public Integer snStatus;
@Column(name="SN")
@ApiParam("一维条码")
@ApiParam("条码")
public String sn;
}

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;

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

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

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

@ -955,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);

Write Preview
Loading…
Cancel
Save