lvhao 17 tuntia sitten
vanhempi
commit
84b9675036

+ 25 - 4
core/CoreApp/controllers/Whlabel_bh.php

@@ -2176,6 +2176,7 @@ class Whlabel_bh extends Start_Controller {
 		$post = $this->input->post(NULL, TRUE);
 		if(!empty($post)){
 			$orderinfo = $this->input->post('orderinfo',true);
+			$pm = $this->input->post('pm',true);
 			$tid = $this->input->post('tid',true);
 			$page = $this->input->post('page',true);
 		    $perpage = $this->input->post('perpage',true);
@@ -2188,10 +2189,30 @@ class Whlabel_bh extends Start_Controller {
             {
                 $where .= " and time > '$timetk' and time < '$timetj'";
             }
-			if($orderinfo){
-				$number_list  = $this->whlabel_bh->find_all(" orderinfo = '$orderinfo'","orderinfo,number");
-				$numbers = array_column($number_list,'number');
-				$where.= " and number in (".implode(",",$numbers).") ";
+			
+			if($pm){
+				if(empty($orderinfo)){
+					$rows = array('total'=>0,'over'=>1,'pagenum'=>1,'rows'=>([]),'cwxx'=>"请先输入订单号");
+					echo json_encode($rows);exit;
+				}else{
+					$number_list  = $this->whlabel_bh->find_all(" orderinfo = '$orderinfo' and pm like '%|".$pm."|%' " ,"orderinfo,number");
+					$numbers = array_column($number_list,'number');
+					if(empty($numbers)){
+						$rows = array('total'=>0,'over'=>1,'pagenum'=>1,'rows'=>([]));
+						echo json_encode($rows);exit;
+					}
+					$where.= " and number in (".implode(",",$numbers).") ";
+				}
+			}else{
+				if($orderinfo){
+					$number_list  = $this->whlabel_bh->find_all(" orderinfo = '$orderinfo'","orderinfo,number");
+					$numbers = array_column($number_list,'number');
+					if(empty($numbers)){
+						$rows = array('total'=>0,'over'=>1,'pagenum'=>1,'rows'=>([]));
+						echo json_encode($rows);exit;
+					}
+					$where.= " and number in (".implode(",",$numbers).") ";
+				}
 			}
 			if(empty($page))
 		    {

+ 1 - 0
template/erp/whlabel_bh_cj_transfer_log.html

@@ -13,6 +13,7 @@
     </select>
 </li>
 <li>订单号:<input value="" name="orderinfo" type="text"></li>
+<li>品名:<input style="width:300px" value="" name="pm" type="text"></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>
     <input type="hidden" name="tid" value="{$transfer['id']}">