I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
WYnneaoapc 6 years ago
parent 82fe491bd3 f55e65a227
commit 42a8fb357f
37 changed files with 451 additions and 30 deletions
Show Stats Download Patch File Download Diff File

14
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
Unescape Escape View File

@ -157,6 +157,10 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "解决人")
private String resetUser;
@Column(name = "SOURCE_TYPE")
@ApiParam(value = "安灯来源类型")
private String sourceType = AndonEnumUtil.ALARM_SOURCE_TYPE.SOFT.getValue();
@Transient
@ApiParam(value = "解决人名字")
private String resetUserName;
@ -279,6 +283,10 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "发送标志")
private String sendFlag;
@Column(name = "SIGN_SEND_FLAG")
@ApiParam(value = "响应已通知标识")
private String signSendFlag;
/**
* 处理类型：10=标准处理，20=自处理
*/
@ -325,6 +333,10 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "驳回意见")
private String rejectOpinion;
@Column(name = "OPEN_INFO")
@ApiParam(value = "放行说明")
private String openInfo;
@Transient
@ApiParam(value = "安灯状态集合")
private List<String> statusCodeList;
@ -380,7 +392,7 @@ public class AndonManageQueue extends BaseBean {
* @param workCellCode
* @param workCellNameRdd
* @param alarmCode
* @param ecCode
* @param ecCodec
* @param ecNameRdd
* @param emCode
* @param emNameRdd

8
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java
Unescape Escape View File

@ -264,6 +264,14 @@ public class AndonManageRecord extends BaseBean {
@ApiParam(value = "驳回意见")
private String rejectOpinion;
@Column(name = "OPEN_INFO")
@ApiParam(value = "放行说明")
private String openInfo;
@Column(name = "SIGN_SEND_FLAG")
@ApiParam(value = "响应已通知标识")
private String signSendFlag;
// 是否转呼
public Integer getIsShiftCall() {
return this.isShiftCall == null ? 0 : this.isShiftCall;

46
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java
Unescape Escape View File

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.andon.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 : 安灯任务附属表
* @Reference :
* @Author : crish
* @CreateDate : 2019-09-27 19:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="ANDON_MANAGE_ATTACH")
@Api(value="安灯任务附属信息")
public class AndonQueueAttach extends BaseBean {
@Column(name="PROD_INFO")
@ApiParam(value ="产品信息" , example ="-1")
private String prodInfo;
@Column(name="LINE_INFO")
@ApiParam(value ="产线信息")
private String lineInfo;
@Column(name="ANDON_ORDER_NO")
@ApiParam(value ="安灯任务编号")
private String andonOrderNo;
@Column(name="STATUS_CODE")
@ApiParam(value ="安灯状态")
private String statusCode;
}

4
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java
Unescape Escape View File

@ -49,6 +49,10 @@ public class MesWorkCell extends BaseBean {
private String areaCode;
@Transient
@ApiParam(value ="工作单元中安灯队列标识")
private String workCellSignal;
@Transient
@ApiParam(value ="子集列表")
@AnnoOutputColumn(hidden = true)
private List<MesEquipment> childTreeList;

17
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonQueueAttachRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
import cn.estsh.i3plus.pojo.andon.bean.AndonQueueAttach;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description : 安灯附属表
* @Reference :
* @Author : crish
* @CreateDate : 2019-09-28
* @Modify:
**/
@Repository
public interface IAndonQueueAttachRepository extends BaseRepository<AndonQueueAttach, Long> {
}

2
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
Unescape Escape View File

@ -163,7 +163,7 @@ public class AndonHqlPack {
*/
public static DdlPackBean packHqlMesWorkCell(MesWorkCell mesWorkCell){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(mesWorkCell.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result);
getStringBuilderPack(mesWorkCell, result);

8
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
Unescape Escape View File

@ -5,11 +5,13 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import java.util.Date;
import java.util.List;
@ -21,6 +23,7 @@ import java.util.List;
* @Modify:
**/
@Data
@MappedSuperclass
@Api("订单基类")
public class BaseOrder extends BaseCode {
@Column(name="COUNT")
@ -60,6 +63,7 @@ public class BaseOrder extends BaseCode {
@FieldAnnotation(property = false)
private Long materialId;
@JsonBackReference
public List<Work> getWorks() {
return BeanRelation.list(this, EBaseOrder.Works);
}
@ -73,18 +77,22 @@ public class BaseOrder extends BaseCode {
BeanRelation.set(this, EBaseOrder.Material, material);
}
@JsonBackReference
public List<WorkRelation> getPrevRelations() {
return BeanRelation.list(this, EBaseOrder.PrevRelations);
}
@JsonBackReference
public List<WorkRelation> getPostRelations() {
return BeanRelation.list(this, EBaseOrder.PostRelations);
}
@JsonBackReference
public List<BaseOrder> getUpperOrders() {
return BeanRelation.list(this, EBaseOrder.UpperOrders);
}
@JsonBackReference
public List<BaseOrder> getLowerOrders() {
return BeanRelation.list(this, EBaseOrder.LowerOrders);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
Unescape Escape View File

@ -4,6 +4,7 @@ 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.EExportProject;
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -45,6 +46,7 @@ public class ExportProject extends BaseAPS {
BeanRelation.set(this, EExportProject.Link, link);
}
@JsonBackReference
public List<ExportDetail> getDetails() {
return BeanRelation.list(this, EExportProject.Details);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
Unescape Escape View File

@ -4,6 +4,7 @@ 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.EImportProject;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -43,6 +44,7 @@ public class ImportProject extends BaseAPS {
BeanRelation.set(this, EImportProject.Link, link);
}
@JsonBackReference
public List<ImportDetail> getDetails() {
return BeanRelation.list(this, EImportProject.Details);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -38,6 +39,7 @@ public class Inventory extends BaseOrder {
@ApiParam(value ="多余量")
private Double excessCount;
@JsonIgnore
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
}

8
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
Unescape Escape View File

@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.PREPARE_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.REPLENISHMENT_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EMaterial;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -107,30 +108,37 @@ public class Material extends BaseCode {
@ApiParam(value ="最大库存数量")
private Double maxStockCount;
@JsonBackReference
public List<ProductRouting> getProductRoutings() {
return BeanRelation.list(this, EMaterial.ProductRoutings);
}
@JsonBackReference
public List<OperInput> getOperInputs() {
return BeanRelation.list(this, EMaterial.OperInputs);
}
@JsonBackReference
public List<OperOutput> getOperOutputs() {
return BeanRelation.list(this, EMaterial.OperOutputs);
}
@JsonBackReference
public List<WorkInput> getWorkInputs() {
return BeanRelation.list(this, EMaterial.WorkInputs);
}
@JsonBackReference
public List<WorkOutput> getWorkOutputs() {
return BeanRelation.list(this, EMaterial.WorkOutputs);
}
@JsonBackReference
public List<WorkRelation> getWorkRelations() {
return BeanRelation.list(this, EMaterial.WorkRelations);
}
@JsonBackReference
public List<BaseOrder> getOrders() {
return BeanRelation.list(this, EMaterial.Orders);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
Unescape Escape View File

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EOperInput;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -78,6 +79,7 @@ public class OperInput extends BaseAPS {
BeanRelation.set(this, EOperInput.Material, material);
}
@JsonBackReference
public List<WorkInput> getWorkInputs() {
return BeanRelation.list(this, EOperInput.WorkInputs);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java
Unescape Escape View File

@ -4,6 +4,7 @@ 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.EOperOutput;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -65,6 +66,7 @@ public class OperOutput extends BaseAPS {
BeanRelation.set(this, EOperOutput.Material, material);
}
@JsonBackReference
public List<WorkOutput> getWorkOutputs() {
return BeanRelation.list(this, EOperOutput.WorkOutputs);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
Unescape Escape View File

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EOperResource;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -86,6 +87,7 @@ public class OperResource extends BaseAPS {
BeanRelation.set(this, EOperResource.Resource, res);
}
@JsonBackReference
public List<WorkResource> getWorkResources() {
return BeanRelation.list(this, EOperResource.WorkResources);
}

5
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
Unescape Escape View File

@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL;
import cn.estsh.i3plus.pojo.aps.holders.EOperation;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -96,14 +97,17 @@ public class Operation extends BaseAPS {
BeanRelation.set(this, EOperation.ProductRouting, routing);
}
@JsonBackReference
public List<OperInput> getOperInputs() {
return BeanRelation.list(this, EOperation.OperInputs);
}
@JsonBackReference
public List<OperOutput> getOperOutputs() {
return BeanRelation.list(this, EOperation.OperOutputs);
}
@JsonBackReference
public List<Resource> getOperResources() {
return BeanRelation.list(this, EOperation.OperResources);
}
@ -117,6 +121,7 @@ public class Operation extends BaseAPS {
BeanRelation.set(this, EOperation.StandOperation, std);
}
@JsonBackReference
public List<Work> getWorks() {
return BeanRelation.list(this, EOperation.Works);
}

53
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java
Unescape Escape View File

@ -0,0 +1,53 @@
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.EParentWork;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.List;
/**
* @Description :父工作
* 父工作用于记录工作分割前的信息。
* 生产订单应关联父工作，父工作关联多个工作。
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_PARENT_WORK")
@Api("父工作")
public class ParentWork extends BaseAPS {
@Column(name="count")
@ApiParam(value ="数量")
private Double count;
@Column(name="PRODUCT_ORDER_ID")
@ApiParam(value ="订单")
@FieldAnnotation(property = false)
private Long productOrderId;
public BaseOrder getProductOrder() {
return BeanRelation.get(this, EParentWork.ProductOrder);
}
public void setProductOrder(ProductOrder order) {
this.productOrderId = order != null ? order.getId() : 0l;
BeanRelation.set(this, EParentWork.ProductOrder, order);
}
@JsonBackReference
public List<Work> getWorks() {
return BeanRelation.list(this, EParentWork.Works);
}
}

9
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
Unescape Escape View File

@ -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.holders.EProductOrder;
import cn.estsh.i3plus.pojo.aps.holders.EProductRouting;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -12,6 +13,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
import java.util.List;
/**
* @Description :生产订单
@ -85,6 +87,10 @@ public class ProductOrder extends BaseOrder {
@ApiParam(value ="缺少量")
private Double lackCount;
@Column(name="AUTO_SUPPLY")
@ApiParam(value ="物料计算时自动补充")
private Boolean autoSupply;
@Column(name="PRODUCT_ROUTING_ID")
@ApiParam(value ="工艺路线")
@FieldAnnotation(property = false)
@ -98,4 +104,7 @@ public class ProductOrder extends BaseOrder {
this.productRoutingId = routing != null ? routing.getId() : 0l;
BeanRelation.set(this, EProductOrder.ProductRouting, routing);
}
@JsonBackReference
public List<ParentWork> getParentWorks() { return BeanRelation.list(this, EProductOrder.ParentWorks); }
}

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EProductRouting;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -52,10 +53,12 @@ public class ProductRouting extends BaseCode {
BeanRelation.set(this, EProductRouting.Material, material);
}
@JsonBackReference
public List<Operation> getOperations() {
return BeanRelation.list(this, EProductRouting.Operations);
}
@JsonBackReference
public List<ProductOrder> getProductOrders() {
return BeanRelation.list(this, EProductRouting.ProductOrders);
}

6
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -46,6 +47,11 @@ public class PurchaseOrder extends BaseOrder {
@ApiParam(value ="多余量")
private Double excessCount;
@Column(name="AUTO_SUPPLY")
@ApiParam(value ="物料计算时自动补充")
private Boolean autoSupply;
@JsonIgnore
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -43,6 +44,7 @@ public class SalesOrder extends BaseOrder {
@ApiParam(value ="提前期计算值")
private String calcLeadTime;
@JsonIgnore
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
}

7
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
Unescape Escape View File

@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS;
import cn.estsh.i3plus.pojo.aps.enums.WORK_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EWork;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -115,22 +116,27 @@ public class Work extends BaseCode {
BeanRelation.set(this, EWork.Order, order);
}
@JsonBackReference
public List<WorkResource> getWorkResources() {
return BeanRelation.list(this, EWork.WorkResources);
}
@JsonBackReference
public List<WorkInput> getWorkInputs() {
return BeanRelation.list(this, EWork.WorkInputs);
}
@JsonBackReference
public List<WorkOutput> getWorkOutputs() {
return BeanRelation.list(this, EWork.WorkOutputs);
}
@JsonBackReference
public List<WorkRelation> getWorkRelationInputs() {
return BeanRelation.list(this, EWork.WorkRelationInputs);
}
@JsonBackReference
public List<WorkRelation> getWorkRelationOutputs() {
return BeanRelation.list(this, EWork.WorkRelationOutputs);
}
@ -144,6 +150,7 @@ public class Work extends BaseCode {
BeanRelation.set(this, EWork.Operation, oper);
}
@JsonBackReference
public List<PlanFeedback> getPlanFeedbacks() {
return BeanRelation.list(this, EWork.PlanFeedbacks);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java
Unescape Escape View File

@ -4,6 +4,7 @@ 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.EWorkInput;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -62,6 +63,7 @@ public class WorkInput extends BaseAPS {
BeanRelation.set(this, EWorkInput.Work, work);
}
@JsonBackReference
public List<WorkRelation> getWorkRelations() {
return BeanRelation.list(this, EWorkInput.WorkRelations);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java
Unescape Escape View File

@ -4,6 +4,7 @@ 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.EWorkOutput;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -63,6 +64,7 @@ public class WorkOutput extends BaseAPS {
BeanRelation.set(this, EWorkOutput.Work, work);
}
@JsonBackReference
public List<WorkRelation> getWorkRelations() {
return BeanRelation.list(this, EWorkOutput.WorkRelations);
}

40
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import java.util.*;
import java.util.function.Consumer;
public class BeanInfo {
private Class<? extends BaseBean> cls;
@ -103,6 +104,14 @@ public class BeanInfo {
return null;
}
public Class<? extends BaseBean> getRelationClass(Enum<?> holder) {
RelationInfo relaInfo = getRelationInfo(holder);
if (relaInfo != null) {
return relaInfo.getBeanInfo().getBeanClass();
}
return null;
}
public RELATION_TYPE getRelationType(Enum<?> holder) {
RelationInfo relaInfo = getRelationInfo(holder);
if (relaInfo != null) {
@ -120,31 +129,40 @@ public class BeanInfo {
return RELATION_TYPE.INVALID;
}
public List<Enum<?>> getAllHolders() {
List<Enum<?>> holders = new ArrayList<>();
private void foreach(Consumer<RelationInfo> fun) {
for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
holders.add(entry.getKey());
fun.accept(entry.getValue());
}
if (this.superBeanInfo != null) {
this.superBeanInfo.foreach(fun);
}
}
public List<Enum<?>> getAllHolders() {
List<Enum<?>> holders = new ArrayList<>();
foreach((RelationInfo info)->{
holders.add(info.getHolder());
});
return holders;
}
public List<Enum<?>> getOwnerHolders() {
List<Enum<?>> owners = new ArrayList<>();
for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
if (entry.getValue().isOwner()) {
owners.add(entry.getKey());
foreach((RelationInfo info)->{
if (info.isOwner()) {
owners.add(info.getHolder());
}
}
});
return owners;
}
public List<Enum<?>> getNormalSigns() {
List<Enum<?>> holders = new ArrayList<>();
for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
if (!entry.getValue().isOwner()) {
holders.add(entry.getKey());
foreach((RelationInfo info)->{
if (!info.isOwner()) {
holders.add(info.getHolder());
}
}
});
return holders;
}

16
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
Unescape Escape View File

@ -25,7 +25,7 @@ public class DateDuration {
public static final double PRECISION = 0.00001;
private String value;
private int time = 0;
private long time = 0;
private double rate = 0.0;
private boolean bValid = false;
@ -60,7 +60,7 @@ public class DateDuration {
* 对于无效的时间区间，返回0。单位为秒。
* @return
*/
public int getTime() {
public long getTime() {
return this.time;
}
@ -68,7 +68,7 @@ public class DateDuration {
* 设置新的时间区间。
* @return
*/
public void setTime(int time) {
public void setTime(long time) {
this.time = time;
}
@ -92,25 +92,25 @@ public class DateDuration {
return "0S";
}
int iMaxTimeUnit = 4;
long iMaxTimeUnit = 4;
StringBuffer strExtraString = new StringBuffer();
int extraTime = this.time;
long extraTime = this.time;
if (iMaxTimeUnit >= 4) {
int i = extraTime / 86400;
long i = extraTime / 86400;
if (i > 0) {
strExtraString.append(i).append("D");
}
extraTime -= i * 86400;
}
if (iMaxTimeUnit >= 3) {
int i = extraTime / 3600;
long i = extraTime / 3600;
if (i > 0) {
strExtraString.append(i).append("H");
}
extraTime -= i * 3600;
}
if (iMaxTimeUnit >= 2) {
int i = extraTime / 60;
long i = extraTime / 60;
if (i > 0) {
strExtraString.append(i).append("M");
}

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java
Unescape Escape View File

@ -10,5 +10,6 @@ package cn.estsh.i3plus.pojo.aps.enums;
public enum MATERIAL_TYPE {
PRODUCT, // 成品
HALF_PRODUCT, // 半成品
RAW_MATERIAL // 原材料
RAW_MATERIAL, // 原材料
VIRTUAL // 虚拟件
}

6
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java
Unescape Escape View File

@ -0,0 +1,6 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EParentWork {
ProductOrder,
Works
}

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EProductOrder {
ProductRouting
ProductRouting,
ParentWorks
}

1
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.holders;
public enum EWork {
Order,
ParentWork,
WorkResources,
WorkInputs,
WorkOutputs,

9
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ParentWorkRepository.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.ParentWork;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ParentWorkRepository extends CrudRepository<ParentWork, Long> {
}

2
modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml
Unescape Escape View File

@ -8,6 +8,4 @@
</Relation>
<Relation field="PostRelations" name="WorkRelation" reverse="PostOrder" type="ONE_TO_MULTI" owner="false">
</Relation>
<Relation field="UpperOrders" name="BaseOrder" reverse="LowerOrders" type="MULTI_TO_MULTI" owner="false">
</Relation>
</Class>

5
modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml
Unescape Escape View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="ParentWork">
<Relation field="Works" name="Work" reverse="ParentWork" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

2
modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml
Unescape Escape View File

@ -1,3 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="ProductOrder" extends="BaseOrder">
<Relation field="ParentWorks" name="ParentWork" reverse="ProductOrder" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
Unescape Escape View File

@ -134,7 +134,7 @@ public abstract class BaseBean implements Serializable {
String result = "";
if (orderByParam!=null&&orderByParam.trim().length()>0) {
result = " order by " + orderByParam;
if(ascOrDesc!= null && ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
result += " asc";
}else{
result += " desc";

99
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
Unescape Escape View File

@ -58,6 +58,51 @@ public class AndonEnumUtil {
}
/**
* 标准类型 = 10，异常类型 = 20
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_CELL_TYPE{
NORMAL("10","标准类型"),
ABNORMAL("20","异常类型");
private String value;
private String description;
WORK_CELL_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value,val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 审批状态：10=待审批，20=二级审批，30=三级审批，40=四级审批，100=已审批
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -199,7 +244,7 @@ public class AndonEnumUtil {
/**
* 按灯业务状态
* 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60
* 安灯状态=10，工号 =20 ，读取状态=30, 停线=40, 安灯子类型=50, 原因代码=60, 产品信息=70， 产品产量=80
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_BUSI_FLAG{
@ -208,7 +253,9 @@ public class AndonEnumUtil {
READ_FLAG("30", "安灯读取状态"),
STOP_FLAG("40", "停线状态"),
DETAIL_TYPE("50", "安灯子类型"),
AC_CODE("60", "原因代码");
AC_CODE("60", "原因代码"),
PROD_INFO("70", "产品信息"),
LINE_INFO("80", "产量信息");
private String value;
private String description;
@ -362,6 +409,51 @@ public class AndonEnumUtil {
}
}
/**
* 安灯来源
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ALARM_SOURCE_TYPE{
PHYSICAL("10","物理安灯"),
SOFT("20","软件安灯");
private String value;
private String description;
ALARM_SOURCE_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = "";
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测
@ -625,7 +717,8 @@ public class AndonEnumUtil {
CANCEL_ACTION("40", "撤销动作"),
COMMIT_ACTION("50","提交动作"),
PASS_ACTION("60","审批动作"),
REJECT_ACTION("70", "驳回动作");
REJECT_ACTION("70", "驳回动作"),
OPEN_ACTION("80","放行动作");
private String value;
private String description;

6
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -767,7 +767,11 @@ public class WmsEnumUtil {
INSTOCK("INSTOCK", "入库"),
MOVESTOCK("MOVESTOCK", "移库"),
CS("CS", "盘点"),
VDARC("VDARC", "VDA收货");
VDARC("VDARC", "VDA收货"),
VDAINSTOCK("VDAINSTOCK", "VDA入库"),
VDAMOVESTOCK("VDAMOVESTOCK", "VDA内部移库"),
VDA_FAST_STOCK("VDA_FAST_STOCK", "VDA采购快速入库"),
VDAREPORT("VDAREPORT", "VDA生产报工");
private String value;
private String description;

79
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java
Unescape Escape View File

@ -0,0 +1,79 @@
package cn.estsh.i3plus.pojo.wms.bean.iotio;
import lombok.Data;
import java.io.Serializable;
@Data
public class WmsCSOrderDetailsModel implements Serializable {
/******
*
* 工厂代码
*/
public String organizeCode;
/******
*
* 库位编码
*/
public String locateNo;
/******
*
* 订单编码
*/
public String orderNo;
/******
*
* 物料代码
*/
public String partNo;
/******
*
* 物料名称
*/
public String partNameRdd;
/******
*
* 冻结数量
*/
public String qty;
/******
*
* 实盘数量
*/
public String factQty;
/******
*
* 条码
*/
public String sn;
/******
*
* 仓库编码
*/
public String whNo;
/******
*
* 区域编码
*/
public String zoneNo;
/******
*
* 状态
*/
public String wmStatus;
}
Write Preview
Loading…
Cancel
Save