Finish Task #1876 Cost:32h

yun-zuoyi
wynne1005 5 years ago
commit b48ba8c481

@ -0,0 +1,58 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
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 : ANDON_
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-05-13 9:53
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_RITE_ROUTE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_上升流程配置")
public class AndonRiteRoute extends BaseBean implements Serializable {
private static final long serialVersionUID = 5542314911937418047L;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description")
@Column(name = "ANDON_STATUS")
@ApiParam(value = "安灯状态")
private String andonStatus;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心")
private String workCenterCode;
@Column(name = "MEMO")
@ApiParam(value = "备注")
private String memo;
@AnnoOutputColumn(hidden = true)
@Column(name = "WORK_CENTER_NAME_RDD")
@ApiParam(value = "工作中心名称")
private String workCenterNameRdd;
}

@ -0,0 +1,58 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
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 : ANDON_
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-05-13 9:53
* @Modify:
**/
@Data
@Entity
@Table(name="ANDON_RITE_ROUTE_DETAIL")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_上升配置明细")
public class AndonRiteRouteDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 8382210828244626428L;
@Column(name = "RITE_ROUTE_ID")
@ApiParam(value = "上升流程配置ID")
private Long riteRouteId;
@Column(name = "RP_WHERE")
@ApiParam(value = "通知时间")
private String rpWhere;
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "RP_CODE")
@ApiParam(value = "通知方式代码")
private String rpCode;
@Column(name = "RP_OBJECT_CODE")
@ApiParam(value = "通知对象")
private String rpObjectCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description")
@Column(name = "RP_LEVEL")
@ApiParam(value = "通知级别")
private String rpLevel;
}

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.andon.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description: model
* @Reference:
* @Author: wangjie
* @CreateDate:2019-11-12-10:21
* @Modify:
**/
@Data
public class AndonRiteRouteDetailModel implements Serializable {
private static final long serialVersionUID = 1993963582174708808L;
@ApiParam(value = "安灯类型")
private String alarmCode;
@ApiParam(value = "安灯状态")
private String andonStatus;
@ApiParam(value = "工作中心")
private String workCenterCode;
@ApiParam(value = "备注")
private String memo;
@ApiParam(value = "工作中心名称")
private String workCenterNameRdd;
@ApiParam(value = "上升流程配置ID")
private Long riteRouteId;
@ApiParam(value = "通知时间")
private String rpWhere;
@ApiParam(value = "通知方式代码")
private String rpCode;
@ApiParam(value = "通知对象")
private String rpObjectCode;
@ApiParam(value = "通知级别")
private String rpLevel;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRouteDetail;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface IAndonRiteRouteDetailRepository extends BaseRepository<AndonRiteRouteDetail, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonRiteRoute;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface IAndonRiteRouteRepository extends BaseRepository<AndonRiteRoute, Long> {
}

@ -988,4 +988,50 @@ public class AndonHqlPack {
}
return packBean;
}
/**
*
* @param riteRoute
* @param organizeCode
* @return
*/
public static DdlPackBean getAndonRiteRoute(AndonRiteRoute riteRoute, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(riteRoute, organizeCode);
if (!StringUtils.isEmpty(riteRoute.getAlarmCode())) {
DdlPreparedPack.getStringLikerPack(riteRoute.getAlarmCode(), "alarmCode", packBean);
}
if (!StringUtils.isEmpty(riteRoute.getAndonStatus())) {
DdlPreparedPack.getStringEqualPack(riteRoute.getAndonStatus(), "andonStatus", packBean);
}
if (!StringUtils.isEmpty(riteRoute.getWorkCenterCode())) {
DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(riteRoute.getWorkCenterNameRdd())) {
DdlPreparedPack.getStringLikerPack(riteRoute.getWorkCenterNameRdd(), "workCenterNameRdd", packBean);
}
return packBean;
}
/**
*
* @param riteRouteDetail
* @param organizeCode
* @return
*/
public static DdlPackBean getAndonRiteRouteDetail(AndonRiteRouteDetail riteRouteDetail, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(riteRouteDetail, organizeCode);
if (!StringUtils.isEmpty(riteRouteDetail.getRiteRouteId())) {
DdlPreparedPack.getNumEqualPack(riteRouteDetail.getRiteRouteId(), "riteRouteId", packBean);
}
if (!StringUtils.isEmpty(riteRouteDetail.getRpCode())) {
DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpCode(), "rpCode", packBean);
}
if (!StringUtils.isEmpty(riteRouteDetail.getRpLevel())) {
DdlPreparedPack.getStringEqualPack(riteRouteDetail.getRpLevel(), "rpLevel", packBean);
}
if (!StringUtils.isEmpty(riteRouteDetail.getRpObjectCode())) {
DdlPreparedPack.getStringLikerPack(riteRouteDetail.getRpObjectCode(), "rpObjectCode", packBean);
}
return packBean;
}
}

@ -313,7 +313,8 @@ public class MesEnumUtil {
public enum TOOLING_ACTION_RECORD_TYPE {
REPLACE(10, "REPLACE", "更换"),
WAREHOUSE(20, "WAREHOUSE", "入库"),
Use(30, "Use", "领用");
Use(30, "Use", "领用"),
ERROR(40, "ERROR", "异常操作");
private int value;
private String code;
@ -3116,7 +3117,8 @@ public class MesEnumUtil {
public enum METHOD_TYPE {
EXEC(10, "执行方法"),
COMPLETE(20, "完成方法");
COMPLETE(20, "完成方法"),
HNC_ISSUED(30,"队列自动下达");
private int value;
private String description;

@ -6966,4 +6966,76 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SOFT_DATA_FORM {
XML(10, "XML", "XML"), JSON(20, "JSON", "JSON");
private int value;
private String code;
private String description;
SOFT_DATA_FORM(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);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static SOFT_DATA_FORM codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
}

@ -569,7 +569,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public int listCount() {
try{
Long count = entityManager.createQuery("select count(distinct model) from " + persistentClass.getName() + " as model",Long.class)
Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model",Long.class)
.getSingleResult();
return count == null ? 0 : count.intValue();
}catch(NoResultException e){
@ -580,7 +580,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public int findByPropertyCount(String propertyName, Object value) {
try{
String queryString = "select count(distinct model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName;
String queryString = "select count(model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName;
Long count = entityManager.createQuery(queryString, Long.class)
.setParameter(propertyName, value)
.getSingleResult();
@ -612,7 +612,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append("select count(distinct model) from " + persistentClass.getName() + " as model");
queryString.append("select count(model) from " + persistentClass.getName() + " as model");
int size = propertyNames.length;
if (size > 0) {
@ -755,7 +755,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
StringBuffer queryString = new StringBuffer();
queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + " as model where 1=1 ");
queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 ");
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
@ -859,7 +859,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public int findByHqlWhereCount(String hqlWhere) {
StringBuffer queryString = new StringBuffer();
queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() + " as model where 1=1 ");
queryString.append("select count(model) from " + persistentClass.getSimpleName() + " as model where 1=1 ");
if (hqlWhere != null && hqlWhere.length() > 0) {
queryString.append(hqlWhere);
@ -875,7 +875,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public int findByHqlWhereCount(DdlPackBean packBean) {
StringBuffer queryString = new StringBuffer();
queryString.append("select count(distinct model) from " + persistentClass.getSimpleName()
queryString.append("select count(model) from " + persistentClass.getSimpleName()
+ " as model where 1=1 " + packBean.getWhereAppend());
Query query = entityManager.createQuery(queryString.toString(), Long.class);

@ -63,15 +63,15 @@ public class MesEquipmentTooling extends BaseBean implements Serializable {
@ApiParam("更换结束时间")
private String endTime;
@Column(name = "USE_COUNT_MAX")
@ApiParam("最大使用次数")
private Integer useCountMax;
@Column(name = "REMIND_COUNT")
@ApiParam("提醒次数")
private Integer remindCount;
@Transient
@ApiParam("最大次数")
private Integer useCountMax;
@Transient
@ApiParam("按钮名称")
private String btnName;

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

@ -42,4 +42,8 @@ public class MesQcOrderAccessory extends BaseBean implements Serializable {
@Column(name = "ACCESSORY_URL")
@ApiParam("附件路径")
private String accessoryUrl;
@Column(name = "FASTDFS_URL")
@ApiParam("fastDfs地址")
private String fastdfsUrl;
}

@ -32,9 +32,9 @@ import java.io.Serializable;
public class MesQueueJitActualBom extends BaseBean implements Serializable {
private static final long serialVersionUID = 1604529847020812472L;
@Column(name = "JIS_PLAN_NO")
@Column(name = "JIS_ACTUAL_NO")
@ApiParam("队列编号")
private String jisPlanNo;
private String jisActualNo;
@Column(name = "ASSY_NO")
@ApiParam("组件编号")
@ -54,7 +54,7 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
@Column(name = "QTY")
@ApiParam("用量")
private Double qty;
private Double qty = 0d;
@Column(name = "PART_COLOR_VALUE")
@ApiParam("零件色值")

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

@ -1,10 +1,14 @@
package cn.estsh.i3plus.pojo.wms.dbinterface;
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;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -159,4 +163,14 @@ public class WmsInterfaceDataMapper extends BaseBean {
*/
@Column(name = "USE_SCRIPT_FILTER")
public Integer useScriptFilter;
/**
*
*/
@Column(name = "SOFT_DATA_TYPE")
@ApiParam(value = "数据格式类型")
@ColumnDefault("10")
@AnnoOutputColumn(refClass = WmsEnumUtil.SOFT_DATA_FORM.class, refForeignKey = "value", value = "description", required = false)
public Integer softDataType;
}

@ -3146,7 +3146,7 @@ public class WmsHqlPack {
public static DdlPackBean packHqlBasImportTemplate(BasImportTemplate template) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result);
DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result);
DdlPreparedPack.getStringLikerPack(template.getTemplateCode(), "templateCode", result);
DdlPreparedPack.getStringEqualPack(template.getGroupName(), "groupName", result);
getStringBuilderPack(template, result);
return result;

Loading…
Cancel
Save