yun-zuoyi
yumingxing 4 years ago
commit 9202937516

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

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

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

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

@ -244,18 +244,13 @@ public class MesProduceSn extends BaseBean implements Serializable {
this.qcStatus = qcStatus;
this.qty = qty;
}
//sn.serialNumber, sn.productSn, " +
// " sn.partNo, sn.partNameRdd, sn.qty, sn.qcStatus, sn.snStatus, sn.printCount, sn.printStatus" +
// " sn.workCenterCode, sn.workCellCode, sn.routeCode, sn.processCode, sn.nextProcessCode, sn.inWorkCenterTime, " +
// " sn.outWorkCenterTime, sn.shippingTime, sn.workOrderNo, sn.custSn, sn.custPartNo, sn.custCode," +
// " sn.snType, sn.trayNo, sn.operateType, sn.processLabelTemplate, sn.prodLabelTemplate, sn.custLabelTemplate, " +
// " sn.lotNo, sn.defectActionType, sn.vinCode, p.versionNo
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 defectActionType, String vinCode, String versionNo, String createUser, String createDatetime) {
this.id = id;
this.serialNumber = serialNumber;
this.productSn = productSn;
@ -288,6 +283,8 @@ public class MesProduceSn extends BaseBean implements Serializable {
this.defectActionType = defectActionType;
this.vinCode = vinCode;
this.versionNo = versionNo;
this.createUser = createUser;
this.createDatetime = createDatetime;
}
public double getQtyVal() {

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

@ -20,12 +20,12 @@ 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;
@ -34,7 +34,14 @@ public class MesPackageQueryModel extends MesPackage {
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;

@ -12,19 +12,19 @@ import java.util.List;
/**
* @Author: xiangming.liao
* @CreateDate: 2020/12/28 14:24
* @Description: model
* @Description: model
**/
@Api("一次性通过率占比柏拉图报表model")
@Api("缺陷率占比柏拉图报表model")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProduceDispPassPlatoModel {
public class ProduceDefectRatePlatoModel {
@ApiParam("项目号")
private String prodCfgTypeCode;
@ApiParam("零件号")
private String partNo;
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("缺陷代码")
private String defectCode;
@ -41,17 +41,17 @@ public class ProduceDispPassPlatoModel {
@ApiParam("数量")
private Long qty;
public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, String defectCode, String defectName, Long qty) {
public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, String defectCode, String defectName, Long qty) {
this.prodCfgTypeCode = prodCfgTypeCode;
this.partNo = partNo;
this.customerPartNo = customerPartNo;
this.defectCode = defectCode;
this.defectName = defectName;
this.qty = qty;
}
public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, Long qty) {
public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, Long qty) {
this.prodCfgTypeCode = prodCfgTypeCode;
this.partNo = partNo;
this.customerPartNo = customerPartNo;
this.qty = qty;
}
}

@ -12,19 +12,22 @@ 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 extends BaseBean {
public class ProduceDefectRatePlatoQueryModel extends BaseBean {
/**
*
*/
@ApiParam("工序")
private List<String> processCodeList;
private String processCode;
@ApiParam("柱子展示条数")
private Integer displaySize;
//质量状态20冻结30报废
@ApiParam("质量状态")
@ -38,7 +41,7 @@ public class ProduceDispPassPlatoQueryModel extends BaseBean {
@ApiParam("零件号")
private List<String> partNoList;
//统计方式0按月1按天
//统计方式0按月1按天
@ApiParam("统计方式")
private Integer statisticalMethod;

@ -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,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> {
}

@ -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() {
}

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

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

Loading…
Cancel
Save