LD 5 лет назад
Родитель
Сommit
8adfb55cda

+ 11 - 3
app/Http/Controllers/TestController.php

@@ -137,10 +137,18 @@ class TestController extends Controller
 
     }
 
-    function multiSql()
+    function wmsSql()
     {
-       $provinces=Province::query()->with('cities')->get();
-       return view('test',compact('provinces'));
+        $logisticNumber='YT3135994475841';
+        dd(OracleDOCOrderHeader::query()->with('actAllocationDetails','oracleBASCode')
+            ->whereHas('actAllocationDetails',function($query)use($logisticNumber){
+                $query->where('picktotraceid',$logisticNumber);
+            })->orWhere('soreference5',$logisticNumber)->sql());
+        $re= OracleDOCOrderHeader::query()->with('actAllocationDetails','oracleBASCode')
+            ->whereHas('actAllocationDetails',function($query)use($logisticNumber){
+                $query->where('picktotraceid',$logisticNumber);
+            })->orWhere('soreference5',$logisticNumber)->first();
+        dd($re);
     }
     function issues()
     {

+ 5 - 2
app/Http/Controllers/api/thirdPart/goodscan/PackageController.php

@@ -25,6 +25,7 @@ class PackageController
             $requestInput[strtolower($key)] = $item;
         }
 
+        app('LogService')->log(__METHOD__,'GoodScan weightApi add'.__FUNCTION__,json_encode($request->getContent()));
         $errors = $this->validatorWeight($requestInput)->errors(); // 参数校验
         if($requestInput['weight'] == '-9.9'){   // 称重异常校验
             app('LogService')->log(__METHOD__,'GoodScan weightApi (Error)'.__FUNCTION__,'异方接口称重伤上传异常[异常值为-9.9,电子秤故障或未连接]');
@@ -94,7 +95,7 @@ class PackageController
             'h' => ['required', 'numeric', 'min:0'],
             'weight' => ['required', 'numeric', 'min:0'],
             'hid' => ['required', 'string', 'min:0'],
-            'picture' => ['required', 'string', 'min:0'],
+            'picture' => ['nullable'],
         ], [
             'required' => ':attribute 为必填项',
             'max' => ':attribute 字符过多或数值过大',
@@ -215,7 +216,9 @@ class PackageController
         return OracleDOCOrderHeader::query()->with('actAllocationDetails','oracleBASCode')
             ->whereHas('actAllocationDetails',function($query)use($logisticNumber){
                 $query->where('picktotraceid',$logisticNumber);
-            })->orWhere('soreference5',$logisticNumber)->first();
+            })
+//            ->orWhere('soreference5',$logisticNumber)
+            ->first();
     }
 
     /**

+ 1 - 1
app/Http/Controllers/api/thirdPart/weight/PackageController.php

@@ -165,7 +165,7 @@ class PackageController extends Controller
 
     public function new_(Request $requestInitial){
         $request=[];
-//        app('LogService')->log(__METHOD__,'cczdelme'.__FUNCTION__,json_encode($requestInitial->all()),null);
+        app('LogService')->log(__METHOD__,'cczdelme'.__FUNCTION__,json_encode($requestInitial->all()),null);
         foreach ($requestInitial->all() as $k=>$v){
             $request[strtolower($k)]=$v;
         }

+ 1 - 0
app/Owner.php

@@ -37,6 +37,7 @@ class Owner extends Model
             return $query->where('id','0');
         }
         $ownerIds=app('UserService')->getPermittingOwnerIds($user);
+        if(empty($ownerIds))return $query;
         return $query->whereIn('id',$ownerIds);
     }
 

+ 4 - 0
tests/packageYifang.http

@@ -0,0 +1,4 @@
+POST http://bswas/api/thirdPart/goodscan/weight/new
+Content-Type: application/json
+
+{"H":0,"L":0,"W":0,"code":"YT3135994475841","hid":"608e8e3aab002f11","picture":"","time":"2020-11-09 18:26:12","weight":0.01}