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

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : MES_生产计划主表
@@ -86,6 +87,10 @@ public class MesPpMaster extends BaseBean{
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS")
     private Integer workOrderPlanStatus;
 
+    @Transient
+    @ApiParam("是否要从拉动计算中扣除")
+    private boolean needMinutPullQty = false;
+
     public Integer getOrderStatus() {
         return orderStatus == null ? 0 : this.orderStatus.intValue();
     }

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

@@ -72,13 +72,18 @@ public class WmsWorkCenter extends BaseBean {
             searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     private String descLocationCode;
 
-
-    /**
-     * 分钟
-     **/
-    @Column(name = "ADVANCE_PULL_TIMES", columnDefinition = "int default 0")
+    @Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180")
     @ApiParam(value = "提前拉动时间")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
-    private Integer advancePullTimes;
+    private Integer preReadyMinute;
+
+    @Column(name = "PULL_RANGE_MINUTE", columnDefinition = "int default 180")
+    @ApiParam(value = "拉动区间时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer pullRangeMinute;
 
+    @Column(name = "NEXT_PULL_TIME", columnDefinition = "varchar(50) default '' ")
+    @ApiParam(value = "下次拉动时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private String nextPullTime;
 }