Merge remote-tracking branch 'origin/master'

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

@@ -1,11 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Entity;
 import java.util.List;
 
 /**
@@ -17,7 +15,7 @@ import java.util.List;
  **/
 @Data
 @Api("返回前端数据实体")
-public class WmsActionResponseBean extends BaseBean {
+public class WmsActionResponseBean {
 
     @ApiParam("进度")
     public Double percent;

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

@@ -1,16 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.List;
 
 /**
@@ -22,7 +15,7 @@ import java.util.List;
  **/
 @Data
 @Api("接受前端数据实体")
-public class WmsOperationBean extends BaseBean {
+public class WmsOperationBean {
 
     @ApiParam("扫描内容")
     public String barCode;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -181,8 +181,7 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
-        HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), null, "startDate", result, true);
+        HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), wmsIbCheckPlan.getEndDate(), "startDate", result, true);
-        HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true);
 
         getStringBuilderPack(wmsIbCheckPlan, result);
 
@@ -449,7 +448,7 @@ public class WmsHqlPack {
 
         HqlPack.getStringEqualPack(wmsASNMaster.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
-        HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus().toString(), "asnStatus", result);
+        HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
         HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);