diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index e03b224..a58c464 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -260,6 +260,10 @@ public class AndonManageQueue extends BaseBean { private List statusList; @Transient + @ApiParam(value = "查询条件：ANDON状态") + private List typeList; + + @Transient @ApiParam(value = "比例", example = "0") private Double proportion; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index f89b4d0..e356a41 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -271,11 +271,13 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); - DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getAndonOrderNo(), "andonOrderNo", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result); + DdlPreparedPack.getInPackList(andonManageQueue.getStatusList(), "statusCode", result); // 只有安灯任务管理特殊用途 DdlPreparedPack.getInPackArray(obj, "statusCode", result); + DdlPreparedPack.getInPackList(andonManageQueue.getTypeList(), "alarmCode", result); // 只有安灯任务管理特殊用途 + DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){ DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true); @@ -285,7 +287,8 @@ public class AndonHqlPack { // 根据优先级倒序，序号升序排序 // DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, // new String[]{"priorityLevel", "seq"}, result); - result.setOrderByStr(andonManageQueue.orderBy()); + + result.setOrderByStr(andonManageQueue.orderBy()); return result; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index f91c7b4..86caaa2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -8,7 +8,9 @@ import java.lang.annotation.Target; @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface FieldAnnotation { + boolean property() default true; boolean modify() default true; boolean display() default true; int pric() default 2; + boolean mainkey() default false; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index aa093ab..cf27632 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -1,6 +1,8 @@ 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.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import io.swagger.annotations.Api; @@ -20,7 +22,7 @@ import java.util.List; **/ @Data @Api("订单基类") -public class BaseOrder extends BaseAPS { +public class BaseOrder extends BaseCode { @Column(name="COUNT") @ApiParam(value ="数量") private Double count; @@ -53,7 +55,37 @@ public class BaseOrder extends BaseAPS { @ApiParam(value ="接单日期") private Date receiveDate; + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); } + + public Material getMaterial() { + return BeanRelation.get(this, EBaseOrder.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EBaseOrder.Material, material); + } + + public List getPrevRelations() { + return BeanRelation.list(this, EBaseOrder.PrevRelations); + } + + public List getPostRelations() { + return BeanRelation.list(this, EBaseOrder.PostRelations); + } + + public List getUpperOrders() { + return BeanRelation.list(this, EBaseOrder.UpperOrders); + } + + public List getLowerOrders() { + return BeanRelation.list(this, EBaseOrder.LowerOrders); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java index d6926c9..9343571 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java @@ -1,5 +1,6 @@ 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.EExportDetail; @@ -41,6 +42,7 @@ public class ExportDetail extends BaseAPS { @Column(name="PROJECT_ID") @ApiParam(value ="导出项目ID") + @FieldAnnotation(property = false) private Long projectId; public ExportProject getProject() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index 7438e17..27d70a9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -1,8 +1,10 @@ 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.EExportProject; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,7 +31,9 @@ public class ExportProject extends BaseAPS { private String name; @Column(name="LINK_ID") - @ApiParam(value ="数据源连接") + @ApiParam(value ="数据连接对象") + @FieldAnnotation(property = false) + @JsonIgnore private Long linkId; public DataLink getLink() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index 664b43b..817df4a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.lang.reflect.Method; +import java.sql.JDBCType; /** * @Description :字段信息 @@ -71,6 +72,14 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="位置") private String position; + @Column(name="MAIN_KEY") + @ApiParam(value ="主键标识") + private Boolean mainKey; + + @Column(name="JDBC_TYPE") + @ApiParam(value ="数据库类型") + private JDBCType jdbcType; + @JsonIgnore private transient Class clazz; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 102cd83..fb8b71f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -1,7 +1,11 @@ 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.enums.IMPORT_DETAIL_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EExportDetail; +import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,4 +37,18 @@ public class ImportDetail extends BaseAPS { @Column(name="IN_NAME") @ApiParam(value ="内部表名") private String inName; + + @Column(name="PROJECT_ID") + @ApiParam(value ="导入项目ID") + @FieldAnnotation(property = false) + private Long projectId; + + public ImportProject getProject() { + return BeanRelation.get(this, EImportDetail.Project); + } + + public void setProject(ImportProject project) { + this.projectId = project != null ? project.getId() : 0l; + BeanRelation.set(this, EImportDetail.Project, project); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index bb21896..731a820 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -1,6 +1,9 @@ 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.EImportProject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -8,6 +11,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :数据导入明细集合 @@ -24,4 +28,22 @@ public class ImportProject extends BaseAPS { @Column(name="NAME") @ApiParam(value ="标识名") private String name; + + @Column(name="LINK_ID") + @ApiParam(value ="数据连接对象") + @FieldAnnotation(property = false) + private Long linkId; + + public DataLink getLink() { + return BeanRelation.get(this, EImportProject.Link); + } + + public void setLink(DataLink link) { + this.linkId = link != null ? link.getId() : 0l; + BeanRelation.set(this, EImportProject.Link, link); + } + + public List getDetails() { + return BeanRelation.list(this, EImportProject.Details); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 701ac20..54d7fc4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -1,5 +1,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 io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -36,4 +38,7 @@ public class Inventory extends BaseOrder { @ApiParam(value ="多余量") private Double excessCount; + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index c0ae1a0..a42d97e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -1,9 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; 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 io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +13,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :物料 @@ -103,4 +106,32 @@ public class Material extends BaseCode { @Column(name="MAX_STOCK_COUNT") @ApiParam(value ="最大库存数量") private Double maxStockCount; + + public List getProductRoutings() { + return BeanRelation.list(this, EMaterial.ProductRoutings); + } + + public List getOperInputs() { + return BeanRelation.list(this, EMaterial.OperInputs); + } + + public List getOperOutputs() { + return BeanRelation.list(this, EMaterial.OperOutputs); + } + + public List getWorkInputs() { + return BeanRelation.list(this, EMaterial.WorkInputs); + } + + public List getWorkOutputs() { + return BeanRelation.list(this, EMaterial.WorkOutputs); + } + + public List getWorkRelations() { + return BeanRelation.list(this, EMaterial.WorkRelations); + } + + public List getOrders() { + return BeanRelation.list(this, EMaterial.Orders); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 1c8cdc3..1ad9690 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -1,7 +1,10 @@ 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.enums.CONSTRAINT_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EOperInput; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,6 +12,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :工序输入 @@ -45,4 +49,36 @@ public class OperInput extends BaseAPS { @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小时间间隔") private String minSpaceTime; + + @Column(name="OPERATION_ID") + @ApiParam(value ="工序") + @FieldAnnotation(property = false) + private Long operationId; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + public Operation getOperation() { + return BeanRelation.get(this, EOperInput.Operation); + } + + public void setOperation(Operation oper) { + this.operationId = oper != null ? oper.getId() : 0l; + BeanRelation.set(this, EOperInput.Operation, oper); + } + + public Material getMaterial() { + return BeanRelation.get(this, EOperInput.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EOperInput.Material, material); + } + + public List getWorkInputs() { + return BeanRelation.list(this, EOperInput.WorkInputs); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 82ab4cf..41a13fa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -1,6 +1,9 @@ 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.EOperOutput; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -8,6 +11,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :工序输出 @@ -21,15 +25,47 @@ import javax.persistence.Table; @Table(name = "APS_OPER_OUTPUT") @Api("工序输出") public class OperOutput extends BaseAPS { - @Column(name="output_Count") + @Column(name="OUTPUT_COUNT") @ApiParam(value ="输出数量") private Double outputCount; - @Column(name="yield") + @Column(name="YIELD") @ApiParam(value ="成品率") private Double yield; - @Column(name="fix_Scrap_Count") + @Column(name="FIX_SCRAP_COUNT") @ApiParam(value ="固定报废数") private Double fixScrapCount; + + @Column(name="OPERATION_ID") + @ApiParam(value ="工序") + @FieldAnnotation(property = false) + private Long operationId; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + public Operation getOperation() { + return BeanRelation.get(this, EOperOutput.Operation); + } + + public void setOperation(Operation oper) { + this.operationId = oper != null ? oper.getId() : 0l; + BeanRelation.set(this, EOperOutput.Operation, oper); + } + + public Material getMaterial() { + return BeanRelation.get(this, EOperOutput.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EOperOutput.Material, material); + } + + public List getWorkOutputs() { + return BeanRelation.list(this, EOperOutput.WorkOutputs); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index 4de47b0..f0859f7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -1,7 +1,10 @@ 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.enums.USE_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EOperResource; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,6 +12,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :工序资源 @@ -53,4 +57,36 @@ public class OperResource extends BaseAPS { @Column(name="PRIORITY") @ApiParam(value ="优先级") private Integer priority; + + @Column(name="OPERATION_ID") + @ApiParam(value ="工序") + @FieldAnnotation(property = false) + private Long operationId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源") + @FieldAnnotation(property = false) + private Long resourceId; + + public Operation getOperation() { + return BeanRelation.get(this, EOperResource.Operation); + } + + public void setOperation(Operation oper) { + this.operationId = oper != null ? oper.getId() : 0l; + BeanRelation.set(this, EOperResource.Operation, oper); + } + + public Resource getResource() { + return BeanRelation.get(this, EOperResource.Resource); + } + + public void setResource(Resource res) { + this.resourceId = res != null ? res.getId() : 0l; + BeanRelation.set(this, EOperResource.Resource, res); + } + + public List getWorkResources() { + return BeanRelation.list(this, EOperResource.WorkResources); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index cba41d4..4f6513a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -1,15 +1,20 @@ 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.enums.CONSTRAINT_TYPE; import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL; +import cn.estsh.i3plus.pojo.aps.holders.EOperation; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.springframework.context.annotation.Bean; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :工序 @@ -71,4 +76,48 @@ public class Operation extends BaseAPS { @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小时间间隔") private String minSpaceTime; + + @Column(name="PRODUCT_ROUTING_ID") + @ApiParam(value ="工艺路线") + @FieldAnnotation(property = false) + private Long productRoutingId; + + @Column(name="STAND_OPERATION_ID") + @ApiParam(value ="标准工序") + @FieldAnnotation(property = false) + private Long standOperationId; + + public ProductRouting getProductRouting() { + return BeanRelation.get(this, EOperation.ProductRouting); + } + + public void setProductRouting(ProductRouting routing) { + this.productRoutingId = routing != null ? routing.getId() : 0l; + BeanRelation.set(this, EOperation.ProductRouting, routing); + } + + public List getOperInputs() { + return BeanRelation.list(this, EOperation.OperInputs); + } + + public List getOperOutputs() { + return BeanRelation.list(this, EOperation.OperOutputs); + } + + public List getOperResources() { + return BeanRelation.list(this, EOperation.OperResources); + } + + public StandOperation getStandOperation() { + return BeanRelation.get(this, EOperation.StandOperation); + } + + public void setStandOperation(StandOperation std) { + this.standOperationId = std != null ? std.getId() : 0l; + BeanRelation.set(this, EOperation.StandOperation, std); + } + + public List getWorks() { + return BeanRelation.list(this, EOperation.Works); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index dd7e68d..40b004b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java @@ -1,9 +1,14 @@ 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.EPlanFeedback; 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; @@ -19,4 +24,18 @@ import javax.persistence.Table; @Table(name = "APS_PLAN_FEEDBACK") @Api("物料") public class PlanFeedback extends BaseAPS { + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; + + public Work getWork() { + return BeanRelation.get(this, EPlanFeedback.Work); + } + + public void setWork(Work work) { + this.workId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EPlanFeedback.Work, work); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index a1712da..64f17c0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -1,5 +1,9 @@ package cn.estsh.i3plus.pojo.aps.bean; +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 io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -80,4 +84,18 @@ public class ProductOrder extends BaseOrder { @Column(name="LACK_COUNT") @ApiParam(value ="缺少量") private Double lackCount; + + @Column(name="PRODUCT_ROUTING_ID") + @ApiParam(value ="工艺路线") + @FieldAnnotation(property = false) + private Long productRoutingId; + + public ProductRouting getProductRouting() { + return BeanRelation.get(this, EProductOrder.ProductRouting); + } + + public void setProductRouting(ProductRouting routing) { + this.productRoutingId = routing != null ? routing.getId() : 0l; + BeanRelation.set(this, EProductOrder.ProductRouting, routing); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index 88a415c..ed21d2d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.aps.bean; +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 io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; +import java.util.List; /** * @Description :工艺路线 @@ -33,4 +37,26 @@ public class ProductRouting extends BaseCode { @Column(name="PRIORITY") @ApiParam(value ="优先级") private Integer priority; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + public Material getMaterial() { + return BeanRelation.get(this, EProductRouting.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EProductRouting.Material, material); + } + + public List getOperations() { + return BeanRelation.list(this, EProductRouting.Operations); + } + + public List getProductOrders() { + return BeanRelation.list(this, EProductRouting.ProductOrders); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index 7fe588b..b1676d8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -1,5 +1,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 io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -43,4 +45,8 @@ public class PurchaseOrder extends BaseOrder { @Column(name="EXCESS_COUNT") @ApiParam(value ="多余量") private Double excessCount; + + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index ee332b9..f5a85dd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -1,5 +1,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 io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -40,4 +42,8 @@ public class SalesOrder extends BaseOrder { @Column(name="CALC_LEAD_TIME") @ApiParam(value ="提前期计算值") private String calcLeadTime; + + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 799f34a..70f77de 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -26,7 +26,7 @@ public class SysParam extends BaseAPS { @ApiParam(value ="基准时间") private Date baseTime; - @Column(name="max_Interrupt_Count") + @Column(name="MAX_INTERRUPT_COUNT") @ApiParam(value ="最大中断次数") private Integer maxInterruptCount; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 60ca0c0..2dc7c4b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +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.enums.WORK_STATUS; @@ -13,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; +import java.util.List; /** * @Description :工作 @@ -96,8 +98,14 @@ public class Work extends BaseCode { @Column(name="ORDER_ID") @ApiParam(value ="订单") + @FieldAnnotation(property = false) private Long orderId; + @Column(name="OPERATION_ID") + @ApiParam(value ="工序") + @FieldAnnotation(property = false) + private Long operationId; + public BaseOrder getOrder() { return BeanRelation.get(this, EWork.Order); } @@ -106,4 +114,37 @@ public class Work extends BaseCode { this.orderId = order != null ? order.getId() : 0l; BeanRelation.set(this, EWork.Order, order); } + + public List getWorkResources() { + return BeanRelation.list(this, EWork.WorkResources); + } + + public List getWorkInputs() { + return BeanRelation.list(this, EWork.WorkInputs); + } + + public List getWorkOutputs() { + return BeanRelation.list(this, EWork.WorkOutputs); + } + + public List getWorkRelationInputs() { + return BeanRelation.list(this, EWork.WorkRelationInputs); + } + + public List getWorkRelationOutputs() { + return BeanRelation.list(this, EWork.WorkRelationOutputs); + } + + public Operation getOperation() { + return BeanRelation.get(this, EWork.Operation); + } + + public void setOperation(Operation oper) { + this.operationId = oper != null ? oper.getId() : 0l; + BeanRelation.set(this, EWork.Operation, oper); + } + + public List getPlanFeedbacks() { + return BeanRelation.list(this, EWork.PlanFeedbacks); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index b37c70d..2a5dc70 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -1,6 +1,9 @@ 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.EWorkInput; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; +import java.util.List; /** * @Description :工作输入 @@ -33,4 +37,50 @@ public class WorkInput extends BaseAPS { @Column(name="SHORT_COUNT") @ApiParam(value ="短缺数量") private Double shortCount; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + @Column(name="OPER_INPUT_ID") + @ApiParam(value ="工序输入") + @FieldAnnotation(property = false) + private Long operInputId; + + public Work getWork() { + return BeanRelation.get(this, EWorkInput.Work); + } + + public void setWork(Work work) { + this.workId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EWorkInput.Work, work); + } + + public List getWorkRelations() { + return BeanRelation.list(this, EWorkInput.WorkRelations); + } + + public Material getMaterial() { + return BeanRelation.get(this, EWorkInput.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EWorkInput.Material, material); + } + + public OperInput getOperInput() { + return BeanRelation.get(this, EWorkInput.OperInput); + } + + public void setOperInput(OperInput input) { + this.operInputId = input != null ? input.getId() : 0l; + BeanRelation.set(this, EWorkInput.OperInput, input); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index 16023ec..16ce459 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -1,14 +1,19 @@ 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.EWorkOutput; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.springframework.context.annotation.Bean; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; +import java.util.List; /** * @Description :工作输出 @@ -33,4 +38,50 @@ public class WorkOutput extends BaseAPS { @Column(name="REMAIN_COUNT") @ApiParam(value ="多余数量") private Double remainCount; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + @Column(name="OPER_OUTPUT_ID") + @ApiParam(value ="工序输出") + @FieldAnnotation(property = false) + private Long operOutputId; + + public Work getWork() { + return BeanRelation.get(this, EWorkOutput.Work); + } + + public void setWork(Work work) { + this.workId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EWorkOutput.Work, work); + } + + public List getWorkRelations() { + return BeanRelation.list(this, EWorkOutput.WorkRelations); + } + + public Material getMaterial() { + return BeanRelation.get(this, EWorkOutput.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EWorkOutput.Material, material); + } + + public OperOutput getOperOutput() { + return BeanRelation.get(this, EWorkOutput.OperOutput); + } + + public void setOperOutput(OperOutput output) { + this.operOutputId = output != null ? output.getId() : 0l; + BeanRelation.set(this, EWorkOutput.OperOutput, output); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 07095c3..8894581 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -1,8 +1,12 @@ 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.enums.CONSTRAINT_TYPE; import cn.estsh.i3plus.pojo.aps.enums.WORK_RELATION_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EWork; +import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -50,4 +54,102 @@ public class WorkRelation extends BaseAPS { @Column(name="FIX_COUNT") @ApiParam(value ="是否固定数量") private Boolean fixCount; + + @Column(name="WORK_INPUT_ID") + @ApiParam(value ="工作输入") + @FieldAnnotation(property = false) + private Long workInputId; + + @Column(name="WORK_OUTPUT_ID") + @ApiParam(value ="工作输出") + @FieldAnnotation(property = false) + private Long workOutputId; + + @Column(name="PREV_WORK_ID") + @ApiParam(value ="前工作") + @FieldAnnotation(property = false) + private Long prevWorkId; + + @Column(name="POST_WORK_ID") + @ApiParam(value ="后工作") + @FieldAnnotation(property = false) + private Long postWorkId; + + @Column(name="PREV_ORDER_ID") + @ApiParam(value ="前订单") + @FieldAnnotation(property = false) + private Long prevOrderId; + + @Column(name="POST_ORDER_ID") + @ApiParam(value ="后订单") + @FieldAnnotation(property = false) + private Long postOrderId; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + public WorkInput getWorkInput() { + return BeanRelation.get(this, EWorkRelation.WorkInput); + } + + public void setWorkInput(WorkInput input) { + this.workInputId = input != null ? input.getId() : 0l; + BeanRelation.set(this, EWorkRelation.WorkInput, input); + } + + public WorkOutput getWorkOutput() { + return BeanRelation.get(this, EWorkRelation.WorkOutput); + } + + public void setWorkOutput(WorkOutput output) { + this.workOutputId = output != null ? output.getId() : 0l; + BeanRelation.set(this, EWorkRelation.WorkOutput, output); + } + + public Work getPrevWork() { + return BeanRelation.get(this, EWorkRelation.PrevWork); + } + + public void setPrevWork(Work work) { + this.prevWorkId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EWorkRelation.PrevWork, work); + } + + public Work getPostWork() { + return BeanRelation.get(this, EWorkRelation.PostWork); + } + + public void setPostWork(Work work) { + this.postWorkId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EWorkRelation.PostWork, work); + } + + public BaseOrder getPrevOrder() { + return BeanRelation.get(this, EWorkRelation.PrevOrder); + } + + public void setPrevOrder(BaseOrder order) { + this.prevOrderId = order != null ? order.getId() : 0l; + BeanRelation.set(this, EWorkRelation.PrevOrder, order); + } + + public BaseOrder getPostOrder() { + return BeanRelation.get(this, EWorkRelation.PostOrder); + } + + public void setPostOrder(BaseOrder order) { + this.postOrderId = order != null ? order.getId() : 0l; + BeanRelation.set(this, EWorkRelation.PostOrder, order); + } + + public Material getMaterial() { + return BeanRelation.get(this, EWorkRelation.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EWorkRelation.Material, material); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index 34842fb..2e9b10d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -1,7 +1,11 @@ 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.enums.USE_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; +import cn.estsh.i3plus.pojo.aps.holders.EWorkResource; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -53,4 +57,46 @@ public class WorkResource extends BaseAPS { @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") private String maxPostSdTime; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源") + @FieldAnnotation(property = false) + private Long resourceId; + + @Column(name="OPER_RESOURCE_ID") + @ApiParam(value ="工序资源") + @FieldAnnotation(property = false) + private Long operResourceId; + + public Work getWork() { + return BeanRelation.get(this, EWorkResource.Work); + } + + public void setWork(Work work) { + this.workId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EWorkResource.Work, work); + } + + public Resource getResource() { + return BeanRelation.get(this, EWorkResource.Resource); + } + + public void setResource(Resource res) { + this.resourceId = res != null ? res.getId() : 0l; + BeanRelation.set(this, EWorkResource.Resource, res); + } + + public OperResource getOperResource() { + return BeanRelation.get(this, EWorkResource.OperResource); + } + + public void setOperResource(OperResource res) { + this.operResourceId = res != null ? res.getId() : 0l; + BeanRelation.set(this, EWorkResource.OperResource, res); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index 9a60943..016d92e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.aps.common; -import cn.estsh.i3plus.pojo.aps.bean.DateDuration; import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE; import cn.estsh.i3plus.pojo.base.bean.BaseBean; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 915391e..85b62df 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -12,6 +12,12 @@ import java.util.function.Predicate; public class BeanRelation { Map, Map, List>>> caches = new HashMap<>(); + private void init() { + for (Class cls : BeanInfo.getBeanClasses()) { + caches.put(cls, new ConcurrentHashMap<>()); + } + } + private static Map relations = new ConcurrentHashMap<>(); private static BeanRelation get() { Long userId = 0l; @@ -21,6 +27,7 @@ public class BeanRelation { relation = relations.get(userId); if (relation == null) { relation = new BeanRelation(); + relation.init(); relations.put(userId, relation); } } @@ -30,7 +37,15 @@ public class BeanRelation { } private static Map, List> createRelation(Class cls) { - return null; + Map, List> result = new HashMap<>(); + BeanInfo beanInfo = BeanInfo.getBeanInfo(cls); + if (beanInfo == null) { + return result; + } + for (Enum holder : beanInfo.getAllHolders()) { + result.put(holder, new ArrayList<>()); + } + return result; } public static Map, List> get(BaseBean bean) { @@ -46,10 +61,6 @@ public class BeanRelation { return temp; } - public static void init() { - - } - public static T get(BaseBean bean, Enum holder) { List beans = (List)get(bean).get(holder); if (beans == null || beans.isEmpty()) { @@ -72,7 +83,13 @@ public class BeanRelation { return (T)bean; } } else { - //List relaBeans = + List relaBeans = list(bean, args[index]); + for (BaseBean relaBean : relaBeans) { + T temp = getImpl(relaBean, pred, args, index + 1); + if (temp != null) { + return temp; + } + } } return null; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java index e2dba7e..49e3a5f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java @@ -243,7 +243,7 @@ public class BeanRelationUtil { * 将指定包下的类加载到内存中 * @param packName */ - private static List> loadClass(String packName) { + public static List> loadClass(String packName) { List> clses = new ArrayList<>(); ClassLoader loader = Thread.currentThread().getContextClassLoader(); String strFile = packName.replaceAll("\\.", "/"); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java similarity index 98% rename from modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DateDuration.java rename to modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index d394a8f..f68cc74 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.aps.bean; +package cn.estsh.i3plus.pojo.aps.common; import java.util.AbstractMap; import java.util.ArrayList; @@ -80,7 +80,8 @@ public class DateDuration { return this.time * 1000; } - public String getString() { + @Override + public String toString() { if (this.rate > PRECISION) return this.getValue(); @@ -130,7 +131,7 @@ public class DateDuration { if (this.time >= 0) this.time /= val; this.rate /= val; - this.value = getString(); + this.value = toString(); } /** diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java index e1142a0..1c7f79e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java @@ -1,5 +1,4 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EDayShift { - ResCalendar } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java new file mode 100644 index 0000000..f78c6ac --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EImportDetail { + Project +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java index d24c26a..65cc748 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EMaterial { - ProductRouting, + ProductRoutings, OperInputs, OperOutputs, WorkInputs, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java index c8e2201..86fd054 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java @@ -1,6 +1,4 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EResCalendar { - DayShifts, - Resources, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java index 8064356..175536d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java @@ -1,6 +1,4 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EResource { - OperResources, - WorkResources } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java index 200b2a1..08ae7b4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java @@ -1,5 +1,4 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EStandOperation { - Operations } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 330d898..507848d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -8,5 +8,5 @@ public enum EWork { WorkRelationInputs, WorkRelationOutputs, Operation, - PlanFeedback + PlanFeedbacks } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml index 4c21b36..443516d 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml index 8128db4..624a636 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml index 7d7cb1e..51da8ba 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml index 30dc59a..d35accc 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml @@ -1,7 +1,3 @@ - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 457b27d..716a027 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -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 == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + if(ascOrDesc!= null && ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { result += " asc"; }else{ result += " desc"; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index c220e6c..0d742da 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -9,13 +9,15 @@ import com.thoughtworks.xstream.io.naming.NameCoder; import com.thoughtworks.xstream.io.naming.NoNameCoder; import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; import com.thoughtworks.xstream.io.xml.XppDomDriver; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.Writer; import java.lang.reflect.Field; /** * @Description : Xml 工厂 - * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm + * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm * @Reference : * @Author : wei.peng * @CreateDate : 19-7-23 下午5:58 @@ -23,8 +25,13 @@ import java.lang.reflect.Field; **/ public class XStreamFactory { + private static final Logger LOGGER = LoggerFactory.getLogger(XStreamFactory.class); + private static final XStream xStream = XStreamFactory.getXStream(); + /* 转换重试次数 */ + private static final int RETRY_NUM = 3; + public static final String CDATA_PREFIX = ""; @@ -120,7 +127,14 @@ public class XStreamFactory { public static String toXml(T t) { xStream.processAnnotations(t.getClass()); String headLine = "\n"; - return headLine + xStream.toXML(t); + for (int i = 1; i < RETRY_NUM; i++) { + try { + return headLine + xStream.toXML(t); + }catch (Exception e){ + LOGGER.error("Bean To Xml Error Message:{} Number:{}",e.getMessage(),i); + } + } + return null; } /** diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 15e76a4..9d71ce7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -113,14 +113,22 @@ public class BlockSoftSwitchEnumUtil { /* WebService */ SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"), SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"), - CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"), +// CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"), CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"), /* 数据源 */ CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"), /* Restful */ - CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test"); + CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test"), + + /* Socket */ + SERVER_SOCKET_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.SOCKET,210001,"Socket Server Hello测试服务"), + CLIENT_SOCKET_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.SOCKET,110001,"Socket Client Hello测试服务"), + + /* MQ */ + SERVER_MQ_RABBIT_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.MQ,250001,"RabbitMQ Server Hello测试服务"), + CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index b19808e..1fba6f6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -760,5 +760,404 @@ public class MesPcnEnumUtil { } } + /** + * MesPlanOrder实体对应的status值 计划状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLAN_ORDER_STATUS { + + CREATE(10, "CREATED", "创建"), + DE_COMPOSE_ING(20, "DE_COMPOSE_ING", "分解中"), + DE_COMPOSE_ED(30, "DE_COMPOSE_ED", "分解完成"), + CLOSE(40, "CLOSE", "关闭"); + + private int value; + private String code; + private String description; + + PLAN_ORDER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesWorkOrder实体对应的workOrderStatus值 工单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_STATUS { + + CREATE(10, "创建"), + LANDED(20, "下达"), + OPEN(30, "启动"), + PAUSE(40, "暂停"), + CANCEL(50, "取消"), + CLOSE(60, "关闭"); + + private int value; + private String description; + + WORK_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesWorkOrder实体对应的workOrderType值 工单类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_TYPE { + + STANDARD_ORDER(10, "标准工单"), + BTS_ORDER(20, "BTS工单"), + ATTEMPT_ORDER(30, "试制工单"); + + private int value; + private String description; + + WORK_ORDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesPlanOrder实体对应的planType值 计划类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLAN_ORDER_TYPE { + + STANDARD_ORDER(10, "标准"); + + private int value; + private String description; + + PLAN_ORDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(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 Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * MesPlanOrder实体对应的source值 计划来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PALN_ORDER_SOURCE { + + MES("MES", "来源于MES"), + SAP("SAP", "来源于SAP"); + + private String value; + private String description; + + PALN_ORDER_SOURCE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesWorkOrder实体对应的source值 计划来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_SOURCE { + + MES("MES", "来源于MES"), + AMES("AMES", "来源于AMES"), + SAP("SAP", "来源于SAP"), + CREATE("CREATE", "手工新增"), + RESOLVE("RESOLVE", "计划分解"); + + private String value; + private String description; + + WORK_ORDER_SOURCE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesQueueOrder实体对应的status值 队列主表状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_STATUS { + + NORMAL(10, "正常"), + ONLINE(20, "已上线"), + OFFLINE(30, "已下线"), + CLOSE(40, "已关闭"), + ; + + private int value; + private String description; + + QUEUE_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesQueueOrderDetail实体对应的status值 队列详情状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_DETAIL_STATUS { + + NORMAL(10, "正常"), + CLOSE(20, "关闭"); + + private int value; + private String description; + + QUEUE_ORDER_DETAIL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesPartCategory实体对应的categoryType值 条码表条码质量状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_CATEGORY_TYPE { + + CATEGORY_ONE("Category1", "类型1"), + CATEGORY_TWO("Category2", "类型2"), + CATEGORY_THREE("Category3", "类型3"); + + private String value; + private String description; + + PART_CATEGORY_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 (val.equals(values()[i].value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesWorkOrder实体对应的approvalStatus值 审批状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_APPROVAL_STATUS { + + WAIT_APPROVAL(10, "待审批"), + COMPLETE_APPROVAL(20, "已审批"), + REJECT_APPROVAL(30, "驳回"); + + private int value; + private String description; + + WORK_ORDER_APPROVAL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(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 valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 0137da0..ce638d6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -377,6 +377,44 @@ public class WmsEnumUtil { } /** + * 条码打印状态 （库存条码打印字段使用） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRINT_STATUS { + PRINTED(1, "已打印"), NOPRINT(2, "未打印"), GENERATE(3, "退料生成条码"); + + private int value; + private String description; + + PRINT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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); + } + } + + /** * 库位类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -560,7 +598,9 @@ public class WmsEnumUtil { ASN(200, "ASN", "ASN"), PO(210, "PO", "PO"), QC(220, "QC", "QC"), - AMPR(230, "AMPR", "AMPR"); + AMPR(230, "AMPR", "AMPR"), + FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"), + VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"); private int value; @@ -1828,7 +1868,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum COMMON_SN { - PO_SN("PO_SN", "PO条码"); + PO_SN("PO_SN", "PO条码"), + VDA_SN("VDA_SN", "VDA条码"); private String code; private String description; @@ -3408,4 +3449,184 @@ public class WmsEnumUtil { } } + /** + * 打印类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRINT_TYPE { + SN(10, "SN"); + + private int value; + private String description; + + PRINT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** + * 打印状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ETC_PRINT_STATUS { + NOT_HIT (10, "未打"), + ALREADY_HIT(20, "已打"); + + private int value; + private String description; + + ETC_PRINT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** + * 物料关系信息 关联类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_ASSOCIATE_TYPE { + LINE(10, "LINE", "产线"), + CUSTOMER(20, "CUSTOMER", "客户"), + VENDOR(30, "VENDOR", "供应商"); + + private int value; + private String code; + private String description; + + PART_ASSOCIATE_TYPE(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 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; + } + } + + /** + * 条码操作记录信息 操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SN_OPERATE_TYPE { + REPORT(10, "REPORT", "生产报工"), + BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"); + + private int value; + private String code; + private String description; + + SN_OPERATE_TYPE(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 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; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index edb8348..f249d04 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -504,6 +504,19 @@ public class DdlPreparedPack { } /** + * 封装not in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackArray(Object[] data, String columnName, DdlPackBean packBean) { + if (data != null && data.length > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data)); + } + } + + /** * 封装in String查询语句 * * @param data @@ -517,6 +530,19 @@ public class DdlPreparedPack { } /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackList(List data, String columnName, DdlPackBean packBean) { + if (data != null && data.size() > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + "not in (:m_" + columnName + ")", data); + } + } + + /** * 封装in String查询语句 * * @param data diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java new file mode 100644 index 0000000..465a22a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_CUST_PROD_LINE") +@Api("客户产线代码") +public class MesCustProdLine extends BaseBean { + @Column(name="CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name="CUST_PROD_LINE_NAME") + @ApiParam("客户产线名称") + private String custProdLineName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java new file mode 100644 index 0000000..9283664 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : crish + * @CreateDate : 2019-04-22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_CUSTOMER") +@Api("客户产线代码") +public class MesCustomer extends BaseBean { + @Column(name="CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name="CUSTOMER_NAME") + @ApiParam("客户名称") + private String customerName; + + @Column(name="BRIEF_TEXT") + @ApiParam("客户简称") + private String briefText; + + @Column(name="ADDRESS") + @ApiParam("客户地址") + private String address; + + @Column(name="CONTACT") + @ApiParam("客户联系人") + private String contact; + + @Column(name="TELEPHONE") + @ApiParam("客户电话") + private String telephone; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java new file mode 100644 index 0000000..77e74cb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PART_CATEGORY") +@Api("零件种类") +public class MesPartCategory extends BaseBean { + @Column(name="CATEGORY_CODE") + @ApiParam("分类代码") + private String categoryCode; + + @Column(name="CATEGORY_NAME") + @ApiParam("分类名称") + private String categoryName; + + @Column(name="CATEGORY_TYPE") + @ApiParam("分类类型") + private String categoryType; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java new file mode 100644 index 0000000..b71f632 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java @@ -0,0 +1,141 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +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 javax.persistence.Transient; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PLAN_ORDER") +@Api("生产主计划") +public class MesPlanOrder extends BaseBean { + @Column(name="ORDER_NO") + @ApiParam("生产计划单号") + private String orderNo; + + @Column(name="PO_TYPE") + @ApiParam("计划类型") + private Integer planType; + + @Column(name="PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name="PLAN_QTY") + @ApiParam("计划数量") + private Double planQty; + + @Column(name="DECOMPOSE_QTY") + @ApiParam("分解数量") + private Double decomposeQty; + + @Column(name="STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name="START_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam("计划开始时间") + private String startTime; + + @Column(name="END_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam("计划结束时间") + private String endTime; + + @Column(name="DELIVERY_DATE") + @ApiParam("交货日期") + private String deliveryDate; + + @Column(name="CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name="CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + + @Column(name="SOURCE") + @ApiParam("计划来源") + private String source; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + /********************** 冗余字段 *********************************/ + + @Transient + @ApiParam(value="区域") + public String areaCode; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String startTimeEnd; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String endTimeEnd; + + public double getPlanQtyVal() { + return this.planQty == null ? 0.0d : this.planQty; + } + + public double getDecomposeQtyVal() { + return this.decomposeQty == null ? 0.0d : this.decomposeQty; + } + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } + + public int getPlanTypeVal() { + return this.planType == null ? 0 : this.planType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java new file mode 100644 index 0000000..17322bb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PROD_CFG") +@Api("产品配置") +public class MesProdCfg extends BaseBean { + @Column(name="PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name="PROD_CFG_NAME") + @ApiParam("产品配置名称") + private String prodCfgName; + + @Column(name="PROD_CFG_Type_CODE") + @ApiParam("产品配置类型代码") + private String prodCfgTypeCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index dd8dc61..ea9de66 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.pcn.model.MesWorkOrderButtonModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -35,6 +37,10 @@ public class MesWorkOrder extends BaseBean { @ApiParam("物料号") private String partNo; + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + @Column(name="PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; @@ -79,6 +85,10 @@ public class MesWorkOrder extends BaseBean { @ApiParam("工作中心代码") private String workCenterCode; + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + @Column(name="WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; @@ -127,6 +137,60 @@ public class MesWorkOrder extends BaseBean { @ApiParam("客户订单号") private String custOrderNo; + /********************** 冗余字段 *********************************/ + @Transient + @ApiParam(value="工作中心名称") + public String workCenterName; + + @Transient + @ApiParam(value="工作单元名称") + public String workCellName; + + @Transient + @ApiParam(value="客户产线名称") + public String custProdLineName; + + @Transient + @ApiParam(value="班次名称") + public String shiftName; + + @Transient + @ApiParam(value="班组名称") + public String shiftGroupName; + + @Transient + @ApiParam(value="产品配置名称") + public String prodCfgName; + + @Transient + @ApiParam("区域代码名称") + private String areaCodeName; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59") + public String startTimeEnd; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") + public String endTimeEnd; + + @Transient + @ApiParam("mes生产工单页面按钮控制") + private MesWorkOrderButtonModel workOrderButtonModel; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java new file mode 100644 index 0000000..c8f9018 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java @@ -0,0 +1,216 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 javax.persistence.Transient; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-19-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_WORK_ORDER_LOG") +@Api("生产工单日志") +public class MesWorkOrderLog extends BaseBean { + @Column(name="ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name="PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name="QTY") + @ApiParam("数量") + private Double qty; + + @Column(name="COMPLETE_QTY") + @ApiParam("完成数量") + private Double completeQty; + + @Column(name="REPAIR_QTY") + @ApiParam("返修数量") + private Double repairQty; + + @Column(name="SCRAP_QTY") + @ApiParam("报废数量") + private Double scrapQty; + + @Column(name="SEQ") + @ApiParam("工单序号") + private Double seq; + + @Column(name="WO_STATUS") + @ApiParam("工单状态") + private Integer workOrderStatus; + + @Column(name="WO_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; + + @Column(name="NEXT_ORDER") + @ApiParam("下一工单") + private String nextOrder; + + @Column(name="PLAN_ORDER_NO") + @ApiParam("生产计划单号") + private String planOrderNo; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="SCHEDULE_DATE") + @ApiParam("排产日期") + private String scheduleDate; + + @Column(name="CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name="SHIFT_CODE") + @ApiParam("班次") + private String shiftCode; + + @Column(name="START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name="END_TIME") + @ApiParam("结束时间") + private String endTime; + + @Column(name="WO_SOURCE") + @ApiParam("工单来源") + private String workOrderSource; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + + @Column(name="SHIFT_GROUP") + @ApiParam("班组") + private String shiftGroup; + + @Column(name="APPROVAL_STATUS") + @ApiParam("审批状态") + private Integer approvalStatus; + + @Column(name="CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name="CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + + /********************** 冗余字段 *********************************/ + @Transient + @ApiParam(value="工作中心名称") + public String workCenterName; + + @Transient + @ApiParam(value="工作单元名称") + public String workCellName; + + @Transient + @ApiParam(value="客户产线名称") + public String custProdLineName; + + @Transient + @ApiParam(value="班次名称") + public String shiftName; + + @Transient + @ApiParam(value="班组名称") + public String shiftGroupName; + + @Transient + @ApiParam(value="产品配置名称") + public String prodCfgName; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59") + public String startTimeEnd; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") + public String endTimeEnd; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getCompleteQtyVal() { + return this.completeQty == null ? 0.0d : this.completeQty; + } + + public double getRepairQtyVal() { + return this.repairQty == null ? 0.0d : this.repairQty; + } + + public double getScrapQtyVal() { + return this.scrapQty == null ? 0.0d : this.scrapQty; + } + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } + + public int getWorkOrderStatusVal() { + return this.workOrderStatus == null ? 0 : this.workOrderStatus; + } + + public int getWorkOrderTypeVal() { + return this.workOrderType == null ? 0 : this.workOrderType; + } + + public int getApprovalStatusVal() { + return this.approvalStatus == null ? 0 : this.approvalStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java new file mode 100644 index 0000000..8f8db3d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 11:42 AM + * @Description: + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("生成条码模型") +public class GenSerialNoModel { + + @ApiParam("规则代码") + private String ruleCode; + + @ApiParam("规则描述") + private String ruleDesc; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("客户物料号") + private String custPartNo; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("产地") + private String prodLocation; + + @ApiParam("前缀") + private String prefix; + + @ApiParam("编码规则") + private String numberRule; + + @ApiParam("序号长度") + private Integer serialnoLength; + + @ApiParam("增量") + private Integer serialnoIncrement; + + @ApiParam("最大值后循环") + private Integer isCycle; + + @ApiParam("当前编号前缀") + private String currentNumberPrefix; + + @ApiParam("当前序号") + private Integer currentSerialno; + + @ApiParam("当前编号") + private String currentNumber; + + + public GenSerialNoModel(String ruleCode){ + this.ruleCode=ruleCode; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java new file mode 100644 index 0000000..8cd2304 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2019/8/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("mes生产工单页面按钮控制model") +public class MesWorkOrderButtonModel implements Serializable { + + @ApiParam("修改按钮") + private boolean updateButton; + + @ApiParam("启动按钮") + private boolean startUpButton; + + @ApiParam("暂停按钮") + private boolean suspendButton; + + @ApiParam("取消按钮") + private boolean revokeButton; + + @ApiParam("关闭按钮") + private boolean closeButton; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java new file mode 100644 index 0000000..9ffc448 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java @@ -0,0 +1,107 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPart; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrder; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder; + +import java.util.List; + +/** + * @Description: 生产计划，生产队列，生产工单的复杂请求数据结构的统一请求模型 + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-29-11:58 + * @Modify: + **/ +public class RequestModel { + + private List workOrderList; // 工单数据集 + + private List partList; // 物料数据集 + + private List queueOrderList; // 生产队列数据集 + + private Double currentSeq; // 生产队列中的当前序列号 + + private Double nextSeq; // 生产队列中的下一个序列号 + + private Integer srcStatus; // 源状态 + + private Integer destStatus; // 目的状态 + + public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { + this.queueOrderList = queueOrderList; + this.currentSeq = currentSeq; + this.nextSeq = nextSeq; + } + + public RequestModel(List queueOrderList, Integer srcStatus, Integer destStatus) { + this.queueOrderList = queueOrderList; + this.srcStatus = srcStatus; + this.destStatus = destStatus; + } + + public RequestModel(List workOrderList, List partList) { + this.workOrderList = workOrderList; + this.partList = partList; + } + + public List getWorkOrderList() { + return workOrderList; + } + + public RequestModel() { + } + + public void setWorkOrderList(List workOrderList) { + this.workOrderList = workOrderList; + } + + public List getPartList() { + return partList; + } + + public void setPartList(List partList) { + this.partList = partList; + } + + public List getQueueOrderList() { + return queueOrderList; + } + + public void setQueueOrderList(List queueOrderList) { + this.queueOrderList = queueOrderList; + } + + public Double getCurrentSeq() { + return currentSeq == null ? 0.0d : currentSeq; + } + + public void setCurrentSeq(Double currentSeq) { + this.currentSeq = currentSeq; + } + + public Double getNextSeq() { + return nextSeq == null ? 0.0d : nextSeq; + } + + public void setNextSeq(Double nextSeq) { + this.nextSeq = nextSeq; + } + + public Integer getSrcStatus() { + return srcStatus == null ? 0 : srcStatus; + } + + public void setSrcStatus(Integer srcStatus) { + this.srcStatus = srcStatus; + } + + public Integer getDestStatus() { + return destStatus == null ? 0 : destStatus; + } + + public void setDestStatus(Integer destStatus) { + this.destStatus = destStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java new file mode 100644 index 0000000..cbca918 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java @@ -0,0 +1,16 @@ +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.MesCustProdLine; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-19-11:15 + * @Modify: + **/ +@Repository +public interface MesCustProdLineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java new file mode 100644 index 0000000..c006be6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java @@ -0,0 +1,17 @@ +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.MesCustomer; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-22-16:12 + * @Modify: + **/ +@Repository +public interface MesCustomerRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java new file mode 100644 index 0000000..d3b014d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java @@ -0,0 +1,15 @@ +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.MesNumberRule; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 1:22 PM + * @Description: + **/ +@Repository +public interface MesNumberRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java new file mode 100644 index 0000000..11299b0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java @@ -0,0 +1,16 @@ +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.MesNumberSerialno; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 1:23 PM + * @Description: + **/ + +@Repository +public interface MesNumberSerialnoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java new file mode 100644 index 0000000..eb12a69 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java @@ -0,0 +1,16 @@ +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.MesPartCategory; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartCategoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java new file mode 100644 index 0000000..c4ba8c9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java @@ -0,0 +1,16 @@ +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.MesPlanOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:08 + * @Modify: + **/ +@Repository +public interface MesPlanOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java new file mode 100644 index 0000000..1413862 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java @@ -0,0 +1,16 @@ +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.MesProdCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java new file mode 100644 index 0000000..544c627 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java @@ -0,0 +1,16 @@ +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.MesShiftGroup; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesShiftGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java new file mode 100644 index 0000000..fea2dfb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java @@ -0,0 +1,16 @@ +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.MesWorkOrderLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-19-17:13 + * @Modify: + **/ +@Repository +public interface MesWorkOrderLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 84b0dff..61e57f3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -33,6 +33,20 @@ public class MesHqlPack { } /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** * MES PCN系统配置信息条件查询 * * @param mesConfig @@ -96,5 +110,112 @@ public class MesHqlPack { return packBean; } + /** + * 生产工单查询条件封装 + * + * @param mesWorkOrder + * @return + */ + public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesWorkOrder.getOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (mesWorkOrder.getApprovalStatus() != null) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getCustOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getCreateUser())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); + } + if (mesWorkOrder.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); + } + + // 时间段查询 + DdlPreparedPack.timeBuilder( + mesWorkOrder.getStartTimeStart(), + mesWorkOrder.getStartTimeEnd(), + "startTime", packBean, true); + DdlPreparedPack.timeBuilder( + mesWorkOrder.getEndTimeStart(), + mesWorkOrder.getEndTimeEnd(), + "endTime", packBean, true); + DdlPreparedPack.timeBuilder( + mesWorkOrder.getCreateDateTimeStart(), + mesWorkOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + DdlPreparedPack.getOrderDefault(mesWorkOrder); + DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); + return packBean; + } + + /** + * 物料信息查询条件封装 + * + * @param mesPart + * @return + */ + public static DdlPackBean getPartCondition(MesPart mesPart, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + + if (StringUtils.isNotEmpty(mesPart.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getPartName())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getCategoryCode1())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getCategoryCode2())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getCategoryCode3())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); + } + + DdlPreparedPack.getOrderDefault(mesPart); + DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean); + return packBean; + } + + /** + * MES 客户信息查询条件封装 + * + * @param customer + * @return + */ + public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); + if (StringUtils.isNotEmpty(customer.getCustomerCode())) { + DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); + } + if (StringUtils.isNotEmpty(customer.getCustomerName())) { + DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); + } + + return packBean; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index b22729f..8c0735a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -163,6 +163,10 @@ public class MesWorkOrder extends BaseBean { public String prodCfgName; @Transient + @ApiParam("区域代码名称") + private String areaCodeName; + + @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") public String startTimeStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index e48bba7..df1dcb6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -183,11 +183,6 @@ public class MesWorkOrderLog extends BaseBean { @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") public String endTimeEnd; - @Transient - @ApiParam("mes生产工单页面按钮控制") - private MesWorkOrderButtonModel workOrderButtonModel; - - public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 810ec8a..447c70a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.softswitch.bean.*; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.springframework.beans.factory.annotation.Autowired; import java.io.Serializable; @@ -32,6 +33,9 @@ public class BsSuitCaseModel implements Serializable { @ApiParam(value = "Web Service 适配套件") private BsSuitCaseWebService webService; + @ApiParam(value = " MQ 适配套件") + private BsSuitCaseMq mq; + @ApiParam(value = "REST 适配套件") private BsSuitCaseREST bsSuitCaseREST; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java index 596233a..b5c8c0a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java @@ -11,6 +11,16 @@ import lombok.Data; **/ @Data public class SoftswitchIocModel { + /* Spring Ioc Bean 名称 */ private String beanName; + /* Spring Ioc 需要管理的Bean */ private Object obj; + /* 需要 管理 Bean 类型 */ + private Integer objType; + /* 需要 管理 Bean 状态 */ + private Integer objStatus; + /* 需要 管理 Bean 唯一 */ + private String objKey; + /* Bean 的描述信息 */ + private String objDescription; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index a285dad..2654ae6 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -27,6 +27,8 @@ public class SuitServerModel { /* 认证使用 以后使用 */ private String token; + // 请求ID + private String requestId; // 传输单对象 private Object obj; // 传输集合 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index 40edbf5..a5a4d10 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -35,8 +35,11 @@ public class WmsActionResponseBean implements Serializable { @ApiParam("进度") public String percent = "消息提示："; - @ApiParam("当前步骤") - public Integer currentStep; + @ApiParam("当前步骤类型名称") + public String currentStepTypeName; + + @ApiParam("当前步骤名称") + public String currentStepName; @ApiParam("总步数") public int totalStep; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java index 1911b04..ee8cdc6 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.ApiParam; -import io.swagger.models.auth.In; import lombok.Data; import java.io.Serializable; @@ -39,15 +38,12 @@ public class WmsMessageStyleModel implements Serializable { public WmsMessageStyleModel() { } + public WmsMessageStyleModel(String message, Integer selectQty) { this.message = message; - if(selectQty==1){ - this.wsStatus=10; - } - if(selectQty==2){ - this.wsStatus=20; - } + this.wsStatus = selectQty; } + public WmsMessageStyleModel(String message) { this.message = message; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java new file mode 100644 index 0000000..3d3452b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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 : MQ 适配套件 + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019/9/9 上午11:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE_MQ") +@Api(value = "MQ", description = "MQ 适配套件") +public class BsSuitCaseMq extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name = "USER_LOGIN_NAME") + @ApiParam(value = "登录名称") + private String userLoginName; + + @Column(name = "USER_LOGIN_PWD") + @ApiParam(value = "登录密码") + private String userLoginPwd; + + @Column(name = "VIRTUAL_HOST") + @ApiParam(value = "虚拟 Host") + private String virtualHost; + + @Column(name = "QUEUE_NAME") + @ApiParam(value = "队列名称") + private String queueName; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 2d598e5..772bee5 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -26,6 +27,7 @@ import java.util.List; @Entity @DynamicInsert @DynamicUpdate +@XStreamAlias("param") @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SUIT_CASE_PARAM") @Api(value = "适配器出入参", description = "适配器出入参") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseMqRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseMqRepository.java new file mode 100644 index 0000000..b6e8864 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseMqRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseMq; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019/9/26 下午3:25 + * @Modify: + **/ +@Repository +public interface BsSuitCaseMqRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 64ea546..6e21241 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -176,6 +176,9 @@ public class WmsASNMaster extends BaseBean { @ApiParam("项目") private String prodCfgTypeCode; + @Transient + private List orderNoList; + public WmsASNMaster() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 1cdfb49..fc0f62b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -84,6 +84,10 @@ public class WmsActionGroupDetails extends BaseBean { private String asName; @Transient + @ApiParam(value = "步骤类型名称") + private String atName; + + @Transient @ApiParam(value = "流程名称") private String agName; @@ -112,11 +116,13 @@ public class WmsActionGroupDetails extends BaseBean { @ApiParam(value = "是否自动开窗", example = "2") private Integer isAutoOpenWindow; + @Column(name = "SEARCH_KEY") @ApiParam(value = "搜索KEY") - public String searchKey; + private String searchKey; + @Column(name = "GROUP_KEY") @ApiParam(value = "分组KEY") - public String groupKey; + private String groupKey; public int getSeqVal() { return this.seq == null ? 0 : this.seq; @@ -153,4 +159,37 @@ public class WmsActionGroupDetails extends BaseBean { public int getLenCheckVal() { return this.lenCheck == null ? 0 : this.lenCheck; } + + public WmsActionGroupDetails() { + } + + public WmsActionGroupDetails(Long id, Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper, + Integer lenCheck, String regularCheck, String regularCheckFailMsg, Long asId, Long atId, + String asName, String atName, String goToBtnCode, String goToBtnName, Integer preShow, + Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey, + String groupKey, String organizeCode) { + this.id = id; + this.agId = agId; + this.seq = seq; + this.okSeq = okSeq; + this.ngSeq = ngSeq; + this.valueType = valueType; + this.toUpper = toUpper; + this.lenCheck = lenCheck; + this.regularCheck = regularCheck; + this.regularCheckFailMsg = regularCheckFailMsg; + this.asId = asId; + this.atId = atId; + this.asName = asName; + this.atName = atName; + this.goToBtnCode = goToBtnCode; + this.goToBtnName = goToBtnName; + this.preShow = preShow; + this.showAmId = showAmId; + this.isCommitAble = isCommitAble; + this.isAutoOpenWindow = isAutoOpenWindow; + this.searchKey = searchKey; + this.groupKey = groupKey; + this.organizeCode = organizeCode; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index b583ee5..d101b27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -133,6 +133,11 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description") public Integer differenceType; + public Integer getDifferenceTypeVal() { + return this.differenceType == null ? + -1: this.differenceType; + } + public Double getQty() { return this.qty == null ? 0 : this.qty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 8b24b26..1477d82 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -144,6 +144,17 @@ public class WmsPOMaster extends BaseBean { @ApiParam("前端信息") private String message; + @Transient + @ApiParam("计划日期开始") + private String planDateStart; + + @Transient + @ApiParam("计划日期结束") + private String planDateEnd; + + @Transient + private List orderNoList; + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 20705ab..c63c5fc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -147,6 +147,22 @@ public class WmsPart extends BaseBean { @ApiParam("保质期天数") private Integer qualityDays; + @Column(name = "IS_REPORT_PARTNO") + @ApiParam("是否报工零件") + private Integer isReportPartNo; + + @Column(name = "REPORT_LOCATE_NO") + @ApiParam("报工库位") + private String reportLocateNo; + + @Column(name = "REPORT_ZONE_NO") + @ApiParam("报工存储区") + private String reportZoneNo; + + @Column(name = "PRODUCT_LINES") + @ApiParam("报工产线") + private String productLines; + @Transient @ApiParam("总数量") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java new file mode 100644 index 0000000..b31d80a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.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 : jimmy.zeng + * @CreateDate : 2019-09-27 14:44 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_PART_RELATION") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="物料关系表",description = "物料关系表") +public class WmsPartRelation extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partName; + + @Column(name = "ASSOCIATE_CODE") + @ApiParam(value = "关联代码") + private String associateCode; + + @Column(name = "ASSOCIATE_NAME_ADD") + @ApiParam(value = "关联名称") + private String associateNameAdd; + + @Column(name = "ASSOCIATE_TYPE") + @ApiParam(value = "关联类型") + private Integer associateType; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java new file mode 100644 index 0000000..7c8bf61 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.wms.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 : jessica.chen + * @CreateDate : 2019-09-26 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PRINTER_CONFIGURE") +@Api("打印机配置表") +public class WmsPrinterConfigure extends BaseBean{ + + private static final long serialVersionUID = 1234639813072592779L; + @Column(name="PRINTER_NO") + @ApiParam("打印机编号") + private String printerNo; + + @Column(name="PRINTER_NAME") + @ApiParam("打印机名称") + private String printerName; + + @Column(name="IP") + @ApiParam("IP") + private String ip; + + @Column(name="PORT") + @ApiParam("端口") + private Integer port; + + @Column(name="OBJECT_DESCRIPTION") + @ApiParam(value ="描述") + private String objectDescription; + + @Column(name="POSITION") + @ApiParam("位置") + private String position; + + @Column(name="TYPE") + @ApiParam("类型") + private Integer type; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java new file mode 100644 index 0000000..9aac6f4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.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 : jessica.chen + * @CreateDate : 2019-09-27 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PRINTING_QUEUE") +@Api("待打印队列表") +public class WmsPrintingQueue extends BaseBean{ + + private static final long serialVersionUID = 1111639813072592779L; + @Column(name="PRINT_IDENTIFICATION") + @ApiParam("打印标识") + private String printIdentification; + + @Column(name="PRINT_TYPE") + @ApiParam("打印类型") + private Integer printType; + + @Column(name="PRINT_NO") + @ApiParam("打印机编号") + private String printNo; + + @Column(name="PRINT_MUMBER") + @ApiParam("打印机张数") + private Integer printNumber; + + @Column(name="TEMPLATE_NO") + @ApiParam("模板编号") + private String templateNo; + + @Column(name="PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java new file mode 100644 index 0000000..5639a23 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.wms.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 : jimmy.zeng + * @CreateDate : 2019-09-27 16:58 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_SN_OPERATE_RECORD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="条码操作记录表",description = "条码操作记录表") +public class WmsSnOperateRecord extends BaseBean { + + @Column(name = "SN") + @ApiParam(value = "条码") + private String sn; + + @Column(name = "LINE_CODE") + @ApiParam(value = "产线代码") + private String lineCode; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区编号") + private String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位代码") + private String locateNo; + + @Column(name = "QTY") + @ApiParam(value = "数量", example = "0") + private Double qty = 0d; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编码") + private String custNo; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地") + private String shippingFlag; + + @Column(name = "OPERATE_TYPE") + @ApiParam(value = "操作类型") + private Integer operateType; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 43dfd15..37201b2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -128,11 +128,11 @@ public class WmsStockSn extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") private Integer snStatus; /** - * 1:已打印；2：未打印 + * 1:已打印；2：未打印；3：退料生成条码 */ @Column(name = "PRINTED") @ApiParam(value = "是否打印", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") private Integer printed; @Column(name = "PDATE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRelationRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRelationRepository.java new file mode 100644 index 0000000..e2108ed --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRelationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartRelation; +import org.springframework.stereotype.Repository; + +/** + * @Description : 物料关系信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-09-27 15:18 + * @Modify: + **/ +@Repository +public interface WmsPartRelationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrinterConfigureRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrinterConfigureRepository.java new file mode 100644 index 0000000..83401e5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrinterConfigureRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; +import cn.estsh.i3plus.pojo.wms.bean.WmsPrinterConfigure; + +/** + * @Description : 打印机配置 + * @Reference : + * @Author : jessica.chen + * @Date : 2019-09-26 12:03:00 + * @Modify : + **/ +public interface WmsPrinterConfigureRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrintingQueueRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrintingQueueRepository.java new file mode 100644 index 0000000..b63a0f8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrintingQueueRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsPrintingQueue; +import org.springframework.stereotype.Repository; + +/** + * @Description :待打印配置表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-09-27 14:49 + * @Modify: + **/ +@Repository +public interface WmsPrintingQueueRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnOperateRecordRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnOperateRecordRepository.java new file mode 100644 index 0000000..fc4f25d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnOperateRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSnOperateRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : 条码操作记录信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-09-27 17:07 + * @Modify: + **/ +@Repository +public interface WmsSnOperateRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 38ae263..b6cafeb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -208,6 +208,12 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + + // 查询计划时间在指定范围的单号，查询这些单号的数据 + if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) { + DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result); + } + getStringBuilderPack(wmsPOMaster, result); return result; @@ -593,6 +599,11 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); + // 查询计划时间在指定范围的单号，查询这些单号的数据 + if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) { + DdlPreparedPack.getInPackList(wmsASNMaster.getOrderNoList(), "orderNo", result); + } + getStringBuilderPack(wmsASNMaster, result); return result; @@ -1529,6 +1540,12 @@ public class WmsHqlPack { DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result); result.setOrderByStr(wmsStockSn.orderBy()); + if(wmsStockSn.getPrinted()!= null){ + if(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue() == wmsStockSn.getPrinted()){ + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue(),"printed",result); + } + } + getStringBuilderPack(wmsStockSn, result); return result; }