修复了二次加工部分bug，修复了go字段bug，完善了盘收与运输等新需求

app/Http/Controllers/OrderController.php

@@ -20,7 +20,7 @@ use Illuminate\Support\Facades\Http;
 class OrderController extends Controller
 {
     public function delivering(Request $request){
-        if(!Gate::allows('订单管理-查询')){ return view('order/index');  }
+        if(!Gate::allows('订单管理-查询')){ return view('/');  }
         /** @var OrderService $orderService */
         $orderService = app('orderService');
         $request = $request->input();

app/Http/Controllers/OrderIssueController.php

@@ -140,7 +140,7 @@ class OrderIssueController extends Controller
         }else{
             $sqlList = app('orderIssueService')->getSqlList(['id'=>$request->data]);
         }
-        $post = Http::post(config('go.export.url'),['type'=>'orderIssue','sqlList'=>json_encode($sqlList)]);
+        $post = Http::post(config('go.export.url'),['type'=>'orderIssue','sqlList'=>json_encode($sqlList),'createFormat'=>'merge']);
         if ($post->status() == 500){
             throw new Exception($post->header("Msg"));
         }

app/Http/Controllers/PackageController.php

@@ -168,7 +168,13 @@ class PackageController extends Controller
         }else{
             $sql=app('packageService')->getSql(['id'=>$request->data]);
         }
-        $post = Http::post(config('go.export.url'),['type'=>'package','sql'=>$sql]);
+        $row = ["货主","快递单号","波次号","订单号","物流公司","设备","重(KG)","长(cm)","宽(cm)","高(cm)","体积(cm³)","纸箱","状态","波次规则","称重时间","收件人","收件人电话"];
+        $column = ["owner_name", "logistic_number", "batch_number", "order_code", "logistic_name","measuring_machine_name",
+            "weight", "length", "width", "height", "bulk", "paper_box_name", "status","batch_rule","weighed_at","order_consignee_name","order_consignee_phone"];
+        $rule = ["weighed_at"=> "mysqlDate"];
+        $post = Http::post(config('go.export.url'),['type'=>'unify','sql'=>$sql, 'connection'=>'mysql',
+            'row'=>json_encode($row,JSON_UNESCAPED_UNICODE), 'column'=>json_encode($column), 'rule'=>json_encode($rule)]);
+
         if ($post->status() == 500){
             throw new Exception($post->header("Msg"));
         }

app/Http/Controllers/StoreBlindReceiveController.php

@@ -31,10 +31,10 @@ class StoreBlindReceiveController extends Controller
         if(!$goodses||!is_array($goodses)||count($goodses)==0){
             return ['result'=>'failure','fail_info'=>'没有数据提交！'];
         }
-        $goodsesExcelArray=[['隔口','数量','条码','生产日期','失效日期','批次号']];
+        $goodsesExcelArray=[['隔口','数量','条码','生产日期','失效日期','批次号',"唯一码"]];
         foreach ($goodses as $goods){
             array_push($goodsesExcelArray,[$goods['bin'],$goods['amount'],$goods['barcode'].' '
-                ,$goods['produce_date'],$goods['valid_date'],$goods['batch_number']]);
+                ,$goods['produce_date'],$goods['valid_date'],$goods['batch_number'],$goods['unique_code']]);
         }
         $fileName=Carbon::now()->toDateTimeLocalString().microtime(true).'.xlsx';
         $fileName = str_replace( ':', '_',$fileName);

app/Http/Controllers/StoreCheckingReceiveController.php

@@ -84,6 +84,7 @@ class StoreCheckingReceiveController extends Controller
                 if ($barcode->code == $goods['barcode']){
                     if ($goods['batch_number'] == $item->batch_code &&
                         $goods['produce_date'] == $item->produced_at &&
+                        $goods['unique_code'] == $item->unique_code &&
                         $goods['valid_date'] == $item->invalid_at){
                         $storeCheckingReceiveItem = $item;
                         break;
@@ -148,6 +149,7 @@ class StoreCheckingReceiveController extends Controller
             'produced_at' => $goods['produce_date'],
             'invalid_at' => $goods['valid_date'],
             'batch_code' => $goods['batch_number'],
+            'unique_code' => $goods['unique_code'],
             'counted_amount' => $goods['amount'],
         ]);
         $item->load(['commodity'=>function($query){

app/Http/Controllers/TestController.php

@@ -516,23 +516,38 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
     }
 
     public function test2(){
-        $logs = Log::query()->where('created_at','>','2020-09-30 12:25:36')
-        ->where('created_at','<','2020-09-30 18:00:36')
+        ini_set('max_execution_time ',"999999");
+        $logs = Log::query()
         ->where('operation','App\Services\common\BatchUpdateService::batchUpdateItself')
-        ->get();
+        ->where('id','9865536')->get();
+        $arr = [];
         foreach ($logs as $log){
             $str1 = mb_strlen("批量更新失败 SQL:(");
             $str2 = mb_strripos($log->description,") 堆栈:");
             $str = mb_substr($log->description,$str1,$str2-$str1);
-            $str = str_replace('CASEcommodity_id',"CASE commodity_id",$str);
-            $str = str_replace('END WHERE commodity_id'," END WHERE commodity_id",$str);
-            try{
+            dd($str);
+            $sign = "END WHERE commodity_id IN (";
+            $str3 = mb_strripos($str,$sign);
+            $str = substr($str,$str3+strlen($sign));
+            $str = substr($str,0,strlen($str)-1);
+            $arr = array_merge($arr,explode(',',$str));
+            /*try{
                 DB::select(DB::raw($str));
                 LogService::log(__METHOD__,"纠正商品-SQL执行BUG",$str);
             }catch(\Exception $e){
                 LogService::log(__METHOD__,"纠正商品-SQL执行BUG-失败",$str." | 堆栈：". $e->getMessage() . $e->getTraceAsString());
-            }
+            }*/
+        }
+        $comId = [];
+        $logs = Log::query()
+            ->where('type','纠正商品-删除无用商品')->get();
+        foreach ($logs as $log){
+            $comId = array_merge($comId,explode(',',substr($log->description,1,strlen($log->description)-2)));
         }
+        dd(array_diff($comId,$arr));
+        $si = [276705,277352,252318,313660,313687,313500,258354];
+
+        dd($arr);
     }
 
     /*1*/

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

@@ -167,7 +167,6 @@ class ProcessController extends Controller
         $commoditiesData=[];
         $commoditiesTem=["sku"=>[],"owner_id"=>[]];
         $commodityBarCodeData=[];
-        $commodityBarCodeTem=[];
         $owners_code=array_column($oracleBasSkus->toArray(),'customerid');
         $ownersTem=Owner::query()->whereIn('code',$owners_code)->get();
         $owners=array_column($ownersTem->toArray(),'id','code');
@@ -187,9 +186,9 @@ class ProcessController extends Controller
                 if (isset($commodityBarCodeData[$commodity->sku."_".$commodity->owner_id]))
                     $commodityBarCodeData[$commodity->sku."_".$commodity->owner_id]['commodity_id']=$commodity->id;
             }
-            if (count($commodityBarCodeTem) > 0){
+            if (count($commodityBarCodeData) > 0){
                 app('commodityBarcodeService')->insert(array_values($commodityBarCodeData));
-                $this->log(__METHOD__, 'FLUX二次加工单接口录入商品条码__' . __FUNCTION__, json_encode($commodityBarCodeTem), Auth::user()['id']);
+                $this->log(__METHOD__, 'FLUX二次加工单接口录入商品条码__' . __FUNCTION__, json_encode($commodityBarCodeData), Auth::user()['id']);
             }
         }
     }

app/Services/InventoryAccountService.php

@@ -131,7 +131,7 @@ class InventoryAccountService
 
     }
     private function 局部盘点按条码查询_有库位前缀字母($sql,$barcode){
-        $arr=array_filter(preg_split('/[,， ]+/is', $barcode));
+        $arr=array_values(array_filter(preg_split('/[,， ]+/is', $barcode)));
         if (count($arr)==1){
             $sql.=" and (sku.ALTERNATE_SKU1 like '".$barcode."%' or sku.ALTERNATE_SKU2 like '".$barcode."%' or sku.ALTERNATE_SKU3 like '".$barcode."%')";
         }
@@ -168,7 +168,7 @@ class InventoryAccountService
         return $sql;
     }
     private function 动盘局部盘点按条码查询($sql,$barcode){
-        $arr=array_filter(preg_split('/[,， ]+/is', $barcode));
+        $arr=array_values(array_filter(preg_split('/[,， ]+/is', $barcode)));
         if (count($arr)==1){
             $sql.=" and (产品条码1 like '".$barcode."%' or 产品条码2 like '".$barcode."%' or 产品条码3 like '".$barcode."%')";
         }
@@ -205,7 +205,7 @@ class InventoryAccountService
         return $sql;
     }
     private function 局部盘点按条码查询_无库位前缀字母($sql,$barcode){
-        $arr=array_filter(preg_split('/[,， ]+/is', $barcode));
+        $arr=array_values(array_filter(preg_split('/[,， ]+/is', $barcode)));
         if (count($arr)==1){
             $sql.="where  sku.ALTERNATE_SKU1 like '".$barcode."%' or sku.ALTERNATE_SKU2 like '".$barcode."%' or sku.ALTERNATE_SKU3 like '".$barcode."%'";
         }

app/Services/OrderService.php

@@ -115,7 +115,7 @@ class OrderService
         if (!$codename_c&&$codename_c_end)$sql.=" and sostatus = '".$codename_c_end."'";
         if ($carriername)$sql.=" and carriername like '".$carriername."%'";
         if ($soreference1){
-            $arr=array_filter(preg_split('/[,， ]+/is', $soreference1));
+            $arr=array_values(array_filter(preg_split('/[,， ]+/is', $soreference1)));
             if (count($arr)==1){
                 $sql.=" and soreference1 like '".$soreference1."%'";
             }
@@ -138,7 +138,7 @@ class OrderService
             $sql.=" and notes like '%".$notes."%'";
         }
         if ($soreference5){
-            $arr=array_filter(preg_split('/[,， ]+/is', $soreference5));
+            $arr=array_values(array_filter(preg_split('/[,， ]+/is', $soreference5)));
             if (count($arr)>0){
                 $sql.=" and (soreference5 in (";
                 foreach ($arr as $index=>$str){

app/Services/PackageService.php

@@ -45,6 +45,7 @@ Class PackageService
     public function getSql($params){
         return $this->conditionQuery($params)->selectRaw(TABLE.'*')
         ->leftJoin('orders',TABLE.'order_id','orders.id')
+            ->selectRaw('orders.code order_code,orders.consignee_name order_consignee_name,orders.consignee_phone order_consignee_phone')
         ->LeftJoin('owners','orders.owner_id','owners.id')
             ->selectRaw('owners.name owner_name')
         ->LeftJoin('logistics','orders.logistic_id','logistics.id')

app/Services/ProcessStatisticService.php

@@ -55,7 +55,7 @@ Class ProcessStatisticService
     public function getSql(array $params){
         return $this->conditionQuery($params)->selectRaw('process_statistics.*')
             ->leftJoin('processes','process_statistics.process_id','processes.id')
-                ->selectRaw('processes.code process_code,processes.unit_price process_unit_price,processes.amount process_amount,processes.completed_amount process_completed_amount,processes.status process_status')
+                ->selectRaw('processes.code process_code,processes.unit_price process_unit_price,processes.amount process_amount,processes.completed_amount process_completed_amount,processes.status process_status,processes.remark process_remark,processes.balance_remark process_balance_remark')
             ->leftJoin('owners','processes.owner_id','owners.id')
                 ->selectRaw('owners.name owner_name')
             ->leftJoin('process_methods','processes.process_method_id','process_methods.id')

database/migrations/2020_10_09_155700_add_orders_index_owner_id_and_add_processes_column_balance_remark.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddOrdersIndexOwnerIdAndAddProcessesColumnBalanceRemark extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('orders', function (Blueprint $table) {
+            $table->index('owner_id','orders_owner_id_index');
+        });
+        Schema::table('processes', function (Blueprint $table) {
+            $table->string('balance_remark')->nullable()->comment('结算备注(上个备注字段为加工备注)');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('orders', function (Blueprint $table) {
+            $table->dropIndex('orders_owner_id_index');
+        });
+        Schema::table('processes', function (Blueprint $table) {
+            $table->dropColumn('balance_remark');
+        });
+    }
+}

resources/js/queryForm/queryForm.js

@@ -27,16 +27,15 @@ const query = function getQueryForm(data) {
             if(!this.autoSubmit){
                 return;
             }
-            // console.log(_data);
             saveSearchOnCookie();
             let form = $("<form method='" + _this.method +"'></form>");
             for (const key in _data) {
                 let map = _data[key];
                 if (["string", "number"].includes(fetchJsType(map.value)) && map.value !== '') {
-                    form.append("<input name='" + key + "' value='" + map.value + "'>")
+                    form.append("<input name='" + key + "' value='" + encodeURIComponent(map.value) + "'>")
                 } else if ('array' === fetchJsType(map.value)) {
                     let string = map.value.join(',');
-                    form.append("<input  name='" + key + "' value='" + string + "'>")
+                    form.append("<input  name='" + key + "' value='" + encodeURIComponent(string) + "'>")
                 }
             }
             for (let key in this.param){
@@ -117,12 +116,12 @@ const query = function getQueryForm(data) {
                 if ([null, '', undefined].includes(condition.type) && ![null, undefined].includes(condition.name)) {
                     condition.type = 'input';
                 }
-                if (['dateTime_dateTime', 'input_input'].includes(condition.type)) {
-                    td = $("<td  style='width: 330px'</td>")
+                if (['dateTime_dateTime', 'dateTimeLocal','input_input'].includes(condition.type)) {
+                    td = $("<td  style='width: 330px'></td>")
                 } else if (['select_multiple_select', 'time', 'dateTime_select'].includes(condition.type)) {
-                    td = $("<td  style='width: 280px'</td>");
+                    td = $("<td  style='width: 280px'></td>");
                 } else if (['time', 'dateTime_select'].includes(condition.type)) {
-                    td = $("<td  style='width: 320px'</td>");
+                    td = $("<td  style='width: 320px'></td>");
                 }
                 td.append(createModule(condition));
                 tr.append(td);
@@ -146,7 +145,7 @@ const query = function getQueryForm(data) {
             conditions.forEach(function (condition, index, array) {
                 if (['input', 'select', 'dateTime', 'input_select'].includes(condition.type)) {
                     _width += 260;
-                } else if (['dateTime_dateTime', 'input_input'].includes(condition.type)) {
+                } else if (['dateTime_dateTime','dateTimeLocal', 'input_input'].includes(condition.type)) {
                     _width += 330;
                 } else if (['select_multiple_select','search_select'].includes(condition.type)) {
                     _width += 280;
@@ -314,6 +313,7 @@ const query = function getQueryForm(data) {
             || (type === "search_select" && getSearchSelect(condition))
             || (type === "input_select" && getInputSelect(condition))
             || (type === "dateTime" && getdateTime(condition))
+            || (type === "dateTimeLocal" && getDateTimeLocal(condition))
             || (type === "time" && getTime(condition))
             || (type === "input_input" && getInputInput(condition))
             || (type === "dateTime_dateTime" && getdateTimedateTime(condition))
@@ -322,6 +322,17 @@ const query = function getQueryForm(data) {
             || (type === "checkbox" && getCheckBox(condition));
     }
 
+    //dateTimeLocal
+    function getDateTimeLocal(condition) {
+        let dateTimeLocal = $("<input name = '"+ condition.name +"' type='datetime-local' step='01' class='form-control form-control-sm' style='vertical-align: middle; max-width: 280px;' placeholder='" + condition.placeholder + "' autocomplete='off' data-toggle='tooltip' data-placement='top' >");
+        dateTimeLocal.attr('title', condition.tip === undefined ? '' : condition.tip);
+        dateTimeLocal.bind('input propertychange', function () {
+            let dom = {name: condition.name, type: 'dateTimeLocal', value: this.value, mold: 'dateTimeLocal'};
+            modifyData(dom);
+        });
+        return dateTimeLocal;
+    }
+
     // input
     function getInput(condition) {
         let input = $("<input name='" + condition.name + "' class='form-control form-control-sm' style='vertical-align: middle; max-width: 200px;' placeholder='" + condition.placeholder + "' autocomplete='off' data-toggle='tooltip' data-placement='top' >");
@@ -1026,7 +1037,7 @@ const query = function getQueryForm(data) {
     }
 
     function redenerSearchFormOnData(key, value, mold) {
-        if (mold === 'input' ||mold === 'dateTime') {
+        if (mold === 'input' ||mold === 'dateTime' || mold === 'dateTimeLocal') {
             rendererSearchFormOnInput(key, value, mold);
         } else if (mold === 'select') {
             rendererSearchFormOnSelect(key, value, mold);
@@ -1043,7 +1054,7 @@ const query = function getQueryForm(data) {
     function switchData() {
         _this.condition.forEach(function (conditions) {
             conditions.forEach(function (condition) {
-                if (['input', 'select', 'dateTime', 'search_select', 'time', 'select_multiple_select','checkbox'].includes(condition.type)) {
+                if (['input', 'select', 'dateTime','dateTimeLocal', 'search_select', 'time', 'select_multiple_select','checkbox'].includes(condition.type)) {
                     if (!condition.select) {
                         condition.select = '';
                     }
@@ -1133,7 +1144,7 @@ const query = function getQueryForm(data) {
             let value = _data[key].value, type = _data[key].type, mold = _data[key].mold;
             _data[key].select = value;
 
-            if (['input', 'dateTime'].includes(mold)) {
+            if (['input', 'dateTime', 'dateTimeLocal'].includes(mold)) {
                 rendererSearchFormOnInput(key, value, mold);
             } else if (['select'].includes(mold)) {
                 rendererSearchFormOnSelect(key, value, mold);
@@ -1162,7 +1173,7 @@ const query = function getQueryForm(data) {
 
     // url path on search form option  renderer
     function searchOptionToUrlsearch() {
-        let data = window.location.search;
+        let data = decodeURIComponent(window.location.search);
         data = decodeURIComponent(data);
         if (!!data) {
             data = (data.substr(1)).split('&');

resources/views/inventory/statement/changeInventory.blade.php

@@ -54,7 +54,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue=new Vue({

resources/views/inventory/statement/dailyLog.blade.php

@@ -82,7 +82,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({

resources/views/inventory/statement/inventoryCompare.blade.php

@@ -134,7 +134,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({

resources/views/inventory/stockInventory/mission.blade.php

@@ -88,7 +88,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({

resources/views/maintenance/role/index.blade.php

@@ -50,7 +50,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         new Vue({

resources/views/maintenance/userLabor/index.blade.php

@@ -116,7 +116,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

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

@@ -213,7 +213,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue=new Vue({

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

@@ -630,7 +630,7 @@
             -webkit-animation-play-state: running;
         }
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script>
         let listVue = new Vue({

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

@@ -65,7 +65,7 @@
 
 @endsection
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script>
         let performance_vue = new Vue({

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

@@ -74,7 +74,7 @@
 
 @endsection
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>

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

@@ -213,7 +213,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <style>
         .btn-border{

resources/views/order/wave/search.blade.php

@@ -82,7 +82,7 @@
 @endsection
 
 @section("lastScript")
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script>
         let vueList = new Vue({
             el: "#wave_div",

resources/views/personnel/laborReport/index.blade.php

@@ -236,7 +236,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let today=(new Date());

resources/views/process/index.blade.php

@@ -325,7 +325,8 @@
                     <button type="button" class="btn btn-sm btn-outline-primary" v-if="processFullSum[processOne.code]!=processOne.processesContents.length && (processOne.processesContents.length)-(processFullSum[processOne.code])!=1 && ((processOne.is_multi_row || !processOne.id) ? (!processOne.id  ? false :true) : true)" @click="unfold(processOne.code,processOne.id,'原料单')">点击展开原料单</button>
                     <button type="button" class="btn btn-sm btn-outline-primary" v-if="processFullSum[processOne.code] && processFullSum[processOne.code]>1 && ((processOne.is_multi_row || !processOne.id) ? (!processOne.id  ? true :false) : true)" @click="unfold(processOne.code,processOne.id,'成品单')">点击展开成品单</button></div>
                 </td>
-                <td v-if="processOne.id" class="text-muted" :rowspan="processOne.is_multi_row?2:''"><div style="min-width: 500px;white-space: normal">@{{ processOne.remark }}</div></td>
+                <td v-if="processOne.id" class="text-muted" :rowspan="processOne.is_multi_row?2:''"><div style="min-width: 250px;white-space: normal">@{{ processOne.remark }}</div></td>
+                <td v-if="processOne.id" class="text-muted" :rowspan="processOne.is_multi_row?2:''"><div style="min-width: 250px;white-space: normal">@{{ processOne.balance_remark }}</div></td>
                 <td v-if="processOne.id" class="text-muted" :rowspan="processOne.is_multi_row?2:''">
                     @can('二次加工管理-删除')<button type="button" class="btn btn-sm btn-outline-danger" @click="destroy(processOne.code,processOne.id)">删</button>@endcan
                 </td>
@@ -462,7 +463,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({
@@ -474,7 +475,10 @@
                     {id:'{{$processOne->id}}',code:'{{$processOne->code}}',owner_name:'{{$processOne->owner_name}}',owner_id:'{{$processOne->owner_id}}',operatorLogs:{!! $processOne->operatorLogs !!},
                         process_method_name:'{{$processOne->process_method_name}}',amount:'{{$processOne->amount}}',type:'{{$processOne->type}}',signs:{!!$processOne->signs  !!},signUnitPrice:'{{$processOne->signUnitPrice ? $processOne->signUnitPrice->mark :''}}'
                         ,tutorials:{!! $processOne->tutorials !!},processesContents:{!! $processOne->processesContents !!},unit_price:'{{$processOne->unit_price}}',created_at:'{{$processOne->created_at}}',
-                        completed_amount:'{{$processOne->completed_amount}}',status:'{{$processOne->status}}',remark:'{{$processOne->remark}}',detailFolding:false,openProcessHour:false,is_multi_row:false,is_verifier_show:false,is_update_unit_price:false,
+                        completed_amount:'{{$processOne->completed_amount}}',status:'{{$processOne->status}}',remark:'{{$processOne->remark}}',
+                        balance_remark:'{{$processOne->balance_remark}}',
+
+                        detailFolding:false,openProcessHour:false,is_multi_row:false,is_verifier_show:false,is_update_unit_price:false,
                         buttonTexts:{'审核':'审','回滚':'回','编辑':'编','接单':'接','驳回':'驳','质量验收':'验','完成':'完','交接完成':'交','查看单据':'查','登记工时':'登'},
                     },
                     @endforeach
@@ -571,7 +575,8 @@
                     {name:'count',value: '本单数量', neglect: true, style: 'min-width:200px;'},
                     {name:'commodity_barcode',value: '商品条码', neglect: true, style: 'min-width:200px;'},
                     {name:'commodity_name',value: '商品名称', neglect: true, style: 'min-width:200px;'},
-                    {name: 'remark', value: '备注'},
+                    {name:'remark', value: '加工备注'},
+                    {name:'balance_remark', value: '结算备注'},
                     {name:'remove',value: '', neglect: true},
                 ];
                 setTimeout(function () {

resources/views/process/statistic.blade.php

@@ -44,6 +44,8 @@
                 <th>毛利润</th>
                 <th>毛利率</th>
                 <th>状态</th>
+                <th>加工备注</th>
+                <th>结算备注</th>
             </tr>
             <tr v-for="(processStatistic,i) in processStatistics" :class="processStatistic.gross_profit_rate?'text-success':''">
                 <td><input class="checkItem" type="checkbox" :value="processStatistic.process_id" v-model="checkData"></td>
@@ -66,6 +68,8 @@
                 <td>@{{ processStatistic.gross_profit }}</td>
                 <td><b v-if="processStatistic.gross_profit_rate">@{{ (processStatistic.gross_profit_rate)*100 | money}}%</b></td>
                 <td><span v-if="processStatistic.process">@{{ processStatistic.process.status }}</span></td>
+                <td><span v-if="processStatistic.process">@{{ processStatistic.process.remark }}</span></td>
+                <td><span v-if="processStatistic.process">@{{ processStatistic.process.balance_remark }}</span></td>
             </tr>
         </table>
     </div>

resources/views/rejected/search/analyze.blade.php

@@ -61,7 +61,7 @@
 
 @section('lastScript')
     <script src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({

resources/views/rejected/search/general.blade.php

@@ -176,7 +176,7 @@
         let csrfInput='@csrf';
     </script>
     <script src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({

resources/views/store/blindReceive/index.blade.php

@@ -48,6 +48,12 @@
                                     </div>
                                     <input type="date" class="form-control mb-2" v-model="inputting.valid_date" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
                                 </div>
+                                <div v-if="inputMode=='regular'" class="mt-0">
+                                    <div class="card-title">
+                                        唯一码：
+                                    </div>
+                                    <input type="text" class="form-control mb-2" v-model="inputting.unique_code" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
+                                </div>
                             </div>
                             <div class="col-6">
                                 <div class="card-title" id="amountLabel">
@@ -64,8 +70,8 @@
                                 <input type="number" id="bin" class="form-control mt-n2 mb-2"
                                        v-model="inputting.bin"
                                        :disabled="status.binDisable" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter"
-                                       style='height: 80px;font-size: 5em;color:red;font-weight: bolder;padding: 3px;text-align: center'>
-                                <div v-if="inputMode=='regular'">
+                                       style='height: 100px;font-size: 5em;color:red;font-weight: bolder;padding: 3px;text-align: center'>
+                                <div v-if="inputMode=='regular'" class="mt-4">
                                     <div class="card-title">
                                         批次号：
                                     </div>
@@ -88,6 +94,7 @@
                                 <th>生产日期</th>
                                 <th>失效日期</th>
                                 <th>批次号</th>
+                                <th>唯一码</th>
                                 <th>操作</th>
                             </tr>
                             <tr v-for="goods in goodses">
@@ -97,6 +104,7 @@
                                 <td>@{{ goods.produce_date }}</td>
                                 <td>@{{ goods.valid_date }}</td>
                                 <td>@{{ goods.batch_number }}</td>
+                                <td>@{{ goods.unique_code }}</td>
                                 <td><button class="btn btn-outline-danger btn-sm" @click="removeGoods($event,goods.barcode)">删</button></td>
                             </tr>
                         </table>
@@ -121,7 +129,7 @@
                 lastScannedBarcode:'',
                 inputMode:'regular',//regular,increasing,multiIncreasing
                 inputting:{
-                    barcode:'',amount:'',bin:'',produce_date:'',valid_date:'',batch_number:'',fromIncreasing:false
+                    barcode:'',amount:'',bin:'',produce_date:'',valid_date:'',batch_number:'',fromIncreasing:false,unique_code:''
                 },
                 status:{
                     scanEndInputted:false,binDisable:false,barcodeDisable:true,amountDisable:false,
@@ -354,7 +362,7 @@
                     window.tempTip.setDuration(3500);
                     if(!data.inputting.barcode){window.tempTip.show('请扫入条码');return;}
                     else if(!data.inputting.amount){window.tempTip.show('请输入数量');return;}
-                    else if(!data.inputting.bin){window.tempTip.show('请输入隔口号');return;}
+                    //else if(!data.inputting.bin){window.tempTip.show('请输入隔口号');return;}
                     data.recordOrPlusGoods();
                     window.tempTip.setDuration(1500);
                     window.tempTip.showSuccess('成功提交：' + data.inputting.barcode);
@@ -369,6 +377,7 @@
                     this.inputting.produce_date='';
                     this.inputting.valid_date='';
                     this.inputting.batch_number='';
+                    this.inputting.unique_code='';
                     this.commitButtonVisible=false;
                     this.status.binDisable=false;
                     this.lastScannedBarcode='';
@@ -403,8 +412,13 @@
                 },
                 showCommitButton: function () {
                     let data = this;
-                    if(data.inputting.barcode && data.inputting.amount && data.inputting.bin){
+                    if(data.inputting.barcode && data.inputting.amount /*&& data.inputting.bin*/){
                         data.commitButtonVisible=true;
+                    }else{
+                        if (this.inputMode==='regular' && this.status.barcodeDisable && !this.inputting.amount && this.inputting.barcode){
+                            this.focusing = '';
+                            document.getElementById('amount').focus();
+                        }
                     }
                 },
                 submitExcelData: function () {

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

@@ -83,7 +83,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#container",

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

@@ -45,14 +45,16 @@
                                @focusin="focusOutDocument" @focusout="focusDocument">
 
                         <div v-if="inputMode=='regular'">
-                        <div class="card-title">生产日期：</div>
-                        <input type="date" class="form-control mb-2"
-                               v-model="inputting.produce_date" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
-
-                        <div class="card-title">失效日期：</div>
-                        <input type="date" class="form-control mb-2"
-                               v-model="inputting.valid_date" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
+                            <div class="card-title">生产日期：</div>
+                            <input type="date" class="form-control mb-2"
+                                   v-model="inputting.produce_date" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
 
+                            <div class="card-title">失效日期：</div>
+                            <input type="date" class="form-control mb-2"
+                                   v-model="inputting.valid_date" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
+                            <div class="card-title">唯一码：</div>
+                            <input type="text" class="form-control mb-2"
+                                   v-model="inputting.unique_code" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
                         </div>
                     </div>
                     <div class="col-6">
@@ -63,10 +65,10 @@
                         </div>
 
                         <div class="card-title">格口号：</div>
-                        <input type="number" id="bin_number" class="form-control mt-n2 mb-2" style='height: 80px;font-size: 5em;color:red;font-weight: bolder;padding: 3px;text-align: center'
+                        <input type="number" id="bin_number" class="form-control mt-n2 mb-2" style='height: 100px;font-size: 5em;color:red;font-weight: bolder;padding: 3px;text-align: center'
                                v-model="inputting.bin_number" :disabled="status.binDisable"  @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
 
-                        <div v-if="inputMode=='regular'">
+                        <div v-if="inputMode=='regular'" class="mt-4">
                             <div class="card-title">批次号：</div>
                             <input type="text" class="form-control mb-2"
                                    v-model="inputting.batch_number" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
@@ -152,6 +154,7 @@
                 batch_number : '',
                 produce_date : '',
                 valid_date : '',
+                unique_code:'',
             },
             lastScannedBarcode : '',
             asn : '',
@@ -223,16 +226,22 @@
                 });
             },
             showCommitButton: function () {
-                if(this.inputting.barcode && this.inputting.amount && this.inputting.bin_number){
+                if(this.inputting.barcode && this.inputting.amount /*&& this.inputting.bin_number*/){
                     if (this.status.commitButtonVisible){
                         this.commitGoods();
                     }else this.status.commitButtonVisible=true;
+                }else{
+                    if (this.status.barcodeDisable){
+                        this.focusing = '';
+                        document.getElementById('amount').focus();
+                    }
                 }
             },
             _isExist(item){
                 if (item.bin_number == this.inputting.bin_number
                     && item.batch_code == this.inputting.batch_number
                     && item.produced_at == this.inputting.produce_date
+                    && item.unique_code == this.inputting.unique_code
                     && item.invalid_at == this.inputting.valid_date){
                     return true;
                 }
@@ -320,6 +329,7 @@
                 this.inputting.amount='';
                 this.inputting.bin_number='';
                 this.inputting.produce_date='';
+                this.inputting.unique_code='';
                 this.inputting.valid_date='';
                 this.inputting.batch_number='';
                 this.status.commitButtonVisible=false;
@@ -353,7 +363,7 @@
                     window.tempTip.setInputType('number');
                     window.tempTip.inputVal('该商品第一件递增请输入隔口号：', function (bin_number) {
                         if (bin_number === '') {
-                            window.tempTip.setDuration(1500);
+                            window.tempTip.setDuration(2200);
                             window.tempTip.show('未输入隔口号，请重新扫描');
                             _this.alertVibrate();
                             _this.focusDocument();
@@ -366,28 +376,43 @@
                     });
                     return;
                 }
+                _this.status.binDisable=true;
                 if (item.bin_number) {
-                    _this.status.binDisable=true;
                     _this.inputting.bin_number = item.bin_number;
+                    _this.commit(item, signIncreasing);
                 }else{
-                    if (_this.status.binDisable){
-                        _this.status.binDisable=false;
-                        _this.lastScannedBarcode = _this.inputting.barcode;
-                        _this.inputting.bin_number = item.bin_number;
-                    }
+                    //_this.status.binDisable=false;
+                    _this.lastScannedBarcode = _this.inputting.barcode;
+                    //_this.inputting.bin_number = item.bin_number;
+                    _this.focusOutDocument();
+                    window.tempTip.setInputType('number');
+                    window.tempTip.inputVal('该条码存在但无隔口号，请输入：', function (bin_number) {
+                        if (bin_number === '') {
+                            window.tempTip.setDuration(2200);
+                            window.tempTip.show('未输入隔口号，请重新扫描');
+                            _this.alertVibrate();
+                            _this.focusDocument();
+                            return;
+                        }
+                        _this.inputting.bin_number = bin_number;
+                        _this.commit(item, signIncreasing);
+                    });
                 }
-                _this.inputting.amount = '';
-                _this.inputting.produce_date=item.produced_at;
-                _this.inputting.valid_date=item.invalid_at;
-                _this.inputting.batch_number=item.batch_code;
-                if (signIncreasing && _this.lastScannedBarcode && _this.lastScannedBarcode !== _this.inputting.barcode) {
+            },
+            commit(item, signIncreasing){
+                this.inputting.amount = '';
+                this.inputting.produce_date=item.produced_at;
+                this.inputting.unique_code=item.unique_code;
+                this.inputting.valid_date=item.invalid_at;
+                this.inputting.batch_number=item.batch_code;
+                if (signIncreasing && this.lastScannedBarcode && this.lastScannedBarcode !== this.inputting.barcode) {
                     this.audioWarning_otherBarcode();
                     this.focusOutDocument();
-                    window.tempTip.confirm('扫到其它条码，是否切换至新条码并记录？', function (){
-                        _this.commitGoods();
-                        _this.focusDocument();
-                    },function () {
-                        _this.focusDocument();
+                    window.tempTip.confirm('扫到其它条码，是否切换至新条码并记录？', ()=>{
+                        this.commitGoods();
+                        this.focusDocument();
+                    }, () => {
+                        this.focusDocument();
                     });
                 }else this.commitGoods();
             },

resources/views/waybill/index.blade.php

@@ -252,7 +252,7 @@
         }
     </style>
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({
@@ -365,7 +365,7 @@
                     [
                         {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                             placeholder:['货主','定位或多选货主'],data:this.owners},
-                        {name:'created_at_start',type:'dateTime',tip:'选择显示指定日期的起始时间'},
+                        {name:'created_at_start',type:'dateTimeLocal',tip:'选择显示指定日期的起始时间'},
                         {name:'origination',type:'input',tip:'始发地：可在左侧增加百分号(%)进行模糊搜索',placeholder: '始发地'},
                         {name:'carrier_bill',type:'input',tip:'承运商单号：可在左侧增加百分号(%)进行模糊搜索',placeholder: '承运商单号'},
                         {name:'status',type:'select',placeholder: '运单状态',data:this.status},
@@ -373,7 +373,7 @@
                     ],
                     [
                         {name:'wms_bill_number',type:'input',tip:'WMS单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: 'WMS单号'},
-                        {name:'created_at_end',type:'dateTime',tip:'选择显示指定日期的结束时间'},
+                        {name:'created_at_end',type:'dateTimeLocal',tip:'选择显示指定日期的结束时间'},
                         {name:'destination',type:'input',tip:'目的地：可在两侧增加百分号(%)进行模糊搜索',placeholder: '目的地'},
                         {name:'waybill_number',type:'input',tip:'运单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: '运单号'},
                         {name:'carrier_id',type:'select',placeholder: '承运商',data:this.carriers},

resources/views/weight/package/index.blade.php

@@ -58,7 +58,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200918.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200914.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm201009.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
             @if(isset($request))

serves/excelExportGo/api/controller/controller.go

@@ -82,9 +82,6 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 	case "orderWave":
 		data = orm.GetOracleData(params["sql"])
 		row, list = OrderWaveFormat(data)
-	case "package":
-		data = orm.GetMysqlData(params["sql"])
-		row, list = PackageFormat(data)
 	case "packageIssuedException":
 		data = orm.GetMysqlData(params["sql"])
 		row, list = PackageIssuedExceptionFormat(data)
@@ -97,7 +94,7 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 		}else{
 			err := json.Unmarshal([]byte(params["data"]), &data)
 			if err != nil {
-				utilities.WriteLog("/api/controller/controller.go:100   库存数据json解析失败!","ERROR")
+				utilities.WriteLog("/api/controller/controller.go:97   库存数据json解析失败!","ERROR")
 			}
 		}
 		row, list = InventoryFormat(data, true)
@@ -107,7 +104,7 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 		}else{
 			err := json.Unmarshal([]byte(params["data"]), &data)
 			if err != nil {
-				utilities.WriteLog("/api/controller/controller.go:110   全部库存数据json解析失败!","ERROR")
+				utilities.WriteLog("/api/controller/controller.go:107   全部库存数据json解析失败!","ERROR")
 			}
 		}
 		row, list = InventoryFormat(data, false)
@@ -123,14 +120,14 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 	case "laborReport":
 		err := json.Unmarshal([]byte(params["data"]), &data)
 		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:126   临时工报表数据json解析失败!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:123   临时工报表数据json解析失败!","ERROR")
 		}
 		row, list = LaborReportFormat(data)
 	case "orderIssue":
 		sqlList := make(map[string]string)
 		err := json.Unmarshal([]byte(params["sqlList"]), &sqlList)
 		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:133   订单问题件数据json解析失败!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:130   订单问题件数据json解析失败!","ERROR")
 		}
 		if sqlList["orderPackageSql"] == "" || sqlList["secondOrderPackageSql"] == "" || sqlList["orderIssueSql"] == "" || sqlList["rejectedBillItemSql"] == "" || sqlList["logSql"] == ""{
 			return
@@ -186,13 +183,13 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 		request := paramList{}
 		err := json.Unmarshal([]byte(params["data"]), &request)
 		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:189   称重统计数据json解析失败!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:186   称重统计数据json解析失败!","ERROR")
 		}
 		row, list = PackageStatisticFormat(request.ROW, request.LIST)
 	case "inventoryAccountMission":
 		err := json.Unmarshal([]byte(params["data"]), &data)
 		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:195   库存盘点数据json解析失败!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:192   库存盘点数据json解析失败!","ERROR")
 		}
 		row, list = InventoryAccountMissionFormat(data)
 	case "inventoryCompare":
@@ -203,11 +200,11 @@ func selectModule(params map[string]string) (row []interface{}, list [][]interfa
 		var rule map[string]string
 		err := json.Unmarshal([]byte(params["row"]), &row)
 		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:206   参数传递错误!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:203   参数传递错误!","ERROR")
 		}
 		err = json.Unmarshal([]byte(params["column"]), &column)
 		if err != nil {
-			utilities.WriteLog("/api/controller/controller.go:210   参数传递错误!","ERROR")
+			utilities.WriteLog("/api/controller/controller.go:207   参数传递错误!","ERROR")
 		}
 		err = json.Unmarshal([]byte(params["rule"]), &rule)
 		if params["connection"] == "oracle" {

serves/excelExportGo/api/controller/orderController.go

@@ -227,8 +227,8 @@ func OrderIssueFormat(dataMap map[string]map[string]interface{}) ([]interface{},
 		"宝时赔偿金额","宝时快递减免","事故责任方",
 	}
 	column := map[string]int{
-		"order_created_at"  :  0,
-		"order_issues_created_at"  :  1,
+		"order_issues_created_at"  :  0,
+		"order_created_at"  :  1,
 		"owner_name"  :  2,
 		"shop_name"  :  3,
 		"client_code"  :  4,

serves/excelExportGo/api/controller/packageController.go

@@ -5,41 +5,6 @@ import (
 	"strconv"
 )
 
-func PackageFormat(data []map[string]string) ([]interface{}, [][]interface{})  {
-	row := []interface{}{
-		"货主","快递单号","发货单号","波次号","波次规则","操作时间","收件人","收件人电话","承运商","设备",
-		"重量(KG)","长(CM)","宽(CM)","高(CM)","体积(CM³)","纸箱","状态",
-	}
-	column := map[string]int{
-		"owner_name" : 0,
-		"logistic_number" : 1,
-		"delivery_number" : 2,
-		"batch_number" : 3,
-		"batch_rule" : 4,
-		"created_at" : 5,
-		"recipient" : 6,
-		"recipient_mobile" : 7,
-		"logistic_name" : 8,
-		"measuring_machine_name" : 9,
-		"weight" : 10,
-		"length" : 11,
-		"width" : 12,
-		"height" : 13,
-		"bulk" : 14,
-		"paper_box_name" : 15,
-		"status" : 16,
-	}
-	list := make([][]interface{},len(data))
-	for k,v := range data{
-		line := make([]interface{},len(row))
-		for key,value := range column {
-			line[value] = v[key]
-		}
-		list[k] = line
-	}
-	return row,list
-}
-
 func PackageCreateExceptionFormat(data []map[string]string) ([]interface{}, [][]interface{})  {
 	row := []interface{}{
 		"快递单号","承运商","设备","称重时间","重(KG)","长(CM)","宽(CM)","高(CM)","体积(CM³)",

serves/excelExportGo/api/controller/processController.go

@@ -7,8 +7,8 @@ import (
 
 func ProcessFormat(data []map[string]string) ([]interface{}, [][]interface{}, map[string]string) {
 	row := []interface{}{
-		"任务号","货主","加工类型","预期数量","实际数量","状态","备注",
-		"单价","提交日期","单据类型","单据号","商品编码","商品名称","商品条码","本次数量",
+		"任务号","货主","加工类型","预期数量","实际数量","状态","加工备注",
+		"单价","提交日期","单据类型","单据号","商品编码","商品名称","商品条码","本次数量","结算备注",
 	}
 	column := map[string]int{
 		"code" : 0,
@@ -26,6 +26,7 @@ func ProcessFormat(data []map[string]string) ([]interface{}, [][]interface{}, ma
 		"commodity_name" : 12,
 		"commodity_barcode_code" : 13,
 		"content_amount" : 14,
+		"process_balance_remark" : 15,
 	}
 	list := make([][]interface{},len(data))
 	mergeRow := make(map[string]string)
@@ -72,7 +73,7 @@ func ProcessStatisticFormat(data []map[string]string) ([]interface{}, [][]interf
 	row := []interface{}{
 		"任务号", "货主", "开始日期", "完成日期", "单价", "预期数量", "完成数量", "收入合计",
 		"完成时间(天)'", "总工时", "加工类型", "最高日产能", "最低日产能", "日均产能", "合计成本", "毛利润",
-		"毛利率", "状态",
+		"毛利率", "状态","加工备注","结算备注",
 	}
 	column := map[string]int{
 		"process_code" : 0,
@@ -93,6 +94,8 @@ func ProcessStatisticFormat(data []map[string]string) ([]interface{}, [][]interf
 		"gross_profit" : 15,
 		"gross_profit_rate" : 16,
 		"process_status" : 17,
+		"process_remark" : 18,
+		"process_balance_remark" : 19,
 	}
 	list := make([][]interface{},len(data))
 	for k,v := range data{
@@ -105,6 +108,10 @@ func ProcessStatisticFormat(data []map[string]string) ([]interface{}, [][]interf
 				}
 				continue
 			}
+			if key == "started_at" || key == "ended_at" {
+				line[value] = utilities.DateFormat(v[key],"2006-01-02T15:04:05Z");
+				continue
+			}
 			line[value] = v[key]
 		}
 		list[k] = line

serves/excelExportGo/api/controller/rejectedController.go

@@ -80,8 +80,6 @@ func RejectedFormat(data []map[string]string) ([]interface{}, [][]interface{}, m
 					val = "待推单"
 				case "3":
 					val = "上传异常"
-                case "4":
-                    val = "交互异常"
 				}
 			}
 			line[value] = val

serves/excelExportGo/excel/export.go

@@ -36,7 +36,7 @@ func CreateFile(row []interface{},list [][]interface{}, mergeRow map[string]stri
 	}
 
 	if err := streamWriter.Flush(); err != nil {
-		utilities.WriteLog("/excel/export.go:38  文件流关闭失败!","ERROR")
+		utilities.WriteLog("/excel/export.go:39  文件流关闭失败!","ERROR")
 	}
 	return file
 }

webpack.mix.js

@@ -19,7 +19,7 @@ mix.copy('resources/images','public/images');
 mix.copy('resources/icon/faviconc.ico','public/faviconc.ico');
 mix.js('resources/js/trix.js','public/js/trix.js');
 mix.copy('resources/sass/trix.css','public/css/trix.css');
-mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200914.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm201009.js');
 mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200918.js');
 mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200826b.js');