Merge remote-tracking branch 'origin/test' into test

yun-zuoyi
钮海涛 5 years ago
commit 4dd875a691

@ -3864,7 +3864,7 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROCESS_INSPECTION {
NOT_CREATE(10, "未创建"),
CREATE(20, "创建"),
CREATE(20, "创建"),
PROCESS(30, "执行中"),
COMPLETE(40, "完成");

@ -44,6 +44,18 @@ public class MesDefect extends BaseBean implements Serializable {
@ApiParam("缺陷类型")
private String defectType;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "DEFECT_FLAG_VALUE")
@ApiParam("缺陷标识值")
private String defectFlagValue;
@Column(name = "DEFECT_ACTION_TYPE")
@ApiParam("不良处理类型")
private String defectActionType;
@Transient
@ApiParam("缺陷类型名称")
private String defectTypeName;

@ -25,7 +25,7 @@ import java.io.Serializable;
@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
}
}
)
@Api("包装规格明细")
public class MesPackageDetail extends BaseBean implements Serializable {

@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesObjectCfg;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail;
/**

@ -0,0 +1,80 @@
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.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: dominic
* @CreateDate: 2020/10/29 14:11
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_PACKAGE")
@Api("料箱表")
public class IfPackage extends BaseBean implements Serializable {
private static final long serialVersionUID = 9099416791684702129L;
@Column(name = "PACKAGE_NO")
@ApiParam("包装编号")
private String packageNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;
@Column(name = "PORCESS_NAME")
@ApiParam("工序名称")
private String porcessName;
@Column(name = "RK_TYPE")
@ApiParam("料架类型")
private String rkType;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;
@Column(name = "ACTION_DATE_TIME")
@ApiParam("操作时间")
private String actionDateTime;
@Column(name = "ACTION_USER")
@ApiParam("操作人")
private String actionUser;
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
}

@ -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 : MES_
* @Reference :
* @Author : dominic.xiao
* @CreateDate : 2020-11-02 17:47
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CONTAINER_LOCATION")
@Api("MES_容器位置")
public class MesContainerLocation extends BaseBean implements Serializable {
private static final long serialVersionUID = 8181007288150974903L;
@Column(name = "CT_CODE")
@ApiParam(value = "容器类型代码")
private String ctCode;
@Column(name = "CT_LOCATION_NO")
@ApiParam(value = "容器位置编号")
private String ctLocationNo;
@Column(name = "LOCATION_CAPACITY")
@ApiParam(value = "默认容量")
private String locationCapacity;
}

@ -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 : MES_
* @Reference :
* @Author : dominic.xiao
* @CreateDate : 2020-11-02 18:19
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CUSTOMER_SN_RULE")
@Api("MES_客户条码规则")
public class MesCustomerSnRule extends BaseBean implements Serializable {
private static final long serialVersionUID = -3928160156339420471L;
@Column(name = "CUSTOMER_CODE")
@ApiParam(value = "客户代码")
private String customerCode;
@Column(name = "CUSTOMER_PART_NO")
@ApiParam(value = "客户零件号")
private String customerPartNo;
@Column(name = "PART_NO")
@ApiParam(value = "物料号")
private String partNo;
@Column(name = "LENGTH")
@ApiParam(value = "长度")
private Integer length;
@Column(name = "FROM1")
@ApiParam(value = "起始1")
private Integer from1;
@Column(name = "TO1")
@ApiParam(value = "至1")
private Integer to1;
@Column(name = "FIX1")
@ApiParam(value = "内容1")
private String fix1;
}

@ -48,6 +48,10 @@ public class MesDefect extends BaseBean implements Serializable {
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "DEFECT_ACTION_TYPE")
@ApiParam("不良处理类型")
private String defectActionType;
@Column(name = "DEFECT_FLAG_VALUE")
@ApiParam("缺陷标识值")
private String defectFlagValue;
@ -67,6 +71,7 @@ public class MesDefect extends BaseBean implements Serializable {
@Transient
@ApiParam("缺陷类型子集")
private List<MesDefect> mesDefectList;
public MesDefect() {
}

@ -0,0 +1,39 @@
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: dominic
* @CreateDate: 2020\11\13 09:59
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DEFECT_LOCATION")
@Api("产品缺陷位置")
public class MesDefectLocation extends BaseBean implements Serializable {
@Column(name = "DEFECT_LOCATION")
@ApiParam("缺陷位置代码")
private String defectLocation;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷位置名称")
private String defectName;
}

@ -23,7 +23,13 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")
@Table(name = "MES_PACKAGE", indexes = {
@Index(columnList = "PACKAGE_NO"),
@Index(columnList = "PART_NO"),
@Index(columnList = "WORK_ORDER_NO"),
@Index(columnList = "WORK_CENTER_CODE"),
@Index(columnList = "WORK_CELL_CODE"),
@Index(columnList = "IS_SEALED")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
})

@ -34,6 +34,10 @@ public class MesPackageDetail extends BaseBean implements Serializable {
@ApiParam("包装编码")
private String packageNo;
@Column(name = "CT_LOCATION_NO", nullable = false)
@ApiParam("容器位置编号")
private String ctLocationNo;
@Column(name = "SERIAL_NUMBER", nullable = false)
@ApiParam("过程条码")
private String serialNumber;

@ -34,6 +34,10 @@ public class MesPackageTravel extends BaseBean implements Serializable {
@ApiParam("包装编码")
private String packageNo;
@Column(name = "CT_LOCATION_NO", nullable = false)
@ApiParam("容器位置编号")
private String ctLocationNo;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;

@ -0,0 +1,48 @@
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;
/**
* @Description : MES_
* @Reference :
* @Author : dominic.xiao
* @CreateDate : 2020-11-02 18:04
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_CONTAINER_CAPACITY")
@Api("MES_产品容器容量配置")
public class MesPartContainerCapacity extends BaseBean {
private static final long serialVersionUID = 6438819635320965628L;
@Column(name = "PART_NO")
@ApiParam(value = "物料编码")
private String partNo;
@Column(name = "CT_CODE")
@ApiParam(value = "容器类型代码")
private String ctCode;
@Column(name = "CT_LOCATION_NO")
@ApiParam(value = "容器位置编号")
private String ctLocationNo;
@Column(name = "CT_QTY")
@ApiParam(value = "容量")
private Integer ctQty;
}

@ -39,6 +39,10 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable {
@ApiParam("面位")
private String sideLocation;
@Column(name = "DEFECT_LOCATION")
@ApiParam("缺陷位置代码")
private String defectLocation;
@Column(name = "FILE_ID")
@ApiParam("文件id")
private Long fileId;

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesContainerLocation;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: dominic
* @CreateDate: 2020\11\4 11:21
* @Modify:
**/
@Repository
public interface MesContainerLocationRepository extends BaseRepository<MesContainerLocation, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesCustomerSnRule;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: dominic
* @CreateDate: 2020\11\4 13:33
* @Modify:
**/
@Repository
public interface MesCustomerSnRuleRepository extends BaseRepository<MesCustomerSnRule, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPartContainerCapacity;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : dominic
* @CreateDate : 2020-11-10
* @Modify:
**/
@Repository
public interface MesPartContainerCapacityRepository extends BaseRepository<MesPartContainerCapacity, Long> {
}

@ -730,6 +730,7 @@ public class MesHqlPack {
/**
* 线
*
* @param boardLineMatrix
* @param organizeCode
* @return
@ -3540,4 +3541,88 @@ public class MesHqlPack {
}
return packBean;
}
/**
* MES_
*
* @param boardCustomParamCfg
* @return
*/
public static DdlPackBean getBoardCustomParamCfg(MesBoardCustomParamCfg boardCustomParamCfg) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(boardCustomParamCfg.getOrganizeCode());
if (!StringUtils.isEmpty(boardCustomParamCfg.getBoardCode())) {
DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getBoardCode(), "boardCode", packBean);
}
if (!StringUtils.isEmpty(boardCustomParamCfg.getParamCode())) {
DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamCode(), "paramCode", packBean);
}
if (!StringUtils.isEmpty(boardCustomParamCfg.getParamName())) {
DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamName(), "paramName", packBean);
}
return packBean;
}
/**
* MES
*
* @param mesContainerLocation
* @return
*/
public static DdlPackBean getMesContainerLocation(MesContainerLocation mesContainerLocation) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesContainerLocation, mesContainerLocation.getOrganizeCode());
if (!StringUtils.isEmpty(mesContainerLocation.getOrganizeCode())) {
DdlPreparedPack.getStringLikerPack(mesContainerLocation.getOrganizeCode(), "organizeCode", packBean);
}
if (!StringUtils.isEmpty(mesContainerLocation.getCtCode())) {
DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtCode(), "ctCode", packBean);
}
if (!StringUtils.isEmpty(mesContainerLocation.getCtLocationNo())) {
DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtLocationNo(), "ctLocationNo", packBean);
}
return packBean;
}
/**
* MES
*
* @param mesPartContainerCapacity
* @return
*/
public static DdlPackBean getMesPartContainerCapacity(MesPartContainerCapacity mesPartContainerCapacity) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesPartContainerCapacity, mesPartContainerCapacity.getOrganizeCode());
if (!StringUtils.isEmpty(mesPartContainerCapacity.getOrganizeCode())) {
DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getOrganizeCode(), "organizeCode", packBean);
}
if (!StringUtils.isEmpty(mesPartContainerCapacity.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtCode())) {
DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtCode(), "ctCode", packBean);
}
if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtLocationNo())) {
DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtLocationNo(), "ctLocationNo", packBean);
}
return packBean;
}
/**
* MES
*
* @param mesCustomerSnRule
* @return
*/
public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule mesCustomerSnRule) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustomerSnRule, mesCustomerSnRule.getOrganizeCode());
if (!StringUtils.isEmpty(mesCustomerSnRule.getOrganizeCode())) {
DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getOrganizeCode(), "organizeCode", packBean);
}
if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) {
DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean);
}
if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) {
DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", packBean);
}
return packBean;
}
}

@ -696,10 +696,23 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
this.custNo = custNo;
}
public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode) {
public WmsDocMovementDetails(String orderNo, String prodCfgTypeCode, String prodCfgTypeName,
Double qty, String planDate, String planTime, String custNo) {
this.orderNo = orderNo;
this.prodCfgTypeCode = prodCfgTypeCode;
this.prodCfgTypeName = prodCfgTypeName;
this.qty = qty;
this.planDate = planDate;
this.planTime = planTime;
this.custNo = custNo;
}
public WmsDocMovementDetails(String orderNo, Double pickQty, String prodCfgTypeCode, String custNo) {
this.orderNo = orderNo;
this.pickQty = pickQty;
this.prodCfgTypeCode = prodCfgTypeCode;
this.custNo = custNo;
}
}

@ -324,11 +324,13 @@ public class WmsPOMasterDetails extends BaseBean {
this.qty = qty;
}
public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty,
public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty,
Double rcQty, Integer itemStatus) {
this.orderNo = orderNo;
this.erpSrcNo = erpSrcNo;
this.item = item;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.qty = qty;
this.rcQty = rcQty;
this.itemStatus = itemStatus;

@ -61,7 +61,11 @@ public class WmsPushConfig extends BaseBean{
@Column(name = "SCRIPT_NO")
private String scriptNo;
@ApiParam("附件文件路径获取脚本编号")
@ApiParam("脚本入参")
@Column(name = "SCRIPT_PARAM")
private String scriptParam;
@ApiParam("附件脚本编号")
@Column(name = "ATTACH_SCRIPT_NO")
private String attachScriptNo;

@ -874,4 +874,18 @@ public class WmsStockSn extends BaseBean {
this.partNameRdd = wmsStockSn.getPartNameRdd();
this.sumQty = sumQty;
}
public WmsStockSn( String zoneNo, String locateNo, String partNo,
String partNameRdd, String sn, Double qty, String qualityDate,
Integer snStatus,String lotNo) {
this.zoneNo = zoneNo;
this.locateNo = locateNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.sn = sn;
this.qty = qty;
this.qualityDate = qualityDate;
this.snStatus = snStatus;
this.lotNo = lotNo;
}
}

@ -71,8 +71,8 @@ public class WmsQCStatusModel {
this.proportion = proportion;
this.stdCheckTime = stdCheckTime;
}
public WmsQCStatusModel() {
public Double getStdQcTimeVal() {
return this.stdQcTime == null ? 0 : this.stdQcTime;
}
}

Loading…
Cancel
Save