Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev

yun-zuoyi
andly.pan 4 years ago
commit 43d7195a37

@ -44,6 +44,10 @@ public class InsertedOrder extends BaseOrder {
@FieldAnnotation(property = false) @FieldAnnotation(property = false)
private Long productRoutingId; private Long productRoutingId;
@Column(name="FINISH_COUNT")
@ApiParam(value ="完工数")
private Double finishCount;
@Column(name="REMARK") @Column(name="REMARK")
@ApiParam(value ="备注") @ApiParam(value ="备注")
private String remark; private String remark;

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EInterMediateDetail;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2021-04-27
* @Modify:
**/
@Data
@EqualsAndHashCode(callSuper = true)
@Entity
@Table(name = "APS_INTER_MEDIATE_DETAIL")
@Api("计算中间结果")
public class InterMediateDetail extends BaseAPS {
private static final long serialVersionUID = -2588016171684238811L;
@Column(name="RESULT_ID")
@ApiParam(value ="中间结果")
@FieldAnnotation(relation = "InterMediateResult")
private Long resultId;
@Column(name="RULE")
@ApiParam(value ="评估规则")
private String rule;
@Column(name="EVALUATE_VALUE")
@ApiParam(value ="评估值")
private Double evaluateValue;
public InterMediateResult getResult() { return BeanRelation.get(this, EInterMediateDetail.Result); }
public void setResult(InterMediateResult result) {
this.resultId = result != null ? result.getId() : 0;
BeanRelation.set(this, EInterMediateDetail.Result, result);
}
}

@ -0,0 +1,67 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EInterMediateResult;
import cn.estsh.i3plus.pojo.aps.holders.EWorkInput;
import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2021-04-25
* @Modify:
**/
@Data
@EqualsAndHashCode(callSuper = true)
@Entity
@Table(name = "APS_INTER_MEDIATE_RESULT")
@Api("计算中间结果")
public class InterMediateResult extends BaseAPS {
private static final long serialVersionUID = -1869359887027950540L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(relation = "Work")
private Long workId;
@Column(name="RESOURCE_ID")
@ApiParam(value ="资源")
@FieldAnnotation(relation = "Resource")
private Long resourceId;
@Column(name="EVALUATE_VALUE")
@ApiParam(value ="评估值")
private Double evaluateValue;
public Work getWork() {
return BeanRelation.get(this, EInterMediateResult.Work);
}
public void setWork(Work work) {
this.workId = work != null ? work.getId() : 0l;
BeanRelation.set(this, EInterMediateResult.Work, work);
}
public Resource getResource() { return BeanRelation.get(this, EInterMediateResult.Resource); }
public void setResource(Resource resource) {
this.resourceId = resource != null ? resource.getId() : 0l;
BeanRelation.set(this, EInterMediateResult.Resource, resource);
}
@JsonBackReference
public List<InterMediateDetail> getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); }
}

@ -33,11 +33,6 @@ import java.util.List;
public class Inventory extends BaseOrder { public class Inventory extends BaseOrder {
private static final long serialVersionUID = 2378846162007550439L; private static final long serialVersionUID = 2378846162007550439L;
@Column(name="ORDER_STATUS")
@ApiParam(value ="订单状态")
@FieldAnnotation(defaultValue = "UNCOMMIT")
private ApsEnumUtil.INVENTORY_ORDER_STATUS orderStatus = ApsEnumUtil.INVENTORY_ORDER_STATUS.UNCOMMIT;
@Column(name="SPECIFY_TOP_ORDER") @Column(name="SPECIFY_TOP_ORDER")
@ApiParam(value ="指定顶层订单") @ApiParam(value ="指定顶层订单")
private String specifyTopOrder; private String specifyTopOrder;

@ -98,6 +98,10 @@ public class ProductOrder extends BaseOrder {
@FieldAnnotation(defaultValue = "false", display = false) @FieldAnnotation(defaultValue = "false", display = false)
private Boolean autoSupply; private Boolean autoSupply;
@Column(name="FINISH_COUNT")
@ApiParam(value ="完工数")
private Double finishCount;
@Column(name="PRODUCT_ROUTING_ID") @Column(name="PRODUCT_ROUTING_ID")
@ApiParam(value ="工艺路线") @ApiParam(value ="工艺路线")
@FieldAnnotation(property = false) @FieldAnnotation(property = false)

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import cn.estsh.i3plus.pojo.aps.holders.ESafeStockOrder; import cn.estsh.i3plus.pojo.aps.holders.ESafeStockOrder;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
@ -30,16 +31,25 @@ public class SafeStockOrder extends BaseOrder {
private static final long serialVersionUID = 5944067344390531794L; private static final long serialVersionUID = 5944067344390531794L;
@JsonIgnore @Column(name="ORDER_STATUS")
public Work getWork() { @ApiParam(value ="订单状态")
return BeanRelation.get(this, EBaseOrder.Works); @FieldAnnotation(defaultValue = "UNCOMMIT")
} private ApsEnumUtil.SAFE_STOCK_ORDER_STATUS orderStatus = ApsEnumUtil.SAFE_STOCK_ORDER_STATUS.UNCOMMIT;
@Column(name="INVENTORY_ID") @Column(name="INVENTORY_ID")
@ApiParam(value ="库存") @ApiParam(value ="库存")
@FieldAnnotation(relation = "Inventory", notEmpty = true) @FieldAnnotation(relation = "Inventory", notEmpty = true)
private Long inventoryId; private Long inventoryId;
@Column(name="FINISH_COUNT")
@ApiParam(value ="完工数")
private Double finishCount;
@JsonIgnore
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
}
public Inventory getInventory() { return BeanRelation.get(this, ESafeStockOrder.Inventory); } public Inventory getInventory() { return BeanRelation.get(this, ESafeStockOrder.Inventory); }
public void setInventory(Inventory inventory) { public void setInventory(Inventory inventory) {

@ -49,4 +49,8 @@ public class SysParam extends BaseAPS {
@Column(name="INVENTORY_RATE") @Column(name="INVENTORY_RATE")
@ApiParam(value ="库存误差百分比") @ApiParam(value ="库存误差百分比")
private Double inventoryRate; private Double inventoryRate;
@Column(name="RECORD_RESULT")
@ApiParam(value ="记录资源评估结果")
private Boolean recordResult;
} }

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EWork; import cn.estsh.i3plus.pojo.aps.holders.EWork;
import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool;
import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
@ -47,7 +48,7 @@ public class Work extends BaseAPS {
@Column(name="WORK_TYPE") @Column(name="WORK_TYPE")
@ApiParam(value ="工作类型") @ApiParam(value ="工作类型")
@FieldAnnotation(property = false) @FieldAnnotation(display = false)
private ApsEnumUtil.WORK_TYPE workType; private ApsEnumUtil.WORK_TYPE workType;
@Column(name="count", columnDefinition = "decimal(18,8)") @Column(name="count", columnDefinition = "decimal(18,8)")
@ -159,10 +160,13 @@ public class Work extends BaseAPS {
@FieldAnnotation(property = false) @FieldAnnotation(property = false)
private Long mainPlanId; private Long mainPlanId;
@Column(name="DYN_SPLIT_WORK_ID") // @Column(name="DYN_SPLIT_WORK_ID")
@ApiParam(value ="动态拆分的工作ID") // @ApiParam(value ="动态拆分的工作ID")
@FieldAnnotation(property = false) // private Long dynSplitWorkId;
private Long dynSplitWorkId;
@Column(name="ORIGIN_WORK_ID")
@ApiParam(value ="动态拆分工作ID")
private Long originWorkId;
private transient boolean hasOptimized = false; private transient boolean hasOptimized = false;
@ -223,6 +227,7 @@ public class Work extends BaseAPS {
return BeanRelation.get(this, EWork.PlanFeedback); return BeanRelation.get(this, EWork.PlanFeedback);
} }
@JsonBackReference
public WorkPlan getMainPlan() { return BeanRelation.get(this, EWork.MainPlan); } public WorkPlan getMainPlan() { return BeanRelation.get(this, EWork.MainPlan); }
public void setMainPlan(WorkPlan plan) { public void setMainPlan(WorkPlan plan) {
@ -241,4 +246,23 @@ public class Work extends BaseAPS {
this.specifyResourceId = resource != null ? resource.getId() : 0; this.specifyResourceId = resource != null ? resource.getId() : 0;
BeanRelation.set(this, EWork.SpecifyResource, resource); BeanRelation.set(this, EWork.SpecifyResource, resource);
} }
public double getWorkCount() {
if (!APSDoubleTool.isZero(getSpecifyCount())) {
return getSpecifyCount();
}
return getCount();
}
@JsonBackReference
public List<Work> getDynSplitWorks() { return BeanRelation.list(this, EWork.DynSplitWorks); }
public Work getOriginWork() {
return BeanRelation.get(this, EWork.OriginWork);
}
public void setOriginWork(Work work) {
this.originWorkId = work != null ? work.getId() : 0;
BeanRelation.set(this, EWork.OriginWork, work);
}
} }

@ -48,7 +48,7 @@ public class BeanRelation {
return result; return result;
} }
for (Enum<?> holder : beanInfo.getAllHolders()) { for (Enum<?> holder : beanInfo.getAllHolders()) {
result.put(holder, new LinkedList<>()); result.put(holder, new ArrayList<>());
} }
return result; return result;
} }

@ -0,0 +1,5 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EInterMediateDetail {
Result
}

@ -0,0 +1,7 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EInterMediateResult {
Work,
Resource,
Details
}

@ -13,4 +13,6 @@ public enum EWork {
MainPlan, // 关联的为主资源的计划 MainPlan, // 关联的为主资源的计划
WorkPlans, // 关联的工作计划 WorkPlans, // 关联的工作计划
SpecifyResource, // 指定资源 SpecifyResource, // 指定资源
DynSplitWorks, // 动态拆分后的工作
OriginWork, // 动态拆分前的工作
} }

@ -0,0 +1,7 @@
package cn.estsh.i3plus.pojo.aps.tool;
public class APSDoubleTool {
public static boolean isZero(Double value) {
return (value == null) || (value > -0.000001 && value < 0.000001);
}
}

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.validator;
import cn.estsh.i3plus.pojo.aps.annotation.ShiftTimeAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.ShiftTimeAnnotation;
import cn.estsh.i3plus.pojo.aps.model.TimeBlock; import cn.estsh.i3plus.pojo.aps.model.TimeBlock;
import cn.estsh.i3plus.pojo.base.util.StringUtil;
import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext; import javax.validation.ConstraintValidatorContext;
@ -13,6 +14,9 @@ public class ShiftTimeValidator implements ConstraintValidator<ShiftTimeAnnotati
@Override @Override
public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) { public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) {
if (StringUtil.isEmpty(s)) {
return false;
}
for (String strTime : s.split(",")) { for (String strTime : s.split(",")) {
String[] times = strTime.split("-"); String[] times = strTime.split("-");
if (times.length != 2) { if (times.length != 2) {

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="InterMediateResult">
<Relation field="Work" name="Work" type="MULTI_TO_ONE">
</Relation>
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE">
</Relation>
<Relation field="Details" name="InterMediateDetail" reverse="Result" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

@ -20,4 +20,6 @@
</Relation> </Relation>
<Relation field="SpecifyResource" name="Resource" type="MULTI_TO_ONE"> <Relation field="SpecifyResource" name="Resource" type="MULTI_TO_ONE">
</Relation> </Relation>
<Relation field="DynSplitWorks" name="Work" reverse="OriginWork" type="ONE_TO_MULTI">
</Relation>
</Class> </Class>

@ -669,13 +669,14 @@ public class ApsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_SORT_RULE { public enum WORK_SORT_RULE {
ORDER_LET("ORDER_LET", "订单交货期"), ORDER_LET("ORDER_LET", "订单最晚结束时刻计算值"),
ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"), ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"),
ORDER_EST("ORDER_EST", "订单最早开始时刻"), ORDER_EST("ORDER_EST", "订单最早开始时刻"),
ORDER_COUNT("ORDER_COUNT", "订单数量"), ORDER_COUNT("ORDER_COUNT", "订单数量"),
ORDER_RECEIVE_DATE("ORDER_RECEIVE_DATE", "订单接单日期"), ORDER_RECEIVE_DATE("ORDER_RECEIVE_DATE", "订单接单日期"),
ORDER_LET_SUB_EST("ORDER_LET_SUB_EST", "订单交货期与订单最早开始时刻之差"), ORDER_LET_SUB_EST("ORDER_LET_SUB_EST", "订单交货期与订单最早开始时刻之差"),
ORDER_SURPLUS("ORDER_SURPLUS", "订单余裕度"), ORDER_SURPLUS("ORDER_SURPLUS", "订单余裕度"),
ORDER_CODE("ORDER_CODE", "订单编码"),
NOPLAN_OPERATION_SIZE("NOPLAN_OPERATION_SIZE", "残留工序数"), NOPLAN_OPERATION_SIZE("NOPLAN_OPERATION_SIZE", "残留工序数"),
REMAIN_PRODUCE_TIME("REMAIN_PRODUCE_TIME", "残留生产时间"), REMAIN_PRODUCE_TIME("REMAIN_PRODUCE_TIME", "残留生产时间"),
MIN_OPERATION_REMAIN_TIME("MIN_OPERATION_REMAIN_TIME", "最小工序宽裕时间"), MIN_OPERATION_REMAIN_TIME("MIN_OPERATION_REMAIN_TIME", "最小工序宽裕时间"),
@ -685,7 +686,7 @@ public class ApsEnumUtil {
HAVE_HIGH_WORK("HAVE_HIGH_WORK", "订单中含有高级别工作"), HAVE_HIGH_WORK("HAVE_HIGH_WORK", "订单中含有高级别工作"),
WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"), WORK_RESOURCE_SIZE("WORK_RESOURCE_SIZE", "工作的可用资源数"),
TOP_ORDER_LET("TOP_ORDER_LET", "顶层订单的交货期"), TOP_ORDER_LET("TOP_ORDER_LET", "顶层订单的交货期"),
TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单码"), TOP_ORDER_CODE("TOP_ORDER_CODE", "顶层订单码"),
TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"), TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"),
CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式"); CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式");
@ -769,6 +770,7 @@ public class ApsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_TYPE { public enum WORK_TYPE {
FICTITIOUS("FICTITIOUS", "虚拟工作"), FICTITIOUS("FICTITIOUS", "虚拟工作"),
DYNAMIC_FICTITIOUS("DYNAMIC_FICTITIOUS", "动态虚拟工作"),
NORMAL("NORMAL", "普通工作"); NORMAL("NORMAL", "普通工作");
private String value; private String value;
@ -1179,14 +1181,14 @@ public class ApsEnumUtil {
* *
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum INVENTORY_ORDER_STATUS { public enum SAFE_STOCK_ORDER_STATUS {
UNCOMMIT("UNCOMMIT", "待处理"), UNCOMMIT("UNCOMMIT", "待处理"),
COMMIT("COMMIT", "确认"); COMMIT("COMMIT", "确认");
private String value; private String value;
private String description; private String description;
INVENTORY_ORDER_STATUS(String value, String description) { SAFE_STOCK_ORDER_STATUS(String value, String description) {
this.value = value; this.value = value;
this.description = description; this.description = description;
} }

@ -2100,7 +2100,8 @@ public class MesEnumUtil {
MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"), MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"),
MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"),
MES_JISA(640, "jisaExcelService", "JISA导入"), MES_JISA(640, "jisaExcelService", "JISA导入"),
MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"); MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"),
MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入");
private int value; private int value;
private String service; private String service;

@ -22,6 +22,7 @@ public class MdmHqlPack {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isMdmPublished", ddlPackBean);
DdlPreparedPack.getNumEqualPack(mdmBean.isValid, "isValid", ddlPackBean);
return ddlPackBean; return ddlPackBean;
} }

@ -111,4 +111,25 @@ public class IfDismantleRecord extends BaseBean implements Serializable {
@Column(name = "DEFECT_CODE") @Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码") @ApiParam("缺陷代码")
private String defectCode; private String defectCode;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name = "DC_CODE")
@ApiParam("缺陷原因代码")
private String dcCode;
@Column(name = "DC_NAME")
@ApiParam("缺陷原因名称")
private String dcName;
@Column(name = "REPAIR_CODE")
@ApiParam("维修代码")
private String repairCode;
@Column(name = "REPAIR_NAME")
@ApiParam("维修名称")
private String repairName;
} }

@ -5,17 +5,13 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
/** /**
@ -31,7 +27,9 @@ import java.io.Serializable;
@DynamicUpdate @DynamicUpdate
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED) @Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "IF_PRODUCT_OFF_LINE") @Table(name = "IF_PRODUCT_OFF_LINE", uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "ITEM_PART_NO"})
})
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Api("生产报工表") @Api("生产报工表")

@ -0,0 +1,55 @@
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:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-16-17:36
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_CONTAINER_SN_RECORD", indexes = {
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "PART_NO"),
@Index(columnList = "CT_NO")
})
@Api("容器条码记录表")
public class MesContainerSnRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -303802118993255101L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "CT_NO")
@ApiParam("容器号")
private String ctNo;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
}

@ -0,0 +1,42 @@
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;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/10/18 2:55
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_HOLIDAY_VACTION")
@Api("节假日")
public class MesHolidayVacation extends BaseBean implements Serializable {
private static final long serialVersionUID = -1620451254243818560L;
@Column(name = "YEAR")
@ApiParam("年")
private String year;
@Column(name = "MONTH")
@ApiParam("月")
private String month;
@Column(name = "DAY")
@ApiParam("日")
private String day;
}

@ -0,0 +1,49 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.model.ProductDataModel;
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.List;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate:2019\10\9 0009
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_PLC_DATA_RECORD", indexes = {
@Index(columnList = "PLC_CODE")
})
@Api("PLC数据记录表")
public class MesPlcDataRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -8789141495695469898L;
@Column(name = "PLC_CODE")
@ApiParam("PLC代码")
private String plcCode;
@Column(name = "PLC_NAME")
@ApiParam("PLC名称")
private String plcName;
@Column(name = "PLC_VLAUE")
@ApiParam("PLC型号")
private String plcValue;
}

@ -123,6 +123,10 @@ public class MesQcOrder extends BaseBean implements Serializable {
@ApiParam("任务单类型") @ApiParam("任务单类型")
private String checkOrderType; private String checkOrderType;
@Column(name = "ON_SITE_FREQUENCY")
@ApiParam("巡检次数")
private Integer onSiteFrequency = 0;
@Deprecated @Deprecated
@ApiParam(value = "检测结果") @ApiParam(value = "检测结果")
@Transient @Transient
@ -163,4 +167,12 @@ public class MesQcOrder extends BaseBean implements Serializable {
@Transient @Transient
@ApiParam("质检单集合") @ApiParam("质检单集合")
private List<String> orderNoList; private List<String> orderNoList;
@Transient
@ApiParam("控制计划编号")
private String controlPlanId;
@Transient
@ApiParam("班组")
private String shiftGroupName;
} }

@ -73,4 +73,16 @@ public class MesQuarantineRecord extends BaseBean {
@Column(name = "SCRAP_No") @Column(name = "SCRAP_No")
@ApiParam("报废单号") @ApiParam("报废单号")
private String scrapNo; private String scrapNo;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name = "DC_NAME")
@ApiParam("缺陷原因名称")
private String dcName;
@Column(name = "REPAIR_NAME")
@ApiParam("维修名称")
private String repairName;
} }

@ -60,5 +60,5 @@ public class MesWorkCellDefect extends BaseBean implements Serializable {
@Transient @Transient
@ApiParam("缺陷名称") @ApiParam("缺陷名称")
private String defectCodeName; private String defectName;
} }

@ -393,6 +393,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("生产节拍") @ApiParam("生产节拍")
private Integer takt; private Integer takt;
@Transient
@ApiParam("容器号")
private String ctNo;
/********************** 动态冗余字段(界面维护大写) *********************************/ /********************** 动态冗余字段(界面维护大写) *********************************/
@Transient @Transient

@ -8,6 +8,7 @@ import java.io.Serializable;
/** /**
* - * -
*
* @author yumingxing * @author yumingxing
* @version 1.0 * @version 1.0
* @date 2020/12/18 15:16 * @date 2020/12/18 15:16
@ -51,8 +52,11 @@ public class DefectRecordModel implements Serializable {
@ApiParam(value = "扫描时间") @ApiParam(value = "扫描时间")
public String createDatetime; public String createDatetime;
@ApiParam(value = "图片路径")
private String pictureUrl;
public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) {
public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime, String pictureUrl) {
this.workCenterName = workCenterName; this.workCenterName = workCenterName;
this.processName = processName; this.processName = processName;
this.qcStatus = qcStatus; this.qcStatus = qcStatus;
@ -62,5 +66,6 @@ public class DefectRecordModel implements Serializable {
this.serialNumber = serialNumber; this.serialNumber = serialNumber;
this.createUser = createUser; this.createUser = createUser;
this.createDatetime = createDatetime; this.createDatetime = createDatetime;
this.pictureUrl = pictureUrl;
} }
} }

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesContainerSnRecord;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/5/1 12:21 PM
* @Modify:
*/
public interface MesContainerSnRecordRepository extends BaseRepository<MesContainerSnRecord, Long> {
}

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesHolidayVacation;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/5/7 4:44 PM
* @Modify:
*/
public interface MesHolidayVacationRepository extends BaseRepository<MesHolidayVacation, Long> {
}

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPlcDataRecord;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/5/2 4:11 PM
* @Modify:
*/
public interface MesPlcDataRecordRepository extends BaseRepository<MesPlcDataRecord, Long> {
}

@ -130,6 +130,33 @@ public class WmsDocMovementDetails extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
private Integer itemStatus; private Integer itemStatus;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工序")
private String workCellCode;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name = "DC_CODE")
@ApiParam("缺陷原因代码")
private String dcCode;
@Column(name = "DC_NAME")
@ApiParam("缺陷原因名称")
private String dcName;
@Column(name = "REPAIR_CODE")
@ApiParam("维修代码")
private String repairCode;
@Column(name = "REPAIR_NAME")
@ApiParam("维修名称")
private String repairName;
@Transient @Transient
@ApiParam(value = "完成状态") @ApiParam(value = "完成状态")

@ -6,14 +6,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*; import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
import javax.persistence.Transient;
/** /**
* @Description : * @Description :
@ -96,6 +100,9 @@ public class WmsDocMovementSn extends BaseBean {
@ApiParam(value = "目标库位代码") @ApiParam(value = "目标库位代码")
public String destLocateNo; public String destLocateNo;
@Column(name = "PACKAGE_NO")
@ApiParam(value = "包装编号")
private String packageNo;
@Transient @Transient
@ApiParam("前端表格编辑使用") @ApiParam("前端表格编辑使用")

@ -60,6 +60,10 @@ public class WmsPrintingQueue extends BaseBean{
@ApiParam("供应商编码") @ApiParam("供应商编码")
private String vendorNo; private String vendorNo;
@Column(name="PART_NO")
@ApiParam("物料编码")
public String partNo;
public WmsPrintingQueue() { public WmsPrintingQueue() {
} }

@ -237,6 +237,11 @@ public class WmsStockSn extends BaseBean {
// @ApiParam(value = "乐观锁", example = "1") // @ApiParam(value = "乐观锁", example = "1")
// public Integer lockVersion; // public Integer lockVersion;
@ApiParam("托盘(容器)类型编号")
@Column(name = "CT_CODE")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String ctCode;
@ApiParam(value = "仓库名称") @ApiParam(value = "仓库名称")
@Transient @Transient
public String whNameRdd; public String whNameRdd;
@ -955,4 +960,8 @@ public class WmsStockSn extends BaseBean {
this.zoneNo = zoneNo; this.zoneNo = zoneNo;
this.vendorNo = vendorNo; this.vendorNo = vendorNo;
} }
public WmsStockSn(String partNo, Double qty) {
this.partNo = partNo;
this.qty = qty;
}
} }

@ -3222,6 +3222,9 @@ public class WmsHqlPack {
DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result); DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result);
} }
getStringBuilderPack(details, result); getStringBuilderPack(details, result);
DdlPreparedPack.getOrderByPack(
new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()},
new String[]{"seq"}, result);
return result; return result;
} }
@ -3271,7 +3274,11 @@ public class WmsHqlPack {
//查询参数封装 //查询参数封装
DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result); DdlPreparedPack.getStringLikerPack(wmsTestResultDetails.getBhCode(), "bhCode", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getNumEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result); /**
* @Author : gsz 2021/04/09
* 15635 20027-BH- BH- - 20210430
**/
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getCheckTypeCode(), "checkTypeCode", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result); DdlPreparedPack.getStringEqualPack(wmsTestResultDetails.getQrCode(), "qrCode", result);
if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) { if (StringUtils.isNotBlank(wmsTestResultDetails.getCreateDateTimeStart())) {

Loading…
Cancel
Save