1

core/CoreApp/controllers/Workshopshow.php

@@ -532,65 +532,67 @@ class Workshopshow extends Start_Controller
                 $start = ($page - 1)*$perpage;
             }
 
+
             $this->db->where("time >= ",strtotime($timetkk));
             $this->db->where("time < ",strtotime($timetjj));
-            $this->db->not_like('rk', '|11|','before');
+            $this->db->where("type",1);
             $this->db->where("ycrk_type",0);
-            $this->db->order_by('id','desc');
-            $this->db->select("id,number,pm,shipremarks,printtime,time,ctime12");
+            $this->db->where("orver_flag",2);
+            $this->db->where("is_over",0);
+            $this->db->group_by('fid');
             $this->db->limit($perpage,$start);
-            $info_list = $this->db->get('systemtransfer');
-            $info_list = $info_list->result_array();
-
-
-
-            $transfer = $this->transfer->find_all();
-			$t = array();
-			foreach ($transfer as $v)
-		    {
-				$t[$v['id']] = $v['title'];
-				$ot[$v['id']] = ($v['orvertime']>0)?$v['orvertime']*24*3600:0;
-			}
-
-            foreach($info_list as $k=>$v){
-                $info_list[$k]['printtime'] = date('Y-m-d H:i',$v['printtime']);
-                $data = $this->systemtransfer_cr->find_all("fid = '".$v['id']."'");
-                $info_list[$k]['time'] = "布标打印 ：".date('Y-m-d H:i',$v['ctime12']).'<br>';
-                foreach($data as $d){
-                    $type = ($d['type']==1)?'入库':'出库';
-                    if($d['orver_flag'] == 1){
-						if($d['is_over'] == 0){
-							$info_list[$k]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>".$t[$d['lx']].$type.' ：'.date('Y-m-d H:i',$d['time']) ." <l style='font-weight:900;'>即将超时 </l></a>";
+            $info_list = $$this->db->get('systemtransfer_cr');
+            $list = $info_list->result_array();
+
+            $transfer_list = $this->transfer->find_all();
+			$t = $transfer_list = array_column($transfer_list, 'title', 'id');
+
+            $final_list = [];
+			foreach ($list as $key => $value) {
+			    
+
+				$info = $this->systemtransfer->read($value['fid']);
+				$final_list[$key]['id'] = $value['id'];
+				$final_list[$key]['number'] = isset($info['number'])?$info['number']:'';
+			
+				if($info['is_jiaji'] == 2){
+		            $final_list[$key]['is_jiaji'] = "<a href='javascript:void(0)' style='color:red'>加急</a>";
+		        }else{
+		            $final_list[$key]['is_jiaji'] = "常规";
+		        }
+			
+				$final_list[$key]['pm'] = $info['pm'];
+				$final_list[$key]['shipremarks'] = $info['shipremarks'];
+				$final_list[$key]['printtime'] = date('Y-m-d H:i:s',$info['printtime']);
+
+				$data = $this->systemtransfer_cr->find_all("fid = '".$info['id']."'");
+				
+				$info_list[$key]['time'] = "布标打印 ：".date('Y-m-d H:i',$info['ctime12']).'<br>';
+				foreach ($data as $k=>$v)
+		        {
+					$type = ($v['type']==1)?'入库':'出库';
+					
+					
+					if($v['orver_flag'] == 1){
+						if($v['is_over'] == 0){
+							$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l style='padding-left:10px;font-weight:900;'> 即将超时 </l></a>".'<br>';
 							// $info_list[$key]['time'] .= '<i style="padding:10px;color:#90f;font-weight:bold;"> 即将超时</i>'.'<br>';
 						}else{
-							$info_list[$k]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$t[$d['lx']].$type.' ：'.date('Y-m-d H:i',$d['time']) ."</a>";
+							$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ."</a>".'<br>';
 						}
-					}elseif($d['orver_flag'] == 2){
-						$info_list[$k]['time'] .= "<a href='javascript:void(0);' style='color:#f33'>".$t[$d['lx']].$type.' ：'.date('Y-m-d H:i',$d['time']) ." <l font-weight:900'>超时! </l></a>";
-					}elseif($d['orver_flag'] == 3){
-						$info_list[$k]['time'] .= "<a href='javascript:void(0);' style='color:#06f'>".$t[$d['lx']].$type.' ：'.date('Y-m-d H:i',$d['time']) ." <l font-weight:900'>【该单已取消】 </l></a>";
-					}elseif(($d['orver_flag'] == 0)&&(empty($d['lx']))){
-						$info_list[$k]['time'] .= "<a href='javascript:void(0);' style='color:red'>订单已完成:".date('Y-m-d H:i',$d['time']) ."</a>";
-					}else{
-						$info_list[$k]['time'] .= "<a  href='javascript:void(0);' style='color:#000'>".$t[$d['lx']].$type.' ：'.date('Y-m-d H:i',$d['time']) ."</a>";
-					}
-
-					if($d['extra_status'] == 1){
-						$info_list[$k]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>【下道工序未及时入库】</a><br>";
-					}elseif($d['extra_status'] == 2 || $d['extra_status'] == 3){
-						$info_list[$k]['time'] .= "<a href='javascript:void(0);' style='color:#A52A2A'>【工序间流转超过3天】</a><br>";
+					}elseif($v['orver_flag'] == 2){
+						$info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#f33'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l style='padding-left:10px;font-weight:900'> 超 时 ! </l></a>".'<br>';
 					}else{
-						$info_list[$k]['time'] .= "<br>";
+						$info_list[$key]['time'] .= "<a  href='javascript:void(0);' style='color:#000'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ."</a>".'<br>';
 					}
-					
-				    
 				}
-				$info_list[$k]['time'] = trim($info_list[$k]['time'],'<br>');
-				unset($info_list[$k]['ctime12']);
-            }
+				
+				$final_list[$key]['time'] = trim($info_list[$key]['time'],'<br>');
+			}
 
            
            
+           
 
             $this->db->where("time >= ",strtotime($timetkk));
             $this->db->where("time < ",strtotime($timetjj));
@@ -603,7 +605,7 @@ class Workshopshow extends Start_Controller
 
 		    $pagenum = ceil($total/$perpage);
 		    $over = $total-($start+$perpage);
-		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));
+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($final_list));
 		    echo json_encode($rows);exit;
         }else{
             $this->_Template('workshopshow_ycsshow', $this->data);

template/erp/workshopshow_xdshow.html

@@ -451,7 +451,12 @@ h2 {
         <div class="stat-card border-red">
             <div class="stat-info">
                 <h3>已超时单</h3>
-                <div class="count"><span id="ycs_num">-</span> (条)</div>
+                <div class="count">
+                    <a href="/workshopshow/ycsshow" target="_blank">
+                        <span id="ycs_num">-</span> (条)
+                    </a>
+                    
+                </div>
             </div>
             <!-- <div class="icon-box">🚨</div> -->
         </div>

template/erp/workshopshow_ycsshow.html

@@ -0,0 +1,50 @@
+{Template header}
+<body>
+<div class="warp">
+<div class="fixed">
+<ul class="search" >
+
+<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 H:i',time())}" name="timetjj" type="text" onclick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})"></li>
+    <li><span>确 定</span></li>
+</ul>
+
+
+<table class="datatitle data" border="0" style="border-collapse:collapse;">
+<tr>
+<td><label onClick="swapCheck()"><input name="checkbox" type="checkbox" class="regular-checkbox"></label></td>
+<td>编码</td>
+<td>品名</td>
+<td>备注</td>
+<td>打印时间</td>
+<td>操作时间</td>
+
+</tr>
+</table>
+</div>
+<table class="datatext data" border="0" style="border-collapse:collapse;">
+</table>
+<div class="bomf"></div>
+</div>
+<script>
+var dataurl = "/workshopshow/ycsshow";
+var editurl = "/workshopshow/ycsshow";
+// var editdj = 1;
+// var editt = "用户管理 - 修改";
+var customon = 1;
+function custom(){
+$(".data tr").each(function() {
+    $(this).find('td:eq(0)').css("width","1%");
+    $(this).find('td:eq(1)').css("width","11%");
+    $(this).find('td:eq(2)').css("width","25%");
+    $(this).find('td:eq(3)').css("width","25%");
+    $(this).find('td:eq(4)').css("width","10%");
+    $(this).find('td:eq(5)').css("width","10%");
+    $(this).find('td:eq(6)').css("width","15%");
+  
+});}
+
+</script>
+{Template footer}