Browse Source

修改数据

lvhao 1 day ago
parent
commit
a0f2a795c0
2 changed files with 21 additions and 4 deletions
  1. 20 2
      core/CoreApp/controllers/Whlabelfz1.php
  2. 1 2
      template/erp/whlabelfz1_mgxxindex.html

+ 20 - 2
core/CoreApp/controllers/Whlabelfz1.php

@@ -47,8 +47,26 @@ class Whlabelfz1 extends Start_Controller
 	private function _mgxxindex(){
 	private function _mgxxindex(){
 		$post = $this->input->post();
 		$post = $this->input->post();
 		if(!empty($post)){
 		if(!empty($post)){
-			$rows = array('total'=>0,'over'=>1,'pagenum'=>1,'rows'=>([]));
-		    echo json_encode($rows);exit;
+			$timetk = $this->input->post('timetk',true);
+			$timetj = $this->input->post('timetj',true);
+			$timetk = strtotime($timetk);
+			$timetj = strtotime($timetj);
+			$page = $this->input->post('page', true);
+			$perpage = $this->input->post('perpage', true);
+			$where_sql = " scantime >= ".$timetk ." and scantime <= ".$timetj." ";
+			if(!empty($post['orderinfo'])){
+				$where_sql .=" and orderinfo = '".$post['orderinfo']."' ";
+			}
+			$list = $this->db->from("whlabel_bh_scan")->select('id,orderinfo,type,jm,pm,sl,scantime')->where($where_sql)->order_by('id desc')->limit($perpage,($page-1)*$perpage)->get()->result_array();
+			$total = $this->db->from("whlabel_bh_scan")->where($where_sql)->count_all_results();
+			$pagenum = ceil($total/$perpage);
+			$over = $total-($page*$perpage);
+			foreach($list as $k=>$v){
+				$list[$k]['type'] = ($v['type']== 1)?"工厂布标":"仓库标签";
+				$list[$k]['scantime'] = date('Y-m-d H:i:s',$v['scantime']);
+			}
+			$rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($list));
+			echo json_encode($rows);exit;
 		}
 		}
 		$this->_Template('whlabelfz1_mgxxindex', $this->data);
 		$this->_Template('whlabelfz1_mgxxindex', $this->data);
 	}
 	}

+ 1 - 2
template/erp/whlabelfz1_mgxxindex.html

@@ -49,8 +49,7 @@
             
             
             <ul class="search">
             <ul class="search">
                 <li>
                 <li>
-                    <li>编号:<input value="" name="number" type="text"></li>
-                    <li>备注:<input value="" name="remark" type="text"></li>
+                    <li>编号:<input value="" name="orderinfo" type="text"></li>
                     <li>出库时间<input id="timetk" value="{date('Y-m-d',time()-29*24*3600)} 0:00" name="timetk" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})"> 至&nbsp;&nbsp;&nbsp;&nbsp; <input id="timetj" value="{date('Y-m-d',time()+24*3600)} 0:00"
                     <li>出库时间<input id="timetk" value="{date('Y-m-d',time()-29*24*3600)} 0:00" name="timetk" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})"> 至&nbsp;&nbsp;&nbsp;&nbsp; <input id="timetj" value="{date('Y-m-d',time()+24*3600)} 0:00"
                             name="timetj" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})"></li>
                             name="timetj" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})"></li>