补充提交

app/Http/Controllers/TestController.php

@@ -523,9 +523,12 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
     }
 
     public function test2(){
-        $a = ["测试","TEST","123","测试TEST123"];
-        $b = ["测试"];
-        dd(array_diff($a,$b));
+        $owner = Owner::where('name','B站')->first();
+        $commodities = Commodity::query()->where('owner_id',$owner->id)->get();
+        $comID = array_column($commodities->toArray(),'id');
+        CommodityBarcode::query()->whereIn('commodity_id',$comID)->delete();
+        Commodity::destroy($comID);
+        return $comID;
     }
 
     /*1*/

app/Imports/StoreCheckingReceiveImport.php

@@ -96,7 +96,6 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
                 "SKU" => $item["SKU"],
                 "商品名称" => $item["商品名称"],
                 "条码" => $item["条码"],
-                "lineno" => $index+2,
             ]);
             if ($isUniqueCommodity){
                 array_push($commodities[$item["条码"]], count($items)-1);
@@ -127,7 +126,6 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
                 unset($items[$index]["SKU"]);
                 unset($items[$index]["商品名称"]);
                 unset($items[$index]["条码"]);
-                unset($items[$index]["lineno"]);
             }
             unset($commodities[$barcode->code]);
         }
@@ -170,7 +168,6 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
                             unset($items[$index]["SKU"]);
                             unset($items[$index]["商品名称"]);
                             unset($items[$index]["条码"]);
-                            unset($items[$index]["lineno"]);
                         }
                         unset($commodities[$code]);
                     }
@@ -232,7 +229,6 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
                             unset($items[$index]["SKU"]);
                             unset($items[$index]["商品名称"]);
                             unset($items[$index]["条码"]);
-                            unset($items[$index]["lineno"]);
                         }
                     }
                     if (count($barcodes) > 0){

database/migrations/2020_09_30_153758_change_order_issue_and_o_rder_issue_logs.php → database/migrations/2020_10_13_101611_add_commodities_column_type.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ChangeOrderIssueAndORderIssueLogs extends Migration
+class AddCommoditiesColumnType extends Migration
 {
     /**
      * Run the migrations.
@@ -13,8 +13,8 @@ class ChangeOrderIssueAndORderIssueLogs extends Migration
      */
     public function up()
     {
-        Schema::table('order_issues', function (Blueprint $table) {
-            $table->dropColumn('settlement_at');
+        Schema::table('commodities', function (Blueprint $table) {
+            $table->enum('type',['无','临时'])->default('无')->comment('类型(用以区分有效商品与临时商品)');
         });
     }
 
@@ -25,9 +25,8 @@ class ChangeOrderIssueAndORderIssueLogs extends Migration
      */
     public function down()
     {
-        Schema::table('order_issues', function (Blueprint $table) {
-            $table->timestamp('settlement_at')->index()->nullable()->comment('完结日期');
+        Schema::table('commodities', function (Blueprint $table) {
+            $table->dropColumn('type');
         });
-
     }
 }

resources/views/order/index/delivering.blade.php

@@ -19,7 +19,7 @@
                         </div>
                     </span>
                     <div class="custom-control custom-checkbox ml-1">
-                        <input type="checkbox" class="custom-control-input" id="customCheck" v-model="is_merge">
+                        <input type="checkbox" class="custom-control-input" id="customCheck" name="is_merge" v-model="is_merge">
                         <label class="custom-control-label" for="customCheck">导出是否格式化</label>
                     </div>
                     @can('订单管理-批量备注')<button @click="modal()" type="button" class="btn btn-sm ml-2 btn-outline-primary">批量备注追加</button>@endcan
@@ -62,7 +62,7 @@
                 <table class="table table-sm table-striped table-bordered table-hover card-body mt-2 ml-3 d-none" id="headerRoll"></table>
                 <table class="table table-sm table-striped table-bordered table-hover card-body mt-2 ml-3" id="headerParent">
                     <tr class="text-nowrap" id="header"></tr>
-                    <tr v-for="(order,i) in orders" @click="selectedColor(order.orderno)" :style="{'font-weight': order.orderno==selectedStyle?'bold':''}">
+                    <tr v-for="(order,i) in orders" @click="selectedColor(order.orderno)" :style="{'background-color': order.orderno==selectedStyle?'#aac7ea':''}">
                         <td>
                             <input class="checkItem" type="checkbox" :value="order.orderno" v-model="checkData">
                         </td>
@@ -529,10 +529,7 @@
                     $("#myModal").modal('hide');
                 },
                 selectedColor(orderno){
-                    if (orderno==this.selectedStyle){
-                        this.selectedStyle='';
-                        return;
-                    }
+                    if (orderno==this.selectedStyle) return;
                     this.selectedStyle=orderno;
                 },
                 freeze(orderno,waveno){

resources/views/store/checkingReceive/mission.blade.php

@@ -23,7 +23,8 @@
                         <label><b class="text-primary">货主</b>，SKU，商品名称，<b class="text-primary">条码</b>，<b class="text-primary">数量</b>，生产日期，失效日期，批号，唯一码</label><br>
                         <label>
                             <input name="file" hidden type="file" class="col-5" id="excelFile" @change="getFile($event)"
-                                   accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel">
+                                   {{--accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"--}}
+                                   accept=".csv, .xlsx, .xls">
                         </label>
                         <button class="btn btn-dark col-5" @click="selectFile()">选择Excel文件</button><br>
                         <small class="text-primary">@{{ excel.file ? excel.file.name : '' }}</small>

resources/views/store/checkingReceive/show.blade.php

@@ -107,7 +107,7 @@
                     </span>
                     </td>
                     <td>@{{ storeCheckingReceiveItem.imported_amount }}</td>
-                    <td @click="showInput(storeCheckingReceiveItem.id)">
+                    <td @click="showInput(storeCheckingReceiveItem.id)" v-if="is_show">
                         <div class="form-inline">
                             <input  @blur="delFocus()" :id = "'counted_amount_'+storeCheckingReceiveItem.id" :value="storeCheckingReceiveItem.counted_amount"
                                     class="form-control form-control-sm" type="text" :disabled="disabledItemId == storeCheckingReceiveItem.id ? false : true">
@@ -116,8 +116,8 @@
                             <button v-if="disabledItemId == storeCheckingReceiveItem.id" type="button" class="btn btn-sm btn-danger"
                                 @click="disabledItemId = ''">取消</button>
                         </div>
-
                     </td>
+                    <td v-if="!is_show">@{{ storeCheckingReceiveItem.counted_amount }}</td>
                     <td>@{{ storeCheckingReceiveItem.asn_amount }}</td>
                     <td>@{{ storeCheckingReceiveItem.imported_diff_amount }}</td>
                     <td>@{{ storeCheckingReceiveItem.asn_diff_amount }}</td>