问题件

添加隐藏标识['hidden_tag']并在前后端进行对应的处理
文本导入时可录入

app/Http/Controllers/OrderIssueController.php

@@ -587,7 +587,7 @@ class OrderIssueController extends Controller
                 $result_explain = $map['result_explain'];
                 $type = $map['type'];
                 $custom_code = $map['custom_code'] ?? null;
-                $service->createOrderIssue($logistic_number, $type, $result_explain,'导入未处理',$custom_code);
+                $service->createOrderIssue($logistic_number, $type, $result_explain,'导入未处理',$custom_code,$request['hiddenTag'] ?? null);
             }
             return ['success'=>true];
         } catch (Exception $e) {

app/OrderIssue.php

@@ -13,10 +13,15 @@ class OrderIssue extends Model
     use SoftDeletes;
 
     protected $fillable = [
-        'order_id', 'created_at', 'rejected_bill_id', 'rejecting_status', 'result_explain','logistic_number_return',
-        'situation_explain', 'order_issue_type_id', 'second_order_id', 'is_new_rejecting','second_client_no','second_logistic_number',
-        'final_status', 'logistic_indemnity_money', 'logistic_express_remission', 'baoshi_indemnity_money', 'baoshi_express_remission', 'user_workgroup_id',
-        'custom_code','imported_status','finance_confirm'];
+        'order_id', 'created_at', 'rejected_bill_id',
+        'rejecting_status', 'result_explain','logistic_number_return',
+        'situation_explain', 'order_issue_type_id', 'second_order_id',
+        'is_new_rejecting','second_client_no','second_logistic_number',
+        'final_status',
+        'logistic_indemnity_money', 'logistic_express_remission',
+        'baoshi_indemnity_money', 'baoshi_express_remission', 'user_workgroup_id',
+        'custom_code','imported_status','finance_confirm',
+        'hidden_tag'];
     /*
      * second_client_no 二次客户订单号
      * second_logistic_number 二次运单号 【二次运单号可以单独存在，当二次客户订单号有对应的订单信息时，显示的是二次客户订单号对应的运单号，没有的话显示二次原单号】
@@ -28,6 +33,7 @@ class OrderIssue extends Model
      * imported_status 导入处理
      * 退回单号
      * finance_confirm 财务确认
+     * hidden_tag 隐藏标识
      */
     protected $appends = [
 //        'secondLogisticNumber',

app/Services/OrderIssueService.php

@@ -82,7 +82,11 @@ class OrderIssueService
         if (isset($arr['custom_code'])) {
             $query->where('custom_code', $arr['custom_code']);
         }
-
+        if(isset($arr['hiddenTag'])){
+            $query->where('hidden_tag', $arr['hiddenTag']);
+        }else{
+            $query->whereNull('hidden_tag');
+        }
         $query->selectRaw('order_issues.* ,order_issue_on_tops.id top_id ,order_issue_on_tops.remark,order_issue_on_tops.updated_at top_update')
             ->leftJoin('order_issue_on_tops', 'order_issue_on_tops.order_issue_id', '=', 'order_issues.id')
             ->whereNull('order_issue_on_tops.deleted_at')
@@ -305,7 +309,7 @@ class OrderIssueService
         }
     }
 
-    public function createOrderIssueByWmsOrder($orderHeaders, $order_issue_type_id, $result_explain, $imported_status = '正常', $custom_code = null)
+    public function createOrderIssueByWmsOrder($orderHeaders, $order_issue_type_id, $result_explain, $imported_status = '正常', $custom_code = null,$hiddenTag = null)
     {
         /** @var OrderService $orderService */
         $orderService = app('OrderService');
@@ -326,7 +330,8 @@ class OrderIssueService
                     'order_issue_type_id' => $order_issue_type_id,
                     'result_explain' => $result_explain,
                     'imported_status' => $imported_status,
-                    'custom_code' => $custom_code
+                    'custom_code' => $custom_code,
+                    'hidden_tag' => $hiddenTag
                 ];
             }
         }
@@ -509,14 +514,14 @@ class OrderIssueService
     }
 
 
-    public function createOrderIssue($logisticNumber, $type, $result_explain, $importedStatus = '正常', $custom_code = null)
+    public function createOrderIssue($logisticNumber, $type, $result_explain, $importedStatus = '正常', $custom_code = null,$hiddenTag = null)
     {
         $orderHeaders = OracleDOCOrderHeader::query()->with(['oracleDOCOrderDetails', 'actAllocationDetails', 'oracleBASCode'])
             ->whereHas('actAllocationDetails', function ($query) use ($logisticNumber) {
                 $query->where('picktotraceid', $logisticNumber);
             })->get();
         $orderIssueType = OrderIssueType::query()->where('name', $type)->first();
-        return $this->createOrderIssueByWmsOrder($orderHeaders, $orderIssueType->id, $result_explain, $importedStatus, $custom_code);
+        return $this->createOrderIssueByWmsOrder($orderHeaders, $orderIssueType->id, $result_explain, $importedStatus, $custom_code,$hiddenTag);
     }
 
     /**

database/migrations/2020_11_19_100831_add_hidden_tag_to_order_issues.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddHiddenTagToOrderIssues extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('order_issues', function (Blueprint $table) {
+            $table->string('hidden_tag')->nullable()->index()->comment('隐藏标识');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('order_issues', function (Blueprint $table) {
+            $table->dropColumn('hidden_tag');
+        });
+    }
+}

resources/views/order/issue/import.blade.php

@@ -72,11 +72,17 @@
                         </div>
                     </div>
                     <div class="modal-body text-center">
+
+                        <div class="form-group text-left">
+                            <input type="text" class="form-control-sm" v-model="hiddenTag" placeholder="输入标识">
+                        </div>
+
                         <button type="button" id="popover" class="btn btn-danger" v-if="popoverContent"
                                 data-container="body" data-toggle="popover" data-placement="bottom"
                                 :data-content="popoverContent" data-html="true">
                             部分数据导入失败
                         </button>
+
                         <textarea id="pasteDataText" class="w-100" style="height: 400px" v-model="pasteDataText"
                                   @keydown.tab="forbidTab($event)" @keyup.tab="replaceSpacing()"
                                   placeholder="内容可为EXCEL复制,也可手动输入使用“TAB”缩进符区分列，请注意表头顺序,可拖拽表头字段调整顺序，以该顺序为准"></textarea>
@@ -99,6 +105,7 @@
                 requiredRows:['原始运单号','问题类别','情况说明','自定义订单号'],
                 popoverContent:'',
                 pasteDataText: '',
+                hiddenTag:null
             },
             mounted:function(){
                 $('[data-toggle="popover"]').popover();
@@ -130,7 +137,7 @@
                         tempTip.show('导入文本不能为空')
                     }
                     let _this = this
-                    let data = {rows:this.rows,pasteDataText:this.pasteDataText}
+                    let data = {rows:this.rows,pasteDataText:this.pasteDataText,hiddenTag: this.hiddenTag}
                     tempTip.setDuration(99999)
                     tempTip.setIndex(1051)
                     tempTip.waitingTip('正在执行中,请稍后')

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

@@ -786,6 +786,7 @@
                 ],[
                     {name: 'settlement_at_start', type: 'dateTime', tip: '完结起始日期'},
                     {name: 'settlement_at_end', type: 'dateTime', tip: '完结结束日期' },
+                    {name: 'hiddenTag', type: 'input', tip: '隐藏标识',placeholder: '标识'},
                     {name: 'is_new_rejecting', type: 'select', tip: '退件状态',placeholder: '退件状态',data:[{name:'无',value:'无'},{name:'有',value:'有'},{name:'已处理',value:'已处理'}]},
                     {name: 'rejectingStatus', type: 'select', tip: '退单状态',placeholder: '退单状态',data:this.rejectingStatus},
                 ]];