1

core/CoreApp/controllers/Workshopshow.php

@@ -870,11 +870,61 @@ class Workshopshow extends Start_Controller
     private function _wfhshow(){
         if($this->input->method() == 'post'){
             $page = $this->input->post('page',true);
+		    $perpage = $this->input->post('perpage',true);
+
+            $timetkk = $this->input->post('timetkk',true);
+            $timetjj = $this->input->post('timetjj',true);
+
+
+            if(empty($page))
+		    {
+                $start = 0;
+		    	$perpage = 1;
+            }
+		    else
+		    {
+                $start = ($page - 1)*$perpage;
+            }
+
+            $dlz_list = $this->_wfhlist('fullorder',$timetkk,$timetjj);
+            $tt_list = $this->_wfhlist('fullordertt',$timetkk,$timetjj);
+            $amz_list = $this->_wfhlist('fullorderamz',$timetkk,$timetjj);
+            $smt_list = $this->_wfhlist('fullordersmt',$timetkk,$timetjj);
+            $final_list = array_merge($dlz_list,$tt_list,$amz_list,$smt_list);
+            $total = count($final_list);
+
+            $final_splic_list = array_chunk($final_list,$perpage);
+
+            $list = $final_splic_list[$page-1];
+            
+
+            $pagenum = ceil($total/$perpage);
+		    $over = $total-($start+$perpage);
+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($list));
+		    echo json_encode($rows);exit;
         }else{
             $this->_Template('workshopshow_wfhshow', $this->data);
         }
 
     }
+    //未发货的列表
+    private function _wfhlist($table_name,$timetkk,$timetjj){
+        $this->db->select("id,number,buytime,printtime,ts,shipremarks");
+        $this->db->where('library',1);//未出库
+        $this->db->where("print",3);//已打印
+        $this->db->where("type != ",'5');
+        $this->db->where_in('state',['207','208','209']);//允许发货的状态  代发货 部分发货  待揽收
+        $this->db->where("printtime <",strtotime($timetjj));
+        $this->db->where("printtime >=",strtotime($timetkk));
+        $list = $this->db->get($table_name);
+        $list = $list->result_array();
+        foreach($list as $key=>$value){
+            $list[$key]['buytime'] = date('Y-m-d H:i:s',$value['buytime']);
+            $list[$key]['printtime'] = date('Y-m-d H:i:s',$value['printtime']);
+            $list[$key]['id'] = $table_name."-".$value['id'];
+        }
+        return $list;
+    }
     // 各车间生产条数
     private function _gcjscsshow(){
 

template/erp/workshopshow_wfhshow.html

@@ -7,7 +7,7 @@
 <li>
     <input id="timetk"  value="{date('Y-m-d', strtotime('-1 month'))} 00:00" name="timetkk" type="text" onclick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})">
         至&nbsp;&nbsp;&nbsp;&nbsp; 
-    <input id="timetj" value="{date('Y-m-d',strtotime('-6 days'))} 00:00" name="timetjj" type="text" onclick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})"></li>
+    <input id="timetj" value="{date('Y-m-d H:i',time())}" name="timetjj" type="text" onclick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})"></li>
     <li><span>确 定</span></li>
 </ul>
 
@@ -30,8 +30,8 @@
 <div class="bomf"></div>
 </div>
 <script>
-var dataurl = "/workshopshow/dyc7twchshow";
-var editurl = "/workshopshow/dyc7twchshow";
+var dataurl = "/workshopshow/wfhshow";
+var editurl = "/workshopshow/wfhshow";
 // var editdj = 1;
 // var editt = "用户管理 - 修改";
 var customon = 1;