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

yun-zuoyi
jenkins 6 years ago
commit 25fc477991

@ -27,18 +27,18 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PROCESS_BOM")
@Table(name = "MES_PROCESS_BOM")
@Api("工序物料清单")
public class MesProcessBom extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name="PROCESS_CODE")
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name="ITEM_PART_NO")
@Column(name = "ITEM_PART_NO")
@ApiParam("子零件")
private String itemPartNo;
@ -57,7 +57,7 @@ public class MesProcessBom extends BaseBean {
@Transient
@ApiParam("是否已绑定")
private boolean isBind;
private Boolean isBind;
@Transient
@ApiParam("显示颜色")
@ -69,10 +69,42 @@ public class MesProcessBom extends BaseBean {
}
public int getIsRepeatVal() {
return this.isRepeat == null ? 0 : this.isRepeat;
return this.isRepeat == null ? 0 : this.isRepeat;
}
public int getIsCheckVal() {
return this.isCheck == null ? 0 : this.isCheck;
}
public boolean getIsBindVal() {
return this.isBind == null ? false : this.isBind;
}
@Override
public String toString() {
return "MesProcessBom{" +
"partNo='" + partNo + '\'' +
", processCode='" + processCode + '\'' +
", itemPartNo='" + itemPartNo + '\'' +
", qty=" + qty +
", isRepeat=" + isRepeat +
", isCheck=" + isCheck +
", isBind=" + isBind +
", color='" + color + '\'' +
", id=" + id +
", organizeCode='" + organizeCode + '\'' +
", isValid=" + isValid +
", isDeleted=" + isDeleted +
", createUser='" + createUser + '\'' +
", createDatetime='" + createDatetime + '\'' +
", modifyUser='" + modifyUser + '\'' +
", modifyDatetime='" + modifyDatetime + '\'' +
", createDateTimeStart='" + createDateTimeStart + '\'' +
", createDateTimeEnd='" + createDateTimeEnd + '\'' +
", modifyDateTimeStart='" + modifyDateTimeStart + '\'' +
", modifyDateTimeEnd='" + modifyDateTimeEnd + '\'' +
", orderByParam='" + orderByParam + '\'' +
", ascOrDesc=" + ascOrDesc +
'}';
}
}

@ -83,15 +83,18 @@ public class MesStep extends BaseBean {
@ApiParam("工步是否跳过")
private boolean isJump;
// public MesStep(String stepCode,String stepName,String stepText,String stepType,String stepObject,
// String routeCode,String processCode,Integer stepSeq){
// this.stepCode = stepCode;
// this.stepName = stepName;
// this.stepText = stepText;
// this.stepType = stepType;
// this.stepObject = stepObject;
// this.routeCode = routeCode;
// this.processCode = processCode;
// this.stepSeq = stepSeq;
// }
public MesStep() {
}
public MesStep(String stepCode, String stepName, String stepText, String stepType, String stepObject,
String routeCode, String processCode, Integer stepSeq){
this.stepCode = stepCode;
this.stepName = stepName;
this.stepText = stepText;
this.stepType = stepType;
this.stepObject = stepObject;
this.routeCode = routeCode;
this.processCode = processCode;
this.stepSeq = stepSeq;
}
}

@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**
@ -56,6 +57,15 @@ public class MesProcessBom extends BaseBean {
@ApiParam(value = "是否检查")
private Integer isCheck;
@Transient
@ApiParam("是否已绑定")
private Boolean isBind;
@Transient
@ApiParam("显示颜色")
private String color;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
@ -67,4 +77,36 @@ public class MesProcessBom extends BaseBean {
public int getIsCheckVal() {
return this.isCheck == null ? 0 : this.isCheck;
}
public boolean getIsBindVal() {
return this.isBind == null ? false : this.isBind;
}
@Override
public String toString() {
return "MesProcessBom{" +
"partNo='" + partNo + '\'' +
", processCode='" + processCode + '\'' +
", itemPartNo='" + itemPartNo + '\'' +
", qty=" + qty +
", isRepeat=" + isRepeat +
", isCheck=" + isCheck +
", isBind=" + isBind +
", color='" + color + '\'' +
", id=" + id +
", organizeCode='" + organizeCode + '\'' +
", isValid=" + isValid +
", isDeleted=" + isDeleted +
", createUser='" + createUser + '\'' +
", createDatetime='" + createDatetime + '\'' +
", modifyUser='" + modifyUser + '\'' +
", modifyDatetime='" + modifyDatetime + '\'' +
", createDateTimeStart='" + createDateTimeStart + '\'' +
", createDateTimeEnd='" + createDateTimeEnd + '\'' +
", modifyDateTimeStart='" + modifyDateTimeStart + '\'' +
", modifyDateTimeEnd='" + modifyDateTimeEnd + '\'' +
", orderByParam='" + orderByParam + '\'' +
", ascOrDesc=" + ascOrDesc +
'}';
}
}

@ -132,4 +132,31 @@ public class MesProduceSn extends BaseBean {
public int getPrintStatusVal() {
return this.printStatus == null ? 0 : this.printStatus;
}
@Override
public String toString() {
return "MesProduceSn{" +
"serialNumber='" + serialNumber + '\'' +
", partNo='" + partNo + '\'' +
", partNameRdd='" + partNameRdd + '\'' +
", qty=" + qty +
", qcStatus=" + qcStatus +
", snStatus=" + snStatus +
", printCount=" + printCount +
", printStatus=" + printStatus +
", workCenterCode='" + workCenterCode + '\'' +
", workCellCode='" + workCellCode + '\'' +
", routeCode='" + routeCode + '\'' +
", processCode='" + processCode + '\'' +
", nextProcessCode='" + nextProcessCode + '\'' +
", inWorkCenterTime='" + inWorkCenterTime + '\'' +
", outWorkCenterTime='" + outWorkCenterTime + '\'' +
", shippingTime='" + shippingTime + '\'' +
", workOrderNo='" + workOrderNo + '\'' +
", custSn='" + custSn + '\'' +
", custPartNo='" + custPartNo + '\'' +
", packageSn='" + packageSn + '\'' +
", resultMsg='" + resultMsg + '\'' +
'}';
}
}

@ -1,21 +1,25 @@
package cn.estsh.i3plus.pojo.mes.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;
/**
* @Description :
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 16:22
* @Modify:
**/
* @Description :
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-29 16:22
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@ -23,5 +27,108 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PRODUCE_SN_TRAVEL")
@Api("产品条码履历表")
public class MesProduceSnTravel extends MesProduceSn {
public class MesProduceSnTravel extends BaseBean {
@Column(name="SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name="PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name="QTY")
@ApiParam("数量")
private Double qty;
@Column(name="QC_STATUS")
@ApiParam("质量状态")
private Integer qcStatus;
@Column(name="SN_STATUS")
@ApiParam("条码状态")
private Integer snStatus;
@Column(name="PRINT_COUNT")
@ApiParam("打印次数")
private Integer printCount;
@Column(name="PRINT_STATUS")
@ApiParam("打印状态")
private Integer printStatus;
@Column(name="WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name="PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name="NEXT_PROCESS_CODE")
@ApiParam("下一工序代码")
private String nextProcessCode;
@Column(name="IN_WC_TIME")
@ApiParam("进产线时间")
private String inWorkCenterTime;
@Column(name="OUT_WC_TIME")
@ApiParam("出产线时间")
private String outWorkCenterTime;
@Column(name="SHIPPING_TIME")
@ApiParam("发运时间")
private String shippingTime;
@Column(name="WORK_ORDER_NO")
@ApiParam("生产工单号")
private String workOrderNo;
@Column(name="CUST_SN")
@ApiParam("客户条码")
private String custSn;
@Column(name="CUST_PART_NO")
@ApiParam("客户零件号")
private String custPartNo;
@Column(name="PACKAGE_SN")
@ApiParam("包装条码")
private String packageSn;
@Transient
@ApiParam("返回信息")
private String resultMsg;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
public int getQcStatusVal() {
return this.qcStatus == null ? 0 : this.qcStatus;
}
public int getSnStatusVal() {
return this.snStatus == null ? 0 : this.snStatus;
}
public int getPrintCountVal() {
return this.printCount == null ? 0 : this.printCount;
}
public int getPrintStatusVal() {
return this.printStatus == null ? 0 : this.printStatus;
}
}

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
package cn.estsh.i3plus.pojo.model.mes;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -51,9 +51,22 @@ public class StepModel implements Serializable {
*/
@ApiParam("工步是否跳过")
private boolean isJump;
/**
*
*/
@ApiParam("参数代码")
private String paramCode;
/**
*
*/
@ApiParam("工作单元代码")
private String workCellCode;
public StepModel() {
}
public StepModel(String stepCode,String stepName,String stepText,String stepType,String stepObject,
String routeCode,String processCode,Integer stepSeq){
public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject,
String routeCode, String processCode, Integer stepSeq, String paramCode, String workCellCode) {
this.stepCode = stepCode;
this.stepName = stepName;
this.stepText = stepText;
@ -62,5 +75,7 @@ public class StepModel implements Serializable {
this.routeCode = routeCode;
this.processCode = processCode;
this.stepSeq = stepSeq;
this.paramCode = paramCode;
this.workCellCode = workCellCode;
}
}

@ -0,0 +1,90 @@
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;
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 : amy
* @CreateDate : 2019-06-11 15:03
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_BOM")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="物料清单",description = "物料清单")
public class WmsBom extends BaseBean {
@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 = "QTY")
@ApiParam(value = "数量")
private Double qty;
@Column(name = "ITEM_PART_NO")
@ApiParam(value = "子物料号")
private String itemPartNo;
@Column(name = "ITEM_PART_NAM")
@ApiParam(value = "子料物料描述")
private String itemPartNam;
@Column(name = "ITEM_UNIT")
@ApiParam(value = "子计量单位")
private String itemUnit;
@Column(name = "ITEM_QTY")
@ApiParam(value = "子用量")
private Double itemQty;
@Column(name = "BOM_VERSION")
@ApiParam(value = "BOM版本号")
private String bomVersion;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="有效起始日期",example = "2018-12-31 23:59:59")
@AnnoOutputColumn(hidden = true)
@Column(name = "EFF_START_TIME")
private String effStartTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="有效截止日期",example = "2018-12-31 23:59:59")
@AnnoOutputColumn(hidden = true)
@Column(name = "EFF_END_TIME")
private String effEndTime;
public Double getQty() {
return this.qty == null ? 0 : this.qty.doubleValue();
}
public Double getItemQty() {
return this.itemQty == null ? 0 : this.itemQty.doubleValue();
}
}

@ -0,0 +1,43 @@
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 : 2019-06-11 14:50
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_CUSTOMER_PART")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="客户零件关系表",description = "客户零件关系表")
public class WmsCustomerPart extends BaseBean {
@Column(name = "CUSTOMER_CODE")
@ApiParam(value = "客户代码")
private String customerCode;
@Column(name = "PART_NO")
@ApiParam(value = "物料号")
private String partNo;
@Column(name = "CUSTOMER_PART_NO")
@ApiParam(value = "客户零件号")
private String customerPartNo;
}

@ -0,0 +1,43 @@
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 : 2019-06-11 13:54
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_UNIT")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="单位定义",description = "单位定义")
public class WmsUnit extends BaseBean {
@Column(name = "UNIT_CODE")
@ApiParam(value = "单位代码")
private String vendorNo;
@Column(name = "UNIT_NAME")
@ApiParam(value = "单位名称")
private String unitName;
@Column(name = "UNIT_PRECISION")
@ApiParam(value = "单位精度")
private String unitPrecision;
}

@ -0,0 +1,46 @@
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 : 2019-06-11 14:18
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_UNIT_CONVERT")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="单位换算",description = "单位换算")
public class WmsUnitConvert extends BaseBean {
@Column(name = "UNIT_CODE")
@ApiParam(value = "单位代码")
private String unitCode;
@Column(name = "DEST_UNIT_CODE")
@ApiParam(value = "目标单位")
private String destUnitCode;
@Column(name = "UNIT_COEFFICIENT")
@ApiParam(value = "换算率")
private Double unitCoefficient;
public Double getUnitCoefficient() {
return this.unitCoefficient == null ? 0 : this.unitCoefficient.doubleValue();
}
}

@ -0,0 +1,39 @@
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 : 2019-06-11 13:47
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_VENDOR_PART")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="供应商零件关系",description = "供应商零件关系")
public class WmsVendorPart extends BaseBean {
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编号")
private String vendorNo;
@Column(name = "PART_NO")
@ApiParam(value = "物料号")
private String partNo;
}

@ -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 : amy
* @CreateDate : 2019-06-11 14:56
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_WORK_CENTER")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="工作中心",description = "工作中心")
public class WmsWorkCenter extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME")
@ApiParam(value = "工作中心名称")
private String workCenterName;
@Column(name = "ERP_WORK_CENTER")
@ApiParam(value = "ERP_工作中心")
private String erpWorkCenter;
@Column(name = "WORK_VER")
@ApiParam(value = "生产版本")
private String workVer;
@Column(name = "SRC_ZONE_NO")
@ApiParam(value = "原料扣减库区")
private String srcZoneNo;
@Column(name = "DESC_ZONE_NO")
@ApiParam(value = "成品库区")
private String descZoneNo;
@Column(name = "DESC_LOCATION_CODE")
@ApiParam(value = "成品库位")
private String descLocationCode;
}

@ -0,0 +1,38 @@
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 : 2019-06-11 15:01
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_WORK_CENTER_ZONE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="工作中心线边库区关系",description = "工作中心线边库区关系")
public class WmsWorkCenterZone extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "ZONE_NO")
@ApiParam(value = "线边库区")
private String zoneNo;
}
Loading…
Cancel
Save