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

app/Http/Controllers/Api/BoxController.php

@@ -162,7 +162,7 @@ class BoxController extends BaseController
     public function boxAdd(Request $request)
     {
         $service = new BoxService();
-        list($status,$data) = $service->boxIn($request->all());
+        list($status,$data) = $service->boxAdd($request->all());
 
         if($status){
             return $this->json_return(200,'',$data);
@@ -174,7 +174,7 @@ class BoxController extends BaseController
     public function boxFhDetail(Request $request)
     {
         $service = new BoxService();
-        list($status,$data) = $service->boxIn($request->all());
+        list($status,$data) = $service->boxFhDetail($request->all());
 
         if($status){
             return $this->json_return(200,'',$data);
@@ -205,4 +205,28 @@ class BoxController extends BaseController
             return $this->json_return(201,$data);
         }
     }
+
+    public function boxFhBzList(Request $request)
+    {
+        $service = new BoxService();
+        list($status,$data) = $service->boxFhBzList($request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function boxFhBzDetail(Request $request)
+    {
+        $service = new BoxService();
+        list($status,$data) = $service->boxFhBzDetail($request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
 }

app/Service/Box/BoxService.php

@@ -640,6 +640,8 @@ class BoxService extends Service
                 'ext_7' => $value['cuscode'] ?? "",
                 'ext_8' => $value['product_title'],
                 'ext_9' => $value['product_size'],
+                'ext_10' => $value['table_header_mark'],
+                'ext_11' => $value['table_body_mark'],
                 'top_id' => $value['idlsid'],
                 'state' => 0,
                 'num' => $value['submit_quantity'],
@@ -657,7 +659,7 @@ class BoxService extends Service
 
         $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')
+            ->select('order_no','ext_6','ext_7','ext_1','ext_8','ext_9','num','ext_2','ext_3','ext_4','ext_5','ext_10','ext_11')
             ->get()->toArray();
         if(! empty($result)){
             foreach ($result as $key => $value){
@@ -704,14 +706,38 @@ class BoxService extends Service
 
         $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')
+            ->select('order_no','ext_6','ext_7','ext_1','ext_8','ext_9','num','ext_2','ext_3','ext_4','ext_5','shipment_order_no','crt_time','team_id','ext_10','ext_11')
             ->get()->toArray();
         if(! empty($result)){
             foreach ($result as $key => $value){
                 $result[$key] = (array)$value;
             }
+            $map = Team::where('id',array_unique(array_column($result,'team_id')))->pluck('title','id')->toArray();
+            foreach ($result as $key => $value){
+                $result[$key]['team_name'] = $map[$value['team_id']] ?? '';
+            }
         }
 
         return [true,$result];
     }
+
+    public function boxFhBzList($data){
+        $model = DB::table('box_detail')->where('del_time',0)
+            ->select('order_no','crt_time');
+        if(! empty($data['out_order_no'])) $model->whereIn('out_order_no',$data['out_order_no']);
+        if(! empty($data['shipment_order_no'])) $model->whereIn('shipment_order_no',$data['shipment_order_no']);
+
+        $return = [];
+        $result = $model->get()->toArray();
+        if(! empty($result)){
+            foreach ($result as $value){
+                $return[$value->order_no] = [
+                    'order_no' => $value->order_no,
+                    'crt_time' => date("Y-m-d H:i:s",$value->crt_time)
+                ];
+            }
+        }
+
+        return [true,array_values($return)];
+    }
 }

app/Service/FyyOrderService.php

@@ -438,7 +438,7 @@ class FyyOrderService extends Service
     }
 
     public function getYyShipmentOrder($data,$user){
-        if(empty($data['time'][0]) || empty($data['time'][1])) return ['false', '时间范围不能为空！'];
+        if(empty($data['time'][0]) || empty($data['time'][1])) return [false, '时间范围不能为空！'];
 
         $sqlServerModel = new FyySqlServerService($user);
         if($sqlServerModel->error) return [false,$sqlServerModel->error];

app/Service/FyySqlServerService.php

@@ -599,7 +599,7 @@ class FyySqlServerService extends Service
         $model = $this->db->table('DispatchList as a')
             ->leftJoin('DispatchLists as b','b.DLID','a.DLID')
             ->leftJoin('Inventory as c','c.cInvCode','b.cInvCode')
-            ->select('a.cDLCode as cdlcode','a.DLID as id','a.cDefine10 as customer_name','b.cSOCode as csocode','a.cDepCode as cdepcode','a.cCusCode as cuscode','a.dDate as date','b.iDLsID as idlsid','b.cWhCode as cwhcode','b.cInvCode as cinvcode','b.cInvName as product_title','b.cFree1 as cfree1','b.cFree2 as cfree2','b.cPosition as cposition','b.cBatch as cbatch','b.iQuantity as iquantity','b.iNum as inum','b.iInvExchRate as iinvexchrate','b.fOutQuantity as out_quantity','b.iUnitPrice as iunitcost','b.iMoney as imoney','b.cDefine28 as technology_material','b.cDefine30 as process_mark','c.cInvStd as product_size',DB::raw('(b.iQuantity - b.fOutQuantity) as quantity'))
+            ->select('a.cDLCode as cdlcode','a.DLID as id','a.cDefine10 as customer_name','b.cSOCode as csocode','a.cDepCode as cdepcode','a.cCusCode as cuscode','a.dDate as date','b.iDLsID as idlsid','b.cWhCode as cwhcode','b.cInvCode as cinvcode','b.cInvName as product_title','b.cFree1 as cfree1','b.cFree2 as cfree2','b.cPosition as cposition','b.cBatch as cbatch','b.iQuantity as iquantity','b.iNum as inum','b.iInvExchRate as iinvexchrate','b.fOutQuantity as out_quantity','b.iUnitPrice as iunitcost','b.iMoney as imoney','b.cDefine28 as technology_material','b.cDefine30 as process_mark','c.cInvStd as product_size',DB::raw('(b.iQuantity - b.fOutQuantity) as quantity'),'a.cMemo as table_header_mark','b.cMemo as table_body_mark')
             ->whereNotNull('a.cVerifier')
             ->whereColumn('b.iQuantity', '>', 'b.fOutQuantity')
             ->where('a.dDate','>=',$data['time'][0])

routes/api.php

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