Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev

yun-zuoyi
肖奕扬 4 years ago committed by nancy.li
commit 0ee06f6e03

@ -1476,6 +1476,7 @@ public class ImppEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SMS_SUPPLIER {
ALI_CLOUD(1, "阿里云");
@ -1523,10 +1524,11 @@ public class ImppEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SMS_TEMPLATE_STATUS {
VER_CODE(10, "审核中"),
NOTICE_SMS(20, "审核通过"),
PROMOTE_SMS(30, "审核失败");
UNDER_REVIEW(10, "审核中"),
PASS(20, "审核通过"),
FAIL(30, "审核失败");
private int value;
private String description;
@ -1561,6 +1563,7 @@ public class ImppEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SMS_TEMPLATE_TYPE {
VER_CODE(10, "验证码"),
NOTICE_SMS(20, "短信通知"),
@ -1600,6 +1603,7 @@ public class ImppEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SMS_SEND_STATUS {
WAIT_RECEIPT(10, "等待回执"),
FAIL(20, "发送失败"),

@ -2056,7 +2056,7 @@ public class MesEnumUtil {
MES_SHIFT(180, "shiftExcelService", "班次,支持编辑"),
MES_SHIFT_GROUP(190, "shiftGroupExcelService", "班组,支持编辑"),
MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelService", "工作单元参数配置"),
MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表"),
MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表,支持编辑"),
MES_DATA_OBJECT(220, "dataObjectExcelService", "数据对象"),
MES_OBJECT_CFG(230, "objectCfgExcelService", "对象结构"),
MES_WC_CHECK(240, "wcCheckExcelService", "开线检查,支持编辑"),
@ -8243,4 +8243,49 @@ public class MesEnumUtil {
return tmp;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DELIVER_ORDER_MOVE_TYPE {
SHIPING(10, "发运"),
ALLOCATION(20, "发运&调拨");
private int value;
private String description;
DELIVER_ORDER_MOVE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public static MesEnumUtil.DELIVER_ORDER_MOVE_TYPE getByValue(Integer value) {
for (MesEnumUtil.DELIVER_ORDER_MOVE_TYPE showSupplierCode : values()) {
if (showSupplierCode.getValue() == value) {
return showSupplierCode;
}
}
return null;
}
public static String valueOfDescription(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 int getValue() {
return value;
}
public String getValueStr() {
return value + "";
}
public String getDescription() {
return description;
}
}
}

@ -1460,7 +1460,8 @@ public class MesPcnEnumUtil {
public enum WC_CHECK_TYPE {
MATERIAL(10, "MATERIAL", "物料"),
ONLINE_SIGNAL(20, "ONLINE_SIGNAL", "开线信号"),
WORK_ORDER(30, "WORK_ORDER", "工单信息");
WORK_ORDER(30, "WORK_ORDER", "工单信息"),
CLOSE(40, "CLOSE", "关闭开线检查");
private int value;
private String code;

@ -872,7 +872,8 @@ public class WmsEnumUtil {
COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"),
SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"),
COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库"),//默认DMR
PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库");//默认DMR
PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库"),
SUSPECT_IN_STOCK(790, "SUSPECT_IN_STOCK", "可疑品入库");//默认DMR
private int value;
private String code;
@ -2487,7 +2488,8 @@ public class WmsEnumUtil {
TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"),
BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"),
BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"),
BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象");
BH_CHECK_TYPE(80, "BH_CHECK_TYPE", "检测大类对象"),
PDA_BTN(90, "PDA_BTN", "PDA按钮");
private String code;
private String description;
@ -9540,6 +9542,87 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
/**
* PDA_BTN
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PDA_BTN {
CLEAR_REDIS(10, "CLEAR_REDIS", "清空缓存");
private int value;
private String code;
private String description;
PDA_BTN(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
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 String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* TIME_STATUS
*/
public enum TIME_STATUS {
NORMAL(1,"正常"),
TIME_OUT(2,"超时");
private int value;
private String description;
TIME_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 String valueOfDescription(int val) {
return valueOf(val);
}
}
}

@ -0,0 +1,70 @@
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.*;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @Description :IF_
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2020-11-06
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "IF_DELIVER_ORDER_DATA")
@Api("IF_订单交付数据")
public class IfDeliverOrderData extends BaseBean implements Serializable {
private static final long serialVersionUID = 855289009053695347L;
@Column(name = "RGANIZTION_CODE")
@ApiParam("工厂代码")
private String rganiztionCode;
@Column(name = "YEAR")
@ApiParam("年")
private Integer year;
@Column(name = "MONTH")
@ApiParam("月")
private Integer month;
@Column(name = "QTY")
@ApiParam("发运数量")
private Integer qty = 0;
@Column(name = "MOVE_TYPE")
@ApiParam("移动类型")
private Integer moveType;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

@ -172,10 +172,12 @@ public class IfProductOffLine extends BaseBean implements Serializable {
this.qcStatus = qcStatus;
}
public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime, String workOrderNo) {
public IfProductOffLine(String workCenterCode, String partNo, String partName, String itemPartNo, String itemPartName, String packageNo, Double qty, String createDatetime, String workOrderNo) {
this.workCenterCode = workCenterCode;
this.partNo = partNo;
this.partName = partName;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
this.packageNo = packageNo;
this.qty = qty;
this.createDatetime = createDatetime;

@ -0,0 +1,44 @@
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 java.io.Serializable;
/**
* @Description:
* @Author: dominic
* @Date: 2020/12/03 20:29
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ANALYSIS_RULE")
@Api("MES_解析规则")
public class MesAnalysisRule extends BaseBean implements Serializable {
private static final long serialVersionUID = -5274274774653791153L;
@Column(name = "RULE_CODE")
@ApiParam("规则代码")
private String ruleCode;
@Column(name = "ANALYSIS_RULE_CODE")
@ApiParam("解析规则")
private String analysisRuleCode;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
}

@ -30,7 +30,7 @@ import java.io.Serializable;
@Api("MES_看板图片")
public class MesBoardImage extends BaseBean implements Serializable {
private static final long serialVersionUID = -3757764185082659130L;
private static final long serialVersionUID = -3511836584646450267L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")

@ -0,0 +1,43 @@
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.*;
import java.io.Serializable;
/**
* @Description :BP
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2020-11-06
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_BP_BUSINESS")
@Api("BP业务对比表")
public class MesBpBusiness extends BaseBean implements Serializable {
private static final long serialVersionUID = 855289009053666347L;
@Column(name = "YEAR")
@ApiParam("年")
private Integer year;
@Column(name = "MONTH")
@ApiParam("月")
private Integer month;
@Column(name = "QTY")
@ApiParam("预测数量")
private Double qty = 0d;
}

@ -239,7 +239,17 @@ public class MesPackage extends BaseBean implements Serializable {
this.createDatetime = createDatetime;
}
public MesPackage(String partNo, String partNameRdd,String workCenterCode, String workOrderNo,
public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, Integer isSealed, String ctNo) {
this.packageNo = packageNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.qty = qty;
this.packSpecQty = packSpecQty;
this.isSealed = isSealed;
this.ctNo = ctNo;
}
public MesPackage(String partNo, String partNameRdd, String workCenterCode, String workOrderNo,
String packageNo, String lotNo, String custCode, String shiftGroup) {
this.partNo = partNo;
this.partNameRdd = partNameRdd;

@ -0,0 +1,76 @@
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.Index;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/12/10 5:39 PM
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE_QUEUE", indexes = {
@Index(columnList = "PACKAGE_NO"),
@Index(columnList = "CT_NO")
})
@Api("MES_包装队列")
public class MesPackageQueue extends BaseBean implements Serializable {
private static final long serialVersionUID = -7427832962272134299L;
@Column(name = "PACKAGE_NO")
@ApiParam("包装编码")
private String packageNo;
@Column(name = "CT_NO")
@ApiParam("容器编号")
private String ctNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameAdd;
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ApiParam("数量")
private Double qty;
@Column(name = "LOT_NO")
@ApiParam("批号")
private String lotNo;
@Column(name = "FIX_LOT_NO")
@ApiParam("特殊批号")
private String fixLotNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "SEQ", columnDefinition = "decimal(18,8)")
@ApiParam("排序")
private Double seq;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
}

@ -177,4 +177,8 @@ public class MesPart extends BaseBean implements Serializable {
@Transient
@ApiParam("客户零件号")
private String custPartNo;
@Transient
@ApiParam("是否绑定关键件")
private Integer isBingKey;
}

@ -0,0 +1,40 @@
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 java.io.Serializable;
/**
* @Description:
* @Author: dominic
* @Date: 2020/12/03 20:29
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_ANALYSIS_RULE")
@Api("MES_物料解析规则配置")
public class MesPartAnalysisRule extends BaseBean implements Serializable {
private static final long serialVersionUID = 7877300316848838443L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "RULE_CODE")
@ApiParam("规则代码")
private String ruleCode;
}

@ -4,21 +4,17 @@ 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.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;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/4/20 5:16
* @Author: Jessica
* @Date: 2020/11/20 5:16
* @Modify:
*/
@Data
@ -41,6 +37,10 @@ public class MesPartFurnace extends BaseBean implements Serializable {
@ApiParam("物料编码")
private String partNo;
@Column(name = "orientation")
@ApiParam("方向")
private String orientation;
@Column(name = "MODEL_IMG_URL")
@ApiParam("模式图片路径")
private String modelImgUrl;

@ -131,7 +131,6 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("条码类型 10=正常 20=首检件")
private Integer snType;
@Column(name = "TRAY_NO")
@ApiParam("托盘号")
private String trayNo;
@ -233,6 +232,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("颜色名称")
private String colorName;
@Transient
@ApiParam("物料版本号")
private String versionNo;
public MesProduceSn() {
}
@ -242,6 +245,48 @@ public class MesProduceSn extends BaseBean implements Serializable {
this.qty = qty;
}
public MesProduceSn(Long id, String serialNumber, String productSn, String partNo, String partNameRdd, Double qty, Integer qcStatus, Integer snStatus,
Integer printCount, Integer printStatus, String workCenterCode, String workCellCode, String routeCode, String processCode,
String nextProcessCode, String inWorkCenterTime, String outWorkCenterTime, String shippingTime, String workOrderNo,
String custSn, String custPartNo, String custCode, Integer snType, String trayNo, Integer operateType,
String processLabelTemplate, String prodLabelTemplate, String custLabelTemplate, String lotNo,
String defectActionType, String vinCode, String versionNo, String createUser, String createDatetime) {
this.id = id;
this.serialNumber = serialNumber;
this.productSn = productSn;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.qty = qty;
this.qcStatus = qcStatus;
this.snStatus = snStatus;
this.printCount = printCount;
this.printStatus = printStatus;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.routeCode = routeCode;
this.processCode = processCode;
this.nextProcessCode = nextProcessCode;
this.inWorkCenterTime = inWorkCenterTime;
this.outWorkCenterTime = outWorkCenterTime;
this.shippingTime = shippingTime;
this.workOrderNo = workOrderNo;
this.custSn = custSn;
this.custPartNo = custPartNo;
this.custCode = custCode;
this.snType = snType;
this.trayNo = trayNo;
this.operateType = operateType;
this.processLabelTemplate = processLabelTemplate;
this.prodLabelTemplate = prodLabelTemplate;
this.custLabelTemplate = custLabelTemplate;
this.lotNo = lotNo;
this.defectActionType = defectActionType;
this.vinCode = vinCode;
this.versionNo = versionNo;
this.createUser = createUser;
this.createDatetime = createDatetime;
}
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

@ -111,6 +111,10 @@ public class MesProductData extends BaseBean implements Serializable {
@ApiParam("数据组号")
private String groupNo;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Json4Es
@Lob
@Column(name = "LINE_DATA")

@ -86,6 +86,10 @@ public class MesWorkCenter extends BaseBean implements Serializable {
@ApiParam("是否需要设备自动报警")
private Integer isEquMonitor;
@Column(name = "IS_TEMPORARY")
@ApiParam("是否临时开线")
private Integer isTemporary = 2;
@Transient
@ApiParam(value = "子集列表")
private List<MesWorkCell> childTreeList;

@ -70,7 +70,7 @@ public class BiModel implements Serializable {
private double unQualifiedRate = 0;
@ApiParam("目标合格率")
private double targetPassRate;
private double targetPassRate = 0;
@ApiParam("颜色标识")
private Integer colorFlag = 0;
@ -93,6 +93,9 @@ public class BiModel implements Serializable {
@ApiParam("末检")
private Integer endCheck;//首件、30中件、40末件
@ApiParam("质量状态")
private Integer qcStatus;
private double qty;
@ApiParam("比率")
@ -116,4 +119,10 @@ public class BiModel implements Serializable {
this.qty = qty;
this.partNo = partNo;
}
public BiModel(String workCellCode, String partNo, Integer qcStatus) {
this.workCellCode = workCellCode;
this.partNo = partNo;
this.qcStatus = qcStatus;
}
}

@ -100,6 +100,12 @@ public class GenSerialNoModel {
@ApiParam("版本号")
private String versionNo;
@ApiParam("颜色代码")
private String colorCode;
@ApiParam("颜色名称")
private String colorName;
public GenSerialNoModel(String ruleCode) {
this.ruleCode = ruleCode;

@ -0,0 +1,36 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/7/28 2:37
* @Modify:
*/
@Data
public class LogisticsBiModel implements Serializable {
@ApiParam(value = "去年每月发运数量")
private double lastQty = 0;
@ApiParam(value = "今年每月发运数量")
private double thisQty = 0;
@ApiParam(value = "比例值")
private double annualRatio = 0;
@ApiParam(value = "月份")
private Integer month;
@ApiParam(value = "实际出库数量")
private double outQty = 0;
@ApiParam(value = "BP总数")
private double bpQty= 0;
}

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -27,7 +26,7 @@ public class MesBoardWorkCenterOverviewModel {
private String imageUrl;
@ApiParam("工单列表")
List<MesWorkOrder> workOrderList;
List<ProductBiModel> workOrderList;
@ApiParam("班组信息")
MesShiftGroup shiftGroup;

@ -20,21 +20,40 @@ public class MesPackageQueryModel extends MesPackage {
@ApiParam("工序名称")
private String processName;
@ApiParam("工位")
private String workCellName;
@ApiParam("产线")
private String workCenterName;
@ApiParam("工作单元名称")
private String workCellName;
@ApiParam("是否封箱Name")
private String isSealedName;
public MesPackageQueryModel(String workCenterName, String workCellName) {
this.workCenterName = workCenterName;
this.workCellName = workCellName;
}
public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName) {
public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, Integer isSealed, String ctNo, String processName, String workCellName, String workCenterName) {
super(packageNo, partNo, partNameRdd, qty, packSpecQty, isSealed, ctNo);
this.processName = processName;
this.workCellName = workCellName;
this.workCenterName = workCenterName;
}
public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo, String processName, String workCenterName, String workCellName) {
super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo);
this.processName=processName;
this.workCenterName = workCenterName;
this.workCellName = workCellName;
}
public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName,String isSealedName) {
super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo);
this.isSealedName=isSealedName;
this.processName=processName;
this.workCenterName = workCenterName;
this.workCellName = workCellName;
}
}

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
import cn.estsh.i3plus.pojo.mes.bean.MesPackage;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -29,6 +30,9 @@ public class MesPaintSnPrintModel implements Serializable {
@ApiParam("包装编号")
private String packageNo;
@ApiParam("包装信息")
private MesPackage packageInfo;
@ApiParam("工单号")
private String workOrderNo;

@ -190,7 +190,7 @@ public class StationRequestBean implements Serializable {
@ApiParam("创建时间")
private String createDatetime;
@ApiParam("创建时间")
@ApiParam("包装编号")
private String packageNo;
@ApiParam("密码")
@ -232,6 +232,8 @@ public class StationRequestBean implements Serializable {
", workOrderNo='" + workOrderNo + '\'' +
", tray='" + tray + '\'' +
", finishCount=" + finishCount +
", packageNo=" + packageNo +
", createDatetime=" + createDatetime +
'}';
}
}

@ -139,4 +139,10 @@ public class StepPrintSnModel extends MesProduceSn {
@ApiParam("产品位置名称")
private String produceCategoryName;
@ApiParam("版本号")
private String versionNo;
@ApiParam("泰国WL物料描述")
private String tgPartDesc;
@ApiParam("泰国过程条码截取前11位")
private String snTop11;
}

@ -0,0 +1,30 @@
package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description: model
* @Author: wangjie
* @Date: 2020/10/28 2:56 PM
* @Modify:
*/
@Data
public class AssemblyRealWorkModel {
@ApiParam("生产线代码")
private String workCenterCode;
@ApiParam("实际产量")
private Double realProdQty;
@ApiParam("实际目标")
private Double realPlanQty;
@ApiParam("班产目标")
private Double shiftPlanQty;
@ApiParam("本班达成率")
private Integer shiftPassPercent;
}

@ -0,0 +1,38 @@
package cn.estsh.i3plus.pojo.mes.model.report;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* -
* @author yumingxing
* @version 1.0
* @date 2021/1/10 11:02
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel("产品工序过程查询-条件")
public class ConditionQueryModel {
@ApiParam("项目名称")
private String prodCfgTypeCode;
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("开始时间")
private String modifyStartTime;
@ApiParam("结束时间")
private String modifyEndTime;
@ApiParam("零件二维码")
private String serialNumber;
@ApiParam("质量状态")
private Integer qcStatus;
}

@ -0,0 +1,25 @@
package cn.estsh.i3plus.pojo.mes.model.report;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* model
* @author xiangming.liao
* @version 1.0
* @date 2021/01/06 10:43
**/
@Data
@ApiModel("产品条码返回model")
public class CosmaReportProductSnModel extends MesProduceSn implements Serializable {
private static final long serialVersionUID = 5217363746963291483L;
@ApiParam("条码类型Name")
private String snTypeName;
}

@ -13,17 +13,22 @@ import java.io.Serializable;
* @date 2020/12/18 15:16
**/
@Data
@ApiModel("产品履历报表-缺陷信息")
@ApiModel("产品工序过程查询-缺陷信息")
public class DefectRecordModel implements Serializable {
private static final long serialVersionUID = 4994719388513997046L;
@ApiParam("产线")
private String workCenterCode;
@ApiParam("不良处理类型")
private Integer defectActionType;
@ApiParam("工序名称")
private String processName;
@ApiParam("不良处理类型名称")
private String defectActionTypeName;
@ApiParam("质量代码")
private Integer qcStatus;
@ApiParam("质量状态")
private String qcStatusName;
@ApiParam("缺陷名称")
private String defectName;
@ -34,10 +39,28 @@ public class DefectRecordModel implements Serializable {
@ApiParam("缺陷位置名称")
private String defectLocationName;
@ApiParam(value = "创建用户")
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("零件二维码")
private String serialNumber;
@ApiParam(value = "执行人")
public String createUser;
@ApiParam(value = "创建日期")
@ApiParam(value = "扫描时间")
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;
this.processName = processName;
this.qcStatus = qcStatus;
this.defectName = defectName;
this.defectLocation = defectLocation;
this.customerPartNo = customerPartNo;
this.serialNumber = serialNumber;
this.createUser = createUser;
this.createDatetime = createDatetime;
}
}

@ -20,57 +20,61 @@ public class PackageTravelModel implements Serializable {
private static final long serialVersionUID = -7031472442162953544L;
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("过程条码")
@ApiParam("零件二维码")
private String serialNumber;
@ApiParam("料箱编号")
private String ctNo;
@ApiParam("CMS零件号")
private String partNo;
@ApiParam("包装号")
private String packageNo;
@ApiParam("CMS标签号")
private String qrCode;
@ApiParam("料箱类型")
private String cnCode;
@ApiParam("产线")
private String workCenterCode;
@ApiParam("料箱状态")
private String useStatus;
@ApiParam("工序名称")
private String processName;
@ApiParam("料箱状态名称")
private String useStatusName;
@ApiParam("料架类型")
private String ctCode;
@ApiParam("物料码")
private String partNo;
@ApiParam("料架编号")
private String ctNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("进炉模式")
private String modelNo;
@ApiParam("产线")
private String workCenterCode;
@ApiParam("工序信息")
private String processCode;
@ApiParam("炉内料架位置")
private String fnLocationNo;
@ApiParam("执行动作")
private Integer opType;
@ApiParam("层位置")
private String ctLocationNo;
@ApiParam("执行动作名称")
private String opTypeName;
@ApiParam("层内零件位置")
private String ctLocationPartNo;
@ApiParam("执行时间")
private String createDatetime;
public PackageTravelModel(String serialNumber, String ctNo, String packageNo, String cnCode, String useStatus, String partNo, String partNameRdd, String workCenterCode, String processCode, Integer opType, String createDatetime) {
@ApiParam("执行时间")
private String createUser;
public PackageTravelModel(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) {
this.customerPartNo = customerPartNo;
this.serialNumber = serialNumber;
this.ctNo = ctNo;
this.packageNo = packageNo;
this.cnCode = cnCode;
this.useStatus = useStatus;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.qrCode = qrCode;
this.workCenterCode = workCenterCode;
this.processCode = processCode;
this.opType = opType;
this.processName = processName;
this.ctCode = ctCode;
this.ctNo = ctNo;
this.modelNo = modelNo;
this.fnLocationNo = fnLocationNo;
this.ctLocationNo = ctLocationNo;
this.createDatetime = createDatetime;
this.createUser = createUser;
}
}

@ -0,0 +1,31 @@
package cn.estsh.i3plus.pojo.mes.model.report;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @author yumingxing
* @version 1.0
* @date 2021/1/9 14:29
**/
@ApiModel("项目号零件号")
@Data
public class ProdCustPartModel {
@ApiParam("项目号")
private String prodCfgTypeCode;
@ApiParam("物料号")
private String partNo;
@ApiParam("客户零件号")
private String customerPartNo;
public ProdCustPartModel(String prodCfgTypeCode, String partNo, String customerPartNo) {
this.prodCfgTypeCode = prodCfgTypeCode;
this.partNo = partNo;
this.customerPartNo = customerPartNo;
}
}

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.mes.model.report;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.List;
/**
* @Author: xiangming.liao
* @CreateDate: 2020/12/28 14:24
* @Description: model
**/
@Api("缺陷率占比柏拉图报表model")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProduceDefectRatePlatoModel {
@ApiParam("项目号")
private String prodCfgTypeCode;
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("缺陷代码")
private String defectCode;
@ApiParam("缺陷名称")
private String defectName;
@ApiParam("单项占比")
private Double singleRatio;
@ApiParam("累计占比")
private Double cumulativeRatio;
@ApiParam("数量")
private Long qty;
public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, String defectCode, String defectName, Long qty) {
this.prodCfgTypeCode = prodCfgTypeCode;
this.customerPartNo = customerPartNo;
this.defectCode = defectCode;
this.defectName = defectName;
this.qty = qty;
}
public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, Long qty) {
this.prodCfgTypeCode = prodCfgTypeCode;
this.customerPartNo = customerPartNo;
this.qty = qty;
}
}

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.mes.model.report;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
@ -11,13 +12,13 @@ import java.util.List;
/**
* @Author: xiangming.liao
* @CreateDate: 2020/12/28 14:18
* @Description: model
* @Description: model
**/
@Api("一次性通过率占比柏拉图报表查询参数model")
@Api("缺陷率占比柏拉图报表查询参数model")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProduceDispPassPlatoQueryModel {
public class ProduceDefectRatePlatoQueryModel extends BaseBean {
/**
*
*/
@ -25,8 +26,12 @@ public class ProduceDispPassPlatoQueryModel {
@ApiParam("工序")
private String processCode;
@ApiParam("统计方式")
private Integer statisticalPlacer;
@ApiParam("柱子展示条数")
private Integer displaySize;
//质量状态20冻结30报废
@ApiParam("质量状态")
private List<Integer> qcStatusList;
/**
*
*/
@ -36,6 +41,10 @@ public class ProduceDispPassPlatoQueryModel {
@ApiParam("零件号")
private List<String> partNoList;
//统计方式0按月1按天。
@ApiParam("统计方式")
private Integer statisticalMethod;
@ApiParam("开始时间")
private String modifyStartDate;

@ -1,38 +0,0 @@
package cn.estsh.i3plus.pojo.mes.model.report;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.List;
/**
* @Author: xiangming.liao
* @CreateDate: 2020/12/28 14:24
* @Description: model
**/
@Api("一次性通过率占比柏拉图报表model")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProduceDispPassPlatoModel {
@ApiParam("项目号")
private List<String> prodCfgTypeCodeList;
@ApiParam("零件号")
private List<String> partNoList;
@ApiParam("单项占比")
private BigDecimal singleRatio;
@ApiParam("累计占比")
private BigDecimal cumulativeRatio;
@ApiParam("缺陷数量")
private BigDecimal defectQty;
}

@ -19,11 +19,9 @@ public class ProduceDispPassRateModel {
@ApiParam("统计时间")
private String statisticalTime;
@ApiParam("质量状态/类型")
private Integer qcStatus;
//统计选项10=全部20=冻结30=报废)
@ApiParam("统计选项")
private String statisticalOption;
private Integer statisticalOption;
@ApiParam("冻结数")
private BigDecimal freezeQty;
@ -37,9 +35,8 @@ public class ProduceDispPassRateModel {
@ApiParam("占比率")
private BigDecimal ratio;
public ProduceDispPassRateModel(String statisticalTime, Integer qcStatus, String statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
public ProduceDispPassRateModel(String statisticalTime, Integer statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
this.statisticalTime = statisticalTime;
this.qcStatus = qcStatus;
this.statisticalOption = statisticalOption;
this.freezeQty = freezeQty;
this.scrapQty = scrapQty;

@ -25,11 +25,20 @@ public class ProduceDispPassRateQueryModel {
@ApiParam("工序")
private String processCode;
//统计方式0=按月1按天
@ApiParam("统计方式")
private Integer statisticalPlacer;
private Integer statisticalMethod;
//质量状态10=合格20=冻结30=报废)
@ApiParam("质量类型")
private String qcStatus;
private Integer qcStatus;
@ApiParam("开始时间")
private String modifyStartDate;
@ApiParam("结束时间")
private String modifyEndDate;
/**
*
@ -40,10 +49,5 @@ public class ProduceDispPassRateQueryModel {
@ApiParam("零件号")
private List<String> partNoList;
@ApiParam("开始时间")
private String modifyStartDate;
@ApiParam("结束时间")
private String modifyEndDate;
}

@ -21,6 +21,9 @@ public class ProductDetailResult {
@ApiParam("零件号")
private String partNo;
@ApiParam
private String customerPartNo;
@ApiParam("零件描述")
private String partNameRdd;
@ -49,9 +52,10 @@ public class ProductDetailResult {
public String modifyDatetime;
public ProductDetailResult(String serialNumber, String partNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
public ProductDetailResult(String serialNumber, String partNo,String customerPartNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
this.serialNumber = serialNumber;
this.partNo = partNo;
this.customerPartNo = customerPartNo;
this.partNameRdd = partNameRdd;
this.workCenterCode = workCenterCode;
this.processCode = processCode;

@ -19,6 +19,8 @@ public class ProductResult {
private String workCellCode;
@ApiParam("零件号")
private String partNo;
@ApiParam("零件号")
private String customerPartNo;
@ApiParam("零件描述")
private String partNameRdd;
@ApiParam("生产线")
@ -42,9 +44,10 @@ public class ProductResult {
@ApiParam("报废率")
private BigDecimal scrapRate;
public ProductResult(String workCellCode,String partNo, String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap) {
public ProductResult(String workCellCode,String partNo, String customerPartNo,String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap) {
this.workCellCode = workCellCode;
this.partNo = partNo;
this.customerPartNo = customerPartNo;
this.partNameRdd = partNameRdd;
this.workCenterCode = workCenterCode;
this.processCode = processCode;

@ -0,0 +1,62 @@
package cn.estsh.i3plus.pojo.mes.model.report;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* -
* @author yumingxing
* @version 1.0
* @date 2020/12/18 15:16
**/
@Data
@ApiModel("产品工序过程查询-条件查询页面")
public class ProductSnConditionModel implements Serializable {
private static final long serialVersionUID = 3154899794523800804L;
@ApiParam("零件二维码")
private String serialNumber;
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("CMS零件号")
private String partNo;
@ApiParam("项目名称")
private String prodCfgTypeCode;
@ApiParam("产线")
private String workCenterCode;
@ApiParam("工序名称")
private String processName;
@ApiParam("工位名称")
private String workCellName;
@ApiParam(value = "扫码时间")
public String createDatetime;
@ApiParam("质量状态")
private Integer qcStatus;
@ApiParam("质量状态Name")
private String qcStatusName;
public ProductSnConditionModel(String serialNumber, String customerPartNo, String partNo, String prodCfgTypeCode, String workCenterCode, String processName, String workCellName, String createDatetime, Integer qcStatus) {
this.serialNumber = serialNumber;
this.customerPartNo = customerPartNo;
this.partNo = partNo;
this.prodCfgTypeCode = prodCfgTypeCode;
this.workCenterCode = workCenterCode;
this.processName = processName;
this.workCellName = workCellName;
this.createDatetime = createDatetime;
this.qcStatus = qcStatus;
}
}

@ -19,44 +19,50 @@ public class ProductSnModel implements Serializable {
private static final long serialVersionUID = 5217363746963291483L;
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("条码状态")
private Integer snStatus;
@ApiParam("条码状态Name")
private String snStatusName;
@ApiParam("质量状态")
private Integer qcStatus;
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("质量状态Name")
private String qcStatusName;
@ApiParam("零件二维码")
private String serialNumber;
@ApiParam("物料码")
@ApiParam("CMS零件号")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("CMS标签号")
private String qrCode;
@ApiParam("产线")
private String workCenterCode;
@ApiParam("流程代码")
private String routeCode;
@ApiParam("工序名称")
private String processName;
@ApiParam("工位名称")
private String workCellName;
@ApiParam("当前工序")
private String processCode;
@ApiParam(value = "执行人")
public String createUser;
@ApiParam("条码类型")
private Integer snType;
@ApiParam(value = "扫码时间")
public String createDatetime;
@ApiParam("条码类型Name")
private String snTypeName;
@ApiParam("质量代码")
private Integer qcStatus;
@ApiParam("质量状态")
private String qcStatusName;
@ApiParam(value = "执行时间")
public String modifyDatetime;
public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterCode, String processName, String workCellName, String createUser, String createDatetime, Integer qcStatus) {
this.customerPartNo = customerPartNo;
this.serialNumber = serialNumber;
this.partNo = partNo;
this.qrCode = qrCode;
this.workCenterCode = workCenterCode;
this.processName = processName;
this.workCellName = workCellName;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.qcStatus = qcStatus;
}
}

@ -20,9 +20,6 @@ public class ReportQueryModel {
@ApiParam("项目号")
private List<String> prodCfgTypeCodeList;
/**
*
*/
@ApiParam("零件号")
private List<String> partNoList;
@ -38,4 +35,7 @@ public class ReportQueryModel {
@ApiParam("姓名")
private String userName;
@ApiParam("单个工序")
private String singleProcessCode;
}

@ -22,6 +22,8 @@ public class ScrapOfPlatoModel {
@ApiParam("零件号")
private String partNo;
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("项目")
private String prodCfgTypeCode;
@ApiParam("缺陷代码")
@ -41,12 +43,12 @@ public class ScrapOfPlatoModel {
private BigDecimal scrapRatioPlato;
public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects,String workCellCode) {
public ScrapOfPlatoModel(String partNo, String customerPartNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects) {
this.partNo = partNo;
this.customerPartNo = customerPartNo;
this.prodCfgTypeCode = prodCfgTypeCode;
this.defectCode = defectCode;
this.defectName = defectName;
this.numberOfDefects = numberOfDefects;
this.workCellCode = workCellCode;
}
}

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.IfDeliverOrderData;
import org.springframework.stereotype.Repository;
@Repository
public interface IfDeliverOrderDataRepository extends BaseRepository<IfDeliverOrderData, Long> {
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesAnalysisRule;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: dominic
* @Date: 2020/12/03 20:29
* @Modify:
*/
@Repository
public interface MesAnalysisRuleRepository extends BaseRepository<MesAnalysisRule, Long> {
}

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBpBusiness;
import org.springframework.stereotype.Repository;
@Repository
public interface MesBpBusinessRepository extends BaseRepository<MesBpBusiness, Long> {
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPackageQueue;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/12/10 5:40 PM
* @Modify:
*/
@Repository
public interface MesPackageQueueRepository extends BaseRepository<MesPackageQueue, Long> {
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPartAnalysisRule;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Author: dominic
* @Date: 2020/12/03 20:29
* @Modify:
*/
@Repository
public interface MesPartAnalysisRuleRepository extends BaseRepository<MesPartAnalysisRule, Long> {
}

@ -3711,4 +3711,13 @@ public class MesHqlPack {
return packBean;
}
public static DdlPackBean getMesQueueOrderDetail(MesQueueOrderDetail queueOrderDetail) {
DdlPackBean packBean = getAllBaseData(queueOrderDetail.getOrganizeCode());
DdlPreparedPack.getStringLikerPack(queueOrderDetail.getSerialNumber(), "serialNumber", packBean);
DdlPreparedPack.getStringLikerPack(queueOrderDetail.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getStringLikerPack(queueOrderDetail.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringLikerPack(queueOrderDetail.getPartNameRdd(), "partNameRdd", packBean);
return packBean;
}
}

@ -26,4 +26,6 @@ public class WmsAgCacheModel implements Serializable {
public List<WmsOptionModel> options;
@ApiParam("作业流程明细Model集合")
public Map<String, WmsAgdCacheModel> wmsAgdCacheModelMap;
@ApiParam("流程级别组件参数集合")
public Map<String,Map<String,String>> wmsAgAmParamsMap;
}

@ -5,7 +5,6 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description BBACMODEL
@ -35,6 +34,9 @@ public class WmsBjmgnBbacReductModel implements Serializable {
public Double qty;
@ApiParam("单位")
public String unit;
@ApiParam("包含0")
public Integer includeZero;
public WmsBjmgnBbacReductModel() {
}

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -47,6 +48,10 @@ public class SysSmsSendRecord extends BaseBean {
@ApiModelProperty(value = "软件模块")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
/**
*
*/
@ -104,6 +109,10 @@ public class SysSmsSendRecord extends BaseBean {
@ApiModelProperty(value = "短信发送状态")
private Integer smsSendStatus;
public String getSmsSendStatusTxt() {
return smsSendStatus == null ? null : ImppEnumUtil.SMS_SEND_STATUS.valueOfDescription(smsSendStatus);
}
/**
*
*/

@ -51,12 +51,13 @@ public class SysSmsTemplate extends BaseBean {
*
*/
@Column(name = "SUPPLIER_TEMPLATE_CODE")
@ApiModelProperty(value = "模板代码")
@ApiModelProperty(value = "供应商模板代码")
private String supplierTemplateCode;
/**
*
*/
@AnnoOutputColumn
@Column(name = "TEMPLATE_TYPE")
@ApiModelProperty(value = "模板类型")
private Integer templateType;
@ -64,10 +65,15 @@ public class SysSmsTemplate extends BaseBean {
/**
*
*/
@AnnoOutputColumn(refClass = ImppEnumUtil.SMS_SUPPLIER.class)
@Column(name = "SUPPLIER_TYPE")
@ApiModelProperty(value = "供应商类型")
private Integer supplierType;
public String getSupplierTypeTxt() {
return supplierType == null ? null : ImppEnumUtil.SMS_SUPPLIER.valueOfDescription(supplierType);
}
/**
*
*/
@ -76,6 +82,10 @@ public class SysSmsTemplate extends BaseBean {
@AnnoOutputColumn(refClass = ImppEnumUtil.SMS_TEMPLATE_STATUS.class)
private Integer templateStatus;
public String getTemplateStatusTxt() {
return templateStatus == null ? null : ImppEnumUtil.SMS_TEMPLATE_STATUS.valueOfDescription(templateStatus);
}
/**
*
*/
@ -92,6 +102,13 @@ public class SysSmsTemplate extends BaseBean {
/**
*
*/
@Transient
@ApiModelProperty(value = "是否修改模板内容")
private Integer isModifyContent;
/**
*
*/
@Transient

@ -5,17 +5,12 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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.Version;
import javax.persistence.*;
/**
* @Description :
@ -167,4 +162,8 @@ public class SwebDocMovementDetails extends BaseBean {
@Column(name = "LOT_NO")
@ApiParam("批次")
public String lotNo;
@Column(name = "IS_SYNC", nullable = false)
@ApiParam("是否同步")
public Integer isSync = CommonEnumUtil.FALSE;
}

@ -1,18 +1,15 @@
package cn.estsh.i3plus.pojo.sweb.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.*;
/**
* @Description :
@ -149,4 +146,8 @@ public class SwebDocMovementMaster extends BaseBean {
@Column(name = "SHIP_TIME")
@ApiParam(value = "发运时间")
private String shipTime;
@Column(name = "IS_SYNC", nullable = false)
@ApiParam("是否同步")
public Integer isSync = CommonEnumUtil.FALSE;
}

@ -1,19 +1,16 @@
package cn.estsh.i3plus.pojo.sweb.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
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.*;
/**
* @Description :
@ -81,4 +78,8 @@ public class SwebDocMovementSn extends BaseBean {
@ApiParam("供应商名称")
@Column(name = "VENDOR_NAME")
private String vendorName;
@Column(name = "IS_SYNC", nullable = false)
@ApiParam("是否同步")
public Integer isSync = CommonEnumUtil.FALSE;
}

@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.util.List;
/**
* @Description :
@ -98,6 +99,9 @@ public class WmsActionGroup extends BaseBean {
@Transient
@ApiParam(value = "提交步骤序号")
private Integer submitStepSeq;
@Transient
@ApiParam(value = "流程级别组件参数")
private List<WmsActionStepCallParam> agAmParamsList;
public long getInitAmIdVal() {
return this.initAmId == null ? 0 : this.initAmId.longValue();

@ -34,25 +34,21 @@ import javax.persistence.Table;
@Inheritance(strategy = InheritanceType.JOINED)
@Api(value = "物流费用管理")
public class WmsLogisticsCosts extends BaseBean {
private static final long serialVersionUID = -5307311210847854654L;
@Column(name = "ORGANIZE_NAME")
@ApiParam(value = "工厂名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String organizeName;
@Column(name = "TRANSPORT_TYPE")
@ApiParam(value = "运输类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class)
private Integer transportType;
@Column(name = "PLACE_OF_ORIGIN")
@ApiParam(value = "发出地")
@ApiParam(value = "发出地存储区")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String placeOfOrigin;
@Column(name = "DESTINATION_WAREHOUSE")
@ApiParam(value = "目的仓库")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String destinationWarehouse;
@Column(name = "SHIPPING_FLAG")
@ApiParam(value = "发往地")
@ApiParam(value = "发往地存储区")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String shippingFlag;
@ -61,16 +57,26 @@ public class WmsLogisticsCosts extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String logisticsVendorNo;
@Column(name = "part_no")
@ApiParam(value = "物料编号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "part_name")
@ApiParam(value = "物料名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "SALES_UNIT")
@ApiParam(value = "计价单位")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String salesUnit;
@Column(name = "TRANSPORT_TYPE")
@Column(name = "TRANSPORT_MODE")
@ApiParam(value = "运输方式")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
@AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
private Integer transportType;
private Integer transportMode;
@Column(name = "price")
@ApiParam(value = "单价")
@ -83,7 +89,7 @@ public class WmsLogisticsCosts extends BaseBean {
private String startDate;
@Column(name = "END_DATE")
@ApiParam(value = "结束日期")
@ApiParam(value = "失效日期")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String endDate;

@ -42,4 +42,7 @@ public class WmsOperationBean<Obj> extends BaseBean {
@ApiParam("选中的明细数据")
public List<String> details;
@ApiParam("是否确认重置")
public int isConfirmReset;
}

@ -1,18 +1,13 @@
package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
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.*;
/**
* @Description : ERP COGI
@ -34,7 +29,7 @@ import javax.persistence.Table;
@Index(columnList = "SNAPSHOT_TIME"),
@Index(columnList = "MOVE_TYPE")
})
public class WmsErpCOGISnapshot extends SnapshotBean {
public class WmsErpCOGISnapshot extends BaseBean {
private static final long serialVersionUID = -4095222692227226944L;
@Column(name="SNAPSHOT_TIME")

@ -1,18 +1,13 @@
package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
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.*;
/**
* @Description : ERP
@ -34,7 +29,7 @@ import javax.persistence.Table;
@Index(columnList = "RECEIVER"),
@Index(columnList = "SNAPSHOT_TIME")
})
public class WmsErpInterfaceSnapshot extends SnapshotBean {
public class WmsErpInterfaceSnapshot extends BaseBean {
private static final long serialVersionUID = -4095333692227226944L;
@Column(name="SNAPSHOT_TIME")

@ -1,18 +1,13 @@
package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
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.*;
/**
* @Description : ERP
@ -33,7 +28,7 @@ import javax.persistence.Table;
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "SNAPSHOT_TIME")
})
public class WmsErpStockQuanSnapshot extends SnapshotBean {
public class WmsErpStockQuanSnapshot extends BaseBean {
private static final long serialVersionUID = -4095444692227226944L;
@Column(name="SNAPSHOT_TIME")

@ -1,18 +1,13 @@
package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
import cn.estsh.i3plus.pojo.wms.bean.snapshot.SnapshotBean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
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.*;
/**
* @Description : ERP
@ -35,7 +30,7 @@ import javax.persistence.Table;
@Index(columnList = "SNAPSHOT_TIME"),
@Index(columnList = "MOVE_TYPE")
})
public class WmsErpTransSnapshot extends SnapshotBean {
public class WmsErpTransSnapshot extends BaseBean {
private static final long serialVersionUID = -4095555692227226944L;
@Column(name="SNAPSHOT_TIME")

@ -13,7 +13,9 @@ public class WmsInterfaceEnumUtil {
SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"),
SWEB2SAP(50, "SWEB2SAP", "SWEB --> SAP"),
WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"),
SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB");
SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"),
SAP2MES(60, "SAP2MES", "SAP --> WMS"),
;
private int value;
private String name;

@ -24,6 +24,8 @@ public class AutoPickingModel {
private String partNo;
@ApiParam("简称")
private String partNameRdd;
@ApiParam("成品数量")
private Double productQty;
@ApiParam("完成数量")
private Double printQty;
@ApiParam("总数量")

@ -0,0 +1,29 @@
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;
@Data
@Api("JIS发运报表明细模型")
public class JisReportDetailModel extends BaseBean {
@ApiParam("客户工厂")
private String customerNo;
@ApiParam("计划发货数量")
private Integer planShipingCount;
@ApiParam("计划发货时间")
private String planLoadTime;
@ApiParam("料架号")
private String fixLotNo;
@ApiParam("排序单号")
private String queneGroupNo;
@ApiParam("JIS号")
private String jisNo;
@ApiParam("箱条码")
private String sn;
@ApiParam("实际发货时间")
private String actualLoadTime;
@ApiParam("实际上线时间")
private String custOnLineTime;
}

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@Data
@Api("JIS发运报表模型")
public class JisReportModel extends BaseBean {
@ApiParam("客户工厂")
private String custOrganizeCode;
@ApiParam("计划装车时间")
private String planLoadTime;
@ApiParam("计划发货数量")
private Double planShipingCount;
@ApiParam("实际装车时间")
private String actualLoadTime;
@ApiParam("实际发货数量")
private Double actualShipingCount;
@ApiParam("状态")
@AnnoOutputColumn(refClass = WmsEnumUtil.TIME_STATUS.class,refForeignKey = "value",value = "description")
private Integer shippingStatus;
@ApiParam("料架号1")
private String queueGroupNo_1;
@ApiParam("客户上线时间1")
private String custOnLineTime_1;
@ApiParam("料架号2")
private String queueGroupNo_2;
@ApiParam("客户上线时间2")
private String custOnLineTime_2;
@ApiParam("料架号3")
private String queueGroupNo_3;
@ApiParam("客户上线时间3")
private String custOnLineTime_3;
@ApiParam("料架号4")
private String queueGroupNo_4;
@ApiParam("客户上线时间4")
private String custOnLineTime_4;
@ApiParam("客户现场库存")
private Double qty;
}
Loading…
Cancel
Save