Merge remote-tracking branch 'origin/fyy' into fyy

# Conflicts:
#	app/Service/Box/BoxService.php

app/Service/Box/BoxService.php

@@ -656,6 +656,7 @@ class BoxService extends Service
         if(empty($data['idlsid'])) return [false,'请选择数据'];
 
         $result = DB::table('box_detail')->where('del_time',0)
+            ->where('top_id',$data['idlsid'])
             ->select('order_no','ext_6','ext_7','ext_1','ext_8','ext_9','num','ext_2','ext_3','ext_4','ext_5')
             ->get()->toArray();
         if(! empty($result)){
@@ -700,4 +701,20 @@ class BoxService extends Service
         return [200,''];
 
     }
+
+    public function boxFhBzDetail($data){
+        if(empty($data['order_no'])) return [false,'请选择包装单数据'];
+
+        $result = DB::table('box_detail')->where('del_time',0)
+            ->whereIn('order_no',$data['order_no'])
+            ->select('order_no','ext_6','ext_7','ext_1','ext_8','ext_9','num','ext_2','ext_3','ext_4','ext_5')
+            ->get()->toArray();
+        if(! empty($result)){
+            foreach ($result as $key => $value){
+                $result[$key] = (array)$value;
+            }
+        }
+
+        return [true,$result];
+    }
 }

app/Service/FyySqlServerService.php

@@ -605,6 +605,15 @@ class FyySqlServerService extends Service
             ->where('a.dDate','>=',$data['time'][0])
             ->where('a.dDate','<=',$data['time'][1]);
 
+        if(! empty($data['cdlcode'])) $model->where('a.cDLCode','Like','%'. $data['cdlcode'] . '%');
+        if(! empty($data['cinvcode'])) $model->where('b.cDLCode','Like','%'. $data['cinvcode'] . '%');
+        if(! empty($data['product_title'])) $model->where('b.cInvName','Like','%'. $data['product_title'] . '%');
+        if(! empty($data['product_size'])) $model->where('c.cInvStd','Like','%'. $data['product_size'] . '%');
+        if(! empty($data['technology_material'])) $model->where('b.cDefine28','Like','%'. $data['technology_material'] . '%');
+        if(! empty($data['cfree1'])) $model->where('b.cFree1','Like','%'. $data['cfree1'] . '%');
+        if(! empty($data['cfree2'])) $model->where('b.cFree2','Like','%'. $data['cfree2'] . '%');
+        if(! empty($data['process_mark'])) $model->where('b.cDefine30','Like','%'. $data['process_mark'] . '%');
+
         $list = $this->limit($model,'',$data);
 
         if(! empty($list['data'])){
@@ -621,6 +630,9 @@ class FyySqlServerService extends Service
             foreach ($list['data'] as $key => $value){
                 $list['data'][$key] = (array)$value;
                 $list['data'][$key]['unit'] = $messageMap[$value->cinvcode] ?? '';
+                $list['data'][$key]['iquantity'] = intval($value->iquantity);
+                $list['data'][$key]['out_quantity'] = intval($value->out_quantity);
+                $list['data'][$key]['quantity'] = intval($value->quantity);
             }
         }
 

routes/api.php

@@ -245,4 +245,5 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('boxAdd','Api\BoxController@boxAdd');
     $route->any('boxFhDetail','Api\BoxController@boxFhDetail');
     $route->any('boxFhDel','Api\BoxController@boxFhDel');
+    $route->any('boxFhBzDetail','Api\BoxController@boxFhBzDetail');
 });