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

app/Http/Controllers/OrderController.php

@@ -6,6 +6,7 @@ use App\OracleBasCustomer;
 use App\OracleDOCOrderHeader;
 use App\OracleDOCWaveDetails;
 use App\OrderIssueType;
+use App\Services\LogisticService;
 use App\Services\LogService;
 use App\Services\OrderService;
 use App\Services\RejectedBillItemService;
@@ -25,6 +26,8 @@ class OrderController extends Controller
         $orderService = app('OrderService');
         $request = $request->input();
         $owners = app('OwnerService')->getIntersectPermitting(['id','code']);
+        $service=app(LogisticService::class);
+        $logistics=$service->getSelection(['id','name']);
         $codes = array_column($owners->toArray(),'code');
         if ($request['customerid'] ?? false){
             $arr = explode(',',$request['customerid']);
@@ -44,7 +47,7 @@ class OrderController extends Controller
         $page = $request["page"] ?? 1;
         $codes=DB::connection('oracle')->table('BAS_CODES')->select('code','codename_c')->where('codeid','SO_STS')->orderBy('code','asc')->get();
         $orderIssueType = OrderIssueType::all();
-        return view('order/index/delivering',compact('orders','customers','request','codes','commodities','page','picktotraceids','orderIssueType','orderIssueNos'));
+        return view('order/index/delivering',compact('orders','customers','request','codes','commodities','page','picktotraceids','orderIssueType','orderIssueNos','logistics'));
     }
 
     //导出

app/Http/Controllers/api/thirdPart/weixin/ProcurementController.php

@@ -142,6 +142,13 @@ class ProcurementController extends Controller
         $procurement=Procurement::query()->find($id)->update(['status'=>5]);//  5 => "待收货",
         if ($procurement) return $this->success($procurement);
     }
+    //取消生产
+    public function cancelProcurement(Request $request): \Illuminate\Http\JsonResponse
+    {
+        $id=$request->input('id');
+        $procurement=Procurement::query()->find($id)->update(['status'=>10]);//  10 => "订单取消",
+        if ($procurement) return $this->success($procurement);
+    }
 
     public function getProcurementDeliveries(): \Illuminate\Http\JsonResponse
     {

app/Services/OrderService.php

@@ -163,7 +163,22 @@ class OrderService
         if ($codename_c&&!$codename_c_end)$sql.=" and sostatus = '".$codename_c."'";
         if (!$codename_c&&$codename_c_end)$sql.=" and sostatus = '".$codename_c_end."'";
 //        if ($carriername)$sql.=" and carriername like '".$carriername."%'";
-        if ($carriername)$sql=$this->sqlSearchWay($sql,$carriername,'carriername');
+//        if ($carriername)$sql=$this->sqlSearchWay($sql,$carriername,'carriername');
+        if ($carriername){
+            if (!is_array($carriername))$arr = explode(',',$carriername);
+            else $arr = $carriername;
+            if (count($arr)>0) {
+                $sql.=" and carriername in (";
+                foreach ($arr as $index=>$str){
+                    if ($index==0){
+                        $sql.="'".$str."'";
+                        continue;
+                    }
+                    $sql.=",'".$str."'";
+                }
+                $sql.=")";
+            }
+        }
         if ($soreference1){
             $arr=array_values(array_filter(preg_split('/[,， ]+/is', $soreference1)));
             if (count($arr)==1){

app/Services/WaybillService.php

@@ -125,6 +125,7 @@ class WaybillService
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ':59'],
             'uriType' => ['alias' => 'type'],
             'id' => ['multi' => ','],
+            'logistic_id' => ['multi' => ','],
         ];
         $waybills = app(QueryService::class)->query($param,$waybills,$columnQueryRules,"waybills");
         return $waybills;

laravel-echo-server.json

@@ -27,6 +27,8 @@
 	"protocol": "http",
 	"socketio": {},
 	"secureOptions": 67108864,
+	"sslCertPath": "",
+	"sslKeyPath": "",
 	"sslCertChainPath": "",
 	"sslPassphrase": "",
 	"subscribers": {

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

@@ -242,6 +242,11 @@
                     { name:'{{$customer->customerid}}',value:'{{$customer->descr_c}}' },
                     @endforeach
                 ],
+                logistics:[
+                        @foreach($logistics as $logistic)
+                    { name:'{{$logistic->name}}',value:'{{$logistic->name}}' },
+                    @endforeach
+                ],
                 orders:{!! $orders !!},
                 commodities:{!! $commodities !!},
                 content:'',
@@ -287,7 +292,9 @@
                         {name:'orderdate_start',type:'time',tip:['选择显示日期的起始时间','选择显示日期的起始时间'],
                             rules:{date_relevance:{date:['orderdate_start','orderdate_end'],relevance:'addtime',killing:'relevance',default:[31,92,183,366]}}},
                         {name:'orderno',type:'input',tip:'可支持多SO号，糊模查找需要在左边打上%符号',placeholder: 'SO号'},
-                        {name:'carriername',type:'input',tip:'可支持多承运人,糊模查找需要在左边打上%符号',placeholder:'承运人'},
+                        // {name:'carriername',type:'input',tip:'可支持多承运人,糊模查找需要在左边打上%符号',placeholder:'承运人'},
+                        {name:'carriername',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的承运人'],
+                            placeholder:['承运人','定位或多选承运人'],data:this.logistics},
                         {name:['notes','addtime'],type:'input_select',tip:['右侧选择查询范围，默认为一月内','查询范围，范围越短搜索越快'],placeholder: ['备注',''],
                             data:[{name:'31',value:'近一月'},{name:'92',value:'近三月'},{name:'183',value:'近半年'},{name:'366',value:'近一年'},{name:'0',value:'不限'},],
                             rules:{son:{addtime:{default:'31',required_without_all_if:['orderdate_start','orderdate_end']}},

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

@@ -1089,6 +1089,13 @@
                             }
                         }]
                     },
+                    {
+                        name: 'user_owner_group_id',
+                        type: 'select',
+                        tip: '项目责任方',
+                        placeholder: '项目责任方',
+                        data: this.userOwnerGroups
+                    },
                 ], [
                     {name: 'created_at_end', type: 'dateTime', tip: '登记结束日期'},
                     {name: 'consignee_name', type: 'input', tip: '可支持多收货人名称：前或后加百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '收货人名称'},
@@ -1149,8 +1156,6 @@
                         }]
                     },
                     // {date_relevance:{date:['orderdate_start','orderdate_end'],relevance:'addtime',killing:'date',default:[31,92,183,366]}}]},
-                    {name: 'custom_code', type: 'input', tip: '自定义订单号：自定义订单号', placeholder: '自定义订单号'},
-                    {name: 'is_handle', type: 'checkbox', tip: '是否已处理', data: [{name: 'ture', value: '已解决'}]},
                     {
                         name: 'finance_confirm',
                         type: 'select',
@@ -1178,20 +1183,16 @@
                     },
                     {name: 'sendOrderClientCode', type: 'input', tip: '二次客户订单号', placeholder: '二次客户订单号'},
                     {name: 'sendOrderLogisticNumber', type: 'input', tip: '二次运单号', placeholder: '二次运单号'},
-                    {
-                        name: 'user_owner_group_id',
-                        type: 'select',
-                        tip: '项目责任方',
-                        placeholder: '项目责任方',
-                        data: this.userOwnerGroups
-                    },
+                    {name: 'custom_code', type: 'input', tip: '自定义订单号：自定义订单号', placeholder: '自定义订单号'},
                 ],
-                    @cannot('订单管理-问题件-客户不可见')
+
                     [
+                            @cannot('订单管理-问题件-客户不可见')
                         {name: 'archive_at_start', type: 'dateTime', tip: '归档起始日期'},
                         {name: 'archive_at_end', type: 'dateTime', tip: '归档结束日期'},
+                            @endcannot
+                        {name: 'is_handle', type: 'checkbox', tip: '是否已处理', data: [{name: 'ture', value: '已解决'}]},
                     ]
-                    @endcannot
                 ];
                 this.form = new query({
                     el: '#form_div',

resources/views/transport/waybill/index.blade.php

@@ -396,7 +396,9 @@
                         {name:'created_at_end',type:'time',tip:['选择显示指定日期的结束时间','选择显示指定日期的结束时间']},
                         {name:'destination',type:'input',tip:'目的地：可在两侧增加百分号(%)进行模糊搜索',placeholder: '目的地'},
                         {name:'waybill_number',type:'input',tip:'运单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: '运单号'},
-                        {name:'logistic_id',type:'select',placeholder: '承运商',data:this.logistics},
+                        // {name:'logistic_id',type:'select',placeholder: '承运商',data:this.logistics},
+                        {name:'logistic_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的承运商'],
+                            placeholder:['承运商','定位或多选承运商'],data:this.logistics},
                         {name:'recipient_mobile',type:'input',tip: '可支持多收货人电话：可在左侧增加百分号(%)进行模糊搜索',placeholder: '收货人电话'},
                     ],
                 ];

routes/api/thirdPart/weixin.php

@@ -25,6 +25,7 @@ Route::group(['prefix' => 'procurement','middleware'=>'procurement.auth.api'], f
     Route::get('getProcurementDeliveries', 'ProcurementController@getProcurementDeliveries');
     Route::post('makeProcurementDelivery', 'ProcurementController@makeProcurementDelivery');
     Route::post('finishProductionProcurement', 'ProcurementController@finishProductionProcurement');
+    Route::post('cancelProcurement', 'ProcurementController@cancelProcurement');
     Route::post('getProcurementDeliveryById', 'ProcurementController@getProcurementDeliveryById');
     Route::post('updateProcurementDeliveryAmount', 'ProcurementController@updateProcurementDeliveryAmount');
     Route::get('getProcurementTotalBill', 'ProcurementController@getProcurementTotalBill');