超节损显示

application/api/controller/OrderSuperLoss.php

@@ -214,6 +214,7 @@ class OrderSuperLoss extends Api
                 $sql= db('物料_收发记录')
                     ->alias('d')
                     ->where('d.仓库编号', 'Y101')
+                    ->whereOr('d.仓库编号', '101')
                     ->group('d.st_gdbh, d.cpdh')
                     ->field('d.st_gdbh, d.cpdh,d.st_rq, SUM(d.st_sl) as 实际投料,d.仓库编号')
                     ->buildSql();
@@ -497,7 +498,9 @@ class OrderSuperLoss extends Api
             ->where('a.Gd_Gdbh',$order)
             ->where('a.行号',$params['yjno'])
             ->where('c.yj_Yjno',$params['yjno'])
-            ->where('b.仓库编号','Y101')
+            ->where(function($query) {
+                $query->where('b.仓库编号', '101')
+                    ->whereOr('b.仓库编号', 'Y101');})
             ->where('c.质量考核',null)
             ->field($field)
             ->find();
@@ -990,7 +993,9 @@ class OrderSuperLoss extends Api
 //            ->where('a.投料确认','like','%'.$search.'%')
             ->where('a.Gd_gdbh',$params['workorder'])
             ->where('c.yj_Yjno',$params['yjno'])
-            ->where('d.仓库编号','Y101')
+            ->where(function($query) {
+                $query->where('d.仓库编号', '101')
+                    ->whereOr('d.仓库编号', 'Y101');})
             ->field($field)
             ->group('a.Gd_gdbh,d.Uniqid')
             ->order('b.BOM_投料单位,a.UniqId asc')
@@ -1052,7 +1057,9 @@ class OrderSuperLoss extends Api
             ->join('工单_印件资料 b','a.st_gdbh = b.Yj_Gdbh AND a.cpdh = b.yj_yjdh')
             ->where('a.st_gdbh',$list['st_gdbh'])
             ->where('a.cpdh',$list['cpdh'])
-            ->where('a.仓库编号','Y101')
+            ->where(function($query) {
+                $query->where('a.仓库编号', '101')
+                    ->whereOr('a.仓库编号', 'Y101');})
             ->find();
         $number = $total_num['投料数量']/10000*$total_num['yj_ls']*$total_num['yj_ks'];
         $res_sql = db('工单_基本资料')->where('Gd_gdbh',$list['st_gdbh'])->where('Gd_cpdh',$list['cpdh'])->fetchSql(true)->setField('实际投料',$number);
@@ -1207,7 +1214,9 @@ class OrderSuperLoss extends Api
                 ->join('工单_印件资料 c','c.Yj_Gdbh = a.Gd_gdbh AND c.yj_Yjdh = a.Gd_cpdh')
                 ->where('a.Gd_Gdbh',$value['jjcp_gdbh'])
                 ->where('c.yj_Yjno',$value['jjcp_yjno'])
-                ->where('b.仓库编号','Y101')
+                ->where(function($query) {
+                    $query->where('b.仓库编号', '101')
+                        ->whereOr('b.仓库编号', 'Y101');})
                 ->field($field)
                 ->find();
             if ($data[$key]['ls'] == 0){