no message

wms-vue/src/components/duochaxun/JianHuoXiaoLv.vue

@@ -4,11 +4,46 @@
 
     <div class="div2" style="padding-bottom: 10px">
       <el-form ref="form" :model="param" label-width="80px">
-
+        <el-row :gutter="24">
+          <el-col :span="4">
+            <el-form-item label="出库类型:">
+              <el-input type="text" v-model="param.出库类型" style="width: 105px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="任务号:">
+              <el-input type="textarea" v-model="param.任务号" :rows="1"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="子任务号:">
+              <el-input type="textarea" v-model="param.子任务号" :rows="1"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="库区:">
+              <el-input type="textarea" v-model="param.库区" :rows="1"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="创建日期:">
+              <el-date-picker style="width: 300px"
+                              v-model="param.创建日期"
+                              type="daterange"
+                              align="right"
+                              unlink-panels
+                              range-separator="至"
+                              start-placeholder="开始日期"
+                              end-placeholder="结束日期"
+                              :picker-options="pickerOptions">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-button type="success" @click="find">查找</el-button>
         <el-button type="success" @click="down">导出</el-button>
         <el-button type="success" @click="rest">重置</el-button>&nbsp;&nbsp;
-        <el-checkbox v-model="checked" @change="Allquesr">是否显示全部查询条件</el-checkbox>
+<!--        <el-checkbox v-model="checked" @change="Allquesr">是否显示全部查询条件</el-checkbox>-->
       </el-form>
     </div>
 
@@ -40,6 +75,33 @@
 export default {
   data() {
     return {
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
       // 表头配置
       columns: [
         {
@@ -148,9 +210,6 @@ export default {
           label: '拣货-交单时间'
         }
       ],
-      /*columns:[
-        prop: 'a1',
-      ],*/
       tableloding: false,
       isShow:false,//是否展示全部搜索条件
       tableData: [],
@@ -160,6 +219,11 @@ export default {
       pageNum: 1,
       total: 3,
       param: {
+        出库类型:'',
+        任务号:'',
+        子任务号:'',
+        库区:'',
+        创建日期:''
       },
       loading: false,
       checked: false,
@@ -236,6 +300,7 @@ export default {
 
     },
     find(){
+      this.pageNum=1;
       this.queryUser();
     },
     down(){

wms/src/main/java/com/yc/wms/controller/JianHuoXiaoLvController.java

@@ -38,7 +38,25 @@ public class JianHuoXiaoLvController {
         JSONObject jsonObject= JSONUtil.parseObj(json);
         query.setPageSize((int)jsonObject.get("pageSize"));
         query.setPageNum((int)jsonObject.get("pageNum"));
+        String querySql="";//查询条件
         JSONObject param= (JSONObject)jsonObject.get("param");
+        if (param.getStr("出库类型")!=null&&param.getStr("出库类型").length()>0){
+            querySql=querySql+" and 出库类型 like '%"+param.getStr("出库类型")+"%'";
+        }
+        if (param.getStr("任务号")!=null&&param.getStr("任务号").length()>0){
+            querySql=querySql+" and 任务号 like '%"+param.getStr("任务号")+"%'";
+        }
+        if (param.getStr("子任务号")!=null&&param.getStr("子任务号").length()>0){
+            querySql=querySql+" and 子任务号 like '%"+param.getStr("子任务号")+"%'";
+        }
+        if (param.getStr("库区")!=null&&param.getStr("库区").length()>0){
+            querySql=querySql+" and 库区 like '%"+param.getStr("库区")+"%'";
+        }
+        if (param.getStr("创建日期")!=null&&param.getStr("创建日期").length()>0){
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            querySql=querySql+" and 创建时间 >= '"+sdf.format(param.getJSONArray("创建日期").getDate(0))+"'";
+            querySql=querySql+" and 创建时间 <= '"+sdf.format(param.getJSONArray("创建日期").getDate(1))+"'";
+        }
         /* 基础sql数据查询*/
         String sql=" select t.id,bt.NAME as '单据类型',pt.sourceType as '出库类型',pt.id as '任务号',t.BILLCODE as '子任务号', "
                 +"    z.NAME as '库区',ptd.LINE_NUMBER as '拣货行' ,pt.UPDATE_TIME as '创建时间',t.dateBill3 as '生成合单任务时间', "
@@ -58,22 +76,21 @@ public class JianHuoXiaoLvController {
                 +"  left join LOCATION loc on loc.id=t.SRC_LOC_ID "
                 +"  left join [ZONE] z on z.id=loc.ZONE_ID "
                 +"  where t.PLAN_QUANTITY>0 ";
-        String sqlCount = "select count(t.id) as nums from (" + sql+") t";
-        /* 总条数*/
-        List<Integer> counts = entityManager.createNativeQuery(sqlCount).getResultList();
         /* 当前页数据*/
         int pageNum = query.getPageNum();//当前页
         int pageSize = query.getPageSize();//条数
-        String querySql="";//查询条件
 
-        String sqlFy = "select * from( "
+        String sqlFa = "select * from( "
                 +  sql
                 + ") t where 1=1 "
-                + querySql
+                + querySql ;
-                +" ORDER BY id "
+        String sqlFy= sqlFa+" ORDER BY id "
                 +"    OFFSET "+ (pageNum-1) * pageSize +" ROWS "
-                +"    FETCH NEXT "+pageSize+" ROWS ONLY; ";
+                +"    FETCH NEXT "+pageSize+" ROWS ONLY ";
 
+        /* 总条数*/
+        String sqlCount = "select count(t.id) as nums from (" + sqlFa+") t";
+        List<Integer> counts = entityManager.createNativeQuery(sqlCount).getResultList();
         /* 查询所有数据*/
         List<JhXl> jhXlList = entityManager.createNativeQuery(sqlFy, JhXl.class).getResultList();
         Result result=Result.result(200,"操作成功",Long.parseLong(counts.get(0).toString()), jhXlList);