修改看板的发条和包装

core/CoreApp/controllers/Workshopshow.php

@@ -160,6 +160,8 @@ class Workshopshow extends Start_Controller
             'o_3'=>0,//完成
             'o_17'=>0,//辫子
             'o_13'=>0,//中转仓
+            'o_8'=>0,//包装
+            'o_18'=>0,//发条库
         ];
         foreach($list as $k=>$v){
             if (substr($v['rk'], -3) === '|1|') {
@@ -178,10 +180,14 @@ class Workshopshow extends Start_Controller
                 $operate_list['o_7'] += 1;
             }elseif(substr($v['rk'], -3) === '|3|'){
                 $operate_list['o_3'] += 1;
-            }elseif(substr($v['rk'], -3) === '|17|'){
+            }elseif(substr($v['rk'], -4) === '|17|'){
                 $operate_list['o_17'] += 1;
-            }elseif(substr($v['rk'], -3) === '|13|'){
+            }elseif(substr($v['rk'], -4) === '|13|'){
                 $operate_list['o_13'] += 1;
+            }elseif(substr($v['rk'], -3) === '|8|'){
+                $operate_list['o_8'] += 1;
+            }elseif(substr($v['rk'], -4) === '|18|'){
+                $operate_list['o_18'] += 1;
             }else {
                 
             }
@@ -331,6 +337,8 @@ class Workshopshow extends Start_Controller
             'bh_7'=>0,//发型师
             'bh_3'=>0,//完成
             'bh_17'=>0,//辫子
+            'bh_8'=>0,//包装
+            'bh_18'=>0,//发条库
         ];
     }
     //美国备货的各车间在产数量
@@ -344,8 +352,9 @@ class Workshopshow extends Start_Controller
         $this->db->group_by('orderinfo');
         $list = $this->db->get('whlabel_bh')->result_array();
         $orderinfos = array_column($list,'orderinfo');
-        
-        $this->db->where_in('orderinfo',$orderinfos);
+        if(!empty($orderinfos)){
+            $this->db->where_in('orderinfo',$orderinfos);
+        }
         $this->db->not_like('rk', '|11|','before');
         $this->db->where('rk != ck');
         $this->db->select("orderinfo,rk,ck");
@@ -376,10 +385,14 @@ class Workshopshow extends Start_Controller
                 $operate_list['bh_7'] += 1;
             }elseif(substr($v['rk'], -3) === '|3|'){
                 $operate_list['bh_3'] += 1;
-            }elseif(substr($v['rk'], -3) === '|17|'){
+            }elseif(substr($v['rk'], -4) === '|17|'){
                 $operate_list['bh_17'] += 1;
-            }elseif(substr($v['rk'], -3) === '|13|'){
+            }elseif(substr($v['rk'], -4) === '|13|'){
                 $operate_list['bh_13'] += 1;
+            }elseif(substr($v['rk'], -3) === '|8|'){
+                $operate_list['bh_8'] += 1;
+            }elseif(substr($v['rk'], -4) === '|18|'){
+                $operate_list['bh_18'] += 1;
             }else {
                 
             }

template/erp/workshopshow_xdshow.html

@@ -607,6 +607,20 @@ h2 {
             </a>
             <div class="count-label"></div>
         </div>
+        <div class="process-card">
+            <div class="process-name">包装</div>
+            <a href="/workshopshow/gcjscsshow?id=8"  target="_blank">
+                <div class="process-count"  id="o_8">-</div>
+            </a>
+            <div class="count-label"></div>
+        </div>
+        <div class="process-card">
+            <div class="process-name">发条库</div>
+            <a href="/workshopshow/gcjscsshow?id=18"  target="_blank">
+                <div class="process-count"  id="o_18">-</div>
+            </a>
+            <div class="count-label"></div>
+        </div>
 
     </div>
 
@@ -701,6 +715,18 @@ h2 {
                 <div class="ws-value" id="bh_17">-</div>
                 </a>
             </div>
+             <div class="workshop-card"  style="background: #F5F5DC;">
+                <div class="ws-label">包装</div>
+                <a href="/workshopshow/cjzcsl?id=8" target="_blank">
+                <div class="ws-value" id="bh_8">-</div>
+                </a>
+            </div>
+             <div class="workshop-card"  style="background: #F5F5DC;">
+                <div class="ws-label">发条</div>
+                <a href="/workshopshow/cjzcsl?id=18" target="_blank">
+                <div class="ws-value" id="bh_18">-</div>
+                </a>
+            </div>
         </div>
     </div>
 
@@ -801,6 +827,12 @@ h2 {
                 let o_13 = res.data.o_13;
                 $("#o_13").text(o_13);
 
+                let o_8 = res.data.o_8;
+                $("#o_8").text(o_8);
+
+                let o_18 = res.data.o_18;
+                $("#o_18").text(o_18);
+
             }
         },'json')
     }
@@ -859,6 +891,12 @@ h2 {
 
                 let bh_17 = res.data.bh_17; 
                 $("#bh_17").text(bh_17);
+
+                let bh_8 = res.data.bh_8;
+                $("#bh_8").text(bh_8);
+
+                let bh_18 = res.data.bh_18;
+                $("#bh_18").text(bh_18);
             }
         },'json')
     }