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

 Conflicts:

	app/Http/Controllers/TestController.php

app/Console/Commands/MakeServiceCommand.php

@@ -45,6 +45,6 @@ class MakeServiceCommand extends Command
             file_put_contents(base_path('app\\Services\\'.$fileName.'.php'),
                 '<?php '.PHP_EOL.PHP_EOL.'namespace App\Services; '.PHP_EOL.PHP_EOL.'Class '.$fileName.PHP_EOL.'{ '.PHP_EOL.PHP_EOL.PHP_EOL.'}');
         }
-        else echo $this->error("ERROR: file exists;");
+        else $this->error("ERROR: file exists;");
     }
 }

app/Http/Controllers/TestController.php

@@ -110,13 +110,17 @@ class TestController extends Controller
             app(BatchUpdateService::class)->batchUpdate('inventory_accounts', $updateParams);
         }
     }
-    public function zui(){
-        $a = new \Illuminate\Support\Collection(["a"=>"b"]);
-        foreach ($a as $i=>$l)dump($i,$l);
+    public function roleCallback($type,$f1,$f2,$f3)
+    {
+        if ($type==1)return $f1();
+        if ($type==2)return $f2([2]);
+        if ($type==3)return $f3;
     }
     public function zzd()
     {
-        $post=Http::post("http://localhost:9722",["type"=>"base","format"=>[
+        dd(Carbon::parse("adsa")->format('Y-m-d'));
+        dd(PHP_OS);
+        /*$post=Http::post("http://localhost:9722",["type"=>"base","format"=>[
             "method"=>"warpText",
             "mergeColumn"=>["column"],
             "mergeRow"=>["row"=>"row"],
@@ -140,8 +144,30 @@ class TestController extends Controller
             "log"=>"log",
             "file"=>""
         ]]);
-        $http = new Client();
-        $response = $http->get("http://localhost:9722", ["type"=>"base","format"=>[
+        if ($post->status() == 500){
+            throw new Exception($post->header("Msg"));
+        }
+        $test = "test";
+        return response($post,200, [
+            "Content-type"=>"application/octet-stream",
+            "Content-Disposition"=>"attachment; filename=".$test."-".date('ymdHis').'.xlsx',
+        ]);*/
+        $http = new Client(['base_uri' => 'http://localhost:9722','timeout'=>2.0]);
+        /** @var  $response */
+
+        $response = $http->request('POST', '/',[
+            'headers'=>[
+                'Accept'     => 'application/json',
+            ],
+            "json"=>["type"=>"base","data"=>[
+                "row"=>["sql-row"],
+                "list"=>[["sql-list"]],]]
+        ]);
+        return new \GuzzleHttp\Psr7\Response(200, [
+            "Content-type"=>"application/octet-stream",
+            "Content-Disposition"=>"attachment; filename=测试.xlsx",
+        ],$response->getBody()->getContents());
+        $response = $http->post("http://localhost:9722", ["form_params"=>["type"=>"base",/*"format"=>[
             "method"=>"warpText",
             "mergeColumn"=>["column"],
             "mergeRow"=>["row"=>"row"],
@@ -156,15 +182,15 @@ class TestController extends Controller
             "charset"=>"char",
             "parsetime"=>"pars",
             "sid"=>"",
-        ],"data"=>[
+        ],*/"data"=>[
             "row"=>["sql-row"],
             "list"=>[["sql-list"]],
-            "sql"=>"sql",
-            "rule"=>["sql"=>"rule"],
-        ],"path"=>[
+            /*"sql"=>"sql",
+            "rule"=>["sql"=>"rule"],*/
+        ]/*,"path"=>[
             "log"=>"log",
             "file"=>""
-        ]]);
+        ]*/]]);
         if ($response->getStatusCode() == 500){
             throw new \Exception($response->getHeader("Msg"));
         }
@@ -177,7 +203,7 @@ class TestController extends Controller
             throw new Exception($post->header("Msg"));
         }
         $test = "test";
-        return response($response->get,200, [
+        return response($response,200, [
             "Content-type"=>"application/octet-stream",
             "Content-Disposition"=>"attachment; filename=".$test."-".date('ymdHis').'.xlsx',
         ]);

app/Imports/UpdatePickZone.php

@@ -4,6 +4,7 @@ namespace App\Imports;
 
 use App\OracleDOCOrderDetail;
 use App\Services\LogService;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
@@ -35,8 +36,28 @@ class UpdatePickZone implements ToCollection,WithHeadingRow
         $errors = [];
         $ids = [];
         foreach ($collection as $index=>$item){
-            if ($item["生产日期"]) $item["生产日期"] = formatExcelDate($item["生产日期"]);
-            if ($item["失效日期"]) $item["失效日期"] = formatExcelDate($item["失效日期"]);
+            if ($item["生产日期"]){
+                if (is_numeric($item["生产日期"]))$item["生产日期"] = formatExcelDate($item["生产日期"]);
+                else{
+                    try{
+                        $item["生产日期"]=Carbon::parse($item["生产日期"])->format('Y-m-d');
+                    }catch (\Exception $e){
+                        $errors[] = "第“" . ($index + 2) . "”生产日期无法识别";
+                        continue;
+                    }
+                }
+            }
+            if ($item["失效日期"]){
+                if (is_numeric($item["失效日期"]))$item["失效日期"] = formatExcelDate($item["失效日期"]);
+                else{
+                    try{
+                        $item["失效日期"]=Carbon::parse($item["失效日期"])->format('Y-m-d');
+                    }catch (\Exception $e){
+                        $errors[] = "第“" . ($index + 2) . "”失效日期无法识别";
+                        continue;
+                    }
+                }
+            }
 
             if (!$item["订单编号"]){
                 $errors[] = "第“" . ($index + 2) . "”行订单编号为空";

app/Services/OrderService.php

@@ -231,6 +231,7 @@ class OrderService
                 ->getOrderno(['checktime_start'=>$checktime_start,'checktime_end'=>$checktime_end,
                     'paginate'=>$paginate,'page'=>$page]);
             if ($ordernos)$params['ordernos'] = $ordernos;
+            else return null;
         }
         $sql="select ACT_ALLOCATION_DETAILS.CHECKTIME,DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
         ,DOC_ORDER_HEADER.C_Tel2,DOC_ORDER_HEADER.C_Tel1,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,DOC_ORDER_HEADER.EDIREMARKS2,
@@ -308,13 +309,15 @@ class OrderService
         }
 
         $sql = $this->getSql($params,$params['page'] ?? 1, $params['paginate'] ?? 50);
-        $orders=DB::connection('oracle')->select(DB::raw($sql));
+        if ($sql)$orders=DB::connection('oracle')->select(DB::raw($sql));
+        else $orders = [];
         return $this->orderFormat($orders);
     }
 
     public function get(array $params){
         $sql = $this->getSql($params);
-        $orders=DB::connection('oracle')->select(DB::raw($sql));
+        if ($sql)$orders=DB::connection('oracle')->select(DB::raw($sql));
+        else $orders = [];
         return $this->orderFormat($orders);
     }
 

resources/views/maintenance/priceModel/logistic/index.blade.php

@@ -200,7 +200,7 @@
                     })
                         .then(res=>{
                             if (res.data.success) {
-                                this.details[this.id] = res.data.data;
+                                this.details[this.models[this.index]["id"]] = res.data.data;
                                 this.errors = res.data.errors;
                                 tempTip.cancelWaitingTip();
                                 tempTip.setDuration(2000);
@@ -242,7 +242,7 @@
                         detail.rate = $("#rate-"+detail.id).attr('data');
                         detail.edit = false;
                     }else{
-                        this.$delete(this.details[this.id],index);
+                        this.$delete(this.details[this.models[this.index]["id"]],index);
                     }
                     this.$forceUpdate();
                 },

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

@@ -870,7 +870,7 @@
                                 if (order.orderno == code){
                                     if (order.soreference5) {
                                         text += order.soreference5;
-                                        if(i!==this.checkData.length-1)text += ",";
+                                        if(i!==this.checkData.length-1)text += "\r\n";
                                     }
                                     return true;
                                 }

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

@@ -316,7 +316,7 @@
                         this.rejectedBills.some(bill=>{
                             if (bill.id == id){
                                 text += bill.logistic_number_return;
-                                if (i!==this.rejectedBills_checkBoxes.length-1)text += ",";
+                                if (i!==this.rejectedBills_checkBoxes.length-1)text += "\r\n";
                                 return true;
                             }
                         });