yun-zuoyi
廖湘明 5 years ago
commit d6ed0a40a1

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

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

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

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

@ -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,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 +
'}';
}
}

@ -141,4 +141,8 @@ public class StepPrintSnModel extends MesProduceSn {
@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,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() {
}

@ -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,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();

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