称重接口

app/Http/Controllers/PackageController.php

@@ -138,7 +138,7 @@ class PackageController extends Controller
                 $package->batch_number=$batch_number;
                 $package->order_code=$order_code;
                 $result=$accomplishToWMS->accomplishToWMS($package);
-                if ($result['result']=='success'){
+                if ($result['result']){
                     if ($package->status=="记录异常")$package->status="已上传异常";
                     else $package->status="已上传";
                 }else{

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

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api\thirdPart\flux;
 use App\Http\Controllers\Controller;
 use App\Jobs\MarkPackageExcepted;
 use App\Logistic;
+use App\OracleDOCOrderDetail;
 use App\OracleDOCOrderHeader;
 use App\OracleDOCWaveHeader;
 use App\Owner;
@@ -20,122 +21,122 @@ 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);
-        }
-        //package不存在
-        $receive = new WMSReflectPackage($receiveInputs);
-        try{
-            $receive->save();
-        }catch (\Exception $exception){
-            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'WMS下发请求保存异常：'.$exception->getMessage(),null);
-            return ['response'=>['flag'=>'W','message'=>'already send, order number unique violation.',
-                'errors'=>$exception->getMessage()]];
-        }
-        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);
+//        $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);
+//        }
+//        //package不存在
+//        $receive = new WMSReflectPackage($receiveInputs);
+//        try{
+//            $receive->save();
+//        }catch (\Exception $exception){
+//            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'WMS下发请求保存异常：'.$exception->getMessage(),null);
+//            return ['response'=>['flag'=>'W','message'=>'already send, order number unique violation.',
+//                'errors'=>$exception->getMessage()]];
+//        }
+//        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);
     }
@@ -172,15 +173,8 @@ 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__,'跳过1_'.__FUNCTION__,'未实际上传，之前有上传成功且无变动：'.json_encode($package),null);
-////                    return ['result'=>'success']; //不写WMS接口则不需要中断
-//                }
-//            }
-//            $this->log(__METHOD__,'common_'.__FUNCTION__,'标记WMS波次：'.$package['batch_number'].'进入中',null);
-            $success=$this->markWMSOnBatch($package['batch_number']);
-            return ['result'=>$success];
+//            OracleDOCOrderDetail::where()
+//            return ['result'=>$success];
             //对WMS接口请求不需要了，直接写其数据库
 //            $json=["request"=>['TASKID'=>$package->WMSReflectPackage_name,
 //                'SOReference5'=>$package->logistic_number,

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

@@ -92,7 +92,7 @@ class PackageController extends Controller
                 $this->log(__METHOD__,'Batch_'.__FUNCTION__,json_encode($package),null);
                 $package->save();
                 $result=$accomplishToWMS->accomplishToWMS($package);
-                if ($result['result']=='success'){
+                if ($result['result']){
                     if ($package->status=="记录异常")$package->status="已上传异常";
                     else $package->status="已上传";
                 }else{

resources/views/process/index.blade.php

@@ -388,7 +388,7 @@
                         ,{'-webkit-transform':'scale('+(1/Math.ceil(arrayFilter(processOne.processesContents,processOne).length/4))+')'},{height: (35*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/4))+'px'}
                         ,{width: (100*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/4))+'%'},{'margin-left': (-100*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/4))-1)/2)+'%'}
                         ,{'margin-top': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/4))-1)/2)+'px'},{'margin-bottom': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/4))-1)/2)+'px'}]">
-                            <div v-for="(processesContent,i) in arrayFilter(processOne.processesContents,processOne)"  class=" row  p-0" style="float: left;margin-right: 20px;font-size:1vw;-webkit-transform-origin: 0" :style="[{opacity:1/0.7},
+                            <div v-for="(processesContent,i) in arrayFilter(processOne.processesContents,processOne)"  class=" row  p-1" style="float: left;margin-right: 20px;font-size:1vw;-webkit-transform-origin: 0" :style="[{opacity:1/0.7},
                             {'margin-left': arrayFilter(processOne.processesContents,processOne).length >4 ? (1*parseInt(arrayFilter(processOne.processesContents,processOne).length/2))+'px' : '0px'}]">
                                 <span>@{{ processesContent.bill_type }}</span>&nbsp;&nbsp;
                                 <span>@{{ processesContent.wms_code }}</span>&nbsp;&nbsp;