lvhao 8 часов назад
Родитель
Сommit
5656055abc
2 измененных файлов с 15 добавлено и 0 удалено
  1. 7 0
      core/CoreApp/controllers/Outerrors.php
  2. 8 0
      template/erp/outerrors.html

+ 7 - 0
core/CoreApp/controllers/Outerrors.php

@@ -51,6 +51,7 @@ class Outerrors extends  Start_Controller{
 			$number = $this->input->post('number',true);
 			$timetk = $this->input->post('timetk',true);
 			$timetj = $this->input->post('timetj',true);
+            $order_status = $this->input->post('order_status',true);
 			$timetk = strtotime($timetk);
 			$timetj = strtotime($timetj);
             $where = "";
@@ -62,6 +63,11 @@ class Outerrors extends  Start_Controller{
             }else{
                 $where  .= " and scan_time > '$timetk' and scan_time  < '$timetj'  ";
             }
+            if($order_status >= 0){
+               
+                $where  .= " and  order_status = '$order_status' ";
+                
+            }
             //数据排序
             $order_str = " id desc";
             if(empty($page))
@@ -92,6 +98,7 @@ class Outerrors extends  Start_Controller{
                    'waybill' => $v['waybill'],
                    'dy_status'=>empty($v['dy_status'])?'':$v['dy_operate'],
                    'ck_status' => empty($v['ck_status'])?'':$v['ck_operate'],
+                   'order_status'=>empty($v['order_status'])?'':date("Y-m-d H:i:s",$v['library_time']),
                    'remark'=>empty($v['remark'])?'':$v['remark'],
                    'opreate'=>$str
                 ];

+ 8 - 0
template/erp/outerrors.html

@@ -51,6 +51,13 @@
 </div>
 <ul class="search">
 <li>订单编号:<input value="" name="number" type="text"></li>
+<li>
+    是否出库:<select name="order_status" class="select" style="width:90px">
+    <option value="-1">请选择</option>
+    <option value="0">未出库</option>
+    <option value="1">已出库</option>
+    </select>
+</li>
 <li>扫描时间:<input id="timetk"  value="{date('Y-m-d',time()-14*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>
 <li><span>确 定</span></li>
@@ -70,6 +77,7 @@
 <td>当前运单号</td>
 <td>店员备注</td>
 <td>仓库备注</td>
+<td>出库时间</td>
 <td>扫不出库原因</td>
 <td>操作</td>
 </tr>