称重直接标记至WMS数据库功能

其他修改

app/Http/Controllers/PackageController.php

@@ -362,6 +362,7 @@ class PackageController extends Controller
         $weightChanged=$packageBatch['weight']!=$weight;
         Package::where('batch_number',$batch_number)->update($newValues);
         $packageBatch['forceUpload']=$weightChanged;
+        Controller::logS(__METHOD__,__FUNCTION__,"批量更新时批次号传入：{$batch_number}，模型中：{$packageBatch['batch_number']}".json_encode($packageBatch));
         $result=$accomplishToWMS->accomplishToWMS($packageBatch);
         if ($result['result']=='success'){
             $newValues['status']='已上传';

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

@@ -5,6 +5,8 @@ namespace App\Http\Controllers\Api\thirdPart\flux;
 use App\Http\Controllers\Controller;
 use App\Jobs\MarkPackageExcepted;
 use App\Logistic;
+use App\OracleDOCOrderHeader;
+use App\OracleDOCWaveHeader;
 use App\Owner;
 use App\Package;
 use App\WMSReflectPackage;
@@ -170,43 +172,59 @@ class PackageController extends Controller
     public function accomplishToWMS(Package $package)
     {
         try{
-
             if($package['status']=='已上传'&&strstr($package['batch_rule'],'组合')){
                 if(isset($package['forceUpload'])&&$package['forceUpload']!=true){
-                    $this->log(__METHOD__,'跳过_'.__FUNCTION__,'未实际上传，之前有上传成功且无变动：'.json_encode($package),null);
-                    return ['result'=>'success'];
+                    $this->log(__METHOD__,'跳过1_'.__FUNCTION__,'未实际上传，之前有上传成功且无变动：'.json_encode($package),null);
+//                    return ['result'=>'success']; //不写WMS接口则不需要中断
                 }
             }
-            $json=["request"=>['TASKID'=>$package->WMSReflectPackage_name,
-                'SOReference5'=>$package->logistic_number,
-                'Weigh'=>$package->weight,
-                'Addwho'=>'',
-                'Addtime'=>Carbon::now(),
-                'Package'=>$package->paperBox_name,
-                'USERDEFINE1'=>$package->batch_number,
-                'USERDEFINE2'=>$package->batch_rule,
-                'USERDEFINE3'=>'OK',
-            ]];
-            $json=json_encode($json);
-            $url=url(config('api.flux.package.new'));
-            $response = Zttp::post($url, json_decode($json));
-            $this->log(__METHOD__,'Sign'.__FUNCTION__,json_encode($response->json()),null);
-            $response=$response->json();
-            $noIssues=true;
-            if(!$response||!isset($response['response'])||!$response['response']['flag']=='Y'){
-                $noIssues=false;
-            }
-            if($noIssues&&$response['response']['flag']=='Y'){
-                $this->log(__METHOD__,'SUCCESS_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
-                return ['result'=>'success'];
-            }
-            $this->log(__METHOD__,'ERROR_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
-            return ['result'=>'false'];
+            $this->log(__METHOD__,'common_'.__FUNCTION__,'标记WMS波次：'.$package['batch_number'].'进入中',null);
+            $this->markWMS($package['batch_number']);
+            return ['result'=>'success'];
+            //对WMS接口请求不需要了，直接写其数据库
+//            $json=["request"=>['TASKID'=>$package->WMSReflectPackage_name,
+//                'SOReference5'=>$package->logistic_number,
+//                'Weigh'=>$package->weight,
+//                'Addwho'=>'',
+//                'Addtime'=>Carbon::now(),
+//                'Package'=>$package->paperBox_name,
+//                'USERDEFINE1'=>$package->batch_number,
+//                'USERDEFINE2'=>$package->batch_rule,
+//                'USERDEFINE3'=>'OK',
+//            ]];
+//            $json=json_encode($json);
+//            $url=url(config('api.flux.package.new'));
+//            $response = Zttp::post($url, json_decode($json));
+//            $this->log(__METHOD__,'Sign'.__FUNCTION__,json_encode($response->json()),null);
+//            $response=$response->json();
+//            $noIssues=true;
+//            if(!$response||!isset($response['response'])||!$response['response']['flag']=='Y'){
+//                $noIssues=false;
+//            }
+//            if($noIssues&&$response['response']['flag']=='Y'){
+//                $this->log(__METHOD__,'SUCCESS_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
+//                return ['result'=>'success'];
+//            }
+//            $this->log(__METHOD__,'ERROR_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
+//            return ['result'=>'false'];
         }catch (\Exception $exception){
-            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'CURL请求异常：'.$exception->getMessage(),null);
+            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'请求异常：'.$exception->getMessage(),null);
             return ['result'=>'false'];
         }
     }
+    private function markWMS($batchNumber){
+        $docWaveHeader=OracleDOCWaveHeader::where('waveno',$batchNumber)->first();
+        if($docWaveHeader){
+            $docWaveHeader['userdefine3'] = 'Y';
+            OracleDOCWaveHeader::select('waveno','userdefine3')->where('waveno',$batchNumber)
+                ->update(['userdefine3'=>'Y']);
+//            $docWaveHeader->update();
+            $docWaveHeader=OracleDOCWaveHeader::where('waveno',$batchNumber)->first();
+            $this->log(__METHOD__,'SUCCESS_'.__FUNCTION__,'标记WMS波次：'.$batchNumber.',userdefine3='.$docWaveHeader['userdefine3'],null);
+        }else{
+            $this->log(__METHOD__,'ERROR'.__FUNCTION__,'标记WMS波次：'.$batchNumber.'未取到',null);
+        }
+    }
 
 
 }

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

@@ -1,203 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\thirdPart\flux;
-
-use App\Http\Controllers\Controller;
-use App\Jobs\MarkPackageExcepted;
-use App\Logistic;
-use App\Owner;
-use App\Package;
-use App\WMSReflectPackage;
-use Carbon\Carbon;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Validator;
-use Zttp\Zttp;
-
-class PackageController extends Controller
-{
-
-    public function new_(Request $request)
-    {
-        $requestInputs=$request->all();
-        $this->log(__METHOD__,'request_'.__FUNCTION__,json_encode($requestInputs),null);
-        $errors=$this->validatorForNew($requestInputs)->errors();
-        if(count($errors)>0){
-            $this->log(__METHOD__,'error2_'.__FUNCTION__,json_encode($requestInputs).'||'.json_encode($errors),null);
-            return ['response'=>['flag'=>'W','message'=>'fields wrong, see Errors report please.',
-                'errors'=>$errors]];
-        }
-        $receiveInputs=$requestInputs['request'];
-        $package=Package::where('logistic_number',$receiveInputs['SOReference5'])->first();
-        if (!$receiveInputs['Customer']) {
-            $this->log(__METHOD__, __FUNCTION__, '富勒没有下发货主！快递单号：'.$receiveInputs['SOReference5'] , null);
-        }
-        $owner=Owner::select('id')->where('code',$receiveInputs['Customer'])->first();
-        if (!$owner&&$receiveInputs['SOReference5']) {
-            Owner::create(['code'=>$receiveInputs['Customer'],'name'=>$receiveInputs['Customer']]);
-            $this->log(__METHOD__, __FUNCTION__, '富勒下发找不到货主，添加. 快递单号：'.$receiveInputs['SOReference5'] , null);
-        }
-        if (!$receiveInputs['CarrierID']) {
-            $this->log(__METHOD__, __FUNCTION__, '富勒没有下发快递公司！快递单号：'.$receiveInputs['SOReference5'] , null);
-        }
-        $logistic=Logistic::select('id')->where('code',$receiveInputs['CarrierID'])->first();
-        if (!$logistic&&$receiveInputs['CarrierID']) {
-            Logistic::create(['code'=>$receiveInputs['CarrierID'],'name'=>$receiveInputs['CarrierID']]);
-            $this->log(__METHOD__, __FUNCTION__, '富勒下发找不到承运商，添加. 快递单号：' .$receiveInputs['SOReference5'] , null);
-        }
-        if ($package) {
-            $package->delivery_number = $receiveInputs['palletid'];
-            if ($owner) {
-                $package->owner_id = $owner->id;
-                $packagePaperBox = new Package();
-                $paperBox_id = $packagePaperBox->checkPaperBox($package->length, $package->width, $package->height, $owner->id);
-                if ($paperBox_id) $package->paperBox_id = $paperBox_id;
-            } else {
-                $package->status = '记录异常';
-            }
-            $package->recipient = $receiveInputs['Consigneename'];
-            if ($logistic) $package->logistic_id = $logistic->id;
-            $package->batch_number = $receiveInputs['USERDEFINE1'];
-            $package->batch_rule = $receiveInputs['USERDEFINE2'];
-            $package->save();
-            $result = $this->accomplishToWMS($package);
-            if ($result['result'] == 'success') {
-                if ($package->status == "记录异常") $package->status = "已上传异常";
-                else $package->status = "已上传";
-            } else {
-                $package->status = "上传异常";
-            }
-            $package->save();
-            $this->log(__METHOD__, 'fluxPackageApi' . __FUNCTION__, json_encode($request->all()), null);
-            return response()->json(['response' => ['flag' => 'Y', 'code' => '0000', 'message' => '正确接收']])
-                ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
-        }
-        if (isset($owner->id)&&isset($logistic->id)){
-            $createPackage = new Package([
-                'logistic_number'=>$receiveInputs['SOReference5'],
-                'delivery_number'=>$receiveInputs['palletid'],
-                'recipient'=>$receiveInputs['Consigneename'],
-                'owner_id'=>$owner->id,
-                'logistic_id'=>$logistic->id,
-                'batch_number'=>$receiveInputs['USERDEFINE1'],
-                'batch_rule'=>$receiveInputs['USERDEFINE2'],
-                'status'=>'未测量'
-            ]);
-        }else{
-            $this->log(__METHOD__,'fluxPackageApi(no owner or carrier)'.__FUNCTION__,json_encode($request->all()),null);
-            $createPackage = new Package([
-                'logistic_number'=>$receiveInputs['SOReference5'],
-                'delivery_number'=>$receiveInputs['palletid'],
-                'recipient'=>$receiveInputs['Consigneename'],
-                'batch_number'=>$receiveInputs['USERDEFINE1'],
-                'batch_rule'=>$receiveInputs['USERDEFINE2'],
-                'status'=>'记录异常'
-            ]);
-        }
-        $createPackage->order_code=$receiveInputs['Orderno'];
-        $createPackage->save();
-        //活动波次同步  组合提总
-        if ($receiveInputs['USERDEFINE2']&&strstr($receiveInputs['USERDEFINE2'],'组合')) {
-            $packageBatch = Package::whereRaw('batch_number = ? AND weight IS NOT NULL', [$receiveInputs['USERDEFINE1']])->first();
-            if ($receiveInputs['USERDEFINE1'] && $packageBatch) {
-                $createPackage->measuring_machine_id = $packageBatch->measuring_machine_id;
-                $createPackage->weight = $packageBatch->weight;
-                $createPackage->length = $packageBatch->length;
-                $createPackage->width = $packageBatch->width;
-                $createPackage->height = $packageBatch->height;
-                $createPackage->bulk = $packageBatch->bulk;
-                $createPackage->paper_box_id = $packageBatch->paper_box_id;
-                $createPackage->save();
-                $result = $this->accomplishToWMS($createPackage);
-                if ($result['result'] == 'success') {
-                    if ($createPackage->status == "记录异常") $createPackage->status = "已上传异常";
-                    else $createPackage->status = "已上传";
-                } else {
-                    $createPackage->status = "上传异常";
-                }
-            }
-            if (!$receiveInputs['USERDEFINE1'] || !$packageBatch) {
-                MarkPackageExcepted::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
-            }
-            $createPackage->save();
-            $this->log(__METHOD__, 'success_' . __FUNCTION__, json_encode($request->all()), null);
-            return response()->json(['response' => ['flag' => 'Y', 'code' => '0000', 'message' => '正确接收']])
-                ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
-        }
-        MarkPackageExcepted::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
-        $this->log(__METHOD__,'success_'.__FUNCTION__,json_encode($request->all()),null);
-        return response()->json(['response'=>['flag'=>'Y','code'=>'0000','message'=>'正确接收']])
-            ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
-    }
-
-    protected function validatorForNew(array $data)
-    {
-        return Validator::make($data, [
-            'request.TASKID' => ['required', 'string', 'max:191'],
-            'request.Orderno' => ['nullable', 'string', 'max:191'],
-            'request.palletid' => ['required', 'string', 'max:191'],
-            'request.SOReference5' => ['required', 'string', 'max:191'],
-            'request.Customer' => ['nullable', 'string', 'max:191'],
-            'request.Consigneename' => ['nullable', 'string', 'max:191'],
-            'request.CarrierID' => ['nullable', 'string', 'max:191'],
-            'request.USERDEFINE1' => ['nullable', 'string', 'max:191'],
-            'request.USERDEFINE2' => ['nullable', 'string', 'max:191'],
-            'request.USERDEFINE3' => ['nullable', 'string', 'max:191'],
-        ],[],[
-            'request.TASKID' => 'taskid',
-            'request.Orderno' => 'orderno',
-            'request.palletid' => 'palletid',
-            'request.SOReference5' => 'soreference5',
-            'request.Customer' => 'custmoer',
-            'request.Consigneename' => 'consigmeename',
-            'request.CarrierID' => 'carrierid',
-            'request.USERDEFINE1' => 'userdefine1',
-            'request.USERDEFINE2' => 'userdefine2',
-            'request.USERDEFINE3' => 'userdefine3',
-        ]);
-    }
-    /**
-     * 完成的包裹称量发送给WMS
-     */
-    public function accomplishToWMS(Package $package)
-    {
-        try{
-
-            if($package['status']=='已上传'&&strstr($package['batch_rule'],'组合')){
-                if(isset($package['forceUpload'])&&$package['forceUpload']!=true){
-                    $this->log(__METHOD__,'跳过_'.__FUNCTION__,'未实际上传，之前有上传成功且无变动：'.json_encode($package),null);
-                    return ['result'=>'success'];
-                }
-            }
-            $json=["request"=>['TASKID'=>$package->WMSReflectPackage_name,
-                'SOReference5'=>$package->logistic_number,
-                'Weigh'=>$package->weight,
-                'Addwho'=>'',
-                'Addtime'=>Carbon::now(),
-                'Package'=>$package->paperBox_name,
-                'USERDEFINE1'=>$package->batch_number,
-                'USERDEFINE2'=>$package->batch_rule,
-                'USERDEFINE3'=>'OK',
-            ]];
-            $json=json_encode($json);
-            $url=url(config('api.flux.package.new'));
-            $response = Zttp::post($url, json_decode($json));
-            $this->log(__METHOD__,'Sign'.__FUNCTION__,json_encode($response->json()),null);
-            $response=$response->json();
-            $noIssues=true;
-            if(!$response||!isset($response['response'])||!$response['response']['flag']=='Y'){
-                $noIssues=false;
-            }
-            if($noIssues&&$response['response']['flag']=='Y'){
-                $this->log(__METHOD__,'SUCCESS_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
-                return ['result'=>'success'];
-            }
-            $this->log(__METHOD__,'ERROR_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
-            return ['result'=>'false'];
-        }catch (\Exception $exception){
-            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'CURL请求异常：'.$exception->getMessage(),null);
-            return ['result'=>'false'];
-        }
-    }
-
-
-}

app/OracleDOCWaveHeader.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+use App\Traits\ModelTimeFormat;
+
+class OracleDOCWaveHeader extends Model
+{
+    use ModelTimeFormat;
+    protected $connection="oracle";
+    protected $table="DOC_WAVE_HEADER";
+//    protected $primaryKey="WAVENO";
+    public $timestamps=false;
+}

config/users.php

@@ -3,7 +3,7 @@
 return [
 
 
-    'superAdmin' => ['ldaaww','baoshi56','zhouyaping','shiyao','zhouzhendong','胡浩'],
+    'superAdmin' => ['ldaaww','baoshi56','zhouyaping','shiyao','zhouzhendong','胡浩','阿珺'],
     'token_expire_minutes'=>7200,
     'token_check_in_expire_minutes'=>7200, //打卡过期时间，单位为分钟
 ];

resources/views/layouts/menu.blade.php

@@ -12,7 +12,7 @@
                     <span class="fa fa-sign-in" style="color: #721b25"></span>
                     入库管理</a></li> @endcan
         @can('订单管理')
-            <li class="nav-item"><a href="{{url("exit/index/forwarding")}}" class="nav-link"
+            <li class="nav-item"><a href="{{url("order/index/delivering")}}" class="nav-link"
                                     :class="{active:isActive('order',1)}">
                     <span class="fa fa-calendar-check-o" style="color: #1b4b72"></span>
                     订单管理</a></li> @endcan