Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas into LD

app/Imports/ExpressImport.php

@@ -11,11 +11,20 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Maatwebsite\Excel\Concerns\ToCollection;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 use Maatwebsite\Excel\Imports\HeadingRowFormatter;
 
 HeadingRowFormatter::default('none');
-class ExpressImport implements ToCollection,WithHeadingRow
+class ExpressImport implements ToCollection,WithHeadingRow,WithMultipleSheets
 {
+
+    public function sheets(): array
+    {
+        return [
+            0 => $this,
+        ];
+    }
+
     protected $express;
     public function __construct(OwnerPriceExpress $express = null)
     {

app/Imports/OrderTrackingImport.php

@@ -43,7 +43,6 @@ class OrderTrackingImport implements ToCollection
          * @var OrderPackage $package
          * @var Commodity $commodity
          */
-        $service = app('OrderTrackingService');
         $owner = Owner::query()->where('name','安桥主品')->first();
         $this->owner = $owner;
         $collection->shift();
@@ -84,10 +83,6 @@ class OrderTrackingImport implements ToCollection
     }
 
     public function getOrderPackageCommodities($items){
-        /**
-         * @var OrderService $orderService
-         */
-        $orderService = app('OrderService');
         $packages = $this->getPackage($items[1],$items);
         $packages = collect($packages);
         if(!$packages||$packages->isEmpty()){

app/Imports/OwnerPriceDirectLogisticDetailImport.php

@@ -11,11 +11,18 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Maatwebsite\Excel\Concerns\ToCollection;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 use Maatwebsite\Excel\Imports\HeadingRowFormatter;
 
 HeadingRowFormatter::default('none');
-class OwnerPriceDirectLogisticDetailImport implements ToCollection,WithHeadingRow
+class OwnerPriceDirectLogisticDetailImport implements ToCollection,WithHeadingRow,WithMultipleSheets
 {
+    public function sheets(): array
+    {
+        return [
+            0 => $this,
+        ];
+    }
     protected $model;
 
     public function __construct($model)

app/Imports/StoreCheckingReceiveImport.php

@@ -10,12 +10,12 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Maatwebsite\Excel\Concerns\ToCollection;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 use Maatwebsite\Excel\Imports\HeadingRowFormatter;
 
 HeadingRowFormatter::default('none');
 class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
 {
-
     /**
      * @param Collection $collection
      * @return bool

app/Services/FeatureService.php

@@ -178,18 +178,6 @@ Class FeatureService
                         case "等于":
                             $logic = " = ";
                             break;
-                        case "大于":
-                            $logic = " > ";
-                            break;
-                        case "大于等于":
-                            $logic = " >= ";
-                            break;
-                        case "小于":
-                            $logic = " < ";
-                            break;
-                        case "小于等于":
-                            $logic = " <= ";
-                            break;
                     }
                     $str = $column.$logic."'".$describe."'";
                 }else $str = $features[$str]["type"].' '.$features[$str]["logic"].' '.$features[$str]["describe"];
@@ -242,23 +230,6 @@ Class FeatureService
                 $column = $features[$str]["type"];
                 $logic = $features[$str]["logic"];
                 $describe = $features[$str]["describe"];
-                if ($column == '订单数'){
-                    $sum = 0;
-                    switch ($logic) {
-                        case "大于":
-                            if ($sum > $describe) return 'true';
-                            break;
-                        case "大于等于":
-                            if ($sum >= $describe) return 'true';
-                            break;
-                        case "小于":
-                            if ($sum < $describe) return 'true';
-                            break;
-                        case "小于等于":
-                            if ($sum <= $describe) return 'true';
-                            break;
-                    }
-                }
                 if ($column == '商品名称' && $isMultiMatching){
                     $packageColumn = $columnMapping["packages"] ?? "packages";
                     $packages = $matchObject[$packageColumn] ?? [];

database/migrations/2021_01_27_174543_add_column_owner_price_model_storage.php

@@ -17,10 +17,10 @@ class AddColumnOwnerPriceModelStorage extends Migration
         Schema::table('owner_storage_price_models', function (Blueprint $table) {
             $table->bigInteger("time_unit_id")->comment("计时单位");
         });
-        Schema::table("owner_price_model_operations",function (Blueprint $table){
-            $table->decimal("discount_count")->nullable()->comment("减免数");
+        Schema::table("owner_price_operations",function (Blueprint $table){
+            $table->integer("discount_count")->nullable()->comment("减免数");
         });
-        Schema::table("owner_price_model_operation_items",function (Blueprint $table){
+        Schema::table("owner_price_operation_items",function (Blueprint $table){
             $table->decimal("discount_price")->nullable()->comment("减免单价");
         });
     }
@@ -35,10 +35,10 @@ class AddColumnOwnerPriceModelStorage extends Migration
         Schema::table('owner_storage_price_models', function (Blueprint $table) {
             $table->dropColumn("time_unit_id");
         });
-        Schema::table("owner_price_model_operations",function (Blueprint $table){
+        Schema::table("owner_price_operations",function (Blueprint $table){
             $table->dropColumn("discount_count");
         });
-        Schema::table("owner_price_model_operation_items",function (Blueprint $table){
+        Schema::table("owner_price_operation_items",function (Blueprint $table){
             $table->dropColumn("discount_price");
         });
     }

resources/views/customer/project/create.blade.php

@@ -416,7 +416,6 @@
                         }
                         if (res.owner_price_expresses.length>0){
                             this._loadExpress();
-                            if (!this.pool.logistics)this._getLogistics();
                             res.owner_price_expresses.forEach((express,i)=>{
                                 express.logistics.forEach((logistic,j)=>{
                                     express.logistics[j] = logistic.id;
@@ -603,6 +602,11 @@
                         this.$forceUpdate();
                         return;
                     }
+                    if (this.model.operation.isDiscount && !this.model.operation.discount_count){
+                        this.errors["discount_price"] = ["满减值不存在"];
+                        this.$forceUpdate();
+                        return;
+                    }
                     if ((this.model.operation.operation_type === '出库' && this._verifyOperationItem(0)) || this._verifyOperationItem(1))return;
                     if (this.model.operation.items.length>2){
                         for (let i=2;i<this.model.operation.items.length;i++){
@@ -650,6 +654,10 @@
                 _verifyOperationItem(itemIndex){//验证作业费子项信息完整
                     let obj = this.model.operation.items[itemIndex];
                     let sign = false;
+                    if (this.model.operation.isDiscount && !obj.discount_price){
+                        this.errors['items.'+itemIndex+'.discount_price'] = ["满减单价不得为空"];
+                        sign = true;
+                    }
                     if (obj.strategy!=='起步' && !obj.amount){
                         this.errors['items.'+itemIndex+'.amount'] = ["数量不得为空"];
                         sign = true;

resources/views/customer/project/part/_operation.blade.php

@@ -26,12 +26,21 @@
     </span>
 </div>
 <div class="row mt-3" v-if="model.operation.strategy == '特征'">
-    <label class="col-2">特征：</label>
+    <label class="col-2">特征</label>
     <label class="col-8">
         <label v-if="model.operation.feature">@{{ model.operation.featureFormat }}</label><br>
         <button type="button" class="btn btn-dark col-2 ml-2" @click="showAddFeatureModal(-1,model.operation.feature)">调整特征</button>
     </label>
 </div>
+<div class="row mt-3" v-if="model.operation.operation_type == '出库'">
+    <label class="col-2" for="isDiscount">是否满减</label>
+    <input type="checkbox" id="isDiscount" class="col-2 rounded mt-1" v-model="model.operation.isDiscount">
+    <div class="col-8 row" v-if="model.operation.isDiscount">
+        <label class="col-3" for="discount">满减值</label>
+        <input id="discount" v-model="model.operation.discount_count"
+               class="form-control form-control-sm col-6" :class="errors.discount_count ? 'is-invalid' : ''" step="1" type="number" min="0">
+    </div>
+</div>
 <div class="row mt-3">
     {{--起步--}}
     <div class="card row text-white offset-1 col-9 bg-dark" v-if="model.operation.operation_type === '出库'">
@@ -76,6 +85,14 @@
                     <div class="row mt-0" v-if="errors['items.0.unit_price']">
                         <div class="offset-3"><small class="text-danger font-weight-bold ml-3">起步费为必填项</small></div>
                     </div>
+                    <div class="row mt-2" v-if="model.operation.isDiscount">
+                        <label class="col-3">满减起步费</label>
+                        <label class="col-5 mb-0"><input type="number" min="0" step="0.001" class="form-control" v-model="model.operation.items[0].discount_price"
+                                                         :class="errors['items.0.discount_price'] ? 'is-invalid' : ''"></label>
+                    </div>
+                    <div class="row mt-0" v-if="errors['items.0.discount_price']">
+                        <div class="offset-3"><small class="text-danger font-weight-bold ml-3">满减起步费为必填项</small></div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -121,6 +138,14 @@
             <div class="row mt-0" v-if="errors['items.1.unit_price']">
                 <div class="offset-3"><small class="text-danger font-weight-bold ml-3">单价为必填项</small></div>
             </div>
+            <div class="row mt-2" v-if="model.operation.isDiscount">
+                <label class="col-3">满减单价</label>
+                <label class="col-5 mb-0"><input type="number" min="0" step="0.001" class="form-control" v-model="model.operation.items[1].discount_price"
+                                                 :class="errors['items.1.discount_price'] ? 'is-invalid' : ''"></label>
+            </div>
+            <div class="row mt-0" v-if="errors['items.1.discount_price']">
+                <div class="offset-3"><small class="text-danger font-weight-bold ml-3">满减单价为必填项</small></div>
+            </div>
         </div>
     </div>
 
@@ -164,6 +189,14 @@
             <div class="row mt-0" v-if="errors['items.'+i+'.unit_price']">
                 <div class="offset-3"><small class="text-danger font-weight-bold ml-3">单价为必填项</small></div>
             </div>
+            <div class="row mt-2" v-if="model.operation.isDiscount">
+                <label class="col-3">满减单价</label>
+                <label class="col-5 mb-0"><input type="number" min="0" step="0.001" class="form-control" v-model="item.discount_price"
+                                                 :class="errors['items.'+i+'.discount_price'] ? 'is-invalid' : ''"></label>
+            </div>
+            <div class="row mt-0" v-if="errors['items.'+i+'.discount_price']">
+                <div class="offset-3"><small class="text-danger font-weight-bold ml-3">满减单价为必填项</small></div>
+            </div>
             <div class="row mt-2">
                 <label class="col-3">特征：</label>
                 <label class="col-5">