Merge branch 'master' into Haozi

app/Demand.php

@@ -63,7 +63,7 @@ class Demand extends Model
      */
     public function saveFile($fileName,$fileSuffix)
     {
-        return UploadFile::query()->create(['table_name' => $this->getTable(), 'table_id' => $this['id'], 'url' => '/files/issue/'.$fileName, 'type' => $fileSuffix]);
+        return UploadFile::query()->create(['table_name' => $this->getTable(), 'table_id' => $this['id'], 'url' => '/files/'.$fileName, 'type' => $fileSuffix]);
     }
 
     /**

app/Filters/DischargeTaskFilters.php

@@ -11,7 +11,7 @@ class DischargeTaskFilters
     protected $request;
     protected $queryBuilder;
     protected $filters = [
-        'owner_id', 'created_at_start', 'created_at_end', 'numbers', 'status', 'type', 'income_remark','facilitator_id','created_range'
+        'owners', 'created_at_start', 'created_at_end', 'numbers', 'status', 'type', 'income_remark','facilitators','created_range','owners'
     ];
     protected $array_filter;
     protected $params = [];
@@ -60,7 +60,7 @@ class DischargeTaskFilters
         return $query;
     }
 
-    public function owner_id($owner_id)
+    public function owners($owner_id)
     {
         $this->queryBuilder->where('discharge_tasks.owner_id',$owner_id);
     }
@@ -99,7 +99,7 @@ class DischargeTaskFilters
         $this->queryBuilder->whereIn('discharge_tasks.id',$ids);
     }
 
-    public function facilitator_id($facilitator_id)
+    public function facilitators($facilitator_id)
     {
         $this->searchWay($this->queryBuilder,$facilitator_id,'discharge_tasks.facilitator_id');
     }

app/Filters/LogFilters.php

@@ -12,7 +12,7 @@ class LogFilters
 {
     protected $request;
     protected $queryBuilder;
-    protected $filters = ['username', 'type', 'description',
+    protected $filters = ['name', 'type', 'description',
         'created_at_start', 'created_at_end', 'is_exception', 'class', 'method'];
     protected $array_filter;
 
@@ -111,7 +111,7 @@ class LogFilters
         $this->queryBuilder->whereIn("type", $types);
     }
 
-    private function username($username)
+    private function name($username)
     {
         $this->queryBuilder->whereIn("id_user", function ($query) use ($username) {
             return $query->from("users")->select("id")->where("name", 'like', $username . '%');

app/Filters/OrderIssueFilters.php

@@ -36,7 +36,7 @@ class OrderIssueFilters
         'log_content',
         'is_imported',
         'is_new_rejecting',
-        'logistic_id',
+        'logistic',
         'custom_code',
         'hiddenTag',
         'client_code',
@@ -50,7 +50,7 @@ class OrderIssueFilters
         'id',
         'created_at_start',
         'created_at_end',
-        'order_issue_type_id',
+        'order_issue_type',
         'logistic_indemnity_money',
         'baoshi_indemnity_money',
         'rejectingStatus',
@@ -59,12 +59,12 @@ class OrderIssueFilters
         'settlement_at_end',
         'sendOrderClientCode',
         'sendOrderLogisticNumber',
-        'user_workgroups',
+        'workgroups',
         'shop_name',
         'finance_confirm',
         'logistic_number_return',
         'final_status',
-        'user_owner_group_id',
+        'user_owner_group',
         'archive_at_start',
         'archive_at_end',
     ];
@@ -172,8 +172,8 @@ class OrderIssueFilters
 
         $user = Auth::user();
         $owner_ids = $user ? app('UserService')->getPermittingOwnerIds($user) : [];
-        if (isset($this->params['owner_id'])){
-            $this->searchWay($this->getOrderQuery(),$this->params['owner_id'],'orders.owner_id');
+        if (isset($this->params['owner'])){
+            $this->searchWay($this->getOrderQuery(),$this->params['owner'],'orders.owner_id');
         } else{
             $this->getOrderQuery()->whereIn('owner_id',$owner_ids);
         }
@@ -249,7 +249,7 @@ class OrderIssueFilters
         $this->queryBuilder->where('order_issues.is_new_rejecting',$is_new_rejecting);
     }
 
-    public function logistic_id($logistic_id)
+    public function logistic($logistic_id)
     {
         $this->getOrderQuery()->where('orders.logistic_id',$logistic_id);
     }
@@ -324,7 +324,7 @@ class OrderIssueFilters
         $this->queryBuilder->where('order_issues.created_at', '<=', $created_at_end . " 23:59:59");
     }
 
-    public function order_issue_type_id($order_issue_type_id)
+    public function order_issue_type($order_issue_type_id)
     {
         $this->searchWay($this->queryBuilder,$order_issue_type_id,'order_issues.order_issue_type_id');
     }
@@ -370,7 +370,7 @@ class OrderIssueFilters
         $this->searchWay($this->queryBuilder,$sendOrderClientCode,'order_issues.second_client_no');
     }
 
-    public function user_workgroups($user_work_groups)
+    public function workgroups($user_work_groups)
     {
         if(is_string($user_work_groups)){
             $user_work_groups = explode(',', $user_work_groups);
@@ -431,7 +431,7 @@ class OrderIssueFilters
         $this->queryBuilder->where('order_issues.finance_confirm',$finance_confirm);
     }
 
-    public function user_owner_group_id($user_owner_group_id)
+    public function user_owner_group($user_owner_group_id)
     {
         $this->queryBuilder->where('order_issues.user_owner_group_id',$user_owner_group_id);
     }

app/Filters/OrderPackageFilters.php

@@ -15,7 +15,7 @@ class OrderPackageFilters
     protected $request;
     protected $queryBuilder;
     protected $filters = ['logistic_number', 'status', 'received_at_start',
-        'received_at_end', 'is_weighed', 'logistic_id', 'owner_id', 'sent_at_start', 'sent_at_end', 'is_exception', 'exception_type', 'default_date','has_transfer_status'];
+        'received_at_end', 'is_weighed', 'logistic', 'owner', 'sent_at_start', 'sent_at_end', 'is_exception', 'exception_type', 'default_date','has_transfer_status'];
 
     public function __construct(Request $request)
     {
@@ -82,7 +82,7 @@ class OrderPackageFilters
         }
     }
 
-    private function logistic_id($logistic_id)
+    private function logistic($logistic_id)
     {
         $logistic_ids = array_filter(preg_split('/[,， ]+/is', $logistic_id));
         $this->queryBuilder->whereIn('order_id', function ($query) use ($logistic_ids) {
@@ -90,7 +90,7 @@ class OrderPackageFilters
         });
     }
 
-    private function owner_id($owner_id)
+    private function owner($owner_id)
     {
         $owner_ids = array_filter(preg_split('/[,， ]+/is', $owner_id));
         $this->queryBuilder->whereIn('owner_id', $owner_ids);

app/Filters/OrderTrackFilters.php

@@ -24,7 +24,7 @@ class OrderTrackFilters
     protected $queryBuilder;
     protected $params = [];
     protected $filters = ['client_code', 'order_client_code_wms',
-        'logistic_id', 'client', 'web_order_number', 'sku', 'logistic_number','remark','ids',
+        'logistic', 'client', 'web_order_number', 'sku', 'logistic_number','remark','ids',
         'start_at', 'end_at', 'start_planning_sent_at', 'end_planning_sent_at'];
     protected $array_filter;
 
@@ -65,8 +65,8 @@ class OrderTrackFilters
         // 货主
         $user = Auth::user();
         $owner_ids = $user ? app(UserService::class)->getPermittingOwnerIds($user) : [];
-        if (isset($this->params['owner_id'])) {
-            $ownerIds = explode(",", $this->params['owner_id']);
+        if (isset($this->params['owner'])) {
+            $ownerIds = explode(",", $this->params['owner']);
             $owner_ids = array_intersect($owner_ids, $ownerIds);
         }
         $this->ownerId($owner_ids);
@@ -110,7 +110,7 @@ class OrderTrackFilters
         $this->searchWay($this->queryBuilder,$order_client_code_wms,'order_trackings.order_client_code_wms');
     }
 
-    public function logistic_id($logistic_id)
+    public function logistic($logistic_id)
     {
         $this->queryBuilder->where('order_trackings.logistic_id',$logistic_id);
     }

app/Filters/OwnerSundryFeeDetailFilters.php

@@ -14,7 +14,7 @@ class OwnerSundryFeeDetailFilters
 {
     protected $request;
     protected $queryBuilder;
-    protected $filters = ['owner_id'];
+    protected $filters = ['owners'];
 
     public function __construct(Request $request)
     {
@@ -34,7 +34,7 @@ class OwnerSundryFeeDetailFilters
     }
 
 
-    private function owner_id($owner_id)
+    private function owners($owner_id)
     {
         if (strpos($owner_id, ',') || strpos($owner_id, '，') || strpos($owner_id, ' ')) {
             $arr = array_filter(preg_split('/[,， ]+/is', $owner_id));

app/Http/Controllers/DemandController.php

@@ -32,7 +32,6 @@ class DemandController extends Controller
         if(!isset($user))return redirect('/');
 
         $demands = Demand::query()->with(['initiator', 'handle', 'uploadFile', 'processes.user'])->filter($filters)->orderByDesc('demands.id')->paginate($request['paginate'] ?? 50);
-
         return view('demand.search.index', compact('demands'));
     }
 

app/Http/Controllers/StationController.php

@@ -57,7 +57,7 @@ class StationController extends Controller
 //        $stationTypeBinMonitor = StationTypeBinMonitor::query()->where("station_id",$station->id)->first();
         $station->loadMissing([
             "stationTasks_today.stationTaskCommodities.commodity.barcodes",
-            "stationTasks_today.stationTaskCommodities.materialBox",
+            "stationTasks_today.stationTaskCommodities.stationTaskMaterialBox",
             "stationTasks_today.stationTaskBatches.batch.owner",
             "stationTasks_today.stationTaskMaterialBoxes.materialBox",
             "stationTypeBinMonitor",

app/Http/Controllers/StorageController.php

@@ -97,13 +97,49 @@ class StorageController extends Controller
         $models = CommodityMaterialBoxModel::query()->where("commodity_id",$item->commodity_id)->get();
         if ($models->count()==0)$this->error("商品首入，请使用缓存架空箱入库");
         foreach ($models as $model){
-            $box = Storage::query()->select(DB::raw("MAX({$model->maximum}-amount) need"),"material_box_id")
-                ->whereHas("materialBox",function (Builder $query)use($model){
+            $stationCodes = '';//拼接库位编码
+            $map = [];//库位与库存映射
+            //查询填充
+            Storage::query()->with("station")->whereHas("materialBox",function (Builder $query)use($model){
                 $query->where("material_box_model_id",$model->material_box_model_id);
             })->where("commodity_id",$model->commodity_id)->where("amount","<",$model->maximum)
-                ->where("status",0)->first();
-            $box->commodity_id = $item->commodity_id;
-            if ($box)$this->success($box);
+                ->where("status",0)->where(DB::raw("{$model->maximum}-amount"),">",0)->get()
+                ->each(function ($storage)use(&$stationCodes,&$map){
+                    $stationCodes .= "'".$storage->station->code."',";
+                    $map[$storage->station->code] = $storage;
+                });
+            //不存在跳出
+            if (!$stationCodes)continue;
+            $stationCodes = mb_substr($stationCodes,0,-1);
+            //查询对应asn detail
+            $detail = DB::connection("oracle")->selectOne(DB::raw("SELECT * FROM DOC_ASN_DETAILS WHERE ASNNO = ? AND ASNLINENO = ?"),[
+                request("asn"),$item->asn_line_code
+            ]);
+            if($detail)continue;
+            $detail = get_object_vars($detail);
+            //查询对应批次属性
+            $lot = DB::connection("oracle")->selectOne(DB::raw("SELECT * FROM BAS_LOTID WHERE LOTID = (SELECT LOTID FROM BAS_SKU WHERE CUSTOMERID = ? AND SKU = ?)"),[
+                $detail["customerid"],$detail["sku"]
+            ]);
+            if($lot)continue;
+            //通过符合条件的批次号来查询 库存
+            $lot = get_object_vars($lot);
+            $sql = <<<sql
+SELECT * FROM INV_LOT_LOC_ID WHERE LOTNUM IN
+ (SELECT LOTNUM FROM INV_LOT_ATT WHERE INV_LOT_ATT.CUSTOMERID = ? AND SKU = ?
+sql;
+            //拼接可以合并的批次属性要求
+            for ($i=1;$i<=8;$i++){
+                if ($lot["lotkey0{$i}"]=='Y'){
+                    $val = $detail["lotatt0{$i}"] ? "'{$detail["lotatt0{$i}"]}'" : null;
+                    $sql .= " AND LOTATT0{$i} = $val";
+                }
+            }
+            $sql .= ") AND LOCATIONID IN ({$stationCodes}) AND TRACEID = '*' AND {$model->maximum}-QTY > 0 ORDER BY {$model->maximum}-QTY";
+            $res = DB::connection("oracle")->selectOne(DB::raw($sql),[
+                $detail["customerid"],$detail["sku"]
+            ]);
+            if ($res)$this->success($map[$res->locationid]);
         }
         $this->success(["need"=>$models[0]->maximum,"material_box_model_id"=>$models[0]->material_box_model_id,"commodity_id"=>$item->commodity_id]);
     }

app/Http/Controllers/TestController.php

@@ -54,6 +54,7 @@ use App\ProcurementDeliverie;
 use App\ProcurementQuotation;
 use App\ProcurementTotalBill;
 use App\RejectedBillItem;
+use App\Services\AuthorityService;
 use App\Services\BatchService;
 use App\Services\CacheService;
 use App\Services\CacheShelfService;
@@ -68,6 +69,7 @@ use App\Services\InventoryCompareService;
 use App\Services\LogisticService;
 use App\Services\LogisticZopService;
 use App\Services\LogService;
+use App\Services\MenuService;
 use App\Services\NewOrderCountingRecordService;
 use App\Services\MaterialBoxService;
 use App\Services\MenuService;
@@ -142,11 +144,24 @@ class TestController extends Controller
     {
         return call_user_func([$this, $method], $request);
     }
-
+    public function test3(){
+        $nums = [1,2,3,4,5,6,7];
+        $target = 3;
+        $sum = 0;
+        $res = $this->test1($nums,$target);
+        dump($res);
+        if (!$res)return null;
+        if (!is_array($res))dd($nums[$res]);
+        foreach ($res as $item){
+            dump($nums[$item]);
+            $sum += $nums[$item];
+        }
+        dd($sum);
+    }
     public function test1()
     {
-        $box = app("MaterialBoxService")->getAnEmptyBox([],$modelId);
-        return view("test");
+        $unit = DB::selectOne("SELECT * FROM UNITS where id = 9999");
+        dd(get_object_vars($unit));
     }
 
     public function test2()

app/Http/Controllers/UserController.php

@@ -33,8 +33,8 @@ class UserController extends Controller
         $owners=app("OwnerService")->getIntersectPermitting();
         $userDetailQuery = UserDetail::query()->select('user_id')->where('type','临时工');
         $query = User::with(['roles','logistics','userWorkgroups','suppliers','userDetail'])->whereNotIn('id',$userDetailQuery);
-        if($request->has('user')){
-            $user=$request->input('user');
+        if($request->has('name')){
+            $user=$request->input('name');
             $query->where('name','like',$user.'%');
         }
         if($request->has('role')){
@@ -49,8 +49,8 @@ class UserController extends Controller
                 }
             });
         }
-        if($request->input('owner_id')){
-            $owner_id= $request->input('owner_id');
+        if($request->input('owners')){
+            $owner_id= $request->input('owners');
             $owner_ids = array_filter(preg_split('/[,， ]+/is',$owner_id));
             $ownerIds=[];
             foreach ($owner_ids as $id)$ownerIds[]='_'.$id;

app/Http/Controllers/UserLaborController.php

@@ -26,7 +26,7 @@ class UserLaborController extends Controller
     public function index(Request $request)
     {
         $userLabors=UserLabor::query()->with('userDetail')->orderBy('user_id','desc');
-        $full_name = $request->user_name ?? false;
+        $full_name = $request->name ?? false;
         if ($full_name){
             $userLabors->whereHas('userDetail',function($query)use($full_name){
                 if (strpos($full_name, ',') || strpos($full_name, '，') || strpos($full_name, ' ')) {

app/Services/BatchService.php

@@ -101,7 +101,7 @@ class BatchService
             foreach ($stationTasks as &$stationTask){
                 $stationTask->loadMissing([
                     "stationTaskCommodities.commodity.barcodes",
-                    "stationTaskCommodities.materialBox",
+                    "stationTaskCommodities.stationTaskMaterialBox",
                     "stationTaskBatches.batch.owner",
                     "stationTaskMaterialBoxes.materialBox",
                 ]);

app/Services/DemandService.php

@@ -32,16 +32,23 @@ class DemandService
         if ($file->getSize() > 5 * 1024 * 1024) return ['success' => false, 'message' => '文件不能大于5MB'];
         $fileSuffix = $file->getClientOriginalExtension();
 
-        $dirPath = storage_path('app\public\files\issue');
+        if (!in_array($fileSuffix,[ 'gif','image','jpeg','jpg','png','svg']))
+            return ['success' => false , 'message' => '文件格式应该为gif,image,jpeg,jpg,png,svg格式'];
+
+        $path = ['app','public','files'];
+
+        $path = join(DIRECTORY_SEPARATOR,$path);
+
+        $dirPath = storage_path($path);
         if (!file_exists($dirPath)) {
             mkdir($dirPath);
         }
 
         $fileName = date('ymd') . '-' . Uuid::uuid1();
 
-        $thumbnailName = storage_path('app\public\files\issue\\' . $fileName . '-thumbnail.' . $fileSuffix);
-        $commonName = storage_path('app\public\files\issue\\' . $fileName . '-common.' . $fileSuffix);
-        $bulkyName = storage_path('app\public\files\issue\\' . $fileName . '-bulky.' . $fileSuffix);
+        $thumbnailName = storage_path('app/public/files/' . $fileName . '-thumbnail.' . $fileSuffix);
+        $commonName = storage_path('app/public/files/' . $fileName . '-common.' . $fileSuffix);
+        $bulkyName = storage_path('app/public/files/' . $fileName . '-bulky.' . $fileSuffix);
 
         $result = move_uploaded_file($tmpFile, $bulkyName);
 

app/Services/InventoryCompareService.php

@@ -146,7 +146,7 @@ class InventoryCompareService
         }
         unset($param['differ']);
         $columnQueryRules=[
-            'owner_id' => ['multi' => ','],
+            'owners' => ['alias' => 'owner_id','multi' => ','],
             'date_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'date_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
             'mission_code' => ['batch' => '','timeLimit' => 15],

app/Services/InventoryDailyLogService.php

@@ -19,7 +19,7 @@ class InventoryDailyLogService
             $query->with('barcodes');
         }])->orderByDesc('inventory_daily_logs.id');
         $columnQueryRules=[
-            'owner_id' => ['multi' => ','],
+            'owner' => ['alias'=>'owner_id','multi' => ','],
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
             'id' => ['multi' => ','],

app/Services/LaborReportsCountingRecordService.php

@@ -43,8 +43,8 @@ class LaborReportsCountingRecordService
             $result->push(
                 [
                     'value' => $item->amount,
-                    'name' => $item->userWorkgroup->name,
-                    'id' => $item->userWorkgroup->id,
+                    'name' => $item->userWorkgroup->name ?? '未进组',
+                    'id' => $item->userWorkgroup->id ?? 10000,
                 ]
             );
         });

app/Services/MenuService.php

@@ -98,6 +98,7 @@ class MenuService
             foreach ($authorities as $j=>$authority){
                 if ($menu["name"] == $authority["name"]){
                     $mapping[$menu["id"]] = $authority["id"];
+                    $menus[$index]["authId"] = $authority["id"];
                     $mark = true;
                     $authorities[$j]["mark"] = true;
                     if ($authority["child"])$menus[$index]["child"] = array_values($this->formatMenu($menu["child"],$authority["child"],$mapping));

app/Services/OrderService.php

@@ -90,27 +90,32 @@ class OrderService
         if ($ordernos){
             $sql .= " AND orderno IN ".$ordernos;
         }
-//        if ($c_contact) $sql .= " AND c_contact like '".$c_contact."'";
         if ($c_contact)$sql=$this->sqlSearchWay($sql,$c_contact,'c_contact');
         if ($c_tel2){
+            $c_tel2 = str_replace("'",'"',$c_tel2);
             $sql .= " AND (c_tel2 like '".$c_tel2."' OR c_tel1 like '".$c_tel2."')";
         }
         if ($c_province){
+            $c_province = str_replace("'",'"',$c_province);
             if ($c_province=='空')$sql .= " AND c_province is null";
             else$sql .= " AND c_province like '".$c_province."'";
         }
         if ($c_city){
+            $c_city = str_replace("'",'"',$c_city);
             if ($c_city=='空')$sql .= " AND c_city is null";
             else$sql .= " AND c_city like '".$c_city."'";
         }
         if ($c_district){
+            $c_district = str_replace("'",'"',$c_district);
             if ($c_district=='空')$sql .= " AND c_district is null";
             else$sql .= " AND c_district like '".$c_district."'";
         }
         if ($releasestatus){
+            $releasestatus = str_replace("'",'"',$releasestatus);
             $sql .= " AND releasestatus = '".$releasestatus."'";
         }
         if ($alternate_sku1){
+            $alternate_sku1 = str_replace("'",'"',$alternate_sku1);
             if ($checkAllSign) $detailsOrderno = $this->getOrdersNo($alternate_sku1,false);
             else $detailsOrderno = $this->getOrdersNo($alternate_sku1,true, $params['page'] ?? 1, $params['paginate'] ?? 50);
             if (count($detailsOrderno)>0){
@@ -184,6 +189,7 @@ class OrderService
             $sql.=" and notes like '%".$notes."%'";
         }
         if ($soreference5){
+            $soreference5 = str_replace("'",'"',$soreference5);
             $arr=array_values(array_filter(preg_split('/[,， ]+/is', $soreference5)));
             if (count($arr)>0){
                 $sql.=" and (soreference5 in (";

app/Services/OwnerBillReportService.php

@@ -23,7 +23,7 @@ class OwnerBillReportService
         $columnQueryRules = [
             'counting_month_start' => ['alias' => 'counting_month', 'startDate' => '-01'],
             'counting_month_end' => ['alias' => 'counting_month', 'endDate' => '-31'],
-            'owner_id' => ['multi' => ','],
+            'owners' => ['alias' => 'owner_id','multi' => ','],
         ];
         if (($params["customer_id"] ?? false) || ($params["owner_group_id"] ?? false)){
             $builder->whereHas('owner',function ($query)use(&$params){

app/Services/OwnerFeeDetailService.php

@@ -22,7 +22,7 @@ class OwnerFeeDetailService
         $columnQueryRules = [
             'worked_at_start' => ['alias' => 'worked_at', 'startDate' => ''],
             'worked_at_end' => ['alias' => 'worked_at', 'endDate' => ''],
-            'owner_id' => ['multi' => ','],
+            'owners' => ['alias' => 'owner_id','multi' => ','],
             'id' => ['multi' => ','],
             'operation_bill' => ['batch' => ''],
             'logistic_bill' => ['batch' => ''],

app/Services/OwnerReportService.php

@@ -22,21 +22,21 @@ class OwnerReportService
         $columnQueryRules = [
             'counting_month_start' => ['alias' => 'counting_month', 'startDate' => '-01'],
             'counting_month_end' => ['alias' => 'counting_month', 'endDate' => '-31'],
-            'owner_id' => ['multi' => ','],
+            'owners' => ['alias' => 'owner_id','multi' => ','],
         ];
-        if ($params["owner_group_id"] ?? false){
+        if ($params["owner_groups"] ?? false){
             $builder->whereHas('owner',function ($query)use(&$params){
                 /** @var Builder $query */
-                $query->where("user_owner_group_id",$params["owner_group_id"]);
+                $query->where("user_owner_group_id",$params["owner_groups"]);
             });
-            unset($params["owner_group_id"]);
+            unset($params["owner_groups"]);
         }
-        if ($params["customer_id"] ?? false){
+        if ($params["customers"] ?? false){
             $builder->whereHas('owner',function ($query)use(&$params){
                 /** @var Builder $query */
-                $query->where("customer_id",$params["customer_id"]);
+                $query->where("customer_id",$params["customers"]);
             });
-            unset($params["customer_id"]);
+            unset($params["customers"]);
         }
         if ($params["status"] ?? false){
             $builder->whereHas('owner',function ($query)use(&$params){

app/Services/OwnerService.php

@@ -252,6 +252,15 @@ class OwnerService
                 });
                 continue;
             }
+            if ($column == 'customers'){
+                if (is_array($param))$builder->whereIn('customer_id',$param);
+                else $builder->where('customer_id',$param);
+            }
+            if ($column == 'ids'){
+                if (is_array($param))$builder->whereIn('id',$param);
+                else $builder->where('id',$param);
+            }
+
             if (is_array($param))$builder->whereIn($column,$param);
             else $builder->where($column,$param);
         }
@@ -385,37 +394,37 @@ sql
     {
         $relevance = [];
         $sql = <<<sql
-SELECT 1 FROM owner_storage_price_models a 
-LEFT JOIN owner_storage_price_model_owner b ON a.id =  b.owner_storage_price_model_id 
-LEFT JOIN owners c ON b.owner_id = c.id 
+SELECT 1 FROM owner_storage_price_models a
+LEFT JOIN owner_storage_price_model_owner b ON a.id =  b.owner_storage_price_model_id
+LEFT JOIN owners c ON b.owner_id = c.id
 WHERE (a.operation IS NULL OR a.operation = '') AND c.id = ? LIMIT 1
 sql;
         if (DB::selectOne(DB::raw($sql),[$ownerId]))$relevance[] = 0;
         $sql = <<<sql
-SELECT 1 FROM owner_price_operations a 
-LEFT JOIN owner_price_operation_owner b ON a.id =  b.owner_price_operation_id 
-LEFT JOIN owners c ON b.owner_id = c.id 
+SELECT 1 FROM owner_price_operations a
+LEFT JOIN owner_price_operation_owner b ON a.id =  b.owner_price_operation_id
+LEFT JOIN owners c ON b.owner_id = c.id
 WHERE (a.operation IS NULL OR a.operation = '') AND c.id = ? LIMIT 1
 sql;
         if (DB::selectOne(DB::raw($sql),[$ownerId]))$relevance[] = 1;
         $sql = <<<sql
-SELECT 1 FROM owner_price_expresses a 
-LEFT JOIN owner_price_express_owner b ON a.id =  b.owner_price_express_id 
-LEFT JOIN owners c ON b.owner_id = c.id 
+SELECT 1 FROM owner_price_expresses a
+LEFT JOIN owner_price_express_owner b ON a.id =  b.owner_price_express_id
+LEFT JOIN owners c ON b.owner_id = c.id
 WHERE (a.operation IS NULL OR a.operation = '') AND c.id = ? LIMIT 1
 sql;
         if (DB::selectOne(DB::raw($sql),[$ownerId]))$relevance[] = 2;
         $sql = <<<sql
-SELECT 1 FROM owner_price_logistics a 
-LEFT JOIN owner_price_logistic_owner b ON a.id =  b.owner_price_logistic_id 
-LEFT JOIN owners c ON b.owner_id = c.id 
+SELECT 1 FROM owner_price_logistics a
+LEFT JOIN owner_price_logistic_owner b ON a.id =  b.owner_price_logistic_id
+LEFT JOIN owners c ON b.owner_id = c.id
 WHERE (a.operation IS NULL OR a.operation = '') AND c.id = ? LIMIT 1
 sql;
         if (DB::selectOne(DB::raw($sql),[$ownerId]))$relevance[] = 3;
         $sql = <<<sql
-SELECT 1 FROM owner_price_direct_logistics a 
-LEFT JOIN owner_price_direct_logistic_owner b ON a.id =  b.owner_price_direct_logistic_id 
-LEFT JOIN owners c ON b.owner_id = c.id 
+SELECT 1 FROM owner_price_direct_logistics a
+LEFT JOIN owner_price_direct_logistic_owner b ON a.id =  b.owner_price_direct_logistic_id
+LEFT JOIN owners c ON b.owner_id = c.id
 WHERE (a.operation IS NULL OR a.operation = '') AND c.id = ? LIMIT 1
 sql;
         if (DB::selectOne(DB::raw($sql),[$ownerId]))$relevance[] = 4;

app/Services/PackageService.php

@@ -24,10 +24,10 @@ class PackageService
             return  $query->with(['owner','logistic','batch']);
         },'paperBox','measuringMachine'])
         ->whereIn('order_packages.owner_id',$ownerIds)->orderBy(TABLE.'id','DESC');
-        if ($params['owner_id'] ?? false){
-            $owner_id = explode(',',$params['owner_id']);
+        if ($params['owner'] ?? false){
+            $owner_id = explode(',',$params['owner']);
             $packages->whereIn('order_packages.owner_id',$owner_id);
-            unset($params['owner_id']);
+            unset($params['owner']);
         }
         if ($params['logistic_number'] ?? false){
             $packages->whereIn('logistic_number',array_values(array_filter(preg_split('/[,， ]+/is', $params['logistic_number']))));

app/Services/ProcessService.php

@@ -59,7 +59,7 @@ class ProcessService
             'date_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'date_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
             'code' => ['batch' => ''],
-            'owner_id' => ['multi' => ','],
+            'owners' => ['alias' => 'owner_id' ,'multi' => ','],
             'id' => ['multi' => ','],
         ];
         $processes = app(QueryService::class)->query($params,$processes,$columnQueryRules,"processes");

app/Services/ProcessStatisticService.php

@@ -15,12 +15,12 @@ class ProcessStatisticService
     private function conditionQuery(array $params){
         $query = ProcessStatistic::with(['process.owner','operatorLog.user'])->orderBy('process_statistics.process_id','DESC')
             ->has('process');
-        if ($params["owner_id"] ?? false){
-            $owner_id=$params["owner_id"];
+        if ($params["owners"] ?? false){
+            $owner_id=$params["owners"];
             $query=$query->whereHas('process',function (Builder $builder)use($owner_id){
                 $builder->where('owner_id',$owner_id);
             });
-            unset($params["owner_id"]);
+            unset($params["owners"]);
         }
         if ($params["code"] ?? false){
             $code=$params["code"];

app/Services/RejectedService.php

@@ -31,7 +31,7 @@ class RejectedService
         $columnQueryRules = [
             'created_at_start' => ['alias' => 'created_at', 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at', 'endDate' => ' 23:59:59'],
-            'owner_id' => ['alias' => 'id_owner', 'multi' => ','],
+            'owner' => ['alias' => 'id_owner', 'multi' => ','],
             'order_number' => ['batch' => ''],
             'remark' => ['batch' => '','timeLimit'=>15],
             'logistic_number' => ['batch' => ''],

app/Services/StationService.php

@@ -82,7 +82,7 @@ class StationService
         if($stationTask)
             $stationTask->loadMissing([
                 "stationTaskCommodities.commodity.barcodes",
-                "stationTaskCommodities.materialBox",
+                "stationTaskCommodities.stationTaskMaterialBox",
                 "stationTaskBatches.batch",
                 "stationTaskMaterialBoxes.materialBox",
             ]);

app/Services/StationTaskCommodityService.php

@@ -108,11 +108,11 @@ class StationTaskCommodityService
             $stationType=$this->stationTypeService->getForCommodity();
             $station=$this->stationService->getStation_byType($stationType['name']);
             $materialBox=$this->materialBoxService->firstOrCreate(['code' => $orderCommodity['location']]);
-            $stationTaskMaterialBoxId=StationTaskMaterialBox::query()->where('station_task_batch_id',$batch['id'])->where('material_box_id',$materialBox['id'])->get('id');
+            $stationTaskMaterialBoxId=StationTaskMaterialBox::query()->where('station_task_batch_id',$stationTaskBatch['id'])->where('material_box_id',$materialBox['id'])->get('id')->first()['id']??null;
             $stationTaskCommodities_toCreate->push(
                 new StationTaskCommodity([
                     'station_id'=>$station['id'],
-                    'material_box_id'=>$materialBox['id'],
+//                    'material_box_id'=>$materialBox['id'],
                     'material_box_position'=>$orderCommodity['material_box_position'],
                     'commodity_id'=>$orderCommodity['commodity_id'],
                     'amount'=>$orderCommodity['amount'],
@@ -156,7 +156,7 @@ class StationTaskCommodityService
                 });
                 if(count($processingIds)==0){
                     foreach($groupByBatch as &$stationTaskCommodity){
-                        if($stationTaskCommodity['material_box_id']==$groupByBatch[0]['material_box_id']){
+                        if($stationTaskCommodity['station_task_material_box_id']==$groupByBatch[0]['station_task_material_box_id']){
                             $stationTaskCommodity['status']='处理中';
                         }
                     }

app/Services/StorageService.php

@@ -15,6 +15,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 
 class StorageService
 {
@@ -237,7 +238,7 @@ class StorageService
      *
      * @return array|null
      */
-    public function getFluxTask($asn,$barCode,$amount):?array
+    public function getFluxTask(string $asn,string $barCode,int $amount):array
     {
         $sql = <<<sql
 SELECT * FROM DOC_ASN_DETAILS LEFT JOIN BAS_SKU ON DOC_ASN_DETAILS.CUSTOMERID = BAS_SKU.CUSTOMERID AND DOC_ASN_DETAILS.SKU = BAS_SKU.SKU
@@ -246,15 +247,123 @@ WHERE ASNNO = ? AND (ALTERNATE_SKU1 = ? OR ALTERNATE_SKU2 = ? OR ALTERNATE_SKU3
   AND TASKPROCESS = '00' AND TASKTYPE = 'PA'
 sql;
         $asns = DB::connection("oracle")->select(DB::raw($sql),[$asn,$barCode,$barCode,$barCode,$amount]);
-        if (!$asns)return null;
+        if (!$asns)return [];
         $nums = [];
-        foreach ($asns as $asn){
+        $sum = 0;
+        $maxIndex = null;
+        foreach ($asns as $i => $asn){
             if ((int)$asn->fmqty == $amount)return [$asn];
             $nums[] = (int)$asn->fmqty;
+            $sum += (int)$asn->fmqty;
+            if ((int)$asn->fmqty>$amount)$maxIndex = $i;
         }
-        $result = $this->twoSum($nums,$amount);
-        if ($result)return [$asns[$result[0]],$asns[$result[1]]];
-        return null;
+        if ($sum<$amount)return []; //上架数大于入库数
+        $result = $this->getMatch($nums,$amount);
+        if (!$result)return $this->splitTask($asns,$maxIndex,$amount);
+        $arr = [];
+        foreach ($result as $index)$arr[] = $asns[$index];
+        return $arr;
+    }
+
+    /**
+     * 拆分任务
+     * @param array $asns
+     * @param int|null $maxIndex
+     * @param int $amount
+     *
+     * @return array
+     */
+    private function splitTask($asns,$maxIndex,$amount):array
+    {
+        $result = [];
+        if ($maxIndex===null){
+            foreach ($asns as $asn){
+                if ($amount>(int)$asn->fmqty){
+                    $result[] = $asn;
+                    $amount-=(int)$asn->fmqty;
+                }else $splitTarget = $asn;
+            }
+        }else $splitTarget = $asns[$maxIndex];
+        $result[] = $this->copyTask($splitTarget,$amount);
+        return $result;
+    }
+
+    /**
+     * @param \stdClass $task
+     * @param int $amount
+     *
+     * @return \stdClass
+     *
+     * @throws
+     */
+    private function copyTask($task,$amount)
+    {
+        DB::connection("oracle")->beginTransaction();
+        try {
+            $columns = '';
+            $values = '';
+            $seq = 0;
+            foreach ($task as $key=>$val){
+                if (Str::upper($key)=='TASKID_SEQUENCE') {
+                    $taskMax = DB::connection("oracle")->selectOne(DB::raw("select MAX(TASKID_SEQUENCE) maxseq from TSK_TASKLISTS where taskid = ?"),[$task->taskid]);
+                    $val = $taskMax->maxseq + 1;
+                    $seq = $val;
+                }
+                if (Str::upper($key)=='FMQTY' || Str::upper($key)=='FMQTY_EACH')$val = $amount;
+                if (Str::upper($key)=='FMID')$val = "WAS".$val;
+                $columns .= "'".$key."',";
+                $values .= "'".$val."',";
+            }
+            $columns = mb_substr($columns,0,-1);
+            $values = mb_substr($values,0,-1);
+            $sql = <<<sql
+    INSERT INTO TSK_TASKLISTS({$columns}) VALUES({$values})
+sql;
+            DB::connection("oracle")->insert(DB::raw($sql));
+            DB::connection("oracle")->update(DB::raw("UPDATE TSK_TASKLISTS SET FMQTY = FMQTY-?,FMQTY_EACH = FMQTY_EACH-? WHERE TASKID = ? AND TASKID_SEQUENCE = ?"),[
+                $amount,$amount,$task->taskid,$task->taskid_sequence
+            ]);
+            $invs = DB::connection("oracle")->select(DB::raw("SELECT * FROM INV_LOT_LOC_ID WHERE LOTNUM = ? AND LOCATIONID IN (?,?) AND TRACEID = ?"),[
+                $task->fmlotnum,$task->fmlocation,$task->plantolocation,$task->fmid
+            ]);
+            foreach ($invs as $inv){
+                $columns = '';
+                $values = '';
+                if ($inv->locationid==$task->fmlocation){
+                    DB::connection("oracle")->update(DB::raw("UPDATE inv_lot_loc_id SET qty = qty-? WHERE lotnum = ? AND locationid = ? AND traceid = ?"),[
+                        $amount,$inv->lotnum,$inv->locationid,$inv->traceid
+                    ]);
+                    foreach ($inv as $key=>$val){
+                        if (Str::upper($key)=='TRACEID') $val = "WAS".$task->fmid;
+                        if (Str::upper($key)=='QTY') $val = $amount;
+                        $columns .= "'".$key."',";
+                        $values .= "'".$val."',";
+                    }
+                    $columns = mb_substr($columns,0,-1);
+                    $values = mb_substr($values,0,-1);
+                    DB::connection("oracle")->insert(DB::raw("INSERT INTO inv_lot_loc_id({$columns}) VALUES({$values})"));
+                }
+                if ($inv->locationid==$task->plantolocation){
+                    DB::connection("oracle")->update(DB::raw("UPDATE inv_lot_loc_id SET QTYPA = QTYPA-? WHERE lotnum = ? AND locationid = ? AND traceid = ?"),[
+                        $amount,$inv->lotnum,$inv->locationid,$inv->traceid
+                    ]);
+                    foreach ($inv as $key=>$val){
+                        if (Str::upper($key)=='TRACEID') $val = "WAS".$task->fmid;
+                        if (Str::upper($key)=='QTYPA') $val = $amount;
+                        $columns .= "'".$key."',";
+                        $values .= "'".$val."',";
+                    }
+                    $columns = mb_substr($columns,0,-1);
+                    $values = mb_substr($values,0,-1);
+                    DB::connection("oracle")->insert(DB::raw("INSERT INTO inv_lot_loc_id({$columns}) VALUES({$values})"));
+                }
+            }
+            DB::connection("oracle")->commit();
+        }catch(\Exception $e) {
+            DB::connection("oracle")->rollBack();
+            throw new \Exception("拆分任务失败：".$e->getMessage());
+        }
+        return DB::connection("oracle")->selectOne(DB::raw("SELECT * FROM TSK_TASKLISTS WHERE TASKID = ? AND TASKID_SEQUENCE = ?"),[$task->taskid,$seq]);
     }
 
     /**
@@ -264,14 +373,23 @@ sql;
      * @param Integer $target
      * @return Integer[]|null
      */
-    protected function twoSum($nums, $target) {
+    protected function getMatch(array $nums,int $target) :?array
+    {
         $map=[];
-        for($i=0;$i<count($nums);$i++){
-            $complement=$target-$nums[$i];
-            if(array_key_exists($complement,$map)){
-                return [$map[$complement],$i];
+        foreach ($nums as $index=>$val){
+            $complement=$target-$val;
+            if(array_key_exists($complement,$map))return [$map[$complement],$index];
+            if ($val==$target)return [$index];
+            $map[$val]=$index;
+            if ($val<$target){
+                $temp = $nums;
+                unset($temp[$index]);
+                $arr = $this->getMatch($temp,$target-$val);
+                if ($arr) {
+                    $arr[] = $index;
+                    return $arr;
+                }
             }
-            $map[$nums[$i]]=$i;
         }
         return null;
     }
@@ -296,22 +414,6 @@ sql;
         if (!$inv)return false;//余量与入库不符
         DB::connection("oracle")->transaction(function ()use($inv,$amount,$ide,$asn,&$who){
             $db = DB::connection("oracle");
-            /*$qty = $amount;
-            foreach ($inv as $in){
-                if ($qty==0)break;
-                if ($in->qty > $qty){
-                    $db->update(DB::raw("update inv_lot_loc_id set qty = qty-?,qtymvout = qty-? where lotnum = ? and locationid = ? and traceid = ?"),[
-                        $qty,$qty,$in->lotnum,$in->locationid,$in->traceid
-                    ]);
-                    $in->qty = $in->qty-$qty;
-                    $qty = 0;
-                }else{
-                    $db->delete(DB::raw("DELETE FROM inv_lot_loc_id WHERE lotnum = ? and locationid = ? and traceid = ?"),[
-                        $in->lotnum,$in->locationid,$in->traceid
-                    ]);
-                    $qty = $qty-$in->qty;
-                }
-            }*/
             $db->delete(DB::raw("DELETE FROM inv_lot_loc_id WHERE lotnum = ? AND traceid = ? AND traceid != '*'  AND qty = 0"),[
                 $inv->lotnum,$inv->traceid
             ]);
@@ -341,13 +443,13 @@ sql;
             ]);
             $this->setTrNumber($max);
             $sql = <<<sql
-update TSK_TASKLISTS set TASKPROCESS = '99',REASONCODE = 'OK',PLANTOLOCATION = ?,PLANLOGICALTOSEQUENCE = ?,
-CREATE_TRANSACTIONID = ?,OPENWHO = ?,OPENTIME = TO_DATE(?,'yyyy-mm-dd hh24:mi:ss'),
+update TSK_TASKLISTS set TASKPROCESS = '99',REASONCODE = 'OK',PLANTOLOCATION = ?,PLANLOGICALTOSEQUENCE = ?,FMID = '*'
+COMPLETED_TRANSACTIONID = ?,OPENWHO = ?,OPENTIME = TO_DATE(?,'yyyy-mm-dd hh24:mi:ss'),
  CLOSEWHO = ?,CLOSETIME = ?,EDITTIME = ?,EDITWHO = ?
  where taskid = ? AND TASKID_SEQUENCE = ?
 sql;
             $db->update(DB::raw($sql),[
-                $ide,$ide,$trid,$who,date("Y-m-d H:i:s"),$who,date("Y-m-d H:i:s"),date("Y-m-d H:i:s"),$who,$asn->taskid,$asn->taskid_sequence
+                $ide,'0',$trid,$who,date("Y-m-d H:i:s"),$who,date("Y-m-d H:i:s"),date("Y-m-d H:i:s"),$who,$asn->taskid,$asn->taskid_sequence
             ]);
         });
         //成功后应去修改ASN状态及数量 暂时不知上架后ASN应为状态

app/Services/StoreCheckingReceiveService.php

@@ -18,10 +18,11 @@ class StoreCheckingReceiveService
      * @return Builder
      */
     private function conditionQuery(Builder $query,array $params){
+
         $columnQueryRules=[
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
-            'owner_id' => ['multi' => ','],
+            'owner' => ['alias' => 'owner_id','multi' => ','],
             'id' => ['multi' => ','],
             'asn' => ['batch' => ',']
         ];

app/Services/StoreService.php

@@ -32,8 +32,8 @@ class StoreService
             'remark' => ['batch' => '','timeLimit' => 15],
             'created_at_start' => ['alias' => 'created_at', 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at', 'endDate' => ' 23:59:59'],
-            'owner_id' => ['multi' => ','],
-            'warehouse_id' => ['multi' => ','],
+            'owner' => ['alias' => 'owner_id','multi' => ','],
+            'warehouse' => ['alias' => 'warehouse_id','multi' => ','],
             'status' => ['multi' => ','],
             'stored_method' => ['multi' => ','],
             'id' => ['multi' => ',']

app/StationTaskCommodity.php

@@ -11,15 +11,15 @@ class StationTaskCommodity extends Model
 {
     use ModelLogChanging;
 
-    protected $fillable= ['station_id','material_box_id','commodity_id','amount','order_id','status',"bin_number","station_task_batch_id","material_box_position"];
+    protected $fillable= ['station_id','station_task_material_box_id','commodity_id','amount','order_id','status',"bin_number","station_task_batch_id","material_box_position"];
 
     public function commodity(): BelongsTo
     {   //商品
         return $this->belongsTo(Commodity::class);
     }
-    public function materialBox(): BelongsTo
+    public function StationTaskMaterialBox(): BelongsTo
     {   //料箱
-        return $this->belongsTo(MaterialBox::class);
+        return $this->belongsTo(StationTaskMaterialBox::class);
     }
     function stationTask(): BelongsTo
     {

database/migrations/2021_06_29_161702_change_station_task_commodities_field_material_box.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeStationTaskCommoditiesFieldMaterialBox extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('station_task_commodities', function (Blueprint $table) {
+            $table->integer('material_box_id')->nullable()->change();
+            $table->renameColumn('material_box_id','station_task_material_box_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('station_task_commodities', function (Blueprint $table) {
+            $table->renameColumn('station_task_material_box_id','material_box_id');
+        });
+    }
+}

resources/views/customer/ownerSundryFee/index.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+
 @section('content')
     @include('shared._messages')
     @include('shared._error')
@@ -84,7 +85,7 @@
                 let data = [
                     [
                         {
-                            name: 'owner_id',
+                            name: 'owners',
                             type: 'select_multiple_select',
                             tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
                             placeholder: ['货主', '定位或多选货主'],

resources/views/customer/project/index.blade.php

@@ -140,11 +140,11 @@
                     [
                         {name:'user_owner_group_id',type:'select',tip:'项目小组',placeholder: '项目小组',data:this.ownerGroups},
                         {name:'created_at_start',type:'time',tip:['选择显示创建日期的起始时间','']},
-                        {name:'id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的项目'],
+                        {name:'ids',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的项目'],
                             placeholder:['项目','定位或多选项目'],data:this.models},
                         {name:'contract_number',type:'input',tip: '合同号：可在左侧增加百分号(%)进行模糊搜索',placeholder: '合同号'},
                     ],[
-                        {name:'customer_id',type:'select_multiple_select',tip:['客户','定位或多选项目'],placeholder: ['客户','定位或多选项目'],data:this.customers},
+                        {name:'customers',type:'select_multiple_select',tip:['客户','定位或多选项目'],placeholder: ['客户','定位或多选项目'],data:this.customers},
                         {name:'created_at_end',type:'time',tip:['选择显示创建日期的结束时间','']},
                         {name:'using_type',type:'select',placeholder: '用仓类型',data:[{name:"常温",value:"常温"},{name:"恒温",value:"恒温"}]},
                     ],

resources/views/demand/_create.blade.php

@@ -34,10 +34,10 @@
                             <select name="add-demand-auth" id="add-demand-auth" class="form-control col-sm-7"
                                     v-model="addDemand.authority_id"
                                     :class="demandErrors.authority_id?'is-invalid':''"
-                                    @focus="demandErrors.authority_id!==null ? demandErrors.authority_id=null:''">
+                                    >
                                 <option v-for="(authority,index) in authoritiesFilter" :value="authority.id">@{{ authority.alias_name }}</option>
                             </select>
-                            <input type="text" class="form-control col-sm-3 ml-1" id="add-demand-auth-filter" @input="filterAuth($event)"
+                            <input type="text" class="form-control col-sm-3 ml-1" id="add-demand-auth-filter" v-model="filterAuthority"
                                    placeholder="输入权限进行删选">
                             <div class="invalid-feedback" v-if="demandErrors.authority_id">
                                 @{{ demandErrors.authority_id[0] }}
@@ -80,6 +80,7 @@
                         <label for="add-demand-file" class="col-sm-2 col-form-label text-right">上传文件</label>
                         <div class="col-sm-10 form-inline">
                             <input type="file" name="name" id="add-demand-file-create" class="form-control-file col-sm-10"
+                                   accept="image/gif,image/jpeg,image/jpg,image/png,image/svg"
                                    placeholder="输入配置名称"
                                    :class="demandErrors.file?'is-invalid':''"
                                    @focus="demandErrors.file!==null ? demandErrors.file=null:''">

resources/views/demand/_createjs.blade.php

@@ -4,9 +4,11 @@
         el: "#demand-div",
         data: {
             types: [{name:'0',value:'需求'},{name:'1',value:'问题'}],
-            addDemand: {},
             authorities: [],
-            authoritiesFilter: [],
+            addDemand: {
+                authority_id:null
+            },
+            filterAuthority: null,
             demandErrors: {},
             ratio:{
                 unClaimCount:null,
@@ -14,43 +16,40 @@
             }
         },
         created() {
-            this.authoritiesFilter = JSON.parse(JSON.stringify(this.authorities));
             this.getAuthority();
             this.setUnClaimDemandRatio();
             $('#demand-div').removeClass('d-none');
         },
         mounted() {
         },
-        methods: {
-            /** 筛选 */
-            filterAuth($e) {
-                let value = $($e.target).val();
+        computed: {
+            authoritiesFilter:function(){
                 let authorities = JSON.parse(JSON.stringify(this.authorities));
-                if (value === null) {
-                    this.authoritiesFilter = authorities;
-                    return;
+                if (!this.filterAuthority) {
+                    this.$set(this.addDemand,'authority_id',lastAuthority);
+                    return authorities;
                 }
-                this.authoritiesFilter = authorities.filter(function (item) {
-                    return item['name'].includes(value);
+                let self = this;
+                let authoritiesFilter = authorities.filter(function(item){
+                    return  item['name'].includes(self.filterAuthority);
                 });
-                if(this.authoritiesFilter.length > 0)
-                    this.addDemand.authority_id = this.authoritiesFilter[0]['id'];
+                if (authoritiesFilter.length >0 && authoritiesFilter.length < authorities.length){
+                    this.addDemand.authority_id =authoritiesFilter[0]['id']
+                }
+                this.$forceUpdate()
+                return authoritiesFilter;
             },
+        },
+        methods: {
             /** 创建 */
             showAddDemand() {
                 this.addDemand = {};
-                this.authoritiesFilter = JSON.parse(JSON.stringify(this.authorities));
                 $('#add-demand-auth-filter').val('');
                 $('#add-demand').modal('show')
-                if(this.authoritiesFilter.length === 0){
-                    if(this.authorities.length !==0)this.authoritiesFilter = JSON.parse(JSON.stringify(this.authorities));
-                    else this.getAuthority();
-                }
             },
             /** 创建 */
             createDemand() {
                 let url = '{{url('apiLocal/demand/store')}}';
-
                 window.tempTip.setIndex(1999);
                 window.tempTip.setDuration(3000);
 
@@ -80,7 +79,7 @@
                 window.axios.get(url).then(res=>{
                     if(res.data.success){
                         this.authorities = res.data.data;
-                        this.authoritiesFilter = res.data.data;
+                        this.filterAuthority = null;
                         this.$forceUpdate();
                     }
                 }).catch(err=>{

resources/views/finance/billConfirmation.blade.php

@@ -97,7 +97,7 @@
                     [
                         {name:'owner_group_id',type:'select',tip:'项目小组',placeholder: '项目小组',data:this.ownerGroups},
                         {name:'counting_month_start',type:'dateMonth',tip:'起始结算月'},
-                        {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的项目'],
+                        {name:'owners',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的项目'],
                             placeholder:['项目','定位或多选项目'],data:this.owners},
                     ],[
                         {name:'customer_id',type:'select',tip:'客户',placeholder: '客户',data:this.customers},
@@ -198,4 +198,4 @@
             },
         });
     </script>
-@stop
+@stop

resources/views/finance/instantBill.blade.php

@@ -149,7 +149,7 @@
                     [
                         {name:'shop_id',type:'select',tip:'店铺',placeholder: '店铺',data:this.shops},
                         {name:'worked_at_start',type:'dateTime',tip:'起始作业日期'},
-                        {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的项目'],
+                        {name:'owners',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的项目'],
                             placeholder:['项目','定位或多选项目'],data:this.owners},
                         {name: 'operation_bill', type: 'input', tip: '可支持多发/收/退/提货单号：模糊搜索可在两侧增加百分号(%)进行', placeholder: '单据号'},
                     ],[

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

@@ -119,7 +119,7 @@
                     [
                         {name:'created_at_start',type:'dateTime',tip:'选择创建日期的起始时间'},
                         {
-                            name: 'owner_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
+                            name: 'owner', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
                             placeholder: ['货主', '定位或多选货主'], data: this.owners
                         },
                     ],

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

@@ -153,7 +153,7 @@
                         {name:'date_start',type:'dateTime',tip:'选择创建日期的起始时间'},
                         {name:'mission_code',type:'input',tip:'可支持多任务号,糊模查找需要在右边打上%符号',placeholder: '任务号'},
                         {
-                            name: 'owner_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
+                            name: 'owners', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
                             placeholder: ['货主', '定位或多选货主'], data: this.owners
                         },
                     ],

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

@@ -144,7 +144,7 @@
                     [
                         {name:'date_start',type:'dateTime',tip:'选择显示指定日期的起始时间'},
                         {name:'date_end',type:'dateTime',tip:'选择显示指定日期的结束时间'},
-                         {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的货主'],
+                         {name:'owner',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的货主'],
                              placeholder:['货主','定位或多选货主'],data:this.owners},
                         {name:'type',type:'select',placeholder: '任务类型',data:[{name:'全盘',value:'全盘'},{name:'动盘',value:'动盘'}, {name:'局部盘点',value:'局部盘点'}]},
                     ],

resources/views/layouts/app.blade.php

@@ -44,6 +44,7 @@
     let baseUrl = "{{url('')}}";
     let currentUri = window.location.href.slice(baseUrl.length+1);
     let relativeUrl = currentUri.split(/[/?]/);
+    let lastAuthority;
     (function () {
         if ("{{\Illuminate\Support\Facades\Auth::id()}}")createMenu();
     }());
@@ -62,10 +63,12 @@
                     else continue;
                 }
                 dom.appendChild(createChildElement(type,menus[i],isEquals));
+                if (isEquals)lastAuthority = menus[i].authId;
                 if (isEquals && menus[i].child && menus[i].child.length>0)createMenu(type+1,menus[i].child);
             }
         });
     }
+
     function createBeforeMenu(type) {
         let dom = undefined;
         let ul = undefined;

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

@@ -61,7 +61,7 @@
             mounted: function () {
                 let data = [
                     [
-                        {name: 'username', type: 'input', tip: '操作者', placeholder: '操作者'},
+                        {name: 'name', type: 'input', tip: '操作者', placeholder: '操作者'},
                         {name: 'type',
                             type: 'select_multiple_select',
                             tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的类型'],

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

@@ -72,9 +72,9 @@
             },
             mounted:function(){
                 let data = [
-                    [{name:'user',type:'input',tip:'用户名：可在两侧添加百分号(%)进行模糊搜索',placeholder:'用户名'},
+                    [{name:'name',type:'input',tip:'用户名：可在两侧添加百分号(%)进行模糊搜索',placeholder:'用户名'},
                     {name:'role',type:'input',tip:'可支持多角色名,模糊搜索可在两侧添加百分号(%)进行',placeholder:'角色名'},
-                        {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
+                        {name:'owners',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                             placeholder:['货主','定位或多选货主'],data:this.owners},
                     ]
                 ];

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

@@ -135,7 +135,7 @@
             mounted(){
                 let data=[
                    [
-                       {name: 'user_name', type: 'input', tip: '可支持多姓名查找,模糊搜索可在左侧增加百分号(%)进行', placeholder: '姓名'},
+                       {name: 'name', type: 'input', tip: '可支持多姓名查找,模糊搜索可在左侧增加百分号(%)进行', placeholder: '姓名'},
                    ]
                 ];
                 this.form = new query({

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

@@ -1046,7 +1046,7 @@
                 let data = [[
                     {name: 'created_at_start', type: 'dateTime', tip: '登记开始日期'},
                     {
-                        name: 'owner_id',
+                        name: 'owner',
                         type: 'select_multiple_select',
                         tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
                         placeholder: ['货主', '定位或多选货主'],
@@ -1060,7 +1060,7 @@
                         placeholder: '原始运单号'
                     },
                     {
-                        name: 'logistic_id',
+                        name: 'logistic',
                         type: 'select_multiple_select',
                         tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的承运商'],
                         placeholder: ['承运商', '定位或多选承运商'],
@@ -1089,7 +1089,7 @@
                         }]
                     },
                     {
-                        name: 'user_owner_group_id',
+                        name: 'user_owner_group',
                         type: 'select',
                         tip: '项目责任方',
                         placeholder: '项目责任方',
@@ -1104,7 +1104,7 @@
                     {name: 'id_quality_label', type: 'select', tip: '是否正品', placeholder: '是否正品', data: this.qualityLabel},
                     {name: 'is_imported', type: 'select', tip: '是否导入处理', placeholder: '是否导入处理', data: imported_status},
                     {
-                        name: 'user_workgroups',
+                        name: 'workgroups',
                         type: 'select_multiple_select',
                         tip: ['事故责任方', ''],
                         placeholder: ['事故责任方', ''],
@@ -1132,7 +1132,7 @@
                         name: 'final_status', type: 'select', tip: '问题件的最终状态', placeholder: '最终状态', data: final_status
                     },
                     {
-                        name: 'order_issue_type_id',
+                        name: 'order_issue_type',
                         type: 'select_multiple_select',
                         tip: ['问题类别', ''],
                         placeholder: ['问题类别', ''],

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

@@ -381,7 +381,7 @@
                 let data = [
                     [
                         {name:'start_at',type:'dateTime',tip:'起始日期',placeholder:'起始日期'},
-                        {name:'owner_id',type:'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'], placeholder: ['货主', '定位或多选货主'], data: _this.owners},
+                        {name:'owner',type:'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'], placeholder: ['货主', '定位或多选货主'], data: _this.owners},
                         {name:'start_planning_sent_at',type:'dateTime',tip:'应送达时间开始',placeholder:'应送达时间开始'},
                         {name:'client_code',type:'input',tip:'订单号',placeholder:'订单号'},
                         {name:'web_order_number',type:'input',tip:'web+订单号',placeholder:'web+订单号'},
@@ -396,7 +396,7 @@
                         {name:'end_at',type:'dateTime',tip:'结束日期',placeholder: '结束日期'},
                         {name:'logistic_number',type:'input',tip:'运输单号',placeholder:'运输单号'},
                         {name:'end_planning_sent_at',type:'dateTime',tip:'应送达时间结束',placeholder:'应送达时间结束'},
-                        {name:'logistic_id',type:'select',tip:'物流方式',placeholder:'物流方式',data:this.logistics},
+                        {name:'logistic',type:'select',tip:'物流方式',placeholder:'物流方式',data:this.logistics},
                         {name:'sku',type:'input',tip:'SKU',placeholder: '商品编号'},
                     ]
                 ];

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

@@ -254,14 +254,14 @@
 
                     ], [
                         {
-                            name: 'logistic_id',
+                            name: 'logistic',
                             type: 'select_multiple_select',
                             tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的快递'],
                             placeholder: ['快递', '定位或多选快递'],
                             data: _this.logistics
                         },
                         {
-                            name: 'owner_id',
+                            name: 'owner',
                             type: 'select_multiple_select',
                             tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的货主'],
                             placeholder: ['货主', '定位或多选货主'],

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

@@ -96,7 +96,7 @@
                 let _this = this;
                 let data = [[
                     {name:'weighed_at_start',type:'time',tip:['选择显示称重日期的起始时间','选择显示称重日期的起始时间']},
-                    {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
+                    {name:'owner',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                         placeholder:['货主','定位或多选货主'],data:_this.owners},
                     {name:'logistic_number',type:'input',tip:'可支持多快递单号，糊模查找需要在右边打上%符号',placeholder:'快递单号'},
                     {name:'is_weighed',type:'checkbox',tip:'是否已称重', data: [{name: 'true', value: '是否已称重'}]}

resources/views/personnel/discharge/statement/index.blade.php

@@ -61,7 +61,7 @@
                 let status = [{name: 0, value: '创建'}, {name: 1, value: '接单'}, {name: 2, value: '作业中'}, {name: 3, value: '完成'}];
                 let data = [[
                     {
-                        name: 'owner_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
+                        name: 'owners', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
                         placeholder: ['货主', '定位或多选货主'],
                         data: _this.owners
                     },
@@ -71,7 +71,7 @@
                     {name: 'status', type: 'select', tip: '状态', data: status, placeholder: '状态'},
                 ], [
                     {
-                        name: 'facilitator_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的装卸队'],
+                        name: 'facilitators', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的装卸队'],
                         placeholder: ['装卸队', '定位或多选装卸队'],
                         data: _this.facilitators
                     },

resources/views/personnel/discharge/task/index.blade.php

@@ -102,7 +102,7 @@
                 let _this = this;
                 let data = [[
                     {
-                        name: 'owner_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
+                        name: 'owners', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
                         placeholder: ['货主', '定位或多选货主'],
                         data: _this.owners
                     },

resources/views/personnel/report.blade.php

@@ -142,12 +142,12 @@
                 $('#container').removeClass('d-none');
                 let data=[
                     [
-                        {name:'owner_group_id',type:'select',tip:'项目小组',placeholder: '项目小组',data:this.workgroup},
+                        {name:'owner_groups',type:'select',tip:'项目小组',placeholder: '项目小组',data:this.workgroup},
                         {name:'counting_month_start',type:'dateMonth',tip:'起始结算月',placeholder: '----年--月'},
-                        {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的项目'],
+                        {name:'owners',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的项目'],
                             placeholder:['项目','定位或多选项目'],data:this.owners},
                     ],[
-                        {name:'customer_id',type:'select_multiple_select',tip:['客户','定位或多选客户'],placeholder: ['客户','定位或多选客户'],data:this.customers},
+                        {name:'customers',type:'select_multiple_select',tip:['客户','定位或多选客户'],placeholder: ['客户','定位或多选客户'],data:this.customers},
                         {name:'counting_month_end',type:'dateMonth',tip:'结束结算月',placeholder: '----年--月'},
                         {name:'status',type:'select',placeholder:'状态',data:this.status},
                     ],

resources/views/process/index.blade.php

@@ -535,7 +535,7 @@
                     [
                         {name: 'date_start', type: 'dateTime', tip: '选择显示指定日期的起始时间'},
                         {
-                            name: 'owner_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
+                            name: 'owners', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
                             placeholder: ['货主', '定位或多选货主'], data: this.owners
                         },
                         {name: 'wms_code', type: 'input', tip: '可支持多单据号,模糊搜索可在两侧增加百分号(%)进行', placeholder: '单据号'},

resources/views/process/statistic.blade.php

@@ -85,7 +85,7 @@
                     [
                         {name: 'started_at_start', type: 'dateTime', tip: '选择显示指定日期的起始时间'},
                         {
-                            name: 'owner_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
+                            name: 'owners', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的客户'],
                             placeholder: ['货主', '定位或多选货主'], data: this.owners
                         },
                         {name: 'process_method_id', type: 'select', placeholder: '加工类型', data: this.processMethods},

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

@@ -206,7 +206,7 @@
                 let data=[
                     [
                         {name:'created_at_start',type:'dateTime',tip:'选择显示指定日期的起始时间'},
-                        {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
+                        {name:'owner',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                             placeholder:['货主','定位或多选货主'],data:this.owners},
                         {name:'order_number',type:'input',tip:'可支持多客户单号，糊模查找需要在右边打上%符号',placeholder:'客户单号'},
                         {name:'logistic_number_return',type:'input',tip:'可支持多退回单号，糊模查找需要在右边打上%符号',placeholder:'退回单号'},

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

@@ -108,7 +108,7 @@
                 let data = [[
                     {name:'created_at_start',type:'dateTime',tip:'选择显示指定日期的起始时间'},
                     {name:'created_at_end',type:'dateTime',tip:'选择显示指定日期的结束时间'},
-                    {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
+                    {name:'owner',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                         placeholder:['货主','定位或多选货主'],data:_this.owners},
                     {name:'asn',type:'input',tip:'可支持多ASN单号：模糊搜索可在两侧增加百分号(%)进行',placeholder:'ASN单号'},
                 ]];

resources/views/store/inStorage/halfChestStorage.blade.php

@@ -87,7 +87,7 @@
                 },
                 errors:{},
                 ov:{},//溢出减量数值
-                checkSign:false;
+                checkSign:false,
             },
             mounted(){
                 this.codeFocus();
@@ -164,7 +164,7 @@
                     this.checkSign = false;
                 },
                 checkMaximum(){
-                    if (!this.info.asn || !this.info.barCode)return;
+                    if (!this.info.asn || !this.info.barCode || this.checkSign)return;
                     window.tempTip.postBasicRequest("{{url('store/inStorage/checkMaximum')}}",this.info,res=>{
                         this.info.maximum = res.need;
                         this.info.material_box_id = res.material_box_id;

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

@@ -87,9 +87,9 @@
                 let data=[
                     [
                         {name:'created_at_start',type:'dateTime',tip:'选择显示指定日期的起始时间'},
-                        {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的货主'],
+                        {name:'owner',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的货主'],
                             placeholder:['货主','定位或多选货主'],data:this.owners},
-                        {name:'warehouse_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的仓库'],
+                        {name:'warehouse',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的仓库'],
                             placeholder:['仓库','定位或多选仓库'],data:this.warehouses},
                         {name:'remark',type:'input',tip:'备注：可在两侧增加百分号(%)进行模糊搜索',placeholder: '备注'},
                     ],