Merge branch 'waybill_ZD'

app/Http/Controllers/ProcessController.php

@@ -26,19 +26,29 @@ use Ramsey\Uuid\Uuid;
 
 class ProcessController extends Controller
 {
-
     public function conditionQuery(Request $request,$processes){
         if(!Gate::allows('二次加工管理-查询')){ return redirect(url('/'));  }
-        $today=Carbon::now()->subDays(15);
+        $today=Carbon::now()->subDays(15)->format('Y-m-d');;
         if ($request->input('commodity_barcode')){
             $barcode=$request->input('commodity_barcode');
-            $processes=$processes->whereHas('processesContents',function ($query)use($barcode){
+            $processesTem=clone $processes;
+            $processesTem=$processesTem->whereHas('processesContents',function ($query)use($barcode){
                 $query->whereHas('commodity',function ($builder)use($barcode){
                     $builder->whereHas('barcodes',function ($builder)use($barcode){
                         $builder->where('code','like',$barcode.'%');
                     });
                 });
-            });
+            })->where('created_at','>=',$today);
+            if ($processesTem->count()>0)$processes=$processesTem;
+            else{
+                $processes=$processes->whereHas('processesContents',function ($query)use($barcode){
+                    $query->whereHas('commodity',function ($builder)use($barcode){
+                        $builder->whereHas('barcodes',function ($builder)use($barcode){
+                            $builder->where('code',$barcode);
+                        });
+                    });
+                });
+            }
         }
         if ($request->input('date_start')){
             $date_start=$request->input('date_start')." 00:00:00";
@@ -55,12 +65,17 @@ class ProcessController extends Controller
             $processes=$processes->where('status',$request->input('status'));
         }
         if ($request->input('wms_code')){
+            $processesTem=clone $processes;
             $wms_code=$request->input('wms_code');
-            $date=$today->format('Y-m-d');
-            $processes=$processes->whereHas('processesContents',function ($builder)use ($wms_code,$date){
-                $builder->where('wms_code','like','%'.$wms_code.'%')
-                    ->where('created_at','>',$date);
-            });
+            $processesTem=$processesTem->whereHas('processesContents',function ($builder)use ($wms_code,$today){
+                $builder->where('wms_code','like','%'.$wms_code.'%');
+            })->where('created_at','>=',$today);
+            if ($processesTem->count()>0)$processes=$processesTem;
+            else{
+                $processes=$processes->whereHas('processesContents',function ($builder)use ($wms_code,$today){
+                    $builder->where('wms_code',$wms_code);
+                });
+            }
         }
         $processes=$processes->paginate($request->input('paginate')??50);
         return $processes;

app/Http/Controllers/TestController.php

@@ -135,9 +135,8 @@ class TestController extends Controller
     }
 
     public function test1(){
-        $str=",15984854564564,";
-        $str=ltrim($str,',');
-        $str=rtrim($str,',');
+        $str=",15984854564564,154484645684，874545454   4565546,";
+        $str=trim($str,',');
         dd($str);
     }
 

app/Http/Controllers/WaybillsController.php

@@ -235,7 +235,7 @@ class WaybillsController extends Controller
         $this->validatorWaybillDispatch($request,$id)->validate();
 
         $data=$request->input();
-
+        $total_receivable=0;
         $waybill->fill($data);
         if ($waybill->save()){
             if ($waybill->type=="直发车"){
@@ -266,7 +266,7 @@ class WaybillsController extends Controller
                 }
                 $total_expense=($waybill->pick_up_fee)+($waybill->other_fee)+($waybill->fee);
             }
-            if (isset($total_receivable)&&$total_receivable>0){
+            if ($total_receivable>0){
                 $waybillPayoff=WaybillPayoff::where('waybill_id','=',$id)->first();
                 if ($waybillPayoff){
                     $waybillPayoff->waybill_id=$id;

public/js/app.js

@@ -61384,8 +61384,8 @@ module.exports = tempTip;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\js\app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\sass\app.scss */"./resources/sass/app.scss");
+__webpack_require__(/*! D:\Demo\bswas\resources\js\app.js */"./resources/js/app.js");
+module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
 /***/ }),

resources/views/process/index.blade.php

@@ -45,7 +45,7 @@
                                </select>
                            </td>
                            <td>
-                               <input id="wms_code" name="wms_code" v-model="filterData.wms_code" class="form-control-sm tooltipTarget" placeholder="单据号" :class="filterData.wms_code?'bg-warning':''">
+                               <input id="wms_code" name="wms_code" title="单据号：支持15内模糊搜索与15天外精确搜索" v-model="filterData.wms_code" class="form-control-sm tooltipTarget" placeholder="单据号" :class="filterData.wms_code?'bg-warning':''">
                            </td>
                            <td colspan="6"></td>
                        </tr>
@@ -54,7 +54,7 @@
                                <input id="date_end" name="date_end" v-model="filterData.date_end" type="date" class="form-control-sm tooltipTarget" title="选择显示指定日期的结束时间" :class="filterData.date_end?'bg-warning':''">
                            </td>
                            <td>
-                               <input name="commodity_barcode" v-model="filterData.commodity_barcode" class="form-control-sm" placeholder="商品条码" :class="filterData.commodity_barcode?'bg-warning':''">
+                               <input name="commodity_barcode" title="商品条码：支持15内模糊搜索与15天外精确搜索" v-model="filterData.commodity_barcode" class="form-control-sm tooltipTarget" placeholder="商品条码" :class="filterData.commodity_barcode?'bg-warning':''">
                            </td>
                            <td >