三力士演示demo

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

@@ -16,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 import java.util.List;
 
@@ -129,6 +130,9 @@ public class WorkPlan extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long furnacePlanId;
 
+    @Transient
+    private boolean hasCominbed = false;
+
     public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
 
     public void setWork(Work work) {

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java

@@ -28,4 +28,5 @@ public class ReportPager extends APSPager {
     private Date end;       // 统计结束时间
     private ApsEnumUtil.MATERIAL_REPORT_TYPE type;
     private ApsEnumUtil.REPORT_TIME_SPAN span;  // 统计时间间隔
+    private String shiftCode;
 }