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

Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

Browse Source
yun-zuoyi
曾贞一 4 years ago
parent b695ab2fc3 a6e0a138df
commit 15452dfa0e
20 changed files with 138 additions and 59 deletions
Show Stats Download Patch File Download Diff File

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

@ -2099,7 +2099,8 @@ public class MesEnumUtil {
MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"),
MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"),
MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"),
MES_JISA(640, "jisaExcelService", "JISA导入");
MES_JISA(640, "jisaExcelService", "JISA导入"),
MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入");
private int value;
private String service;
@ -3737,8 +3738,7 @@ public class MesEnumUtil {
INSTOCKED(40, "入库"),
SHIPING(50, "发运"),
REDO(60, "重做"),
CLOSE(90, "关闭"),
;
CLOSE(90, "关闭");
private int value;
private String description;

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

@ -1656,6 +1656,11 @@ public class WmsEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {

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

@ -56,4 +56,8 @@ public class MesNumberRule extends BaseBean implements Serializable {
@Column(name = "IS_CYCLE")
@ApiParam("最大值后循环")
private Integer isCycle;
@Column(name = "SPILT_RULE")
@ApiParam("拼接规则")
private String spiltRule;
}

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

@ -135,6 +135,14 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam(value = "包装数量")
private Double qty2;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "VERSION_NO")
@ApiParam("版本号")
private String versionNo;
@Transient
@ApiParam("产品类型名称")
private String produceCategoryName;

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

@ -40,10 +40,7 @@ public class DataReviewModel {
@ApiParam("显示标识")
private String showFlag;
@ApiParam("关键件颜色")
private String keyPartColor;
@ApiParam("生产数据颜色")
private String prodDataColor;
@ApiParam("颜色")
private String color;
}

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

@ -94,6 +94,12 @@ public class GenSerialNoModel {
@ApiParam("工序代码")
private String processCode;
@ApiParam("项目代码")
private String prodCfgTypeCode;
@ApiParam("版本号")
private String versionNo;
public GenSerialNoModel(String ruleCode) {
this.ruleCode = ruleCode;

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

@ -6,16 +6,13 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* @Description: 控制计划导入模板
* @CreateDate: 2020/9/29
* @Author: simon.song
*/
@Data
@Api(value="控制计划导入模板",description = "控制计划导入模板")
@Api(value = "控制计划导入模板", description = "控制计划导入模板")
public class MesControlPlanTemplateModel extends BaseBean {
private static final long serialVersionUID = 6846982556729401884L;
@ -40,25 +37,25 @@ public class MesControlPlanTemplateModel extends BaseBean {
@AnnoOutputColumn
private String custName;
@ApiParam("控制计划版本号")
@AnnoOutputColumn
private Integer controlPlanVersion;
@ApiParam("是否启用")
@AnnoOutputColumn
private Integer isEnable;
// @ApiParam("控制计划版本号")
// @AnnoOutputColumn
// private Integer controlPlanVersion;
// @Column(name = "IS_ENABLE")
// @ApiParam("是否启用")
// @AnnoOutputColumn
// private Integer isEnable;
/**
* 中航质量标准明细表
*/
@ApiParam("工作单元代码")
@AnnoOutputColumn
private String workCellCode;
@ApiParam("质量标准版本")
@AnnoOutputColumn
private Integer qualityStandardVersion;
// @ApiParam("质量标准版本")
// @AnnoOutputColumn
// private Integer qualityStandardVersion;
//检测类型：10=首检，20=巡检，30=终检，40=发运检
@ApiParam("检测类型")
@ -87,11 +84,11 @@ public class MesControlPlanTemplateModel extends BaseBean {
@ApiParam("是否允许让步")
@AnnoOutputColumn
private String isConcession;
private Integer isConcession;
@ApiParam("间隔时间")
@AnnoOutputColumn
private String checkInterval;
private Integer checkInterval = 0;
//个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2
@ApiParam("个数标识")
@ -119,11 +116,11 @@ public class MesControlPlanTemplateModel extends BaseBean {
@ApiParam("公差上限")
@AnnoOutputColumn
private BigDecimal differenceMaxLimit;
private Double maximum = 0d;
@ApiParam("公差下限")
@AnnoOutputColumn
private BigDecimal differenceMinLimit;
private Double minimum = 0d;
@ApiParam("是否关键检测项")
@AnnoOutputColumn

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

@ -12,4 +12,7 @@ public class MgnBoardListColorModel {
@ApiParam("颜色")
private String color;
@ApiParam("安灯类型")
private String alarmCode;
}

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

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description: UNPACK
* @Reference:
* @Author: wangjie
* @CreateDate: 2020-06-28-11:44
* @Modify:
**/
@Data
public class PackageUnPackModel {
@ApiParam("工厂")
private String organizeCode;
@ApiParam("包装条码")
private String packageNo;
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partName;
@ApiParam("批次")
private String lotNo;
@ApiParam("状态")
private Integer status;
@ApiParam("状态名称")
private String statusName;
@ApiParam("更新时间")
private String modifyDatetime;
@ApiParam("包装数量")
private String partSpecQty;
@ApiParam("UNPACK数据")
private List<PackageUnPackModel> unPackList;
}

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

@ -5,11 +5,7 @@ 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.Transient;
/**
@ -64,6 +60,9 @@ public class ProdOrgModel extends BaseBean {
@ApiParam("工位类型")
private Integer workCellType;
@ApiParam("工位等级:正常工位，监控工位")
private Integer grade;
@Transient
@ApiParam("序号")
private Integer seq;

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

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails;
import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn;
import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
import lombok.Data;
import java.io.Serializable;
@ -19,6 +20,7 @@ public class WmsMoveDetailsModel implements Serializable {
private static final long serialVersionUID = -6968143574442339454L;
private WmsMoveDetails details;
private List<WmsMoveSn> moveSnList;
private List<WmsStockSn> wmsStockSnList;
public WmsMoveDetailsModel(WmsMoveDetails details, List<WmsMoveSn> moveSnList) {
this.details = details;

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

@ -59,8 +59,7 @@ public class SysOrderNoRule extends BaseBean {
@Column(name = "SERIAL_NO_LENGTH")
@ApiParam(value = "流水号长度",example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long serialNoLength;
private Integer serialNoLength;
@Column(name = "IS_CYCLE")
@ApiParam(value = "是否按日期循环", example = "1")

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

@ -38,15 +38,15 @@ public class WmsCSFactTrans extends BaseBean {
public String orderNo;
@Column(name="WH_NO")
@ApiParam("仓库代码")
@ApiParam("仓库编码")
public String whNo;
@Column(name="ZONE_NO")
@ApiParam("存储区编号")
@ApiParam("存储区编码")
public String zoneNo;
@Column(name="LOCATE_NO")
@ApiParam("库位编号")
@ApiParam("库位编码")
public String locateNo;
@Column(name="PART_NO")
@ -70,9 +70,12 @@ public class WmsCSFactTrans extends BaseBean {
@ApiParam("单位")
public String unit;
/**
* 实盘数量
**/
@Column(name="FACT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "实盘数量", example = "0")
@ApiParam(value = "数量", example = "0")
public Double factQty;
/**
@ -80,7 +83,7 @@ public class WmsCSFactTrans extends BaseBean {
*/
@Column(name="ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = WmsEnumUtil.CS_ITEM_STATUS.class, refForeignKey = "value", value = "description")
public Integer itemStatus;
@Column(name="REMARK")

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

@ -53,7 +53,7 @@ public class WmsCSOrderDetails extends BaseBean {
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
@ApiParam(value = "数量", example = "0")
public Double qty;
@Column(name = "UNIT")

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

@ -100,6 +100,7 @@ public class WmsCSRange extends BaseBean {
public WmsCSRange(){}
public WmsCSRange(String zoneNo,String partNo,String partNameRdd){
this.zoneNo = zoneNo;
this.partNo = partNo;
@ -117,7 +118,10 @@ public class WmsCSRange extends BaseBean {
public WmsCSRange(String zoneNo, String locateNo) {
this.zoneNo = zoneNo;
this.locateNo = locateNo;
}
public WmsCSRange(String zoneNo) {
this.zoneNo = zoneNo;
}
public WmsCSRange(String orderNo, String partNo, String zoneNo, Integer orderStatus) {

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

@ -14,12 +14,7 @@ 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.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.Version;
import javax.persistence.*;
/**
* @Description :移库单明细实体(用于转储类业务)
@ -39,6 +34,9 @@ import javax.persistence.Version;
@Index(columnList = "SRC_NO"),
@Index(columnList = "ORGANIZE_CODE")
})
@Inheritance(
strategy = InheritanceType.JOINED
)
@Api("移库单明细表")
public class WmsDocMovementDetails extends BaseBean {
private static final long serialVersionUID = -4800308354250386102L;

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

@ -13,11 +13,7 @@ import lombok.ToString;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -39,6 +35,9 @@ import java.util.List;
@Index(columnList = "BUSI_TYPE"),
@Index(columnList = "ORGANIZE_CODE")
})
@Inheritance(
strategy = InheritanceType.JOINED
)
@Api("移库单表")
@ToString
public class WmsDocMovementMaster extends BaseBean {

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

@ -11,11 +11,7 @@ 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.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
/**
* @Description : 移库单条码表
@ -36,6 +32,9 @@ import javax.persistence.Transient;
@Index(columnList = "SN"),
@Index(columnList = "ORGANIZE_CODE")
})
@Inheritance(
strategy = InheritanceType.JOINED
)
@Api("移库条码信息")
public class WmsDocMovementSn extends BaseBean {

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

@ -58,7 +58,7 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("行号")
private Integer item;
@Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
@Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
private Double qty;
@ -75,14 +75,14 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("订单号")
private String orderNo;
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "0")
private Double printQty;
//private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; }
@Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@Column(name = "RC_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "收货数量", example = "0")
private Double rcQty = 0d;

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

@ -549,7 +549,8 @@ public class WmsStockSn extends BaseBean {
@ApiParam("库位Z")
private Integer z;
public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z) {
public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z,
String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) {
this.sn = sn;
this.vendorNo = vendorNo;
this.snStatus = snStatus;
@ -561,6 +562,11 @@ public class WmsStockSn extends BaseBean {
this.x = x;
this.y = y;
this.z = z;
this.lotNo = lotNo;
this.dateCode = dateCode;
this.leftCode = leftCode;
this.fixLotNo = fixLotNo;
this.qualityDate = qualityDate;
}
public WmsStockSn() {

Write Preview
Loading…
Cancel
Save