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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -44,6 +44,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAlarmCode(), "alarmCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAndonOrderNo(), "andonOrderNo", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpCode(), "rpCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpLevel(), "rpLevel", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean);
         if(StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeEnd())){

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java

@@ -27,4 +27,5 @@ public @interface FieldAnnotation {
     ApsEnumUtil.EDIT_TYPE editType() default ApsEnumUtil.EDIT_TYPE.NONE; // 定义字段的编辑类型
     Class<?> multiEnumClass() default Object.class;  // 多选枚举的类型。
     String typeName() default "";   // 定义字段类型的简单名称，对于多选关联对象时有用。
+    String relation() default "";   // 关联字段标识
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java

@@ -28,6 +28,12 @@ import java.util.List;
 @MappedSuperclass
 @Api("订单基类")
 public class BaseOrder extends BaseCode {
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(relation = "Material")
+    private Long materialId;
+
     @Column(name="COUNT")
     @ApiParam(value ="数量")
     private Double count;
@@ -69,11 +75,6 @@ public class BaseOrder extends BaseCode {
     @ApiParam(value ="专料号")
     private String specifyMaterialNum;
 
-    @Column(name="MATERIAL_ID")
-    @ApiParam(value ="物料")
-    @FieldAnnotation(property = false)
-    private Long materialId;
-
     @JsonBackReference
     public List<Work> getWorks() {
         return BeanRelation.list(this, EBaseOrder.Works);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java

@@ -30,25 +30,25 @@ public class DynamicSetTime extends BaseAPS {
     private String resCode;
 
     @Column(name="TYPE")
-    @ApiParam(value ="应用工作计划类型")
+    @ApiParam(value ="影响类型")
     @FieldAnnotation(defaultValue = "ALL")
     private ApsEnumUtil.DYNAMIC_SET_TYPE type;
 
     @Column(name="CONSIDER_ASS_RES")
-    @ApiParam(value ="是否启用副资源动态设置时间")
+    @ApiParam(value ="启用副资源设置时间")
     private Boolean considerAssRes;
 
     @Column(name="CONSIDER_MATERIAL")
-    @ApiParam(value ="是否启用物料动态设置时间")
+    @ApiParam(value ="启用物料设置时间")
     private Boolean considerMaterial;
 
     @Column(name="ASS_RES_CALC")
-    @ApiParam(value ="副资源动态设置计算方式")
+    @ApiParam(value ="副资源设置计算方式")
     @FieldAnnotation(defaultValue = "MAX")
     private ApsEnumUtil.DYNAMIC_SET_CALC assResCalc;
 
     @Column(name="MATERIAL_CALC")
-    @ApiParam(value ="物料动态设置时间计算方式")
+    @ApiParam(value ="物料设置时间计算方式")
     @FieldAnnotation(defaultValue = "MAX")
     private ApsEnumUtil.DYNAMIC_SET_CALC materialCalc;
 

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.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.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
@@ -50,18 +51,22 @@ public class FieldInfo extends BaseCode {
 
     @Column(name="CUSTOMIZE")
     @ApiParam(value ="是否为自定义字段")
-    private Boolean customize;
+    @FieldAnnotation(defaultValue = "true")
+    private Boolean customize = true;
 
     @Column(name="MODIFY")
     @ApiParam(value ="是否能修改")
-    private Boolean modify;
+    @FieldAnnotation(defaultValue = "true")
+    private Boolean modify = true;
 
     @Column(name="DISPLAY")
     @ApiParam(value ="是否在界面显示")
-    private Boolean display;
+    @FieldAnnotation(defaultValue = "true")
+    private Boolean display = true;
 
     @Column(name="PRIC")
     @ApiParam(value ="浮点数显示精度")
+    @FieldAnnotation(defaultValue = "2")
     private Integer pric;
 
     @Column(name="TIPS")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java

@@ -29,6 +29,11 @@ import java.util.List;
 @Table(name = "APS_OPER_INPUT")
 @Api("工序输入")
 public class OperInput extends BaseAPS {
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(relation = "Material")
+    private Long materialId;
+
     @Column(name="INPUT_COUNT")
     @ApiParam(value ="输入数量")
     private Double inputCount;
@@ -59,11 +64,6 @@ public class OperInput extends BaseAPS {
     @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);
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java

@@ -28,6 +28,11 @@ import java.util.List;
 @Table(name = "APS_OPER_OUTPUT")
 @Api("工序输出")
 public class OperOutput extends BaseAPS {
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(relation = "Material")
+    private Long materialId;
+
     @Column(name="OUTPUT_COUNT")
     @ApiParam(value ="输出数量")
     private Double outputCount;
@@ -45,11 +50,6 @@ public class OperOutput extends BaseAPS {
     @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);
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java

@@ -29,6 +29,12 @@ import java.util.List;
 @Table(name = "APS_OPER_RESOURCE")
 @Api("工序资源")
 public class OperResource extends BaseAPS {
+
+    @Column(name="RESOURCE_ID")
+    @ApiParam(value ="资源")
+    @FieldAnnotation(relation = "Resource")
+    private Long resourceId;
+
     @Column(name="USE_TYPE")
     @ApiParam(value ="使用类型")
     @FieldAnnotation(defaultValue = "MAIN")
@@ -71,11 +77,6 @@ public class OperResource extends BaseAPS {
     @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);
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java

@@ -3,7 +3,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.*;
 import cn.estsh.i3plus.pojo.aps.holders.EResource;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
@@ -30,11 +29,6 @@ import java.util.List;
 @Table(name = "APS_RESOURCE")
 @Api("资源")
 public class Resource extends BaseCode {
-    @Column(name="BOTTLENECK")
-    @ApiParam(value ="是否瓶颈资源")
-    @FieldAnnotation(defaultValue = "false")
-    private Boolean bottleneck;
-
     @Column(name="TYPE")
     @ApiParam(value ="资源类型")
     @FieldAnnotation(defaultValue = "MAIN")
@@ -89,17 +83,17 @@ public class Resource extends BaseCode {
 
     @Column(name="EFFICIENCY_EFFECT")
     @ApiParam(value ="效率影响类型")
-    @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class)
+    @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
     private Integer EfficiencyEffect;
 
     @Column(name="TIME_ROUND")
     @ApiParam(value ="时间圆整影响")
-    @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class)
+    @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
     private Integer timeRound;
 
     @Column(name="TIME_TAIL_ROUND")
     @ApiParam(value ="时间尾数影响")
-    @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class)
+    @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
     private Integer timeTailRound;
 
     @Column(name="LOCK_TYPE")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java

@@ -25,6 +25,12 @@ import javax.persistence.Table;
 @Table(name = "APS_STAND_OPERATION")
 @Api("标准工序")
 public class StandOperation extends BaseCode {
+
+    @Column(name="DIRECTION")
+    @ApiParam(value ="排程方向")
+    @FieldAnnotation(defaultValue = "POSITIVE")
+    private ApsEnumUtil.DIRECTION direction;
+
     @Column(name="RATIO")
     @ApiParam(value ="分割比例")
     private String ratio;
@@ -37,11 +43,6 @@ public class StandOperation extends BaseCode {
     @ApiParam(value ="分割批量")
     private Double batch;
 
-    @Column(name="DIRECTION")
-    @ApiParam(value ="排程方向")
-    @FieldAnnotation(defaultValue = "POSITIVE")
-    private ApsEnumUtil.DIRECTION direction;
-
     @Column(name="COMB_TYPE")
     @ApiParam(value ="生产组合方式")
     @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java

@@ -1,6 +1,7 @@
 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.EWork;
@@ -29,10 +30,20 @@ import java.util.List;
 @Entity
 @Table(name = "APS_WORK")
 @Api("工作")
-public class Work extends BaseCode {
+public class Work extends BaseAPS {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="ORDER_ID")
+    @ApiParam(value ="订单")
+    @FieldAnnotation(relation = "Order")
+    private Long orderId;
+
     @Column(name="WORK_TYPE")
     @ApiParam(value ="工作类型")
-    @FieldAnnotation(modify = false)
+    @FieldAnnotation(property = false)
     private ApsEnumUtil.WORK_TYPE workType;
 
     @Column(name="count")
@@ -40,6 +51,25 @@ public class Work extends BaseCode {
     @FieldAnnotation(modify = false)
     private Double count;
 
+    @Column(name="WORK_STATUS")
+    @ApiParam(value ="工作状态")
+    private ApsEnumUtil.WORK_STATUS workStatus;
+
+    @Column(name="PLAN_BEGIN")
+    @ApiParam(value ="计划开始时间")
+    @FieldAnnotation(modify = false)
+    private Date planBegin;
+
+    @Column(name="PLAN_END")
+    @ApiParam(value ="计划结束时间")
+    @FieldAnnotation(modify = false)
+    private Date planEnd;
+
+    @Column(name="PLAN_RESOURCE")
+    @ApiParam(value ="计划主资源")
+    @FieldAnnotation(modify = false)
+    private String planResource;
+
     @Column(name="SPECIFY_COUNT")
     @ApiParam(value ="指定数量")
     private Double specifyCount;
@@ -86,25 +116,6 @@ public class Work extends BaseCode {
     @FieldAnnotation(modify = false)
     private Date calcLet;
 
-    @Column(name="WORK_STATUS")
-    @ApiParam(value ="工作状态")
-    private ApsEnumUtil.WORK_STATUS workStatus;
-
-    @Column(name="PLAN_BEGIN")
-    @ApiParam(value ="计划开始时间")
-    @FieldAnnotation(modify = false)
-    private Date planBegin;
-
-    @Column(name="PLAN_END")
-    @ApiParam(value ="计划结束时间")
-    @FieldAnnotation(modify = false)
-    private Date planEnd;
-
-    @Column(name="PLAN_RESOURCE")
-    @ApiParam(value ="计划主资源")
-    @FieldAnnotation(modify = false)
-    private String planResource;
-
     @Column(name="FIX_SPLIT")
     @ApiParam(value ="已分割的工作是否固定")
     private Boolean fixSplit;
@@ -124,11 +135,6 @@ public class Work extends BaseCode {
     @FieldAnnotation(modify = false)
     private String failedReason;
 
-    @Column(name="ORDER_ID")
-    @ApiParam(value ="订单")
-    @FieldAnnotation(property = false)
-    private Long orderId;
-
     @Column(name="OPERATION_ID")
     @ApiParam(value ="工序")
     @FieldAnnotation(property = false)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java

@@ -29,10 +29,15 @@ import java.util.List;
 @Table(name = "APS_WORK_INPUT")
 @Api("工作输入")
 public class WorkInput extends BaseAPS {
-    @Column(name="INPUT_TIME")
+    @Column(name="WORK_ID")
-    @ApiParam(value ="输入时间")
+    @ApiParam(value ="工作")
-    @FieldAnnotation(modify = false)
+    @FieldAnnotation(relation = "Work")
-    private Date inputTime;
+    private Long workId;
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(relation = "Material")
+    private Long materialId;
 
     @Column(name="INPUT_COUNT")
     @ApiParam(value ="输入数量")
@@ -44,15 +49,10 @@ public class WorkInput extends BaseAPS {
     @FieldAnnotation(modify = false)
     private Double shortCount;
 
-    @Column(name="WORK_ID")
+    @Column(name="INPUT_TIME")
-    @ApiParam(value ="工作")
+    @ApiParam(value ="输入时间")
-    @FieldAnnotation(property = false)
+    @FieldAnnotation(modify = false)
-    private Long workId;
+    private Date inputTime;
-
-    @Column(name="MATERIAL_ID")
-    @ApiParam(value ="物料")
-    @FieldAnnotation(property = false)
-    private Long materialId;
 
     @Column(name="OPER_INPUT_ID")
     @ApiParam(value ="工序输入")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java

@@ -30,10 +30,16 @@ import java.util.List;
 @Table(name = "APS_WORK_OUTPUT")
 @Api("工作输出")
 public class WorkOutput extends BaseAPS {
-    @Column(name="OUTPUT_TIME")
+
-    @ApiParam(value ="输出时间")
+    @Column(name="WORK_ID")
-    @FieldAnnotation(modify = false)
+    @ApiParam(value ="工作")
-    private Date outputTime;
+    @FieldAnnotation(relation = "Work")
+    private Long workId;
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(relation = "Material")
+    private Long materialId;
 
     @Column(name="OUTPUT_COUNT")
     @ApiParam(value ="输出数量")
@@ -45,15 +51,10 @@ public class WorkOutput extends BaseAPS {
     @FieldAnnotation(modify = false)
     private Double remainCount;
 
-    @Column(name="WORK_ID")
+    @Column(name="OUTPUT_TIME")
-    @ApiParam(value ="工作")
+    @ApiParam(value ="输出时间")
-    @FieldAnnotation(property = false)
+    @FieldAnnotation(modify = false)
-    private Long workId;
+    private Date outputTime;
-
-    @Column(name="MATERIAL_ID")
-    @ApiParam(value ="物料")
-    @FieldAnnotation(property = false)
-    private Long materialId;
 
     @Column(name="OPER_OUTPUT_ID")
     @ApiParam(value ="工序输出")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java

@@ -34,6 +34,17 @@ import java.util.List;
 @Table(name="APS_WORK_PLAN")
 @Api("工作计划")
 public class WorkPlan extends BaseAPS {
+
+    @Column(name="WORK_ID")
+    @ApiParam(value ="工作")
+    @FieldAnnotation(relation = "Work")
+    private Long workId;
+
+    @Column(name="RESOURCE_ID")
+    @ApiParam(value ="资源")
+    @FieldAnnotation(relation = "Resource")
+    private Long resourceId;
+
     @Column(name="TYPE")
     @ApiParam(value ="工作计划类型")
     @FieldAnnotation(modify = false, display = false)
@@ -51,7 +62,7 @@ public class WorkPlan extends BaseAPS {
 
     @Column(name="PREV_SET_TIME")
     @ApiParam(value ="前设置时间")
-    @FieldAnnotation(modify = false)
+    @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private Integer prevSetTime;
 
     @Column(name="PRODUCE_BEGIN")
@@ -68,7 +79,7 @@ public class WorkPlan extends BaseAPS {
 
     @Column(name="PRODUCE_TIME")
     @ApiParam(value ="生产时间")
-    @FieldAnnotation(modify = false)
+    @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private Integer produceTime;
 
     @Column(name="POST_SET_BEGIN")
@@ -83,7 +94,7 @@ public class WorkPlan extends BaseAPS {
 
     @Column(name="POST_SET_TIME")
     @ApiParam(value ="后设置时间")
-    @FieldAnnotation(modify = false)
+    @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private Integer postSetTime;
 
     @Column(name="LOCK_BEGIN")
@@ -99,19 +110,9 @@ public class WorkPlan extends BaseAPS {
 
     @Column(name="LOCK_TIME")
     @ApiParam(value ="锁定时间")
-    @FieldAnnotation(modify = false)
+    @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private Integer lockTime;
 
-    @Column(name="WORK_ID")
-    @ApiParam(value ="工作对象id")
-    @FieldAnnotation(property = false)
-    private Long workId;
-
-    @Column(name="RESOURCE_ID")
-    @ApiParam(value ="资源对象id")
-    @FieldAnnotation(property = false)
-    private Long resourceId;
-
     @Column(name="WORK_RESOURCE_ID")
     @ApiParam(value ="工作资源对象id")
     @FieldAnnotation(property = false)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java

@@ -27,6 +27,37 @@ import javax.persistence.Table;
 @Table(name = "APS_Work_Relation")
 @Api("工作关联")
 public class WorkRelation extends BaseAPS {
+
+    @Column(name="MATERIAL_ID")
+    @ApiParam(value ="物料")
+    @FieldAnnotation(relation = "Material")
+    private Long materialId;
+
+    @Column(name="PREV_ORDER_ID")
+    @ApiParam(value ="前订单")
+    @FieldAnnotation(relation = "PrevOrder")
+    private Long prevOrderId;
+
+    @Column(name="POST_ORDER_ID")
+    @ApiParam(value ="后订单")
+    @FieldAnnotation(relation = "PostOrder")
+    private Long postOrderId;
+
+    @Column(name="PREV_WORK_ID")
+    @ApiParam(value ="前工作")
+    @FieldAnnotation(relation = "PrevWork")
+    private Long prevWorkId;
+
+    @Column(name="POST_WORK_ID")
+    @ApiParam(value ="后工作")
+    @FieldAnnotation(relation = "PostWork")
+    private Long postWorkId;
+
+    @Column(name="COUNT")
+    @ApiParam(value ="关联数量")
+    @FieldAnnotation(modify = false)
+    private Double count;
+
     @Column(name="TYPE")
     @ApiParam(value ="关联类型")
     @FieldAnnotation(modify = false)
@@ -47,11 +78,6 @@ public class WorkRelation extends BaseAPS {
     @FieldAnnotation(modify = false)
     private String minSpaceTime;
 
-    @Column(name="COUNT")
-    @ApiParam(value ="关联数量")
-    @FieldAnnotation(modify = false)
-    private Double count;
-
     @Column(name="FIX_RELATION")
     @ApiParam(value ="是否固定关联")
     private Boolean fixRelation;
@@ -70,31 +96,6 @@ public class WorkRelation extends BaseAPS {
     @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);
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java

@@ -27,6 +27,17 @@ import javax.persistence.Table;
 @Table(name = "APS_WORK_RESOURCE")
 @Api("工作资源")
 public class WorkResource extends BaseAPS {
+
+    @Column(name="WORK_ID")
+    @ApiParam(value ="工作")
+    @FieldAnnotation(relation = "Work")
+    private Long workId;
+
+    @Column(name="RESOURCE_ID")
+    @ApiParam(value ="资源")
+    @FieldAnnotation(relation = "Resource")
+    private Long resourceId;
+
     @Column(name="USE_TYPE")
     @ApiParam(value ="使用类型")
     @FieldAnnotation(modify = false)
@@ -34,17 +45,17 @@ public class WorkResource extends BaseAPS {
 
     @Column(name="PREV_TIME")
     @ApiParam(value ="前设置时间")
-    @FieldAnnotation(modify = false)
+    @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private Integer prevTime;
 
     @Column(name="PRODUCE_TIME")
     @ApiParam(value ="制造时间")
-    @FieldAnnotation(modify = false)
+    @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private Integer produceTime;
 
     @Column(name="POST_TIME")
     @ApiParam(value ="后设置时间")
-    @FieldAnnotation(modify = false)
+    @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private Integer postTime;
 
     @Column(name="PRIORITY")
@@ -72,16 +83,6 @@ public class WorkResource extends BaseAPS {
     @FieldAnnotation(modify = false)
     private String userMatchNumber;
 
-    @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)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java

@@ -28,8 +28,4 @@ public abstract class BaseCode extends BaseAPS {
     @ApiParam(value ="名称")
     @FieldAnnotation(popSearch = true)
     private String name;
-
-    @Column(name="REMARK")
-    @ApiParam(value ="备注")
-    private String remark;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java

@@ -1,24 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.enums;
-
-/**
- * @Description :资源效率影响的计划类型
- * @Reference :
- * @Author : jason.niu
- * @CreateDate : 2019-10-17
- * @Modify:
- **/
-public enum EFFICIENCY_EFFECT {
-    PREV_SET(1),    // 前设置
-    PRODUCE(2),     // 生产
-    POST_SET(4);    // 后设置
-
-    private int _value;
-
-    EFFICIENCY_EFFECT(int value){
-        _value = value;
-    }
-
-    public int value() {
-        return this._value;
-    }
-}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java

@@ -1,10 +1,7 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
-import io.swagger.annotations.ApiParam;
-
 public enum EBaseOrder {
     Works,
-    @ApiParam(value = "物料")
     Material,
     PrevRelations,
     PostRelations,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java

@@ -1,11 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
 public enum EWorkRelation {
-    WorkInput,
+    Material,
-    WorkOutput,
-    PrevWork,
-    PostWork,
     PrevOrder,
     PostOrder,
-    Material
+    PrevWork,
+    PostWork,
+    WorkInput,
+    WorkOutput
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java

@@ -324,6 +324,32 @@ public class ApsEnumUtil {
     }
 
     /**
+     * 资源效率影响类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EFFICIENCY_EFFECT {
+        PREV_SET(1, "前设置"),    // 前设置
+        PRODUCE(2, "生产"),     // 生产
+        POST_SET(4, "后设置");    // 后设置
+
+        private int value;
+        private String description;
+
+        EFFICIENCY_EFFECT(int value, String description){
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 预置的资源选择规则
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -842,7 +842,8 @@ public class ImppEnumUtil {
         NUMBER(2,"number","数字"),
         DATE(3,"date","时间"),
         SWITCH(4,"switch","布尔"),
-        SELECT(5,"select","选择");
+        SELECT(5,"select","选择"),
+        FILE(6,"select","选择");
 
         private int value;
         private String name;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java

@@ -251,4 +251,80 @@ public class LacEnumUtil {
         }
     }
 
+    /**
+     * 指令操作类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMMAND_OPERATE_TYPE{
+        COMMAND_STACK(10,"指令集"),
+        COMMAND_STACK_STEP(20,"指令集步骤"),
+        COMMAND_STACK_STEP_TASK(30,"指令集步骤任务");
+
+        private int value;
+        private String description;
+
+        COMMAND_OPERATE_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;
+        }
+    }
+
+    /**
+     * 指令操作类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMMAND_OPERATE{
+        RESUME(11,"恢复",COMMAND_OPERATE_TYPE.COMMAND_STACK),
+        PAUSE(12,"暂停",COMMAND_OPERATE_TYPE.COMMAND_STACK),
+        CLOSE(13,"关闭",COMMAND_OPERATE_TYPE.COMMAND_STACK),
+        NEXT_STEP(14,"下一步",COMMAND_OPERATE_TYPE.COMMAND_STACK),
+        INTERRUPT(21,"中断",COMMAND_OPERATE_TYPE.COMMAND_STACK_STEP_TASK);
+
+        private int value;
+        private String description;
+        private COMMAND_OPERATE_TYPE commandOperateType;
+
+        COMMAND_OPERATE(int value, String description,COMMAND_OPERATE_TYPE commandOperateType) {
+            this.value = value;
+            this.description = description;
+            this.commandOperateType = commandOperateType;
+        }
+
+        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;
+        }
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -2962,7 +2962,8 @@ public class MesEnumUtil {
         SUPPLY_SWITCH(150,"SUPPLY_SWITCH",""),
         PCN_LOGIN(160, "PCN_LOGIN",""),
         PCN_MENU(170, "PCN_MENU",""),
-        PCN_MODULE(180, "PCN_MODULE","");
+        PCN_MODULE(180, "PCN_MODULE",""),
+        PCN_LOGOUT(190, "PCN_LOGOUT","");
 
 
         private int value;
@@ -3073,6 +3074,39 @@ public class MesEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ONLINE_SEND_TYPE {
+
+        PLC("PLC", "PLC"),
+        DB("DB", "DB");
+
+        private String value;
+        private String description;
+
+        ONLINE_SEND_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 (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     /**
      * WC_CHECK_TYPE 开线检查的模块
      */
@@ -3165,4 +3199,56 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * MesWorkCenter 工作中心运行状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CENTER_RUNNING_STATUS {
+
+        RUNNING("Y", "start", "开线"),
+        STOPPED("N", "stop", "停线");
+
+        private String value;
+        private String code;
+        private String description;
+
+        WORK_CENTER_RUNNING_STATUS(String value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfCode(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1053,7 +1053,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_QC_STATUS {
-        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "ISOLATED", "报废");
+        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废");
 
         private int value;
         private String code;

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.lac.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-11-19 16:14
+ * @Modify:
+ **/
+@Data
+@ApiModel("指令操作")
+public class LacCommandOperate {
+
+    @ApiParam(value ="指令集记录id" , example = "-1")
+    private Long commandStackRecordId;
+
+    @ApiParam(value ="步骤任务id" , example = "-1")
+    private Long commandStackStepTaskIdId;
+
+    @ApiParam(value ="操作类型" , example = "-1")
+    private Integer operateType;
+
+    @ApiParam(value ="操作" , example = "-1")
+    private Integer operate;
+
+}

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java

@@ -94,6 +94,10 @@ public class LacCommandStackRecord extends BaseBean {
     private String executionDescription;
 
     @Transient
+    @ApiParam(value ="Lac实例id")
+    private String lacInstanceId;
+
+    @Transient
     @ApiParam(value ="指令集模板")
     private LacCommandStackTemplate template;
 

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java

@@ -2,9 +2,19 @@ package cn.estsh.i3plus.pojo.lac.sqlpack;
 
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.lac.bean.*;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord;
-
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType;
+import cn.estsh.i3plus.pojo.lac.bean.LacLogTask;
+import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail;
+import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask;
+import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam;
+import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter;
+import cn.estsh.i3plus.pojo.lac.bean.LacTaskType;
 import java.util.List;
 
 /**
@@ -61,9 +71,9 @@ public class LacHqlPack {
     public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTemplateId(), "templateId", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bean.getStepId(),"stepId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getStepId(), "stepId", ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bean.getTaskNameRdd(), "taskNameRdd", ddlPackBean);
 
         return ddlPackBean;
@@ -104,7 +114,7 @@ public class LacHqlPack {
 
     public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
-        if(bean == null){
+        if (bean == null) {
             return ddlPackBean;
         }
         DdlPreparedPack.getNumEqualPack(bean.getParamType(), "paramType", ddlPackBean);
@@ -143,4 +153,10 @@ public class LacHqlPack {
         );
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlNotFinishLacCommandStackRecord() {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getNumberSmallerPack(LacEnumUtil.STACK_STATUS.FINISH.getValue(), "stackStatus", ddlPackBean);
+        return ddlPackBean;
+    }
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java

@@ -100,21 +100,9 @@ public class MesPackage extends BaseBean {
     private String printStrStatus;
 
     @Transient
-    @ApiParam("客户代码名称")
-    private String custCodeName;
-
-    @Transient
     @ApiParam("打印缓存id")
     private String printId;
 
-    @Transient
-    @ApiParam("包装层级名称")
-    private String packLevelName;
-
-    @Transient
-    @ApiParam("是否封箱名称")
-    private String isSealedName;
-
     public MesPackage() {
     }
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -39,6 +40,7 @@ public class MesRoute extends BaseBean {
     @ApiParam("流程类型 10-扫描类型 20-监控类型")
     private Integer routeType;
 
+    @Lob
     @Column(name = "POSITION")
     @ApiParam("GOJS位置")
     private String position;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java

@@ -44,6 +44,10 @@ public class MesShift extends BaseBean {
     @ApiParam("开班时间")
     private String startTime;
 
+    @Column(name = "END_TIME")
+    @ApiParam("下班时间")
+    private String endTime;
+
     @Column(name = "WORK_TIMES")
     @ApiParam("作业时长")
     private Double workTimes;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java

@@ -73,9 +73,6 @@ public class ProdPackageModel {
     @ApiParam("打印状态文字")
     private String printStrStatus;
 
-    @ApiParam("客户代码名称")
-    private String custCodeName;
-
     @ApiParam("包装层级名称")
     private String packLevelName;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java

@@ -51,6 +51,25 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("客户名称")
     private String customerName;
 
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
     @ApiParam("客户物料名称")
     private String customerPartName;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("单位")
+    private String unit;
+
+    @ApiParam("特殊批号")
+    private String fixLotNo;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java

@@ -37,6 +37,10 @@ public class IfDismantleRecord extends BaseBean {
     @ApiParam("产线")
     private String workCenterCode;
 
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
     @Column(name = "PARENT_PART_NO")
     @ApiParam("产品物料编码")
     private String parentPartNo;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java

@@ -99,16 +99,4 @@ public class MesPackage extends BaseBean {
     @ApiParam("打印状态文字")
     private String printStrStatus;
 
-    @Transient
-    @ApiParam("客户代码名称")
-    private String custCodeName;
-
-    @Transient
-    @ApiParam("包装层级名称")
-    private String packLevelName;
-
-    @Transient
-    @ApiParam("是否封箱名称")
-    private String isSealedName;
-
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -35,6 +36,7 @@ public class MesRoute extends BaseBean {
     @ApiParam("流程名称")
     private String routeName;
 
+    @Lob
     @Column(name = "POSITION")
     @ApiParam("GOJS位置")
     private String position;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java

@@ -44,6 +44,10 @@ public class MesShift extends BaseBean {
     @ApiParam("开班时间")
     private String startTime;
 
+    @Column(name = "END_TIME")
+    @ApiParam("下班时间")
+    private String endTime;
+
     @Column(name = "WORK_TIMES")
     @ApiParam("作业时长")
     private Double workTimes;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java

@@ -53,7 +53,7 @@ public class MesWorkCenter extends BaseBean {
 
     @Column(name = "RUNNING_STATUS")
     @ApiParam("运行状态")
-    private Integer runningStatus;
+    private String runningStatus;
 
     @Transient
     @ApiParam(value = "子集列表")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -19,8 +20,8 @@ import java.math.BigDecimal;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Api("动作函数关系model")
+@Api("原材料信息model")
-public class IfRawPartDataModel implements Serializable {
+public class IfRawPartDataModel extends BaseBean {
 
     @ApiParam("id")
     private Long id;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -25,7 +24,7 @@ public class ProductBiModel {
     private String areaCode;
 
     @ApiParam("运行状态")
-    private Integer runningStatus;
+    private String runningStatus;
 
     @ApiParam(value = "物料号")
     private String partNo;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java

@@ -44,6 +44,7 @@ public class LacCommandStackModel {
      */
     private Exception exception;
 
+
     public void setException(Exception exception){
         LoggerFactory.getLogger("YYYY").error("异常信息：{}",exception);
         this.exception = exception;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java

@@ -142,7 +142,7 @@ public class WmsPoSn extends BaseBean {
     @ApiParam(value = "最晚收货时间")
     public String latestReceTime;
 
-    @Column(name = "FIX_LOT_NO", nullable = false)
+    @Column(name = "FIX_LOT_NO")
     @ApiParam(value = "特殊批次")
     private String fixLotNo = "";
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java

@@ -51,6 +51,7 @@ public class WmsRoutingRule extends BaseBean {
 
     @Column(name = "RULE_TYPE")
     @ApiParam(value = "规则类型(10 推动规则，20 补货规则)", example ="10")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ROUTING_RULE_TYPE.class, refForeignKey = "value", value = "description")
     private Integer ruleType;
 
     @Column(name = "SRC_ZONE_NO")