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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -580,7 +580,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public int listCount() {
         try{
-            Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model",Long.class)
+            Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model", Long.class)
                     .getSingleResult();
             return count == null ? 0 : count.intValue();
         }catch(NoResultException e){

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java

@@ -17,6 +17,12 @@ import lombok.Data;
 public class WmsVendorDelayMasterModel extends BaseBean {
 
     private static final long serialVersionUID = 1589775350017343999L;
+    @ApiParam(value = "订单号")
+    private String orderNo;
+
+    @ApiParam(value = "原因")
+    public String reason;
+
     @ApiParam(value = "供应商代码")
     private String vendorNo;
 
@@ -26,12 +32,28 @@ public class WmsVendorDelayMasterModel extends BaseBean {
     @ApiParam(value = "延迟次数")
     private Long delayCount;
 
+    @ApiParam(value = "延迟次数")
+    private Long sumDelayCount;
+
     @ApiParam(value = "查询开始时间")
     private String startDateTime;
 
     @ApiParam(value = "查询结束时间")
     private String endDateTime;
 
+    @ApiParam("计划交货日期")
+    private String planDate;
+
+    @ApiParam("计划交货时间")
+    private String planTime;
+
+    @ApiParam("实际交货时间")
+    private String actualPlanTime;
+
+    @ApiParam("计划交货时间")
+    private String planPlanDateTime;
+
+
     public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode, String createDateTime) {
         this.vendorNo = vendorNo;
         this.vendorName = vendorName;
@@ -40,6 +62,22 @@ public class WmsVendorDelayMasterModel extends BaseBean {
         this.createDatetime = createDateTime;
     }
 
+    public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime, String actualPlanTime, String vendorNo, String vendorName, String organizeCode) {
+        this.orderNo = orderNo;
+        this.reason = reason;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.actualPlanTime = actualPlanTime;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.organizeCode = organizeCode;
+    }
+
+    public WmsVendorDelayMasterModel(String vendorNo, Long delayCount) {
+        this.vendorNo = vendorNo;
+        this.delayCount = delayCount;
+    }
+
     public WmsVendorDelayMasterModel() {
 
     }