临时提交

app/OracleActAllocationDetails.php

@@ -22,7 +22,7 @@ class OracleActAllocationDetails extends Model
 
     public function oracleDocOrderHeader(): BelongsTo
     {
-        return $this->belongsTo('App\OracleDOCOrderHeader','orderno','orderno');
+        return $this->belongsTo(OracleDOCOrderHeader::class,'orderno','orderno');
     }
 
     public function oracleDocOrderSerialNos(): HasMany

app/Providers/AppServiceProvider.php

@@ -146,6 +146,11 @@ use App\Services\OwnerLogisticFeeDetailService;
 use App\Services\OwnerLogisticFeeReportService;
 use App\Services\LogisticSyncRecordService;
 use App\Services\OwnerBillReportArchiveService;
+use App\Services\PDDDeliveryService;
+use App\Services\TBDeliveryService;
+use App\Services\SFDeliveryService;
+use App\Services\JDDeliveryService;
+use App\Services\SFQHDDeliveryService;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -244,6 +249,7 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('InventoryAccountMissionService',InventoryAccountMissionService::class);
         app()->singleton('InventoryCompareService', InventoryCompareService::class);
         app()->singleton('InventoryDailyLogService', InventoryDailyLogService::class);
+        app()->singleton('JDDeliveryService',JDDeliveryService::class);
         app()->singleton('LaborCompanyService',LaborCompanyService::class);
         app()->singleton('LaborReportsCountingRecordService', LaborReportsCountingRecordService::class);
         app()->singleton('LogService', LogService::class);
@@ -298,6 +304,7 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('OwnerReportService', OwnerReportService::class);
         app()->singleton('OwnerService', OwnerService::class);
         app()->singleton('OwnerStoragePriceModelService', OwnerStoragePriceModelService::class);
+        app()->singleton('PDDDeliveryService',PDDDeliveryService::class);
         app()->singleton('PackageService', PackageService::class);
         app()->singleton('PackageStatisticsService', PackageStatisticsService::class);
         app()->singleton('PrintPartService',PrintPartService::class);
@@ -317,6 +324,8 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('RejectedBillService', RejectedBillService::class);
         app()->singleton('RejectedService', RejectedService::class);
         app()->singleton('RoleService',RoleService::class);
+        app()->singleton('SFDeliveryService',SFDeliveryService::class);
+        app()->singleton('SFQHDDeliveryService',SFQHDDeliveryService::class);
         app()->singleton('ShopService', ShopService::class);
         app()->singleton('StationCacheShelfGridService', StationCacheShelfGridService::class);
         app()->singleton('StationRuleBatchService', StationRuleBatchService::class);
@@ -336,6 +345,7 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('StoreItemService', StoreItemService::class);
         app()->singleton('StoreService', StoreService::class);
         app()->singleton('SupplierService', SupplierService::class);
+        app()->singleton('TBDeliveryService',TBDeliveryService::class);
         app()->singleton('TerminalPrinterService',TerminalPrinterService::class);
         app()->singleton('TerminalService',TerminalService::class);
         app()->singleton('UnitService', UnitService::class);

app/Services/PrintService.php

@@ -2,22 +2,23 @@
 
 namespace App\Services;
 
+use App\OracleActAllocationDetails;
 use App\OracleDocOrderDeliveryInfo;
 use App\OracleDOCOrderHeader;
 use App\PrintTemplate;
+use App\Traits\DrawImage;
 use App\Traits\ModelSearchWay;
 use App\Traits\ServiceAppAop;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Intervention\Image\Facades\Image;
-use Picqer\Barcode\BarcodeGeneratorPNG;
 
 class PrintService
 {
     use ModelSearchWay;
     use ServiceAppAop;
+    use DrawImage;
 
     /**
      * 分列 订单号，快递单号，波次号
@@ -53,7 +54,7 @@ class PrintService
             $orderCodes = array_merge($orderHeaders, $orderCodes);
         }
         if($orderCodes) {
-            $info = OracleDocOrderDeliveryInfo::query()->where('OrderNo',$orderCodes)->get()->map(function($item){
+            $info = OracleActAllocationDetails::query()->where('OrderNo',$orderCodes)->get()->map(function($item){
                 return $item->tackingno;
             });
             $logistic_numbers = array_merge($info, $logistic_numbers);
@@ -105,10 +106,8 @@ class PrintService
             $img_base64_code = $param['base64'];
             $img =  Image::make($img_base64_code);
             $printTemplate = PrintTemplate::query()->where('name','123')->first();
-//            $img = $this->convertPrintImage($img,$printTemplate);
-
+            $img = $this->convertPrintImage($img,$printTemplate);
             $img_name = Str::uuid().'.png';
-
             $path_arr = ['app','public','print'];
             $dir_path = implode(DIRECTORY_SEPARATOR,$path_arr);
             if (!file_exists(storage_path($dir_path))) mkdir(storage_path($dir_path));
@@ -141,71 +140,23 @@ class PrintService
      */
     public function convertPrintImage($image,$printTemplate,$order_package = null)
     {
-        $values = $printTemplate->value;
-        usort($values,function($itemA,$itemB){
-            if( $itemA['type'] == "bg") return 1;
-            if (!isset($itemA['z-index'])) return -1;
-            if (!isset($itemB['z-index'])) return 1;
-            if($itemA['z_index'] > $itemB['z_index'])return 1;
-            if($itemA['z_index'] < $itemB['z_index'])return -1;
-            if($itemA['z_index'] == $itemB['z_index'])return 0;
-        });
 
-        foreach ($values as $value) {
-            if($value['type'] == 'bg') continue;
-//            $img = $this->getTextBox($value);
-//            $img = $this->getStripeCode('75175934320303',$value);
-//            $img = $this->getImage(123,123);
-//            $image->insert($img,'top-left', $value['left'], $value['top']);
-        }
-        return $image;
-    }
 
-    /**
-     * 文本框
-     * @param $value
-     * @return \Intervention\Image\Image
-     */
-    public function getTextBox($value): \Intervention\Image\Image
-    {
-        $bgImage = Image::canvas($value['width'],$value['height'],'#000');
-        $borderWidth = $value['borderWidth'] * 2;
-        $img = Image::canvas($value['width']-$borderWidth,$value['height']-$borderWidth,'#fff');
-
-        $textX =  $value['justifyContent'] == 'center' ? ($value['width']-$borderWidth)/2 : ($value['justifyContent'] == 'left' ? 0 : $value['width']-$borderWidth);
-        $textY =  $value['alignItems'] == 'center' ? ($value['height']-$borderWidth)/2 : ($value['alignItems'] == 'top' ? 0 : $value['height']-$borderWidth);
-        $img->text($value['text'],$textX,$textY,function($font)use($value){
-            $font->size(25);
-            $font->align($value['justifyContent']); // 水平对其
-            $font->valign($value['alignItems']);    // 垂直对其
-            $font->angle(100);
+        $items = $printTemplate->value;
+
+        $bg = array_filter($items,function ($item){
+            return $item['type'] == 'bg';
+        });
+        $items = array_filter($items,function($item){
+            return $item['type'] !== 'bg';
+        });
+        usort($items,function ($a, $b) {
+            return $a['z_index'] > $b['z_index'] ? 1 : 0;
         });
-        $bgImage->insert($img,'top-left', $value['borderWidth'], $value['borderWidth']);
 
-        return $bgImage;
-    }
 
-    /**
-     * 条纹码
-     * @param $code
-     * @param $value
-     * @return \Intervention\Image\Image
-     */
-    public function getStripeCode($code,$value): \Intervention\Image\Image
-    {
-        $generatorPng = new BarcodeGeneratorPNG();
-        $img = $generatorPng->getBarcode($code,$generatorPng::TYPE_CODE_128,1,20,[0, 0, 200]);
-        return Image::make($img)->resize($value['width'],$value['height']);
-    }
 
-    /**
-     * 图片
-     * @param $code
-     * @param $value
-     */
-    public function getImage($code,$value)
-    {
-        // Image::make(Storage::get('\\ownerMaterial\\3ce187cf-391e-3e54-9501-de06d57fd8e7.png'));
-        return Image::make('')->resize($value['width'],$value['height']);
     }
+
+
 }

resources/views/maintenance/expressPrinting/setting/menu.blade.php

@@ -1,14 +0,0 @@
-<div class="container-fluid nav3">
-    <div class="card" >
-        <ul class="nav nav-pills">
-            <li class="nav-item">
-                <a target="/maintenance/expressPrinting/setting/terminal/index" class="nav-link"
-                   href="{{url('/maintenance/expressPrinting/setting/terminal/index')}}" :class="{active:isActive('terminal',4)}">终端</a>
-            </li>
-            <li class="nav-item">
-                <a target="/maintenance/expressPrinting/setting/terminal/index" class="nav-link"
-                   href="{{url('/maintenance/expressPrinting/setting/printer/index')}}" :class="{active:isActive('printer',4)}">打印机</a>
-            </li>
-        </ul>
-    </div>
-</div>