Merge branch 'master' of http://101.133.135.193:20080/huhao/baoshi-was

# Conflicts:
#	app/Filters/WorkOrderFilters.php
#	app/Http/ApiControllers/RejectController.php
#	app/Http/Controllers/InventoryController.php
#	app/Http/Controllers/OrderController.php
#	app/Http/Controllers/ProcurementController.php
#	app/Http/Controllers/ReceiveRecordController.php
#	app/Http/Controllers/ReceivingTaskController.php
#	app/Http/Controllers/TestController.php
#	app/Http/Controllers/UserDutyCheckController.php
#	app/LaborReport.php
#	app/RejectedBill.php
#	app/Services/InventoryAccountService.php
#	app/Services/OrderCommodityService.php
#	app/Services/OrderService.php
#	app/Services/StoreService.php
#	app/Services/WaveService.php
#	app/UserDetail.php
#	composer.lock
#	resources/views/personnel/laborApply/dispatch/detail/create.blade.php
#	resources/views/personnel/laborApply/dispatch/detail/edit.blade.php
#	resources/views/personnel/laborReport/index.blade.php
#	resources/views/rejected/create.blade.php
#	resources/views/rejected/receiveRecord.blade.php
#	resources/views/station/monitor/visual.blade.php
#	resources/views/store/handInStorage/putaway.blade.php
#	resources/views/store/handInStorage/receive.blade.php
#	resources/views/store/inStorage/index.blade.php
#	routes/web.php
#	runServes.sh

app/Filters/WorkOrderFilters.php

@@ -154,6 +154,11 @@ class WorkOrderFilters
         if (Gate::allows('订单管理-工单处理-货主编辑') || Gate::allows('订单管理-工单处理-客服编辑')) {
             $this->queryBuilder->whereIn('owner_id', $owner_ids);
         }else if(Gate::allows('订单管理-工单处理-承运商编辑')){
+<<<<<<< HEAD
+=======
+            $user = Auth::user();
+            $owner_ids = app("UserService")->getUserUnderOwnerIdArr($user->id);
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
             $this->queryBuilder->whereIn('owner_id', $owner_ids);
         }
     }
@@ -176,6 +181,22 @@ class WorkOrderFilters
 
     public function beforeApply()
     {
+<<<<<<< HEAD
+=======
+        /** @var User $user */
+        $user = Auth::user();
+        $roles = $user->roles;
+        $songJiang = $roles->filter(function($role){return $role->name == '松江';})->count();
+        $jiaDing = $roles->filter(function($role){return $role->name == '嘉定';})->count();
+
+        if($songJiang){
+            // 松江的第三方
+            $this->getOrderQuery()->where('warehouse_id',2);
+        } else if($jiaDing){
+            // 嘉定的第三方
+            $this->getOrderQuery()->where('warehouse_id',1);
+        }
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
 
         if ($this->shopQuery) {
             $this->getOrderQuery()->whereIn('orders.shop_id', $this->shopQuery);

app/Http/ApiControllers/RejectController.php

@@ -49,12 +49,20 @@ class RejectController
             $rejectBillNew=new RejectedBill();
             $rejectBillNew->logistic_number_return=$data['logistic_number_return']??'';
             $rejectBillNew->id_owner=$data['id_owner']??'';
+<<<<<<< HEAD
             $rejectBillNew->order_number=$data['order_number']??'';
+=======
+            $rejectBillNew->order_number=$data['order_number']??'';//上游单号
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
             $rejectBillNew->sender=$data['sender']??'';
             $rejectBillNew->mobile_sender=$data['mobile_sender']??'';
             $rejectBillNew->remark=$data['remark']??'';
             $rejectBillNew->id_operator=3754;
             $rejectBillNew->id_logistic_return=$id_logistic_return;
+<<<<<<< HEAD
+=======
+            $rejectBillNew->logistic_number=$data['logistic_number']??'';//原快递单号
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
             $rejectBillNew->save();
             $this->saveRejectBillItem($data,$rejectBillNew);
             SyncOrderRejectingStatusJob::dispatch($rejectBillNew);

app/Http/Controllers/InventoryController.php

@@ -8,7 +8,10 @@ use App\Services\InventoryDailyLogService;
 use App\Services\InventoryService;
 use App\Services\OwnerService;
 use Illuminate\Http\Request;
+<<<<<<< HEAD
 use Illuminate\Support\Facades\DB;
+=======
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
 use Illuminate\Support\Facades\Gate;
 use Oursdreams\Export\Export;
 
@@ -69,6 +72,7 @@ class InventoryController extends Controller
             $params = $request->input();
             unset($params['checkAllSign']);
             $sql=app('AllInventoryService')->getSql($request->input());
+<<<<<<< HEAD
             $result = DB::connection("oracle")->select($sql);
             $row = [
                 "货主","库位", "产品编码","产品条码",
@@ -91,6 +95,20 @@ class InventoryController extends Controller
                 ];
             }
             return Export::make($row, $list, "库存报表记录");
+=======
+            $e = new Export();
+            $e->setOracleConnection(config('database.connections.oracle.host'),
+                config('database.connections.oracle.port'),config('database.connections.oracle.database')
+                ,config('database.connections.oracle.username'),config('database.connections.oracle.password'));
+            $e->setFileName("全部库存");
+            return $e->sql($sql,[
+                "货主"=>"货主","库位"=>"库位",
+                "产品编码"=>"产品编码","产品条码"=>"产品条码",
+                "商品名称"=>"商品名称","属性仓"=>"属性仓",
+                "质量状态"=>"质量状态","失效日期"=>"失效日期",
+                "批号"=>"批号","在库数量"=>"在库数量","占用数量"=>"占用数量"
+            ])->direct();
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
         }else return "暂时关闭，如需开启请联系管理员";
     }
 

app/Http/Controllers/OrderController.php

@@ -76,6 +76,7 @@ class OrderController extends Controller
             new OrderDelivering();
             $req["sql"] = $orderService->getSql($request->input());
         }
+<<<<<<< HEAD
         $row = [
             "编号","订单状态","备注","接口下发时间","店铺名称","客户",
             "客户订单号","承运人","快递单号","收货人名称","收货人电话","省",
@@ -121,6 +122,9 @@ class OrderController extends Controller
         }
         return Export::make($row, $list, "订单记录-" . date('ymdHis'));
         /*$e = new Export();
+=======
+        $e = new Export();
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
         $e->setOracleConnection(config('database.connections.oracle.host'),
             config('database.connections.oracle.port'), config('database.connections.oracle.database')
             , config('database.connections.oracle.username'), config('database.connections.oracle.password'));
@@ -143,7 +147,11 @@ class OrderController extends Controller
             "SKU" => "产品代码", "ALTERNATE_SKU1" => "产品条码", "ORDERDETAILCODENAME" => "明细状态", "DESCR_C" => "产品名称",
             "QTYORDERED" => "订单数量", "CHECKTIME" => "复核时间", "ERPCANCELFLAG" => "接口取消标记",
             "PICKING_PRINT_FLAG" => "拣货单打印标记", "EDISENDFLAG" => "接口回传标记", "EDIREMARKS2" => "接口回传异常备注",
+<<<<<<< HEAD
             "RELEASESTATUS" => "订单冻结"], ["ADDTIME" => "date", "EDISENDTIME2" => "date"])->direct();*/
+=======
+            "RELEASESTATUS" => "订单冻结"], ["ADDTIME" => "date", "EDISENDTIME2" => "date"])->direct();
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
     }
 
     public function createRejectedBill(Request $request)

app/Http/Controllers/ProcurementController.php

@@ -353,7 +353,11 @@ class ProcurementController extends Controller
         foreach ($procurements as $procurement){
             if (empty($procurement->procurementDeliveries))continue;
             $procurement->receive_amount=$procurement->procurementDeliveries->sum('amount');
+<<<<<<< HEAD
             $procurement->signed_at=$procurement->procurementDeliveries->first()['signed_at'];
+=======
+            $procurement->signed_at=$procurement->procurementDeliveries->first()['signed_at']??null;
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
         }
         return view('procurement/finance/procurementBill',compact('suppliers','materials','owners','paginateParams','procurements'));
     }
@@ -483,7 +487,11 @@ class ProcurementController extends Controller
         foreach ($procurements as $procurement){
             if (empty($procurement->procurementDeliveries))continue;
             $procurement->receive_amount=$procurement->procurementDeliveries->sum('receipt_amount');
+<<<<<<< HEAD
             $procurement->signed_at=$procurement->procurementDeliveries->first()['signed_at'];
+=======
+            $procurement->signed_at=$procurement->procurementDeliveries->first()['signed_at']??null;
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
         }
 
         $procurementStatus=Procurement::status;

app/Http/Controllers/ReceiveRecordController.php

@@ -29,6 +29,7 @@ class ReceiveRecordController extends Controller
         $timeEn = $request->input("record_at_end");
         $logisticNumber = $request->input("logistic_number");
         $delayed = $request->input("delayed");
+<<<<<<< HEAD
         $logistic = $request->input("logistic_id");
         $warehouse = $request->input("warehouse");
 
@@ -37,6 +38,14 @@ class ReceiveRecordController extends Controller
         }else{
             if ($timeSt)$builder->where("record_at",'>=',$timeSt.':00');
             if ($timeEn)$builder->where("record_at",'<=',$timeEn.':00');
+=======
+
+        if ($timeSt && $timeEn){
+            $builder->whereBetween("record_at",[$timeSt, $timeEn]);
+        }else{
+            if ($timeSt)$builder->where("record_at",'>=',$timeSt);
+            if ($timeEn)$builder->where("record_at",'<=',$timeEn);
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
         }
         if ($logisticNumber!==null){
             mb_regex_encoding('utf-8');
@@ -44,12 +53,15 @@ class ReceiveRecordController extends Controller
             if (count($par)!=1) $builder->whereIn("logistic_number",$par);
             else $builder->where("logistic_number",'like',$par[0]."%");
         }
+<<<<<<< HEAD
         if ($logistic !== null) {
             $builder->whereIn("logistic_id", explode(",",$logistic));
         }
         if ($warehouse !== null) {
             $builder->where("warehouse_id", $warehouse);
         }
+=======
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
         if ($delayed!==null)$builder->where("delayed",$delayed);
         return $builder;
     }
@@ -62,9 +74,13 @@ class ReceiveRecordController extends Controller
         $records = $records->paginate($request->input("paginate",50),['*'],'page',$request->input("page",1));
         $status = ReceiveRecord::DELAYED;
         $paginateParams = $request->input();
+<<<<<<< HEAD
         $logistics = app('LogisticService')->getSelection();
         $warehouses = app('WarehouseService')->getSelection();
         return view("rejected.receiveRecord",compact("records","status","paginateParams","logistics","warehouses"));
+=======
+        return view("rejected.receiveRecord",compact("records","status","paginateParams"));
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
     }
 
     public function export(Request $request)
@@ -84,11 +100,18 @@ class ReceiveRecordController extends Controller
                 $item->logistic_number,
                 $item->logistic->name ?? '未知',
                 $item->record_at,
+<<<<<<< HEAD
                 $item->location_at,
                 ReceiveRecord::DELAYED[$item->delayed],
             ];
         }
         return Export::make(["仓库","快递单号","快递公司","上传时间","本地记录时间","延时标记"],$list,"退件记录");
+=======
+                ReceiveRecord::DELAYED[$item->delayed],
+            ];
+        }
+        return Export::make(["仓库","快递单号","快递公司","记录时间","延时标记"],$list,"退件记录");
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
     }
 
     public function record()

app/Http/Controllers/ReceivingTaskController.php

@@ -54,7 +54,12 @@ class ReceivingTaskController extends Controller
         }
         $appointment_number = $request->input('appointment_number', null);
 
+<<<<<<< HEAD
         $delivery_appointment_car = DeliveryAppointmentCar::query()->with('deliveryAppointment')->where('appointment_number', $appointment_number)->first();
+=======
+        $delivery_appointment_car = DeliveryAppointmentCar::query()->with('deliveryAppointment')
+            ->where('appointment_number', $appointment_number)->orderByDesc("created_at")->first();
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
 
         if (!$delivery_appointment_car || !$delivery_appointment_car->deliveryAppointment) {
             return ['success' => false, 'errors' => ['appointment_number' => ['对应预约号未找到']]];

app/Http/Controllers/TestController.php

@@ -2,12 +2,16 @@
 
 namespace App\Http\Controllers;
 
+<<<<<<< HEAD
 use App\Batch;
 use App\CommodityBarcode;
+=======
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
 use App\Components\AsyncResponse;
 use App\Components\Database;
 use App\Components\ErrorPush;
 use App\Exceptions\Exception;
+<<<<<<< HEAD
 use App\OracleDOCWaveDetails;
 use App\Order;
 use App\OrderBin;
@@ -24,6 +28,13 @@ use App\Services\WaybillService;
 use App\SortingStation;
 use App\User;
 use App\UserToken;
+=======
+use App\Rejected;
+use App\RejectedBill;
+use App\RejectedBillItem;
+use App\Services\WaybillService;
+use App\User;
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
 use App\Waybill;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Request;
@@ -31,7 +42,10 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Http;
+<<<<<<< HEAD
 use Illuminate\Support\Str;
+=======
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
 use Zttp\Zttp;
 
 class TestController extends Controller
@@ -53,6 +67,7 @@ class TestController extends Controller
             dd("方法不存在");
         }
     }
+<<<<<<< HEAD
     public function a1(){
         dd(phpinfo());
         dd(DB::table('BAS_CODES')->select('code', 'codename_c')->where('codeid', 'SO_STS')->orderBy('code', 'asc')->sql());
@@ -108,6 +123,17 @@ class TestController extends Controller
                 }
             }
         });
+=======
+    public function test()
+    {
+        $url = config('api.java.base').config('api.java.device.picking.getContainerOfWave');
+        $get = Http::get($url, ["container" => "JH028"]);
+        $result = $get->json();
+        if ($result["code"] != 200) {
+            return response()->json(['result'=>'failure','fail_info'=>$result["message"]])->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+        }
+        dd($result["data"]);
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
     }
 }
 

app/Http/Controllers/UserDutyCheckController.php

@@ -98,7 +98,11 @@ class UserDutyCheckController extends Controller
         $dateNow = Carbon::now()->format('Y-m-d');
         $userDutyCheckOld = UserDutyCheck::query()->with('laborReport')->where('user_id', $user_id)->where('checked_at','like',$dateNow.'%')->orderBy('id','desc')->first();
         $date = date('Y-m-d H:i:s');
+<<<<<<< HEAD
         app('LogService')->log(__METHOD__, "提交打卡记录__" . __FUNCTION__, json_encode([$user_id, $date]));
+=======
+//        app('LogService')->log(__METHOD__, "提交打卡记录__" . __FUNCTION__, json_encode([$user_id, $date]));
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
         $userDutyCheck = new UserDutyCheck([
             'user_id' => $user_id,
             'checked_at' => $date,
@@ -129,7 +133,11 @@ class UserDutyCheckController extends Controller
             }
             $userDutyCheck->type = "登入";
             $userDutyCheck->save();
+<<<<<<< HEAD
             app('LogService')->log(__METHOD__, "创建打卡记录" . __FUNCTION__, json_encode($userDutyCheck));
+=======
+//            app('LogService')->log(__METHOD__, "创建打卡记录" . __FUNCTION__, json_encode($userDutyCheck));
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
             return $userDutyCheck;
         }else{
             if ($importAndExportQRCodeType && $importAndExportQRCodeType == 'import') {
@@ -148,7 +156,11 @@ class UserDutyCheckController extends Controller
                 $userDutyCheck->type = '登出';
             }
             $userDutyCheck->save();
+<<<<<<< HEAD
             app('LogService')->log(__METHOD__, "创建打卡记录" . __FUNCTION__, json_encode($userDutyCheck));
+=======
+//            app('LogService')->log(__METHOD__, "创建打卡记录" . __FUNCTION__, json_encode($userDutyCheck));
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
             return $userDutyCheck;
         }
     }
@@ -182,7 +194,10 @@ class UserDutyCheckController extends Controller
         $userLabor->update([
             'labor_company_id' => $labor_company_id,
         ]);
+<<<<<<< HEAD
         app('LogService')->log(__METHOD__, "更改临时工劳务所信息" . __FUNCTION__, json_encode($userLabor), Auth::user()['id']);
+=======
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
         $userDutyCheck=$this->importAndExportDutyCheck($userDetail->user_id,$importAndExportQRCodeType);
         $error=$this->hasError($userDutyCheck);
         if ($error) return $error;

app/LaborReport.php

@@ -103,8 +103,17 @@ class LaborReport extends Model
         return $this['check_out_at']? true:false;
     }
     public function getVerifyPersonAttribute(){
+<<<<<<< HEAD
         if ($this['group_user_id']&&$this['group_user_id']==Auth::user()['id'])
         return Auth::user()['name'];
+=======
+        $user=Auth::user();
+        if ($this['group_user_id']&&$user){
+            if ($this['group_user_id']==$user['id']){
+                return $user['name'];
+            }
+        }
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
     }
     public function getUserDutyCheckVerifyUserIdAttribute(){
         return $this['userDutyCheck']['verify_user_id']?$this['userDutyCheck']['verify_user_id']:'';

app/RejectedBill.php

@@ -30,11 +30,19 @@ class RejectedBill extends Model
 
     protected $fillable = [
         'id_owner',
+<<<<<<< HEAD
         'order_number',
         'delivery_status',//收货状态
         'sender',
         'mobile_sender',
         'logistic_number',
+=======
+        'order_number',//上游单号
+        'delivery_status',//收货状态
+        'sender',
+        'mobile_sender',
+        'logistic_number',//原快递单号
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
         'logistic_number_return',
         'id_logistic_return',
         'is_loaded',

app/Services/InventoryAccountService.php

@@ -15,9 +15,17 @@ use App\Services\common\BatchUpdateService;
 use App\Services\common\DataHandlerService;
 use App\Services\common\QueryService;
 use Carbon\Carbon;
+<<<<<<< HEAD
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
+=======
+use Faker\Provider\Uuid;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use App\Traits\ServiceAppAop;
+use Illuminate\Support\Facades\Http;
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
 
 
 class InventoryAccountService
@@ -618,8 +626,44 @@ class InventoryAccountService
         }
         $inventoryAccountMission->update();
         $inventoryAccountMission->createSignStockInventoryPersons();
+<<<<<<< HEAD
+        return $inventoryAccountMission;
+    }
+=======
+        $owner=Owner::query()->where('id',$inventory->owner_id)->first();
+        if ($owner){
+            $this->sendPiece(Uuid::uuid().'inventory',Auth::user()['id']??'0',
+            $inventory->owner_id,$owner->warehouse_id,date("Y-m-d H:i:s"),$count);
+        }
         return $inventoryAccountMission;
     }
+
+    public function sendPiece($messageId, $userId, $ownerId, $warehouseId, $date, $number) {
+        $url = config('api.java.base').config('api.java.piece.log.record');
+        $request = [
+            "user_type" => 0,
+            "job_type" => "盘点",
+            "job_name" => "存储盘点",
+            "form_number" => 0,
+            "piece_time" => $date,
+            "message_id" => $messageId,
+            "user_id" => $userId,
+            "warehouse_id" => $warehouseId,
+            "owner_id" => $ownerId,
+            "item_number" => $number,
+        ];
+        app('LogService')->log("盘点计件",  "通知服务端", json_encode($request));
+        $http = Http::post($url, $request);
+        if (!$http->successful()) {
+            app('LogService')->log("盘点计件",  "sendPiece", '发送失败：'.$http->body());
+            return;
+        }
+        $result = $http->json();
+        if ($result["code"] != 200) {
+            app('LogService')->log("盘点计件",  "sendPiece", '服务端错误：'.$http->body());
+        }
+    }
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
     public function 删除盘点记录($inventoryAccountMissionId,$inventoryAccountId){
         $inventoryAccountMission=InventoryAccountMission::query()->where('id',$inventoryAccountMissionId)->delete();
         Controller::logS(__METHOD__,__FUNCTION__,json_encode($inventoryAccountMissionId));

app/Services/OrderCommodityService.php

@@ -206,6 +206,7 @@ class OrderCommodityService
             $order = $orderCommodity->order;
             $owner  = $dataHandlerService->getKeyValue(['id'=>$order->owner_id ?? ''],$owner_id_maps);
             $sku =  $orderCommodity->commodity->sku ?? '';
+<<<<<<< HEAD
             $key = "order_{$order->code}_owner_code_{$owner['code']}_sku_{ $sku}_location_{$orderCommodity->location}_amount_{$orderCommodity->amount}";
             if(empty($map[$key]))$map[$key]=[];
             $map[$key][]  =[
@@ -215,6 +216,21 @@ class OrderCommodityService
                 'owner_code' => $owner->code ?? '',
                 'amount' => $orderCommodity->amount,
                 'location' => $orderCommodity->location,
+=======
+            $orderCode = $order->code ?? '';
+            $ownerCode = $owner->code ?? '';
+            $orderCommodityLocation = $orderCommodity->location ?? '';
+            $orderCommodityAmount = $orderCommodity->amount ?? '';
+            $key = "order_{$orderCode}_owner_code_{$ownerCode}_sku_{ $sku}_location_{$orderCommodityLocation}_amount_{$orderCommodityAmount}";
+            if(empty($map[$key]))$map[$key]=[];
+            $map[$key][]  =[
+                'id' => $orderCommodity->id,
+                'code' => $orderCode,
+                'sku' => $sku,
+                'owner_code' => $ownerCode,
+                'amount' => $orderCommodityLocation,
+                'location' => $orderCommodityAmount,
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
             ];
         });
         return $map;

app/Services/OrderService.php

@@ -431,9 +431,14 @@ SQL;
             $params['soreference'] = '';
             $sql = $this->getSql($params, $params['page'] ?? 1, $params['paginate'] ?? 50);
         }
+<<<<<<< HEAD
         if ($sql) {
             $orders = DB::connection('oracle')->select(DB::raw($sql));
         } else $orders = [];
+=======
+        if ($sql) $orders = DB::connection('oracle')->select(DB::raw($sql));
+        else $orders = [];
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
         return $this->orderFormat($orders);
     }
 

app/Services/StoreService.php

@@ -30,7 +30,11 @@ class StoreService
     protected $modelClass=Store::class;
     private function conditionQuery(array $params)
     {
+<<<<<<< HEAD
         $stores = Store::query()->with(['storeItems.store', 'warehouse', 'owner'])->where('is_fast_stored', '无')->orderBy('id', 'DESC');
+=======
+        $stores = Store::query()->with(['storeItems.commodity.barcodes', 'warehouse', 'owner'])->where('is_fast_stored', '无')->orderBy('id', 'DESC');
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
         $columnQueryRules = [
             'asn_code' => ['batch' => ''],
             'remark' => ['batch' => '','timeLimit' => 15],

app/Services/WaveService.php

@@ -226,7 +226,12 @@ class WaveService
             "user_type" => 0,
             "job_type" => "二次分拣",
             "job_name" => "二次分拣",
+<<<<<<< HEAD
             "form_number" => 1,
+=======
+            // 二次分拣不需要单
+            "form_number" => 0,
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
 
             "piece_time" => $date,
             "message_id" => $messageId,

app/UserDetail.php

@@ -41,7 +41,11 @@ class UserDetail extends Model
     {
         $laborCompanyId=$this['userLabor']['labor_company_id']??0;
         $laborCompany=LaborCompany::find($laborCompanyId);
+<<<<<<< HEAD
         return $this['user_labor_company']=$laborCompany['name'] ?? '';
+=======
+        return $this['user_labor_company']=$laborCompany['name'];
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
     }
     public function getDutyCheckToken($expireTime)
     {

resources/views/personnel/laborApply/dispatch/detail/create.blade.php

@@ -6,35 +6,59 @@
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form action="{{ route('laborCompanyDispatch.storeDetail', $laborCompanyDispatch->id) }}" method="post"
+<<<<<<< HEAD
                       style="display: inline-block;"
                       onsubmit="return confirm('您确定要提交吗？');">
+=======
+                      style="display: inline-block;" id="create-form"
+                      onsubmit="return check()">
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                     {{ csrf_field() }}
                     <div class="form-group">
                         <template v-for="(item,i) in items">
                             <div class="row mt-3">
                                 <label class="col-lg-1 col-sm-3 col-form-label" :for="'users['+i+'][name]'">姓名</label>
                                 <div class="col-lg-2 col-sm-12">
+<<<<<<< HEAD
                                     <input class="form-control" type="text" :name="'users['+i+'][name]'"
+=======
+                                    <input class="form-control" type="text" :name="'users['+i+'][name]'" v-model="item.name"
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                                            :id="'users['+i+'][name]'" required>
                                 </div>
                                 <label class="col-lg-1 col-sm-3 col-form-label" :for="'users['+i+'][gender]'">性别</label>
                                 <div class="col-lg-2 col-sm-12">
                                     <select class="form-control" :name="'users['+i+'][gender]'"
+<<<<<<< HEAD
                                             required>
+=======
+                                            required v-model="item.gender">
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                                         <option value="" hidden disabled selected>性别</option>
                                         <option value="男">男</option>
                                         <option value="女">女</option>
                                     </select>
                                 </div>
+<<<<<<< HEAD
                                 <label class="col-lg-1 col-sm-3 col-form-label" :for="'users['+i+'][age]'">年龄</label>
                                 <div class="col-lg-2 col-sm-12">
                                     <input class="form-control" type="number" :name="'users['+i+'][age]'"
                                            :id="'users['+i+'][age]'">
+=======
+                                <label class="col-lg-1 col-sm-3 col-form-label" :for="'users['+i+'][age]'" >年龄</label>
+                                <div class="col-lg-2 col-sm-12">
+                                    <input class="form-control" type="number" :name="'users['+i+'][age]'" required
+                                           :id="'users['+i+'][age]'" v-model="item.age">
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                                 </div>
                                 <label class="col-lg-1 col-sm-3 col-form-label" :for="'users['+i+'][cardId]'">身份证</label>
                                 <div class="col-lg-2 col-sm-12">
                                     <input class="form-control" type="text" :name="'users['+i+'][card_id]'"
+<<<<<<< HEAD
                                            :id="'users['+i+'][card_id]'">
+=======
+                                           :id="'users['+i+'][card_id]'"  v-model="item.card_id">
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                                 </div>
                                 <div v-if="i!==0" class="col-1 ml-1">
                                     <button class="btn btn-sm btn-primary float-right" type="button"
@@ -48,7 +72,11 @@
                                 @click="addItem();">添加
                         </button>
                     </div>
+<<<<<<< HEAD
                     <button type="submit" class="btn btn-success btn-sm">
+=======
+                    <button type="button" class="btn btn-success btn-sm" @click="check()">
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                         <i class="far fa-trash-alt"></i> 提交
                     </button>
                 </form>
@@ -68,7 +96,10 @@
             mounted() {
 
             },
+<<<<<<< HEAD
 
+=======
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
             methods: {
                 addItem() {
                     let sum_man_num = this.labor_company_dispatch.man_num + this.labor_company_dispatch.woman_num;
@@ -77,6 +108,38 @@
                     } else {
                         window.tempTip.show("不能超过最大人数限制！");
                     }
+<<<<<<< HEAD
+=======
+                    console.log(this.items);
+                },
+                check() {
+                    for(let i = 0;i< this.items.length;i++){
+                        let item = this.items[i];
+                        let {name, gender, age, card_id} = item;
+                        let flag = true;
+                        if (!name) {
+                            window.tempTip.show(`第${i+1}条信息登记的姓名不符合要求`);
+                            flag = false;
+                        } else if (!age) {
+                            window.tempTip.show(`第${i+1}条信息登记的年龄不符合要求`);
+                            flag = false;
+                        } else if (!gender) {
+                            window.tempTip.show(`第${i+1}条信息登记的性别不符合要求`);
+                            flag = false;
+                        } else if (!this.checkId(card_id)) {
+                            window.tempTip.show(`第${i+1}条信息身份证不符合要求`);
+                            flag = false;
+                        }
+                        if (!flag) {
+                            return flag;
+                        }
+                    }
+                    document.getElementById("create-form").submit();
+                },
+                checkId(idCard) {
+                    let reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+                    return reg.test(idCard);
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                 }
             }
         });

resources/views/personnel/laborApply/dispatch/detail/edit.blade.php

@@ -6,8 +6,13 @@
         <div class="card col-md-8 offset-md-2">
             <div class="card-body">
                 <form action="{{ route('laborCompanyDispatch.storeDetail', $laborCompanyDispatch->id) }}" method="post"
+<<<<<<< HEAD
                       style="display: inline-block;"
                       onsubmit="return confirm('您确定要提交吗？');">
+=======
+                      style="display: inline-block;" id="storeDetail"
+                      onsubmit="return check()">
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                     {{ csrf_field() }}
                     <div class="form-group">
                         <template v-for="(item,i) in items">
@@ -15,13 +20,21 @@
                                 <label class="col-lg-1 col-sm-3 col-form-label" :for="'users['+i+'][name]'">姓名</label>
                                 <div class="col-lg-2 col-sm-12">
                                     <input class="form-control" type="text" :name="'users['+i+'][name]'"
+<<<<<<< HEAD
                                            :value="item.name"
+=======
+                                           v-model="item.name"
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                                            :id="'users['+i+'][name]'" required>
                                 </div>
                                 <label class="col-lg-1 col-sm-3 col-form-label" :for="'users['+i+'][gender]'">性别</label>
                                 <div class="col-lg-2 col-sm-12">
                                     <select class="form-control" :name="'users['+i+'][gender]'"
+<<<<<<< HEAD
                                             required>
+=======
+                                            required v-model="item.gender">
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                                         <option value="男" :selected="item.gender==='男'">男</option>
                                         <option value="女" :selected="item.gender==='女'">女</option>
                                     </select>
@@ -29,6 +42,7 @@
                                 <label class="col-lg-1 col-sm-3 col-form-label" :for="'users['+i+'][age]'">年龄</label>
                                 <div class="col-lg-2 col-sm-12">
                                     <input class="form-control" type="number" :name="'users['+i+'][age]'"
+<<<<<<< HEAD
                                            :value="item.age"
                                            :id="'users['+i+'][age]'">
                                 </div>
@@ -36,6 +50,16 @@
                                 <div class="col-lg-2 col-sm-12">
                                     <input class="form-control" type="text" :name="'users['+i+'][card_id]'"
                                            :value="item.card_id"
+=======
+                                           v-model="item.age"
+                                           :id="'users['+i+'][age]'">
+                                </div>
+                                <label class="col-lg-1 col-sm-3 col-form-label"
+                                       :for="'users['+i+'][cardId]'">身份证</label>
+                                <div class="col-lg-2 col-sm-12">
+                                    <input class="form-control" type="text" :name="'users['+i+'][card_id]'"
+                                           v-model="item.card_id"
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                                            :id="'users['+i+'][card_id]'">
                                 </div>
                                 <div v-if="i!==0" class="col-1 ml-1">
@@ -50,7 +74,11 @@
                                 @click="addItem();">添加
                         </button>
                     </div>
+<<<<<<< HEAD
                     <button type="submit" class="btn btn-success btn-sm">
+=======
+                    <button type="button" class="btn btn-success btn-sm" @click="check()">
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                         <i class="far fa-trash-alt"></i> 提交
                     </button>
                 </form>
@@ -79,6 +107,38 @@
                     } else {
                         window.tempTip.show("不能超过最大人数限制！");
                     }
+<<<<<<< HEAD
+=======
+                    console.log(this.items);
+                },
+                check() {
+                    for(let i = 0;i< this.items.length;i++){
+                        let item = this.items[i];
+                        let {name, gender, age, card_id} = item;
+                        let flag = true;
+                        if (!name) {
+                            window.tempTip.show(`第${i+1}条信息登记的姓名不符合要求`);
+                            flag = false;
+                        } else if (!age) {
+                            window.tempTip.show(`第${i+1}条信息登记的年龄不符合要求`);
+                            flag = false;
+                        } else if (!gender) {
+                            window.tempTip.show(`第${i+1}条信息登记的性别不符合要求`);
+                            flag = false;
+                        } else if (!this.checkId(card_id)) {
+                            window.tempTip.show(`第${i+1}条信息身份证不符合要求`);
+                            flag = false;
+                        }
+                        if (!flag) {
+                            return flag;
+                        }
+                    }
+                    document.getElementById("storeDetail").submit();
+                },
+                checkId(idCard) {
+                    let reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+                    return reg.test(idCard);
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                 }
             }
         });

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

@@ -286,7 +286,15 @@
                             labor_company:'{{$laborReport->laborCompany->name}}',labor_company_id:'{{$laborReport->laborCompany->id}}',@endif
                             checkInAt:'{{$laborReport->check_in_at}}', relax_time:'{{$laborReport->relax_time}}',
                             is_exportGroup:'{{$laborReport->is_exportGroup}}',is_export:'{{$laborReport->is_export}}',
+<<<<<<< HEAD
                             verifyAt:'{{$laborReport->verify_at}}',groupUserId:'{{$laborReport->group_user_id}}',verifyPerson:'{{$laborReport->user['name']}}',
+=======
+                            @if($laborReport->verify_at)
+                            verifyAt:'{{$laborReport->verify_at}}',@endif
+                            groupUserId:'{{$laborReport->group_user_id}}',
+                            @if($laborReport->user)
+                            verifyPerson:'{{$laborReport->user['name']}}',@endif
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                             checkOutAt:'{{$laborReport->check_out_at}}',onlineDuration:'{{$laborReport->online_duration}}',
                             round_check_in_at:'{{$laborReport->round_check_in_at}}',round_check_out_at:'{{$laborReport->round_check_out_at}}',
                             workingDuration:'{{$laborReport->working_duration}}', created_at:'{{$laborReport->created_at}}',

resources/views/rejected/create.blade.php

@@ -2,6 +2,7 @@
 @section('title')录入-退货管理@endsection
 @section('content')
     <div class="container-fluid d-none" id="editPanel">
+<<<<<<< HEAD
         <div class="card mb-2">
             <div style="position: relative" v-if="status.lockingBillPanel">
                 <div style="background-color: #aaa; height: 535px; opacity: 0.5;
@@ -260,6 +261,267 @@
                 </div>
             </div>
         </div>
+=======
+        <h3 class="text-danger text-center">暂停使用</h3>
+{{--        <div class="card mb-2">--}}
+{{--            <div style="position: relative" v-if="status.lockingBillPanel">--}}
+{{--                <div style="background-color: #aaa; height: 535px; opacity: 0.5;--}}
+{{--                width:100%;z-index: 9; position: absolute" class="d-flex ">--}}
+{{--                </div>--}}
+{{--                <div style="height: 550px;--}}
+{{--                width:100%;z-index: 10; position: absolute" class="d-flex align-items-center ">--}}
+{{--                    <button class="btn btn-info flex-fill" @click="cancelPackCommitEdit">取消锁定</button>--}}
+{{--                </div>--}}
+{{--            </div>--}}
+{{--            <div class="row">--}}
+{{--                <div class="col-7">--}}
+{{--                    <div class="card-body">--}}
+{{--                        <div class="list-group" style="max-height: 477px;overflow-y: scroll">--}}
+{{--                            <table class="table table-sm table-striped table-info table-hover table-bordered">--}}
+{{--                                <tr>--}}
+{{--                                    <th>创建时间</th>--}}
+{{--                                    <th>客户名称</th>--}}
+{{--                                    <th>退回单号</th>--}}
+{{--                                    <th>退回公司</th>--}}
+{{--                                    <th>姓名</th>--}}
+{{--                                    <th>电话</th>--}}
+{{--                                    <th>到付费用</th>--}}
+{{--                                    <th>订单号</th>--}}
+{{--                                    <th>原单号</th>--}}
+{{--                                    <th>是否入库</th>--}}
+{{--                                    --}}{{--                                    <th>备注</th>--}}
+{{--                                    <th>操作</th>--}}
+{{--                                </tr>--}}
+{{--                                <tr :class="[rejectedBill.isEditing?'bg-info':'']"--}}
+{{--                                    v-for="rejectedBill in rejectedBills" :data-id="rejectedBill.id" @click="editBill">--}}
+{{--                                    <td>@{{rejectedBill.created_at | dateNoYear}}</td>--}}
+{{--                                    <td>@{{rejectedBill.owner_name }}</td>--}}
+{{--                                    <td>@{{rejectedBill.logistic_number_return }}</td>--}}
+{{--                                    <td>@{{rejectedBill.logistic_name}}</td>--}}
+{{--                                    <td>@{{rejectedBill.sender}}</td>--}}
+{{--                                    <td>@{{rejectedBill.mobile_sender}}</td>--}}
+{{--                                    <td>@{{rejectedBill.fee_collected}}</td>--}}
+{{--                                    <td>@{{rejectedBill.order_number}}</td>--}}
+{{--                                    <td>@{{rejectedBill.logistic_number}}</td>--}}
+{{--                                    <td>@{{rejectedBill.is_loaded|isLoaded}}</td>--}}
+{{--                                    --}}{{--                                    <td>@{{rejectedBill.remark}}</td>--}}
+{{--                                    @can('退货管理-删除')--}}
+{{--                                        <td>--}}
+{{--                                            <button class="btn btn-sm btn-outline-danger"--}}
+{{--                                                    @click.stop="deleteBill(rejectedBill)">删--}}
+{{--                                            </button>--}}
+{{--                                        </td>@endcan--}}
+{{--                                </tr>--}}
+{{--                            </table>--}}
+{{--                        </div>--}}
+{{--                    </div>--}}
+{{--                </div>--}}
+{{--                <div class="col-5 disabled">--}}
+{{--                    <div class="card-body ml-n4">--}}
+{{--                        <table class="table table-striped table-sm  table-bordered"--}}
+{{--                               :class="[status.billEditing?'bg-info':'']">--}}
+{{--                            <tr>--}}
+{{--                                <td>--}}
+{{--                                    <div class="form-group mb-0">--}}
+{{--                                        <label for="id_owner" class="col-form-label text-right">客户名称</label>--}}
+{{--                                        <div class="input-group">--}}
+{{--                                            <select name="id_owner" id="id_owner" class="form-control"--}}
+{{--                                                    :class="[errors.id_owner?'is-invalid':'']"--}}
+{{--                                                    v-model="billInputting.id_owner" required data-focusOrder="1">--}}
+{{--                                                <option value=""></option>--}}
+{{--                                                <option v-for="owner in owners" :value="owner.id">@{{ owner.name }}--}}
+{{--                                                </option>--}}
+{{--                                            </select>--}}
+{{--                                            <input type="text" class="form-control input-group-prepend"--}}
+{{--                                                   placeholder="输入关键字定位客户名称"--}}
+{{--                                                   name="locateOwnerSearch" autocomplete="off" @input="locateIdOwner"--}}
+{{--                                                   v-model="billInputting.locateOwnerSearch">--}}
+{{--                                            <span class="invalid-feedback" v-if="errors.id_owner"><strong>@{{ errors.id_owner[0] }}</strong></span>--}}
+{{--                                        </div>--}}
+{{--                                    </div>--}}
+{{--                                </td>--}}
+{{--                                <td>--}}
+{{--                                    <div class="form-group mb-0">--}}
+{{--                                        <label for="sender" class="col-form-label text-right">姓名</label>--}}
+{{--                                        <input type="text" class="form-control" :class="[errors.sender?'is-invalid':'']"--}}
+{{--                                               data-focusOrder="5"--}}
+{{--                                               name="sender" id="sender" autocomplete="off"--}}
+{{--                                               v-model="billInputting.sender">--}}
+{{--                                        <span class="invalid-feedback" v-if="errors.sender"><strong>@{{errors.sender[0] }}</strong></span>--}}
+{{--                                    </div>--}}
+{{--                                </td>--}}
+{{--                            </tr>--}}
+{{--                            <tr>--}}
+{{--                                <td>--}}
+{{--                                    <div class="form-group mb-0">--}}
+{{--                                        <label for="logistic_number_return"--}}
+{{--                                               class="col-form-label text-right">退回单号</label>--}}
+{{--                                        <input type="text" class="form-control"--}}
+{{--                                               :class="[errors.logistic_number_return?'is-invalid':'']"--}}
+{{--                                               data-focusOrder="2"--}}
+{{--                                               name="logistic_number_return" id="logistic_number_return"--}}
+{{--                                               autocomplete="off" v-model="billInputting.logistic_number_return"--}}
+{{--                                               @change="logistic_number_returnChange"--}}
+{{--                                               required>--}}
+{{--                                        <span class="invalid-feedback" v-if="errors.logistic_number_return"><strong>@{{errors.logistic_number_return[0] }}</strong></span>--}}
+{{--                                    </div>--}}
+{{--                                </td>--}}
+{{--                                <td>--}}
+{{--                                    <div class="form-group mb-0">--}}
+{{--                                        <label for="fee_collected" class="col-form-label text-right">到付费用</label>--}}
+{{--                                        <input type="text" class="form-control"--}}
+{{--                                               :class="[errors.fee_collected?'is-invalid':'']"--}}
+{{--                                               data-focusOrder=""--}}
+{{--                                               v-model="billInputting.fee_collected" name="fee_collected"--}}
+{{--                                               id="fee_collected" autocomplete="off">--}}
+{{--                                        <span class="invalid-feedback" v-if="errors.fee_collected"><strong>@{{errors.fee_collected[0] }}</strong></span>--}}
+{{--                                    </div>--}}
+{{--                                </td>--}}
+{{--                            </tr>--}}
+{{--                            <tr>--}}
+{{--                                <td>--}}
+{{--                                    <div class="form-group mb-0">--}}
+{{--                                        <label for="id_logistic_return" class="col-form-label text-right">退回公司</label>--}}
+{{--                                        <div class="input-group">--}}
+{{--                                            <select name="id_logistic_return" id="id_logistic_return"--}}
+{{--                                                    class="form-control"--}}
+{{--                                                    data-focusOrder="3"--}}
+{{--                                                    :class="[errors.id_logistic_return?'is-invalid':'']"--}}
+{{--                                                    v-model="billInputting.id_logistic_return" required>--}}
+{{--                                                <option value=""></option>--}}
+{{--                                                <option v-for="logistic in logistics" :value="logistic.id">--}}
+{{--                                                    @{{logistic.name}}--}}
+{{--                                                </option>--}}
+{{--                                            </select>--}}
+{{--                                            <input type="text" class="form-control input-group-prepend"--}}
+{{--                                                   placeholder="输入关键字定位物流公司"--}}
+{{--                                                   name="locateLogisticSearch" autocomplete="off"--}}
+{{--                                                   @input="locateLogistic" v-model="billInputting.locateLogisticSearch">--}}
+{{--                                            <span class="invalid-feedback" v-if="errors.id_logistic_return"><strong>@{{errors.id_logistic_return[0] }}</strong></span>--}}
+{{--                                        </div>--}}
+{{--                                    </div>--}}
+{{--                                </td>--}}
+{{--                                <td>--}}
+{{--                                    <div class="form-group mb-0">--}}
+{{--                                        <label for="order_number" class="col-form-label text-right">订单号</label>--}}
+{{--                                        <input type="text" class="form-control"--}}
+{{--                                               :class="[errors.order_number?'is-invalid':'']"--}}
+{{--                                               data-focusOrder="6"--}}
+{{--                                               name="order_number" id="order_number" autocomplete="off"--}}
+{{--                                               v-model="billInputting.order_number">--}}
+{{--                                        <span class="invalid-feedback" v-if="errors.order_number"><strong>@{{ errors.order_number[0] }}</strong></span>--}}
+{{--                                    </div>--}}
+{{--                                </td>--}}
+{{--                            </tr>--}}
+{{--                            <tr>--}}
+{{--                                <td>--}}
+{{--                                    <div class="form-group mb-0">--}}
+{{--                                        <label for="mobile_sender" class="col-form-label text-right">电话</label>--}}
+{{--                                        <input type="text" class="form-control"--}}
+{{--                                               :class="[errors.mobile_sender?'is-invalid':'']"--}}
+{{--                                               data-focusOrder="4"--}}
+{{--                                               name="mobile_sender" id="mobile_sender" autocomplete="off"--}}
+{{--                                               v-model="billInputting.mobile_sender" required>--}}
+{{--                                        <span class="invalid-feedback" v-if="errors.mobile_sender"><strong>@{{ errors.mobile_sender[0] }}</strong></span>--}}
+{{--                                    </div>--}}
+{{--                                </td>--}}
+{{--                                <td>--}}
+{{--                                    <div class="form-group mb-0">--}}
+{{--                                        <label for="logistic_number" class="col-form-label text-right">原单号</label>--}}
+{{--                                        <button class="btn btn-outline-primary btn-sm"--}}
+{{--                                                @click="billInputting.logistic_number='原单退回'"--}}
+{{--                                                style="transform: scale(0.9)">原单退回--}}
+{{--                                        </button>--}}
+{{--                                        <input type="text" class="form-control"--}}
+{{--                                               :class="[errors.logistic_number?'is-invalid':'']"--}}
+{{--                                               data-focusOrder="7"--}}
+{{--                                               name="logistic_number" id="logistic_number" autocomplete="off"--}}
+{{--                                               v-model="billInputting.logistic_number"--}}
+{{--                                        >--}}
+{{--                                        <span class="invalid-feedback" v-if="errors.logistic_number"><strong>@{{errors.logistic_number[0] }}</strong></span>--}}
+{{--                                    </div>--}}
+{{--                                </td>--}}
+{{--                            </tr>--}}
+{{--                            <tr>--}}
+{{--                                <td>--}}
+{{--                                    <div class="form-group mb-0">--}}
+{{--                                        <label for="bill_remark" class="col-form-label text-right">备注</label>--}}
+{{--                                        <input type="text" class="form-control"--}}
+{{--                                               :class="[errors.bill_remark?'is-invalid':'']"--}}
+{{--                                               data-focusOrder="9"--}}
+{{--                                               name="remark" id="bill_remark" autocomplete="off"--}}
+{{--                                               v-model="billInputting.remark" required>--}}
+{{--                                        <span class="invalid-feedback" v-if="errors.bill_remark"><strong>@{{ errors.remark[0] }}</strong></span>--}}
+{{--                                    </div>--}}
+{{--                                </td>--}}
+{{--                                <td>--}}
+{{--                                    <div class="form-group mb-0">--}}
+{{--                                        <label for="is_loaded" class="col-form-label text-right">是否入库</label>--}}
+{{--                                        <div v-if="status.isLoadSign" class="text-danger">系统标计为入库</div>--}}
+{{--                                        <select name="is_loaded" id="is_loaded" class="form-control"--}}
+{{--                                                :class="[errors.is_loaded?'is-invalid':'']"--}}
+{{--                                                data-focusOrder="8" :disabled="status.lockingIsLoadedInput"--}}
+{{--                                                v-model="billInputting.is_loaded" required>--}}
+{{--                                            <option value="0">否</option>--}}
+{{--                                            <option value="1">是</option>--}}
+{{--                                            <option value="null">无需入库</option>--}}
+{{--                                            <option value="3">上传异常</option>--}}
+{{--                                        </select>--}}
+{{--                                        <span class="invalid-feedback" v-if="errors.is_loaded"><strong>@{{errors.is_loaded[0]}}</strong></span>--}}
+{{--                                    </div>--}}
+{{--                                </td>--}}
+{{--                            </tr>--}}
+{{--                            <tr v-if="billInputting.id_owner==='94'">--}}
+{{--                                <td>--}}
+{{--                                    <div class="form-group mb-0">--}}
+{{--                                        <label for="common_01" class="col-form-label text-right">寄件方省</label>--}}
+{{--                                        <input type="text" class="form-control"--}}
+{{--                                               :class="[errors.common_01?'is-invalid':'']"--}}
+{{--                                               data-focusOrder="10"--}}
+{{--                                               name="common_01" id="common_01" autocomplete="off"--}}
+{{--                                               v-model="billInputting.common_01" required>--}}
+{{--                                        <span class="invalid-feedback" v-if="errors.common_01"><strong>@{{ errors.common_01[0] }}</strong></span>--}}
+{{--                                    </div>--}}
+{{--                                </td>--}}
+{{--                                <td>--}}
+{{--                                    <div class="form-group mb-0">--}}
+{{--                                        <label for="common_02" class="col-form-label text-right">重量</label>--}}
+{{--                                        <input type="text" class="form-control"--}}
+{{--                                               :class="[errors.common_02?'is-invalid':'']"--}}
+{{--                                               data-focusOrder="11"--}}
+{{--                                               name="common_02" id="common_02" autocomplete="off"--}}
+{{--                                               v-model="billInputting.common_02" required>--}}
+{{--                                        <span class="invalid-feedback" v-if="errors.common_02"><strong>@{{ errors.common_02[0] }}</strong></span>--}}
+{{--                                    </div>--}}
+{{--                                </td>--}}
+{{--                            </tr>--}}
+{{--                            <tr>--}}
+{{--                                <td>--}}
+{{--                                    <div class="form-group mb-0 align-items-center row">--}}
+{{--                                        <div class="col-2" v-if="status.billEditing">--}}
+{{--                                            <button class="btn btn-success btn-sm tooltipOn" @click="shiftToCreate"--}}
+{{--                                                    title="点击取消编辑，进入新增状态">取消--}}
+{{--                                            </button>--}}
+{{--                                        </div>--}}
+{{--                                        <div class="col-8" :class="[status.billCreating?'offset-2':'']">--}}
+{{--                                            <input v-if="status.billCreating" type="button"--}}
+{{--                                                   class="btn btn-success form-control" value="提交新条目"--}}
+{{--                                                   @click="commitHeader">--}}
+{{--                                            <input v-if="status.billEditing" type="button"--}}
+{{--                                                   class="btn btn-dark form-control" value="修改"--}}
+{{--                                                   @click="commitEditHeader">--}}
+{{--                                        </div>--}}
+{{--                                    </div>--}}
+{{--                                </td>--}}
+{{--                                <td>--}}
+{{--                                </td>--}}
+{{--                            </tr>--}}
+{{--                        </table>--}}
+{{--                    </div>--}}
+{{--                </div>--}}
+{{--            </div>--}}
+{{--        </div>--}}
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
 
 
         <div class="card" v-if="status.editingBill">

resources/views/rejected/receiveRecord.blade.php

@@ -44,6 +44,7 @@
             records:[@foreach($records as $record)@json($record),@endforeach],
             status:[@foreach($status as $index=>$s){name:"{{$index}}",value:"{{$s}}"},@endforeach],
             delayed:[@foreach($status as $s)"{{$s}}",@endforeach],
+<<<<<<< HEAD
             logistics:[
                     @foreach($logistics as $logistic)
                 {name:'{{$logistic->id}}', value: '{{$logistic->name}}'},
@@ -56,11 +57,14 @@
                 },
                 @endforeach
             ],
+=======
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
         },
         mounted:function(){
             $('#container').removeClass('d-none');
             let data=[
                 [
+<<<<<<< HEAD
                     {name:'record_at_start',type:'time',tip:'选择显示本地记录日期的起始时间'},
                     {name:'logistic_number',type:'input',tip:'可支持多单号，糊模查找需要在右边打上%符号',placeholder:'快递单号'},
                     {name:'logistic_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的物流公司'],
@@ -69,6 +73,13 @@
                     {name:'record_at_end',type:'time',tip:'选择显示本地记录日期的结束时间'},
                     {name:'delayed',type:'select',placeholder: '状态',data:this.status},
                     {name:'warehouse',type:'select',placeholder: '仓库',data:this.warehouses},
+=======
+                    {name:'record_at_start',type:'dateTime',tip:'选择显示记录日期的起始时间'},
+                    {name:'logistic_number',type:'input',tip:'可支持多单号，糊模查找需要在右边打上%符号',placeholder:'快递单号'},
+                ],[
+                    {name:'record_at_end',type:'dateTime',tip:'选择显示记录日期的结束时间'},
+                    {name:'delayed',type:'select',placeholder: '状态',data:this.status},
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                 ]
             ];
             this.form=new query({

resources/views/station/monitor/visual.blade.php

@@ -129,8 +129,12 @@
                     }
                     this.mapping.push(arr);
                     let max = this.columnSize * this.heightSize;
+<<<<<<< HEAD
                     console.log(arr);
                     /*window.tempTip.postBasicRequest("{{url('station/monitor/visual/getData')}}",{arr:arr},res=>{
+=======
+                    window.tempTip.postBasicRequest("{{url('station/monitor/visual/getData')}}",{arr:arr},res=>{
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                         let sub = {};
                         arr.forEach((ar,i)=>{
                             for (let key in this.blacklist){
@@ -159,7 +163,11 @@
                             this.statistic.np2 = this.accDivCoupon(this.statistic.number2,this.statistic.sum);
                             this.statistic.np3 = this.accDivCoupon(this.statistic.number3,this.statistic.sum);
                         });
+<<<<<<< HEAD
                     });*/
+=======
+                    });
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                 },
                 loadDetail(index,j){
                     $("#modal").modal('show');

resources/views/store/handInStorage/putaway.blade.php

@@ -6,6 +6,10 @@
         <div class="card offset-md-3 col-md-6">
             <div class="card-header text-center  bg-transparent" id="header_title">
                 <span class="font-weight-bold h3">上架</span>
+<<<<<<< HEAD
+=======
+{{--                <span class="font-weight-bold text-danger">暂停使用</span>--}}
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
             </div>
             <div>
                 <div class="form-group row m-1">

resources/views/store/handInStorage/receive.blade.php

@@ -6,6 +6,10 @@
         <div class="card offset-md-3 col-md-6">
             <div class="card-header text-center bg-transparent" id="header_title">
                 <span class="font-weight-bold h3">收货</span>
+<<<<<<< HEAD
+=======
+{{--                <span class="font-weight-bold text-danger">暂停使用</span>--}}
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
             </div>
             <div >
                 <div class="offset-1 mt-2">

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

@@ -35,7 +35,12 @@
                                         <th>商品名称</th>
                                         <th>商品编码</th>
                                         <th>商品条码</th>
+<<<<<<< HEAD
                                         <th>数量</th>
+=======
+                                        <th>预期数量</th>
+                                        <th>收货数量</th>
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                                         <th>质量</th>
                                         <th>状态</th>
                                         <th>创建时间</th>
@@ -44,7 +49,12 @@
                                         <td>@{{ storeItem.asn_line_code }}</td>
                                         <td>@{{ storeItem.name }}</td>
                                         <td>@{{ storeItem.sku }}</td>
+<<<<<<< HEAD
                                         <td>@{{ storeItem.barcode }}</td>
+=======
+                                        <td>@{{ storeItem.commodity.barcodes[0].code }}</td>
+                                        <td>@{{ storeItem.expected_amount }}</td>
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
                                         <td>@{{ storeItem.amount }}</td>
                                         <td>@{{ storeItem.quality }}</td>
                                         <td>@{{ storeItem.status }}</td>

routes/web.php

@@ -605,10 +605,28 @@ Route::group(['middleware' => 'auth'], function ($route) {
         /** 手持入库 */
         Route::group(['prefix' => 'handInStorage'], function () {
             Route::get('receive', function () {
+<<<<<<< HEAD
                 return view('store.handInStorage.receive');
             });//收货页面
             Route::get('putaway', function () {
                 return view('store.handInStorage.putaway');
+=======
+                /** @var \App\Services\UserService  $userService */
+                $userService=app(\App\Services\UserService::class);
+                $ownerIds=$userService->getUserUnderOwnerIdArr();
+                $isGm=\App\Owner::query()->where("code","GM")->first()['id'];
+                if (in_array($isGm,$ownerIds)){
+                    return view('store.handInStorage.receive');
+                }
+            });//收货页面
+            Route::get('putaway', function () {
+                $userService=app(\App\Services\UserService::class);
+                $ownerIds=$userService->getUserUnderOwnerIdArr();
+                $isGm=\App\Owner::query()->where("code","GM")->first()['id'];
+                if (in_array($isGm,$ownerIds)){
+                    return view('store.handInStorage.putaway');
+                }
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8
             });//上架页面
             Route::get('inventoryInfo', function () {
                 return view('store.handInStorage.inventoryInfo');

runServes.sh

@@ -17,3 +17,8 @@ sudo echo -e '\n* * * * * root cd /var/www/was && php artisan schedule:run >> /d
 fi
 sudo systemctl restart crond
 
+<<<<<<< HEAD
+=======
+
+#nohup laravel-echo-server start>/var/log/echo.log 2>&1 &
+>>>>>>> b0347ca84d8eeedd9c1ac88b1c55b77c6a0613e8