Merge remote-tracking branch 'origin/master'

app/Http/Controllers/api/thirdPart/flux/PackageController.php

@@ -121,6 +121,4 @@ class PackageController extends Controller
         Controller::logS(__METHOD__,'SUCCESS_'.__FUNCTION__,'标记WMS波次：'.$batchNumber.',userdefine3="Y"',auth()->user()['id']);
         return ['result'=>true];
     }
-
-
 }

app/Http/Controllers/api/thirdPart/haochuang/SortingController.php

@@ -106,6 +106,10 @@ class SortingController extends Controller
 
         /** @var Batch|\stdClass $batch */
         $batch=Batch::query()->where('code',$batch_id)->orderBy('id','desc')->first();
+        if ($batch->wms_type && mb_strstr($batch->wms_type, "单品")) {
+            return response()->json(['result'=>'failure','fail_info'=>'单品波次无需分拣'])
+                ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+        }
         $data=[
             'result'=>'success',
             'station_id'=>$station_id,

app/Http/Kernel.php

@@ -40,7 +40,7 @@ class Kernel extends HttpKernel
             \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
+            //\App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 

app/Http/Middleware/LogPostRequest.php

@@ -7,7 +7,7 @@ use App\Services\LogService;
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
-class LogPostRequest
+class logsLogPostRequest
 {
     use ErrorPush;
     /**

app/Http/Middleware/VerifyCsrfToken.php

@@ -20,6 +20,7 @@ class VerifyCsrfToken extends Middleware
      */
     protected $except = [
         'store/deliveryAppointment/delivery',
+        'store/blindReceive/excels/apiStore',
         'package/weigh/measureMonitor/speech',
         'record',
     ];

app/OracleDocOrderPackingSummary.php

@@ -35,19 +35,25 @@ class OracleDocOrderPackingSummary extends Model
                 }
                 $numbersUseful_toInsert[]=$numbers;
             }
-            $inserts='';
-            $values=[];
-            foreach($numbersUseful_toInsert as $numbers){
-                $inserts .= " into doc_order_packing_summary (traceid,orderno,grossweight,addwho,addtime,editwho,edittime)values(?,?,?,?,?,?,?) ";
-                $values[] = $numbers['logistic_number']??'';
-                $values[] = $numbers['orderno']??'';
-                $values[] = $weight;
-                $values[] = 'WAS';
-                $values[] = Carbon::now();
-                $values[] = 'WAS';
-                $values[] = Carbon::now();
+            if (count($numbersUseful_toInsert) > 0) {
+                $inserts='';
+                $values=[];
+                foreach($numbersUseful_toInsert as $numbers){
+                    $inserts .= " into doc_order_packing_summary (traceid,orderno,grossweight,addwho,addtime,editwho,edittime)values(?,?,?,?,?,?,?) ";
+                    $values[] = $numbers['logistic_number']??'';
+                    $values[] = $numbers['orderno']??'';
+                    $values[] = $weight;
+                    $values[] = 'WAS';
+                    $values[] = Carbon::now();
+                    $values[] = 'WAS';
+                    $values[] = Carbon::now();
+                }
+                if (!!$inserts) {
+                    try {
+                        DB::connection('oracle')->insert("insert all {$inserts} select * from dual",$values);
+                    }catch (\Exception $e){return;}
+                }
             }
-            DB::connection('oracle')->insert("insert all {$inserts} select * from dual",$values);
         }
         OracleDocOrderPackingSummary::whereIn('traceid',$numbersUseful)->update(['grossweight'=>$weight]);
     }

app/OracleIdxAsrsReceive.php

@@ -35,19 +35,23 @@ class OracleIdxAsrsReceive extends Model
                 }
                 $logisticNumbers_toInsert[]=$numbers['logistic_number'];
             }
-            $inserts='';
-            $values=[];
-            foreach($logisticNumbers_toInsert as $logisticNumber){
-                if (!$logisticNumber)continue;
-                $inserts .= " into idx_asrs_receive (grouptaskid,grouptasksequence,userdefine1,userdefine2,addwho,addtime)values(?,?,?,?,?,?) ";
-                $values[] = $logisticNumber;
-                $values[] = 1;
-                $values[] = $logisticNumber;
-                $values[] = $weight;
-                $values[] = 'WAS';
-                $values[] = Carbon::now();
+            if(count($logisticNumbers_toInsert) > 0) {
+                $inserts='';
+                $values=[];
+                foreach($logisticNumbers_toInsert as $logisticNumber){
+                    if (!$logisticNumber)continue;
+                    $inserts .= " into idx_asrs_receive (grouptaskid,grouptasksequence,userdefine1,userdefine2,addwho,addtime)values(?,?,?,?,?,?) ";
+                    $values[] = $logisticNumber;
+                    $values[] = 1;
+                    $values[] = $logisticNumber;
+                    $values[] = $weight;
+                    $values[] = 'WAS';
+                    $values[] = Carbon::now();
+                }
+                if (!!$inserts) {
+                    DB::connection('oracle')->insert("insert all {$inserts} select * from dual",$values);
+                }
             }
-            DB::connection('oracle')->insert("insert all {$inserts} select * from dual",$values);
         }
         OracleIdxAsrsReceive::whereIn('userdefine1',$logisticNumbers)->update(['userdefine2'=>$weight]);
     }

resources/views/equipment/index.blade.php

@@ -1164,6 +1164,7 @@
                 })
             },
             _checkEquipmentData(equipment){
+                console.log(equipment)
                 let error = {};
                 if (!equipment.code)error.code = "设备编号未填写";
                 if (equipment.layer !== equipment.children.length)error.children = "设备绑定错误";