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

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

@@ -110,6 +110,11 @@ public class BaseOrder extends BaseAPS {
     @FieldAnnotation(modify = false)
     private Integer delayTime;
 
+    @Column(name="CHECK_FINISH")
+    @ApiParam(value ="检验完成")
+    @FieldAnnotation(property = false)
+    private Boolean checkFinish;
+
     @JsonBackReference
     public List<Work> getWorks() {
         return BeanRelation.list(this, EBaseOrder.Works);

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

@@ -149,6 +149,10 @@ public class Material extends BaseAPS {
     @FieldAnnotation(relation = "WorkShop")
     private Long workShopId;
 
+    @Column(name="BATCH_DAYS")
+    @ApiParam(value ="合并天数")
+    private Integer batchDays;
+
     @JsonBackReference
     public List<ProductRouting> getProductRoutings() {
         return BeanRelation.list(this, EMaterial.ProductRoutings);