【1865 客户JIT生产队列,自动下达定时JOB】

yun-zuoyi
陈思洁 5 years ago
parent 8b63dea809
commit 9b8342b7f5

@ -3115,7 +3115,8 @@ public class MesEnumUtil {
public enum METHOD_TYPE {
EXEC(10, "执行方法"),
COMPLETE(20, "完成方法");
COMPLETE(20, "完成方法"),
HNC_ISSUED(30,"队列自动下达");
private int value;
private String description;

@ -132,6 +132,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("操作类型")
private Integer operateType;
@Column(name = "PROCESS_LABEL_TEMPLATE")
@ApiParam("过程标签模板")
private String processLabelTemplate;
@Column(name = "PROD_LABEL_TEMPLATE")
@ApiParam("产品标签模板")
private String prodLabelTemplate;
// @Version
// @Column(name = "LOCK_VERSION")
// @ApiParam(value = "乐观锁", example = "1")

@ -70,6 +70,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
@ApiParam("客户代码")
private String custCode;
//客户工厂代码
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户产线代码")
private String custPlantCode;
@ -86,6 +87,38 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
@ApiParam("JIT排序号")
private String jitSeq;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商编号")
private String supplierCode;
@Column(name = "SUPPLIER_NAME")
@ApiParam("供应商名称")
private String supplierName;
@Column(name = "VEHICLE_CODE")
@ApiParam("车型代码")
private String vehicleCode;
@Column(name = "VEHICLE_NAME")
@ApiParam("车型名称")
private String vehicleName;
@Column(name = "MODEL_YEAR")
@ApiParam("年度型")
private String modelYear;
@Column(name = "CAR_MODEL_CODE")
@ApiParam("车系编号")
private String carModelCode;
@Column(name = "CAR_SERIES")
@ApiParam("车系名称")
private String carSeries;
@Column(name = "CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
private String custProdLineCode;
@Transient
@ApiParam("客户需求开始时间")
private String custPointStartDate;

@ -0,0 +1,60 @@
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:
* @Reference:
* @Author: jessica.chen
* @CreateDate: 2019\11\15 10:01
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM")
@Api("MES_客户JIT生产队列散件清单")
public class MesQueueJitActualBom extends BaseBean implements Serializable {
private static final long serialVersionUID = -5412635747424111476L;
@Column(name = "JIS_ACTUAL_NO")
@ApiParam("队列编号")
private String jisActualNo;
@Column(name = "ASSY_NO")
@ApiParam("组件编号")
private String assyNo;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private Double produceCtgyCode = 0D;
@Column(name = "CUST_PART_NO")
@ApiParam("客户物料号")
private String custPartNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "QTY")
@ApiParam("用量")
private Double qty = 0d;
@Column(name = "PART_COLOR_VALUE")
@ApiParam("零件色值")
private String partColorValue;
}

@ -74,4 +74,16 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
@Column(name = "seq")
@ApiParam("主序编号")
private String seq;
@Column(name = "PRODUCE_COLOR")
@ApiParam("产品颜色")
private String produceColor;
@Column(name = "OPTION_CODE")
@ApiParam("选项代码")
private String optionCode;
@Column(name = "ASSY_NO")
@ApiParam("组件编号")
private String assyNo;
}

@ -100,6 +100,18 @@ public class MesQueueOrder extends BaseBean implements Serializable {
@ApiParam("客户JIT队列编号")
private String jitActualNo;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "MODEL_YEAR")
@ApiParam("年度型")
private String modelYear;
@Column(name = "GRADE_CODE")
@ApiParam("等级代码")
private String gradeCode;
@Transient
@ApiParam("起始车号")
private String custFlagNoStart;

@ -0,0 +1,60 @@
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:
* @Reference:
* @Author: jessica.chen
* @CreateDate: 2019\11\15 10:01
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_ORDER_BOM")
@Api("MES_生产队列散件清单")
public class MesQueueOrderBom extends BaseBean implements Serializable {
private static final long serialVersionUID = -5412635747424111476L;
@Column(name = "ORDER_NO")
@ApiParam("主队列编号")
private String orderNo;
@Column(name = "VIN_CODE")
@ApiParam("Vin")
private String vinCode;
@Column(name = "ASSY_NO")
@ApiParam("组件编号")
private String assyNo;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "QTY")
@ApiParam("用量")
private Double qty = 0d;
@Column(name = "COLOR_CODE")
@ApiParam("颜色代码")
private String colorCode;
}

@ -86,7 +86,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@Column(name = "IS_GROUP_PRINTED")
@ApiParam("料架是否已打印")
private Integer isGroupPrinted;
private Integer isGroupPrinted = 2;
@Transient
@ApiParam("队列序号")
@ -96,6 +96,18 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@ApiParam("已生产数量")
private Double finsihQty;
@Column(name = "PRODUCE_COLOR")
@ApiParam("产品颜色")
private String produceColor;
@Column(name = "OPTION_CODE")
@ApiParam("选项代码")
private String optionCode;
@Column(name = "ASSY_NO")
@ApiParam("组件编号")
private String assyNo;
public double getQueueSeqVal() {
return this.queueSeq == null ? 0.0d : this.queueSeq;
}

@ -75,4 +75,15 @@ public class MesQueueShipping extends BaseBean implements Serializable {
@ApiParam("客户JIT队列编号")
private String jitActualNo;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "MODEL_YEAR")
@ApiParam("年度型")
private String modelYear;
@Column(name = "GRADE_CODE")
@ApiParam("等级代码")
private String gradeCode;
}

@ -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.IfQcOrder;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitActualBom;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\18 10:34
* @Modify:
**/
public interface MesQueueJitActualBomRepository extends BaseRepository<MesQueueJitActualBom, Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderBom;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\18 10:34
* @Modify:
**/
public interface MesQueueOrderBomRepository extends BaseRepository<MesQueueOrderBom, Long> {
}
Loading…
Cancel
Save