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

Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo

Browse Source
yun-zuoyi
许心洁 5 years ago
parent d107c7a3fe a8fafb2443
commit 8246a28c05
7 changed files with 91 additions and 24 deletions
Show Stats Download Patch File Download Diff File

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

@ -9163,11 +9163,11 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RC_BOARD_STATUS {
FINISH(10, "已完成(绿色)"),
OVER_TIME(20, "已超时（红色）"),
UNRECEIVED(30, "未收货（蓝色）"),
VARIANT(40, "有差异（黄色）"),
NORMAL(50, "正常（白色）");
FINISH(10, "已完成"),//绿色
OVER_TIME(20, "已超时"),//红色
UNRECEIVED(30, "未收货"),//蓝色
VARIANT(40, "有差异"),//黄色
NORMAL(50, "正常");//白色
private int value;
private String description;

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java
Unescape Escape View File

@ -5,16 +5,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
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.*;
import java.io.Serializable;
/**
@ -62,4 +58,12 @@ public class MesCustomerPart extends BaseBean implements Serializable {
@Column(name = "CUSTOMER_CFG_CODE")
@ApiParam("客户配置代码")
private String customerCfgCode;
@Column(name = "CUSTOMER_MARK")
@ApiParam("客户代号")
private String customerMark;
@Column(name = "CUSTOMER_LATCH")
@ApiParam("客户抬头")
private String customerLatch;
}

36
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java
Unescape Escape View File

@ -0,0 +1,36 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description: 业务队列model
* @Reference:
* @Author: wangjie
* @CreateDate: 2020-06-28-11:44
* @Modify:
**/
@Data
public class BusiQueueDispatchModel<T> {
@ApiParam("实现类")
private Object busDispatchervice;
@ApiParam("组织代码")
private String organizeCode;
@ApiParam("key")
private String key;
@ApiParam("数据")
private Object Obj;
@ApiParam("信息")
private String info;
@ApiParam("集合")
private List<T> list;
}

6
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java
Unescape Escape View File

@ -19,7 +19,7 @@ public class DefectRecordModel implements Serializable {
private static final long serialVersionUID = 4994719388513997046L;
@ApiParam("产线")
private String workCenterCode;
private String workCenterName;
@ApiParam("工序名称")
private String processName;
@ -52,8 +52,8 @@ public class DefectRecordModel implements Serializable {
public String createDatetime;
public DefectRecordModel(String workCenterCode, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) {
this.workCenterCode = workCenterCode;
public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) {
this.workCenterName = workCenterName;
this.processName = processName;
this.qcStatus = qcStatus;
this.defectName = defectName;

6
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java
Unescape Escape View File

@ -36,7 +36,7 @@ public class PackageTravelModel implements Serializable {
private String qrCode;
@ApiParam("产线")
private String workCenterCode;
private String workCenterName;
@ApiParam("工序名称")
private String processName;
@ -65,13 +65,13 @@ public class PackageTravelModel implements Serializable {
@ApiParam("执行时间")
private String createUser;
public PackageTravelModel(String packageNo,String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterCode, String processName, String ctCode, String ctNo, String modelNo, String fnLocationNo, String ctLocationNo, String createDatetime, String createUser) {
public PackageTravelModel(String packageNo,String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String ctCode, String ctNo, String modelNo, String fnLocationNo, String ctLocationNo, String createDatetime, String createUser) {
this.packageNo = packageNo;
this.customerPartNo = customerPartNo;
this.serialNumber = serialNumber;
this.partNo = partNo;
this.qrCode = qrCode;
this.workCenterCode = workCenterCode;
this.workCenterName = workCenterName;
this.processName = processName;
this.ctCode = ctCode;
this.ctNo = ctNo;

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java
Unescape Escape View File

@ -16,7 +16,7 @@ import java.io.Serializable;
@ApiModel("产品履历报表-产品信息")
public class ProductSnModel implements Serializable {
private static final long serialVersionUID = 5217363746963291483L;
private static final long serialVersionUID = 7137684552464509466L;
@ApiParam("客户零件号")
@ -53,7 +53,7 @@ public class ProductSnModel implements Serializable {
private String qcStatusName;
public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String workCellName, String createUser, String createDatetime, Integer qcStatus) {
public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String workCellName, String createDatetime, String createUser, Integer qcStatus) {
this.customerPartNo = customerPartNo;
this.serialNumber = serialNumber;
this.partNo = partNo;

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

@ -9,14 +9,19 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.Version;
/**
* @Description :移库单明细实体(用于转储类业务)
@ -387,6 +392,12 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam(value = "目的库位名称")
public String destLocateName;
@Transient
@ApiParam("报废类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description")
public Integer scrapType;
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;
@ -742,7 +753,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo, Integer moveType, Integer busiType,
String item, String partNo, String partNameRdd, String unit, Double qty,
Integer isSn, Integer orderMasterStatus,String createUser, String createDatetime) {
Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime, String seqNo) {
this.organizeCode = organizeCode;
this.workOrderCode = workOrderCode;
this.orderNo = orderNo;
@ -757,5 +768,21 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
this.orderMasterStatus = orderMasterStatus;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.seqNo = seqNo;
}
public WmsDocMovementDetails(String orderNo, String partNo, String custPartNo, String srcZoneNo, String destZoneNo, String destLocateNo, Double qty, Double pickQty, String createDatetime, Integer orderStatus, String createUser) {
this.orderNo = orderNo;
this.partNo = partNo;
this.custPartNo = custPartNo;
this.srcZoneNo = srcZoneNo;
this.destZoneNo = destZoneNo;
this.destLocateNo = destLocateNo;
this.qty = qty;
this.pickQty = pickQty;
this.createDatetime = createDatetime;
this.orderStatus = orderStatus;
this.createUser = createUser;
}
}

Write Preview
Loading…
Cancel
Save