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

 Conflicts:

	app/Http/Controllers/TestController.php

	public/css/app.css

app/Http/Controllers/CustomerController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Gate;
+
+class CustomerController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return Response
+     */
+    public function projectReport()
+    {
+        if(!Gate::allows('客户管理-项目-报表')){ return redirect('denied');  }
+        return response()->view('customer.project.report');
+    }
+}

app/Http/Controllers/OrderController.php

@@ -20,7 +20,7 @@ use Illuminate\Support\Facades\Http;
 class OrderController extends Controller
 {
     public function delivering(Request $request){
-        if(!Gate::allows('订单管理-查询')){ return view('order/index');  }
+        if(!Gate::allows('订单管理-查询')){ return redirect('denied');  }
         /** @var OrderService $orderService */
         $orderService = app('orderService');
         $request = $request->input();
@@ -97,13 +97,13 @@ class OrderController extends Controller
                 ['name' => $order->customer_descr_c, 'code' => $order->customer_descr_c]);
             $logistic = app('logisticService')->firstOrCreate(['name' => $order->carriername],
                 ['name' => $order->carriername, 'code' => $order->carriername]);
-            foreach ($picktotraceids[$order->orderno] as $logistic_number){
+            foreach ($picktotraceids[$order->orderno] as $orderno){
                 $rejectedBill = $rejectedBillService->create([
                     'id_owner' => $owner->id,
                     'sender' => $order->c_contact,
-                    'logistic_number_return' => $logistic_number,
+                    'logistic_number_return' => $order->soreference1,
                     'id_logistic_return' => $logistic->id,
-                    'order_number' => $order->soreference1,
+                    'order_number' => $orderno,
                     'mobile_sender' => $order->c_tel2,
                     'logistic_number' => '原单退回',//$order->soreference1
                     'remark' => $order->notes,

app/Http/Controllers/PackageController.php

@@ -156,7 +156,33 @@ class PackageController extends Controller
         $packages = app('packageStatisticsService')->get($request->input());
         $owners=app('ownerService')->getSelection();
         $logistics=app('logisticService')->getSelection();
-        return view('weight.package.statistics',["packages"=>$packages,'owners'=>$owners,'logistics'=>$logistics]);
+        $ownerTemp = [];
+        foreach ($owners as $owner){
+            $ownerTemp[$owner->id] = $owner->name;
+        }
+        $ps = [];
+        $logisticsTemp = [];
+        foreach ($packages as $package){
+            if (!($logisticsTemp[$package->logistic_id] ?? false))$logisticsTemp[$package->logistic_id] = true;
+            if ($ps[$package->owner_id] ?? false){
+                $ps[$package->owner_id][$package->logistic_id] = $package->count;
+                $ps[$package->owner_id]["sum"] += (int)$package->count;
+            }else{
+                $ps[$package->owner_id] = [
+                    $package->logistic_id => $package->count,
+                    "sum" => (int)$package->count,
+                    "owner_id" => $package->owner_id,
+                    "owner_name" => $ownerTemp[$package->owner_id]
+                ];
+            }
+        }
+        foreach ($logistics as $index => $logistic){
+            if (!($logisticsTemp[$logistic->id] ?? false))unset($logistics[$index]);
+        }
+        foreach ($ps as &$p){
+            $p = json_encode($p,JSON_UNESCAPED_UNICODE);
+        }
+        return view('weight.package.statistics',["packages"=>$ps,'owners'=>$owners,'logistics'=>$logistics]);
     }
 
     public function export(Request $request){
@@ -208,79 +234,65 @@ class PackageController extends Controller
         return $validator;
     }
 
-//    public function syncBatch($batch_number,$weight,$max,$centre,$min,$date,$paperBox_id){
-////        $accomplishToWMS=new Api\thirdPart\flux\PackageController();
-////        $packageBatch=Package::where('batch_number',$batch_number)->first();
-//        $newValues = ['weight' => $weight];
-//        $newValues['batch_number']=$batch_number;
-//        if($max)$newValues['length']=$max;
-//        if($centre)$newValues['width']=$centre;
-//        if($min)$newValues['height']=$min;
-//        if($date)$newValues['weighed_at']=$date;
-//        if($paperBox_id)$newValues['paper_box_id']=$paperBox_id;
-//        if($max&&$centre&&$min){
-//            $newValues['bulk']=$max*$centre*$min;
-//        }
-////        $weightChanged=$packageBatch['weight']!=$weight;
-////        Package::where('batch_number',$batch_number)->update($newValues);
-////        $packageBatch['forceUpload']=$weightChanged;
-//        Controller::logS(__METHOD__,__FUNCTION__,"批量更新时批次号传入：{$batch_number}");
-////        $result=$accomplishToWMS->markWMSOnBatch($packageBatch['batch_number']);
-////        if ($result['result']){
-////            $newValues['status']='已上传';
-////            Controller::logS(__METHOD__,'SUCCESS_'.__FUNCTION__,'批量更改波次上传成功'.json_encode($packageBatch));
-////        }else{
-////            $newValues['status']='上传异常';
-////            Controller::logS(__METHOD__,'error_'.__FUNCTION__,'批量更改波次上传异常:'.$result['message'].json_encode($packageBatch));
-////        }picktotraceid
-//        $packagesInOracle=OracleDOCWaveDetails::where('doc_wave_details.waveno',$batch_number)
-//            ->leftJoin('act_allocation_details','act_allocation_details.orderno','doc_wave_details.orderno')
-//            ->get();
-//        foreach ($packagesInOracle as $packageInOracle) {
-//            $newValues['logistic_number']=$packageInOracle['picktotraceid'];
-//            $package = Package::where('logistic_number', $packageInOracle['picktotraceid'])->first();
-//            if(!$package){
-//                Package::create($newValues);
-//            }else{
-//                $package->fill($newValues);
-//                $package->update();
-//            }
-//        }
-////        Package::where('batch_number',$batch_number)->update($newValues);
-//
-//    }
-
     public function statisticsExport(Request $request){
         if(!Gate::allows('称重管理-查询')){ return '没有权限';  }
+        /** @var PackageStatisticsService $service */
+        $service = app('packageStatisticsService');
+
         if ($request->checkAllSign){
             $params = $request->input();
             unset($params['checkAllSign']);
-            $data = app('packageStatisticsService')->get($params);
+            $data = $service->get($params);
         }else{
             /**@var PackageStatisticsService */
-            $data = app('packageStatisticsService')->get(['owner_id'=>$request->data]);
+            $data = $service->get(['owner_id'=>$request->data]);
+        }
+
+        $owners=app('ownerService')->getSelection();
+        $ownerTemp = [];
+        foreach ($owners as $owner){
+            $ownerTemp[$owner->id] = $owner->name;
         }
+
+
+        $logisticsTemp = [];
+        $ps = [];
+        foreach ($data as $package){
+            if (!($logisticsTemp[$package->logistic_id] ?? false))$logisticsTemp[$package->logistic_id] = true;
+            if ($ps[$package->owner_id] ?? false){
+                $ps[$package->owner_id][$package->logistic_id] = $package->count;
+                $ps[$package->owner_id]["sum"] += (int)$package->count;
+            }else{
+                $ps[$package->owner_id] = [
+                    $package->logistic_id => $package->count,
+                    "sum" => (int)$package->count,
+                    "owner_id" => $package->owner_id,
+                    "owner_name" => $ownerTemp[$package->owner_id]
+                ];
+            }
+        }
+
         $column = ["货主","总计"];
-        $columnMap = ["货主"=>0,"总计"=>1];
-        $row = [];
-        $rowMap = [];
-        $coordinate = [];
-        foreach ($data as $value){
-            if ($value->owner_name && $value->logistic_name){
-                if (!isset($columnMap[$value->logistic_id])){
-                    array_push($column,$value->logistic_name);
-                    $columnMap[$value->logistic_id] = count($column)-1;
-                }
-                if (!isset($rowMap[$value->owner_id])){
-                    array_push($row,$value->owner_name);
-                    $rowMap[$value->owner_id] = count($row)-1 ;
-                }
-                if (isset($coordinate[$rowMap[$value->owner_id]])){
-                    $coordinate[$rowMap[$value->owner_id]][$columnMap[$value->logistic_id]] = (string)$value->count;
-                }else $coordinate[$rowMap[$value->owner_id]] = [0 => $value->owner_name,$columnMap[$value->logistic_id] => (string)$value->count];
+
+        $columnMap = [];
+        $logistics=app('logisticService')->getSelection();
+        foreach ($logistics as $index => $logistic){
+            if (!($logisticsTemp[$logistic->id] ?? false))unset($logistics[$index]);
+            else {
+                $columnMap[] = $logistic->id;
+                $column[] = $logistic->name;
+            }
+        }
+
+        $list = [];
+        foreach ($ps as $p){
+            $row = [$p["owner_name"],$p["sum"]];
+            foreach ($columnMap as $id){
+                $row[] = $p[$id] ?? 0;
             }
+            $list[] = $row;
         }
-        $post = Http::post(config('go.export.url'),['type'=>'packageStatistic','data'=>json_encode(["row"=>$column,"list"=>$coordinate],JSON_UNESCAPED_UNICODE)]);
+        $post = Http::post(config('go.export.url'),['type'=>'base','data'=>json_encode(["row"=>$column,"list"=>$list],JSON_UNESCAPED_UNICODE)]);
         if ($post->status() == 500){
             throw new Exception($post->header("Msg"));
         }

app/Http/Controllers/TestController.php

@@ -9,6 +9,9 @@ use App\City;
 use App\Commodity;
 use App\CommodityBarcode;
 use App\Events\CancelOrder;
+use App\InventoryAccountMission;
+use App\InventoryCompare;
+use App\InventoryDailyLog;
 use App\Log;
 use App\Logistic;
 use App\LogisticTiming;
@@ -29,6 +32,7 @@ use App\Owner;
 use App\Package;
 use App\Process;
 use App\ProcessDaily;
+use App\ProcessesContent;
 use App\ProcessStatistic;
 use App\Province;
 use App\RejectedBill;
@@ -48,6 +52,8 @@ use App\Services\OrderPackageService;
 use App\Services\OrderService;
 use App\Services\OrderTrackingOwnerService;
 use App\Services\OrderTrackingService;
+use App\StoreCheckingReceive;
+use App\StoreCheckingReceiveItem;
 use App\Unit;
 use App\User;
 use App\Waybill;
@@ -74,6 +80,48 @@ class TestController extends Controller
     {
         return call_user_func([$this, $method], $request);
     }
+    /*dd('IN_Warehouse：'.$doc_asn_detail->warehouseid,
+                     'In_ASNNo_C：'.$doc_asn_detail->docno,
+                     'In_ASNLineNo_C：'.$doc_asn_detail->asnlineno,
+                     'In_New_TraceID_C：'.$doc_asn_detail->new_traceid,
+                     'In_CustomerID：'.$doc_asn_detail->customerid,
+                     'In_SKU：'.$doc_asn_detail->sku,
+                     'In_ReceivedQty：'.$doc_asn_detail->receivedqty_each,
+                     'In_PackID：'.$doc_asn_detail->packid,
+                     'In_LotAtt01_C：'.$doc_asn_detail->lotatt01,
+                     'In_LotAtt02_C：'.$doc_asn_detail->lotatt02,
+                     'In_LotAtt04_C：'.$doc_asn_detail->lotatt04,
+                     'In_LotAtt05_C：'.$doc_asn_detail->lotatt05,
+                     'In_LotAtt08_C：'.$doc_asn_detail->lotatt08,
+                     'In_UserDefine1：'.$doc_asn_detail->userdefine1,
+                     'In_UserDefine2：'.$doc_asn_detail->userdefine2,
+                     'In_UserDefine3：'.$doc_asn_detail->userdefine3,
+                     'In_UserDefine4：'.$doc_asn_detail->userdefine4,
+                     'In_UserDefine5：'.$doc_asn_detail->userdefine5,
+                     'In_FMLocation：'.$doc_asn_detail->warehouseid,
+                     'In_TOLocation_C：'.$doc_asn_detail->warehouseid,
+                     'In_Operator：'.$doc_asn_detail->addwho,
+                     'In_UserID：'.$doc_asn_detail->addwho,
+                     'OUT_Return_Code：'.$result
+                 );*/
+    public function test4(){
+        $controller = new \App\Http\Controllers\Api\thirdPart\flux\StoreController();
+        return $controller->quickStorage('JSCS202010210001');
+    }
+
+    public function test2(){
+        $db = DB::connection('oracle');
+        $db->beginTransaction();
+        try{
+            $bas = $db->select("SELECT * FROM BAS_CODES where codeid = 'IVC_STS' and code = '00'");
+            foreach ($bas as $a) {
+                $row = $db->update(DB::raw("UPDATE BAS_CODES set codename_c = '创建' WHERE codeid = ? and code = ?"), [$a->codeid, $a->code]);
+                if ($row > 0) $db->commit();
+            }
+        }catch (\Exception $e){
+            $db->rollBack();
+        }
+    }
 
     function packageFromLog(Request $request)
     { //x        $packagesBatch=Package::where('batch_number',$batch_number)->first();
@@ -428,8 +476,69 @@ class TestController extends Controller
         }
     }
 
-    private function cleanBarcode()
-    {
+    public function test5(){
+        ini_set('max_execution_time',2500);
+        ini_set('memory_limit','1526M');
+        //清理冗余条码
+        $this->cleanBarcode();
+
+        while(true){
+            $toDay = Carbon::now();
+            $skus = DB::select(DB::raw('select sku from commodities group by sku,owner_id having count(*)>1 limit 500 '));
+            $skus = array_column($skus,'sku');
+            // select * from commodities c where (c.sku) in and owner_id is not null order by c.sku
+            $commodities = Commodity::query()->with('barcodes')->whereNotNull('owner_id')->whereIn('sku',$skus)->get();
+
+            if (count($commodities) < 1)return "SUCCESS";
+            $commodityMap = [];
+            $commodityDel = [];
+            $commodityTag = [];
+            $commodityBar = [];
+            $createBarcodes = [];
+            $logs = [];
+            foreach ($commodities as $commodity){
+                if ($commodityMap[$commodity->sku.'_'.$commodity->owner_id] ?? false){
+                    $codes = $commodity->barcodes ? array_column($commodity->barcodes->toArray(),'code') : [];
+                    $logs[] = [
+                        'id' => $commodity->id,
+                        'sku' => $commodity->sku,
+                        'owner_id'=>$commodity->owner_id,
+                        'code'=>$codes,
+                    ];
+                    $commodityDel[] = $commodity->id;
+                    $commodityTag[$commodity->id] = $commodityMap[$commodity->sku.'_'.$commodity->owner_id];
+
+                    $arr = array_diff($codes,$commodityBar[$commodity->sku.'_'.$commodity->owner_id]);
+                    foreach ($arr as $code){
+                        if (!$code)continue;
+                        $createBarcodes[] = [
+                            'code' => $code,
+                            'commodity_id' => $commodityMap[$commodity->sku.'_'.$commodity->owner_id],
+                            'created_at' => $toDay,
+                        ];
+                    }
+                }else{
+                    $commodityMap[$commodity->sku.'_'.$commodity->owner_id] = $commodity->id;
+                    $commodityBar[$commodity->sku.'_'.$commodity->owner_id] = $commodity->barcodes ? array_column($commodity->barcodes->toArray(),'code') : [];
+                }
+            }
+            LogService::log(__METHOD__,'清理商品',json_encode($logs,JSON_UNESCAPED_UNICODE));
+            LogService::log(__METHOD__,'重新分配商品',json_encode($commodityTag,JSON_UNESCAPED_UNICODE));
+
+            app('inventoryAccountMissionService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新库存盘点任务
+            app('inventoryCompareService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新库存对比
+            app('inventoryDailyLogService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新库存每日记录
+            app('processesContentService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新二次加工内容单
+            app('storeCheckingReceiveItemService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新入库盘收一体
+            app('orderPackageCommoditiesService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新订单商品
+
+            LogService::log(__METHOD__,'删除商品与对应条码',json_encode($commodityDel,JSON_UNESCAPED_UNICODE));
+            CommodityBarcode::query()->whereIn('commodity_id',$commodityDel)->delete();
+            Commodity::destroy($commodityDel);
+        }
+    }
+
+    private function cleanBarcode(){
 
         $logCommodityBarcodes = CommodityBarcode::query()->where('code', "")->get();
         if (count($logCommodityBarcodes) > 0) LogService::log(__METHOD__, "纠正商品-删除空条码", json_encode($logCommodityBarcodes, JSON_UNESCAPED_UNICODE));
@@ -455,7 +564,7 @@ where (c.code,c.commodity_id) in (select code,commodity_id from commodity_barcod
         ini_set('max_execution_time', 2500);
         ini_set('memory_limit', '1526M');
         //清理冗余条码
-        $this->cleanBarcode();
+        //$this->cleanBarcode();
 
         //获取重复条码
         $commodities = DB::select(DB::raw('select commodities.name,commodities.sku,commodities.owner_id,commodity_barcodes.id as barcode_id,commodity_barcodes.code as barcode_code,commodity_barcodes.commodity_id from commodities LEFT JOIN commodity_barcodes on commodities.id = commodity_barcodes.commodity_id
@@ -514,16 +623,13 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
             }
             $updateCommodities[$del->commodity_id] = $target->commodity_id;
         }
-        if (count($updateCommodities) > 0) {
-            $targets = array_chunk($updateCommodities, 1000);
-            foreach ($targets as $targetCommodities) {
-                app('inventoryAccountMissionService')->batchUpdateItself('commodity_id', $targetCommodities);//批量更新库存盘点任务
-                app('inventoryCompareService')->batchUpdateItself('commodity_id', $targetCommodities);//批量更新库存对比
-                app('inventoryDailyLogService')->batchUpdateItself('commodity_id', $targetCommodities);//批量更新库存每日记录
-                app('processesContentService')->batchUpdateItself('commodity_id', $targetCommodities);//批量更新二次加工内容单
-                app('storeCheckingReceiveItemService')->batchUpdateItself('commodity_id', $targetCommodities);//批量更新入库盘收一体
-                app('orderPackageCommoditiesService')->batchUpdateItself('commodity_id', $targetCommodities);//批量更新订单商品
-            }
+        if (count($updateCommodities) > 0){
+            app('inventoryAccountMissionService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新库存盘点任务
+            app('inventoryCompareService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新库存对比
+            app('inventoryDailyLogService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新库存每日记录
+            app('processesContentService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新二次加工内容单
+            app('storeCheckingReceiveItemService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新入库盘收一体
+            app('orderPackageCommoditiesService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新订单商品
         }
 
         if (count($createBarcodes) > 0) LogService::log(__METHOD__, "纠正商品-录入合并条码", json_encode(data_get($createBarcodes, '*.id'), JSON_UNESCAPED_UNICODE));
@@ -541,20 +647,6 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
     }
 
 
-    public function test2(){
-        $processes = Process::query()->where('status','交接完成')->get();
-        $ids = array_column($processes->toArray(),'id');
-        $processStatistics = ProcessStatistic::query()->whereIn('process_id',$ids)->whereNull('total_cost')->whereNull('gross_profit')->whereNull('gross_profit_rate')->get();
-        LogService::log(__METHOD__,'更正成本利润',json_encode($processStatistics));
-        foreach ($processStatistics as $p){
-            $p->update([
-                'total_cost'=>0,
-                'gross_profit'=>$p->revenue,
-                'gross_profit_rate'=>1
-            ]);
-        }
-    }
-
     /*1*/
     function socket(Request $request)
     {/**/

app/Http/Controllers/api/thirdPart/flux/StoreController.php

@@ -130,16 +130,17 @@ class StoreController extends Controller
         return $success;
     }
 
-    public function quickStorage($asnno){
-        $docno = ""; //订单号 非ASN号
+    public function quickStorage($docno){
+        //$docno = ""; //订单号 非ASN号
+        $db = DB::connection('oracle');
         //判断单据有效性
-        $cus_bs_asnheader = DB::connection('oracle')->select(DB::raw("SELECT t.addwho FROM CUS_BS_ASNHEADER t WHERE t.asnreferencel = '".$docno."'"));
+        $cus_bs_asnheader = $db->select(DB::raw("SELECT t.addwho FROM CUS_BS_ASNHEADER t WHERE t.ASNREFERENCE1 = '".$docno."'"));
         if (!$cus_bs_asnheader) return ['success'=>false, 'data'=>'单据不存在'];
         $addwho = $cus_bs_asnheader[0]->addwho;
         if ($addwho == "WCS"){
             //判断单据状态
-            $cus_bs_asnheader = DB::connection('oracle')->select(
-                DB::raw("SELECT COUNT(1) FROM CUS_BS_ASNHEADER t INNER JOIN DOC_ASN_HEADER a ON a.asnno = t.asnno WHERE t.asnreference1 = '".$docno."' AND a.asnstatus < '40'"));
+            $cus_bs_asnheader = $db->select(
+                DB::raw("SELECT 1 FROM CUS_BS_ASNHEADER t INNER JOIN DOC_ASN_HEADER a ON a.asnno = t.asnno WHERE t.asnreference1 = '".$docno."' AND a.asnstatus < '40'"));
             if (!$cus_bs_asnheader) return ['success'=>false, 'data'=>"该单据已完成收货"];
 
             $sql = "select a.warehouseid,a.asnno as docno,a1.asnlineno,a.customerid,t1.sku,a1.packid,t1.receivedqty_each,t1.lotatt01,t1.lotatt02,";
@@ -148,36 +149,131 @@ class StoreController extends Controller
             $sql .= " inner join doc_asn_header a on a.asnno = a1.asnno";
             $sql .= " inner join cus_bs_asndetails t1 on t1.asnno = a.asnno and t1.asnlineno = a1.asnlineno";
             $sql .= " inner join cus_bs_asnheader t on t.asnno = a1.asnno";
-            $sql .= " where t.asnreference1 = ".$docno." and nvl(t1.rcvflag,'N') = 'N'";
-            $doc_asn_details = DB::connection('oracle')->select(DB::raw($sql));
-            $that = $this;
-            DB::transaction(function ()use($doc_asn_details,$that){
+            $sql .= " where t.asnreference1 = '".$docno."' and nvl(t1.rcvflag,'N') = 'N'";
+            $doc_asn_details = $db->select(DB::raw($sql));
+            $db->beginTransaction();
+            try{
+                $username=config('database.connections.oracle.username');
+                $password=config('database.connections.oracle.password');
+                $host=config('database.connections.oracle.host');
+                $service_name=config('database.connections.oracle.service_name');
+                $conn=oci_connect($username,$password,$host.'/'.$service_name);
+                $sql_sp="begin SPASN_Receiving_Process(:IN_Warehouse, :In_Process_Action, :In_ASNNo_C, :In_ASNLineNo_C, :In_FMTraceID_C, :In_New_TraceID_C, :In_ProductStatus,".
+                    ":In_ProductStatus_Descr, :In_HoldRejectCode_C, :In_HoldRejectReason_C, :In_PONo_C, :In_CustomerID, :In_SKU, :In_ReceivedQty, :In_RejectedQty,:In_UOM, :In_PackID,".
+                    " :In_ContainerID, :In_LotAtt01_C, :In_LotAtt02_C, :In_LotAtt03_C, :In_LotAtt04_C, :In_LotAtt05_C, :In_LotAtt06_C,".
+                    ":In_LotAtt07_C, :In_LotAtt08_C, :In_LotAtt09_C, :In_LotAtt10_C, :In_LotAtt11_C, :In_LotAtt12_C,".
+                    ":In_TotalCubic, :In_TotalGrossWeight, :In_TotalNetWeight, :In_TotalPrice, :In_UserDefine1, :In_UserDefine2,:In_UserDefine3, :In_UserDefine4, :In_UserDefine5, :In_FMLocation,".
+                    ":In_TOLocation_C,:In_QC_Type_C, :In_PlanToLoc_C,:In_ReceivingTime, :In_LPN, :In_Operator, :IN_RCVModule, :IN_RCVStation, :In_Language, :In_UserID, :OUT_Return_Code); end;";
                 foreach ($doc_asn_details as $doc_asn_detail){
-                    $resule = $that->exe($doc_asn_detail->warehouseid,'3',$doc_asn_detail->docno,$doc_asn_detail->asnlineno,'',$doc_asn_detail->new_traceid,'00','正常','OK','正常',
-                        '',$doc_asn_detail->customerid,$doc_asn_detail->sku,$doc_asn_detail->receivedqty_each,'','EA',$doc_asn_detail->packid,'',$doc_asn_detail->lotatt01,$doc_asn_detail->lotatt02,
-                        '',$doc_asn_detail->lotatt04,$doc_asn_detail->lotatt05,'','',$doc_asn_detail->lotatt08,'','','','',
-                        '0.00','0.00','0.00','0.00',$doc_asn_detail->userdefine1,$doc_asn_detail->userdefine2,$doc_asn_detail->userdefine3,$doc_asn_detail->userdefine4,$doc_asn_detail->userdefine5,'STAGE'.$doc_asn_detail->warehouseid,
-                    'STAGE'.$doc_asn_detail->warehouseid,'OK','','','*',$doc_asn_detail->addwho,'','','cn',$doc_asn_detail->addwho,'');
-                    if (substr($resule,1,3) == '000'){
-                        exe2();
+                    $result = '';
+                    $In_Process_Action = '3';
+                    $In_FMTraceID_C = '';
+                    $In_ProductStatus = '00';
+                    $In_ProductStatus_Descr = '正常';
+                    $In_HoldRejectCode_C = 'OK';
+                    $In_HoldRejectReason_C = '正常';
+                    $In_PONo_C = '';
+                    $In_RejectedQty = '';
+                    $In_UOM = 'EA';
+                    $In_ContainerID = '';
+                    $In_LotAtt03_C = '';
+                    $In_LotAtt06_C = '';
+                    $In_LotAtt07_C = '';
+                    $In_LotAtt09_C = '';
+                    $In_LotAtt10_C = '';
+                    $In_LotAtt11_C = '';
+                    $In_LotAtt12_C = '';
+                    $In_TotalCubic = '0.00';
+                    $In_TotalGrossWeight = '0.00';
+                    $In_TotalNetWeight = '0.00';
+                    $In_TotalPrice = '0.00';
+                    $In_FMLocation = 'STAGE'.$doc_asn_detail->warehouseid;
+                    $In_TOLocation_C = 'STAGE'.$doc_asn_detail->warehouseid;
+                    $In_QC_Type_C = 'OK';
+                    $In_PlanToLoc_C = '';
+                    $In_ReceivingTime = '';
+                    $In_LPN = '*';
+                    $IN_RCVModule = '';
+                    $IN_RCVStation = '';
+                    $In_Language = 'cn';
+                    $stmt = oci_parse($conn, $sql_sp);
+                    oci_bind_by_name($stmt,':IN_Warehouse',$doc_asn_detail->warehouseid);
+                    oci_bind_by_name($stmt,':In_Process_Action',$In_Process_Action);
+                    oci_bind_by_name($stmt,':In_ASNNo_C',$doc_asn_detail->docno);
+                    oci_bind_by_name($stmt,':In_ASNLineNo_C',$doc_asn_detail->asnlineno);
+                    oci_bind_by_name($stmt,':In_FMTraceID_C',$In_FMTraceID_C);
+                    oci_bind_by_name($stmt,':In_New_TraceID_C',$doc_asn_detail->new_traceid);
+                    oci_bind_by_name($stmt,':In_ProductStatus',$In_ProductStatus);
+                    oci_bind_by_name($stmt,':In_ProductStatus_Descr',$In_ProductStatus_Descr);
+                    oci_bind_by_name($stmt,':In_HoldRejectCode_C',$In_HoldRejectCode_C);
+                    oci_bind_by_name($stmt,':In_HoldRejectReason_C',$In_HoldRejectReason_C);
+                    oci_bind_by_name($stmt,':In_PONo_C',$In_PONo_C);
+                    oci_bind_by_name($stmt,':In_CustomerID',$doc_asn_detail->customerid);
+                    oci_bind_by_name($stmt,':In_SKU',$doc_asn_detail->sku);
+                    oci_bind_by_name($stmt,':In_ReceivedQty',$doc_asn_detail->receivedqty_each);
+                    oci_bind_by_name($stmt,':In_RejectedQty',$In_RejectedQty);
+                    oci_bind_by_name($stmt,':In_UOM',$In_UOM);
+                    oci_bind_by_name($stmt,':In_PackID',$doc_asn_detail->packid);
+                    oci_bind_by_name($stmt,':In_ContainerID',$In_ContainerID);
+                    oci_bind_by_name($stmt,':In_LotAtt01_C',$doc_asn_detail->lotatt01);
+                    oci_bind_by_name($stmt,':In_LotAtt02_C',$doc_asn_detail->lotatt02);
+                    oci_bind_by_name($stmt,':In_LotAtt03_C',$In_LotAtt03_C);
+                    oci_bind_by_name($stmt,':In_LotAtt04_C',$doc_asn_detail->lotatt04);
+                    oci_bind_by_name($stmt,':In_LotAtt05_C',$doc_asn_detail->lotatt05);
+                    oci_bind_by_name($stmt,':In_LotAtt06_C',$In_LotAtt06_C);
+                    oci_bind_by_name($stmt,':In_LotAtt07_C',$In_LotAtt07_C);
+                    oci_bind_by_name($stmt,':In_LotAtt08_C',$doc_asn_detail->lotatt08);
+                    oci_bind_by_name($stmt,':In_LotAtt09_C',$In_LotAtt09_C);
+                    oci_bind_by_name($stmt,':In_LotAtt10_C',$In_LotAtt10_C);
+                    oci_bind_by_name($stmt,':In_LotAtt11_C',$In_LotAtt11_C);
+                    oci_bind_by_name($stmt,':In_LotAtt12_C',$In_LotAtt12_C);
+                    oci_bind_by_name($stmt,':In_TotalCubic',$In_TotalCubic);
+                    oci_bind_by_name($stmt,':In_TotalGrossWeight',$In_TotalGrossWeight);
+                    oci_bind_by_name($stmt,':In_TotalNetWeight',$In_TotalNetWeight);
+                    oci_bind_by_name($stmt,':In_TotalPrice',$In_TotalPrice);
+                    oci_bind_by_name($stmt,':In_UserDefine1',$doc_asn_detail->userdefine1);
+                    oci_bind_by_name($stmt,':In_UserDefine2',$doc_asn_detail->userdefine2);
+                    oci_bind_by_name($stmt,':In_UserDefine3',$doc_asn_detail->userdefine3);
+                    oci_bind_by_name($stmt,':In_UserDefine4',$doc_asn_detail->userdefine4);
+                    oci_bind_by_name($stmt,':In_UserDefine5',$doc_asn_detail->userdefine5);
+                    oci_bind_by_name($stmt,':In_FMLocation',$In_FMLocation);
+                    oci_bind_by_name($stmt,':In_TOLocation_C',$In_TOLocation_C);
+                    oci_bind_by_name($stmt,':In_QC_Type_C',$In_QC_Type_C);
+                    oci_bind_by_name($stmt,':In_PlanToLoc_C',$In_PlanToLoc_C);
+                    oci_bind_by_name($stmt,':In_ReceivingTime',$In_ReceivingTime);
+                    oci_bind_by_name($stmt,':In_LPN',$In_LPN);
+                    oci_bind_by_name($stmt,':In_Operator',$doc_asn_detail->addwho);
+                    oci_bind_by_name($stmt,':IN_RCVModule',$IN_RCVModule);
+                    oci_bind_by_name($stmt,':IN_RCVStation',$IN_RCVStation);
+                    oci_bind_by_name($stmt,':In_Language',$In_Language);
+                    oci_bind_by_name($stmt,':In_UserID',$doc_asn_detail->addwho);
+                    oci_bind_by_name($stmt,':OUT_Return_Code',$result);dd($stmt);
+                    oci_execute($stmt);
+                    if (substr($result,1,3) == '000'){
+                        $query = DB::raw("update cus_bs_asndetails t set t.rcvflag = 'Y' where t.asnno = ? and t.asnlineno = ?");
+                        $db->update($query,[$doc_asn_detail->docno,$doc_asn_detail->asnlineno]);
                     }else{
-                        exe3();
-                        DB::rollBack();
-                        break;
+                        $query = DB::raw("update cus_bs_asndetails t set t.rcvflag = 'W' where t.asnno = ? and t.asnlineno = ?");
+                        $db->update($query,[$doc_asn_detail->docno,$doc_asn_detail->asnlineno]);
+                        $db->rollBack();
+                        return ['success'=>false, 'data'=>'收货失败','code'=>$result];
                     }
                 }
-            });
-            DB::commit();
-            return ['success'=>true, 'data'=>"OK"];
-        }
-        if ($addwho == "BSERP"){
-            $cus_bs_asnheader = DB::connection('oracle')->select(DB::raw('SELECT t.asnreference1 FROM cus_bs_asnheader t'));
-            if (!$cus_bs_asnheader) return ['success'=>false, 'data'=>'单据不存在'];
-            $asnreference1 = $cus_bs_asnheader[0]->asnreference1;
-            return ['success'=>true, 'data'=>$asnreference1];
+                $db->commit();
+                return ['success'=>true];
+            }catch (\Exception $e){
+                $db->rollBack();
+                return ['success'=>false, 'data'=>$e->getMessage()];
+            }
         }
     }
 
+
+    /*$resule = $that->exe($doc_asn_detail->warehouseid,'3',$doc_asn_detail->docno,$doc_asn_detail->asnlineno,'',$doc_asn_detail->new_traceid,'00','正常','OK','正常',
+                        '',$doc_asn_detail->customerid,$doc_asn_detail->sku,$doc_asn_detail->receivedqty_each,'','EA',$doc_asn_detail->packid,'',$doc_asn_detail->lotatt01,$doc_asn_detail->lotatt02,
+                        '',$doc_asn_detail->lotatt04,$doc_asn_detail->lotatt05,'','',$doc_asn_detail->lotatt08,'','','','',
+                        '0.00','0.00','0.00','0.00',$doc_asn_detail->userdefine1,$doc_asn_detail->userdefine2,$doc_asn_detail->userdefine3,$doc_asn_detail->userdefine4,$doc_asn_detail->userdefine5,'STAGE'.$doc_asn_detail->warehouseid,
+                    'STAGE'.$doc_asn_detail->warehouseid,'OK','','','*',$doc_asn_detail->addwho,'','','cn',$doc_asn_detail->addwho,'');*/
     /** $In_Process_Action为来源渠道，快速入库调用固定值 为 '3' */
     private function exe($IN_Warehouse, $In_Process_Action, $In_ASNNo_C, $In_ASNLineNo_C, $In_FMTraceID_C, $In_New_TraceID_C, $In_ProductStatus,
         $In_ProductStatus_Descr, $In_HoldRejectCode_C, $In_HoldRejectReason_C, $In_PONo_C, $In_CustomerID, $In_SKU, $In_ReceivedQty, $In_RejectedQty,
@@ -193,6 +289,10 @@ class StoreController extends Controller
         In_LotAtt02 In_LotAtt03 In_LotAtt04 In_LotAtt05 In_LotAtt06 In_LotAtt07 In_LotAtt08 In_LotAtt09 In_LotAtt10
         In_LotAtt11 In_LotAtt12 In_HoldRejectCode In_HoldRejectReason
         */
+        /** IS */
+        $r_OutboundLifeDays = 0;
+        $r_InboundLifeDays = 0;
+
         if ($OUT_Return_Code == "NO_COMMIT" || $OUT_Return_Code == "*_*"){
             $r_NO_COMMIT = 'N';
         }else{
@@ -267,7 +367,7 @@ class StoreController extends Controller
         //TODO 盲收逻辑 SPASN_Receiving_Process：536行 $In_Process_Action = 2
 
         //如果订单已经关闭或者取消，则报错
-        $doc_asn_header = DB::connection('oracle')->select(DB::raw("Select count(1)  from DOC_ASN_Header where ASNNO='".$In_ASNNo."' and (ASNStatus='90' or ASNStatus='99')"));
+        $doc_asn_header = DB::connection('oracle')->select(DB::raw("Select 1  from DOC_ASN_Header where ASNNO='".$In_ASNNo."' and (ASNStatus='90' or ASNStatus='99')"));
         if ($doc_asn_header) return '201';
 
         //收货数量必须大于0
@@ -332,7 +432,7 @@ class StoreController extends Controller
 
         //入库生产日期不能小于在库库存生产日期
         if ($r_ASN_MDT_CHK == 'Y' && trim($In_LotAtt01)){
-            $data = DB::connection('oracle')->select(DB::raw("SELECT count(*) c FROM INV_LOT_LOC_ID a,INV_LOT_ATT b, bas_location c WHERE a.CUSTOMERID='".$In_CustomerID.
+            $data = DB::connection('oracle')->select(DB::raw("SELECT 1 c FROM INV_LOT_LOC_ID a,INV_LOT_ATT b, bas_location c WHERE a.CUSTOMERID='".$In_CustomerID.
                 "' AND a.sku='".$In_SKU."' AND a.LotNum=b.LotNum AND a.LocationID=c.LocationID AND c.LocationUsage<>'ST' AND b.LotAtt01>'".$In_LotAtt01."'"));
             if ($data) return '266INV_LOT_LOC_ID';
         }
@@ -498,21 +598,21 @@ class StoreController extends Controller
         if ($In_New_TraceID != '*' && trim($In_New_TraceID)){
             if ($R_LoseID_Flag == 'N'){
                 if ($r_RCV_MIX_TID == 'N'){ //跟踪号是否可以多次收货
-                    $INV_LOT_LOC_ID = DB::connection('oracle')->select(DB::raw("SELECT COUNT(*) FROM INV_LOT_LOC_ID a INNER JOIN view_MultiWarehouse b ON a.LOCATIONID = b.LOCATIONID WHERE b.WAREHOUSEID = '".
+                    $INV_LOT_LOC_ID = DB::connection('oracle')->select(DB::raw("SELECT 1 FROM INV_LOT_LOC_ID a INNER JOIN view_MultiWarehouse b ON a.LOCATIONID = b.LOCATIONID WHERE b.WAREHOUSEID = '".
                         $IN_Warehouse."' AND  TraceID='".$In_New_TraceID."' AND qty>0"));
                     if ($INV_LOT_LOC_ID) return '218跟踪号重复错误ID='.$In_New_TraceID;
                 }else{
                     if ($r_RCV_MIX_SKU == 'N'){
-                        $TABLE_INV_LOT_LOC_ID = DB::connection('oracle')->select(DB::raw("SELECT COUNT(*) FROM INV_LOT_LOC_ID a INNER JOIN view_MultiWarehouse b ON a.locationid = b.LocationID WHERE b.WarehouseID = '".
+                        $TABLE_INV_LOT_LOC_ID = DB::connection('oracle')->select(DB::raw("SELECT 1 FROM INV_LOT_LOC_ID a INNER JOIN view_MultiWarehouse b ON a.locationid = b.LocationID WHERE b.WarehouseID = '".
                         $IN_Warehouse."' AND TraceID = '".$In_New_TraceID."' AND sku <> '".$In_SKU."' AND qty>0"));
                         if ($TABLE_INV_LOT_LOC_ID) return '273';
                     }elseif ($r_RCV_MIX_GR1 == 'N'){
-                        $TABLE_INV_LOT_LOC_ID = DB::connection('oracle')->select(DB::raw("SELECT count(1) FROM INV_LOT_LOC_ID a INNER JOIN view_MultiWarehouse b ON a.locationid = b.LocationID INNER JOIN Bas_Sku C ON A.CUSTOMERID = C.CUSTOMERID AND A.SKU = C.SKU WHERE b.WarehouseID = '".
+                        $TABLE_INV_LOT_LOC_ID = DB::connection('oracle')->select(DB::raw("SELECT 1 FROM INV_LOT_LOC_ID a INNER JOIN view_MultiWarehouse b ON a.locationid = b.LocationID INNER JOIN Bas_Sku C ON A.CUSTOMERID = C.CUSTOMERID AND A.SKU = C.SKU WHERE b.WarehouseID = '".
                             $IN_Warehouse."' AND TraceID='".$In_New_TraceID."' AND C.SKU_GROUP1 <> '".$r_SKU_Group1."' AND qty>0"));
                         if ($TABLE_INV_LOT_LOC_ID)return '273';
                     }
                     //ID是否重复
-                    $TABLE_INV_LOT_LOC_ID = DB::connection('oracle')->select(DB::raw("SELECT COUNT(*) FROM INV_LOT_LOC_ID a INNER JOIN view_MultiWarehouse b on a.locationid = b.LocationID where b.WarehouseID ='".
+                    $TABLE_INV_LOT_LOC_ID = DB::connection('oracle')->select(DB::raw("SELECT 1 FROM INV_LOT_LOC_ID a INNER JOIN view_MultiWarehouse b on a.locationid = b.LocationID where b.WarehouseID ='".
                         $IN_Warehouse."' AND a.LocationID<>'".$In_TOLocation."' AND a.TraceID='".$In_New_TraceID."' AND a.QTY>0"));
                     if ($TABLE_INV_LOT_LOC_ID)return '218'.$In_New_TraceID;
                 }
@@ -521,6 +621,396 @@ class StoreController extends Controller
 
         //r_QtyOnHold:=0
         if (!trim($In_HoldRejectCode)) $In_HoldRejectCode = 'OK'; //TODO 1098行
+
+        //ID合法性校验 禁止收货到封存库位
+        if (in_array($r_LocationAttribute,["HD","FI"]))return '228';
+
+        //混放产品校验
+        if (($R_Mix_Flag == 'N' || $r_SKUCount > 0) && $R_LocationUsage != 'ST'){
+            $TABLE_inv_lot_LOC_ID = DB::connection('oracle')->select(DB::raw("SELECT COUNT(distinct SKU) c FROM inv_lot_LOC_ID WHERE LocationID='".$In_TOLocation."' AND sku <> '".$In_SKU.
+                "' AND Qty > 0"));
+            if ($TABLE_inv_lot_LOC_ID){
+                if ($TABLE_inv_lot_LOC_ID[0]->c >= 1 && $R_Mix_Flag == 'N')return '205'.rtrim($In_TOLocation);
+                elseif ($R_Mix_Flag == 'Y' && $r_SKUCount > 0 && $TABLE_inv_lot_LOC_ID[0]->c >= $r_SKUCount) return '367'.$r_SKUCount;
+            }
+        }
+
+        //码盘后才能收货
+        if (!rtrim($In_FMTraceID))$In_FMTraceID = '*';
+        if ($r_PLT_RCV == 'Y' && $In_FMTraceID == '*')return '217';
+        if ($In_FMTraceID != '*'){
+            //无论是ASn收货还是码盘收货， 交易里的FMUOM/QTY/Packid都取收货的数据
+            $TABLE_DOC_Trace_Details = DB::connection('oracle')->select(DB::raw("SELECT PlanToLoc, UOM, LineStatus, Reserve_Flag,Lotnum, ExpectedQty_Each - ReceivedQty_Each from DOC_Trace_Details ".
+            "WHERE TraceID=In_FMTraceID  AND ASNNO='".$In_ASNNo."' AND ASNLineNO='".$In_ASNLineNo."'"));
+            if (!$TABLE_DOC_Trace_Details) return '104'.$In_ASNNo.":".$In_ASNLineNo;
+            $r_PlanToLoc_Trace = $TABLE_DOC_Trace_Details[0]->plantoloc;
+            $r_TraceUOM = $TABLE_DOC_Trace_Details[0]->uom;
+            $r_LineStatus_Trace = $TABLE_DOC_Trace_Details[0]->linestatus;
+            $R_Reserve_Flag = $TABLE_DOC_Trace_Details[0]->reserve_flag;
+            $r_Lotnum_Trace = $TABLE_DOC_Trace_Details[0]->lotnum;
+            $r_CancelQty_Trace = $TABLE_DOC_Trace_Details[0]->expectedqty_each - $TABLE_DOC_Trace_Details[0]->receivedqty_each;
+
+            if ($R_Reserve_Flag == 'Y' && $R_LocationUsage != 'ST'){
+                $OUT_Return_Code = '*_*';
+                $OUT_Return_Code = $this->spasn_reserve_cancel($IN_Warehouse, 'TRACEID', $In_ASNNo, $In_ASNLineNo, $In_FMTraceID, $In_Language, $In_UserID, $OUT_Return_Code);
+                if (substr($OUT_Return_Code,1,3) != '000'){
+                    DB::rollBack();
+                    return $OUT_Return_Code;
+                }
+            }
+        }else{
+            //没有码盘
+            $r_FMUOM = $In_UOM;
+            $r_FMPackID = $In_PackID;
+            $r_FMQty_Each = '';
+            $r_FMQty = $In_ReceivedQty;
+        }
+
+        //收货时使用的包装数量转换
+        $TABLE_bas_Package = DB::connection('oracle')->select(DB::raw("SELECT QTY1,QTY2,QTY3,QTY4,QTY5,IN_Label1,IN_Label3,IN_Label4 FROM bas_Package where PackID='".$In_PackID."'"));
+        if (!$TABLE_bas_Package)return '104'.$In_PackID;
+        $r_QTY1_P = $TABLE_bas_Package[0]->qty1;
+        $r_QTY2_P = $TABLE_bas_Package[0]->qty2;
+        $r_QTY3_P = $TABLE_bas_Package[0]->qty3;
+        $r_QTY4_P = $TABLE_bas_Package[0]->qty4;
+        $r_QTY5_P = $TABLE_bas_Package[0]->qty5;
+        $r_IN_Label1 = $TABLE_bas_Package[0]->in_label1;
+        $r_IN_Label3 = $TABLE_bas_Package[0]->in_label3;
+        $r_IN_Label4 = $TABLE_bas_Package[0]->in_label4;
+
+        if ($r_CopyPackIDToLotAtt12 == 'Y')$In_LotAtt12 = $r_QTY3_P;
+        if ($R_LOT_12_PKG == 'Y' && $In_UOM == 'CS')$R_UOMQty_Read = $In_LotAtt12;
+        else{
+            switch ($In_UOM){
+                case 'EA':
+                    $R_UOMQty_Read = $r_QTY1_P;
+                    break;
+                case 'IP':
+                    $R_UOMQty_Read = $r_QTY2_P;
+                    break;
+                case 'CS':
+                    $R_UOMQty_Read = $r_QTY3_P;
+                    break;
+                case 'PL':
+                    $R_UOMQty_Read = $r_QTY4_P;
+                    break;
+                case 'OT':
+                    $R_UOMQty_Read = $r_QTY5_P;
+                    break;
+            }
+        }
+        $r_FMQty_Each = ($r_FMQty ?? 0) * ($R_UOMQty_Read ?? 0);
+        $r_ReceivedQty_Each = $In_ReceivedQty * ($R_UOMQty_Read ?? 0);
+
+        if (!$r_TotalCubic) $r_TotalCubic = ($r_SKU_Cube ?? 0) * $r_ReceivedQty_Each;
+
+        if ($In_Process_Action != 2){
+            if ($R_OverRCVPercentage_ASN ?? false)$r_OverRCVPercentage = $R_OverRCVPercentage_ASN;
+            //质检控制
+            if ($r_QC_RCV_CTL == 'C'){ //校验合格数
+                $TABLE_ACT_QC_Transaction = DB::connection('oracle')->select(DB::raw("SELECT SUM(QCQty_PASS) pass FROM ACT_QC_Transaction a INNER JOIN DOC_QC_Header b ON A.QCNo = b.QcNo WHERE B.ASNNo = '".$In_ASNNo."' AND A.AsnLineNo = '".$In_ASNLineNo."' AND B.QCStatus < '90'"));
+                if ($TABLE_ACT_QC_Transaction)$r_QCQTY_Pass = $TABLE_ACT_QC_Transaction[0]->pass;
+                if ((($r_ReceivedQty_Each_ASN ?? 0) + $r_ReceivedQty_Each) > ($r_QCQTY_Pass ?? 0)) return '225';
+            }else{
+                $TABLE_doc_QC_Details = DB::connection('oracle')->select(DB::raw("SELECT C.UDF1 from doc_QC_Details a INNER JOIN doc_QC_Header b ON a.QcNo = b.QcNo INNER JOIN BAS_Codes C ON a.QCResult = C.Code and codeid = 'QC_RST' WHERE B.ASNNo = '".$In_ASNNo."' and A.AsnLineNo = '".$In_ASNLineNo."' and B.QCStatus < '90' and rownum = 1"));
+                if ($TABLE_doc_QC_Details) $r_UDF1 = $TABLE_doc_QC_Details[0]->udf1;
+                if ($r_UDF1 ?? false){
+                    if ($r_UDF1 == 'NOPASS')return '229'; //拒收,原因:质检不合格'
+                    if ($r_UDF1 == 'CONTROL'){
+                        $TABLE_ACT_QC_Transaction = DB::connection('oracle')->select(DB::raw("Select SUM(QcQty_Reject) QcQty_Reject from ACT_QC_Transaction a inner join DOC_QC_Header b ON A.QCNo = b.QcNo Where B.ASNNo = '".$In_ASNNo."' and A.AsnLineNo = '".$In_ASNLineNo."' and B.QCStatus <> '90'"));
+                        if ($TABLE_ACT_QC_Transaction) $r_QCQTY_Reject = $TABLE_ACT_QC_Transaction[0]->qcqty_reject;
+                        if (($r_ReceivedQty_Each_ASN ?? 0 + $r_ReceivedQty_Each) > ($r_ExpectedQty_Each_ASN ?? 0 - ($r_QCQTY_Reject ?? 0)))return '225'; //超出质检合格数
+                    }
+                }
+            }
+        }
+
+        //超量收货校验
+        if ($R_OverReceiving != 'Y' && ($r_ExpectedQty_Each_ASN ?? false) && ($In_Process_Action != 2)){
+            if ((($r_ReceivedQty_Each_ASN ?? 0) + $r_ReceivedQty_Each) > $r_ExpectedQty_Each_ASN)return '215';
+            if (($r_PONO ?? false) && $r_PONO != '*' && ($r_POLineNO ?? false)){
+                $TABLE_DOC_PO_DETAiLS = DB::connection('oracle')->select(DB::raw("SELECT OrderedQty_Each, ReceivedQty_Each From DOC_PO_DETAiLS where PONO='".$r_PONO."' AND POLineNo='".$r_POLineNO."'"));
+                if ($TABLE_DOC_PO_DETAiLS){
+                    $r_OrderedQty_PO = $TABLE_DOC_PO_DETAiLS[0]->orderedqty_each;
+                    $r_ReceivedQty_Each_PO = $TABLE_DOC_PO_DETAiLS[0]->receivedqty_each;
+                }
+                if ((($r_ReceivedQty_Each_PO ?? 0) + $r_ReceivedQty_Each > ($r_OrderedQty_PO ?? 0)))return '215'.$In_CustomerID.",PONo=".$r_PONO;
+            }
+        }
+
+        if ($R_OverReceiving == 'Y' && $r_OverRCVPercentage && ($r_ExpectedQty_Each_ASN ?? false) && $In_Process_Action != 2){//有百分比限制
+            $r_OVR_RCV_BY = $this->GETSYS_configuration($IN_Warehouse, $In_CustomerID, $r_ASNType, 'OVR_RCV_BY','BOTH');
+            if (in_array($r_OVR_RCV_BY,["ASN","BOTH"])){
+                if (((($r_ReceivedQty_Each_ASN ?? 0) + $r_ReceivedQty_Each) / $r_ExpectedQty_Each_ASN) > (1+$r_OverRCVPercentage))return '215'.$In_CustomerID;
+            }elseif (in_array($r_OVR_RCV_BY,["PO","BOTH"])){
+                if (($r_PONO ?? false) && $r_PONO!='*' && ($r_POLineNO ?? false)){
+                    $TABLE_DOC_PO_DETAiLS = DB::connection('oracle')->select(DB::raw("Select OrderedQty_Each, ReceivedQty_Each From DOC_PO_DETAiLS where PONO=r_PONO AND POLineNo=r_POLineNo"));
+                    if ($TABLE_DOC_PO_DETAiLS){
+                        $r_OrderedQty_PO = $TABLE_DOC_PO_DETAiLS[0]->orderedqty_each;
+                        $r_ReceivedQty_Each_PO = $TABLE_DOC_PO_DETAiLS[0]->receivedqty_each;
+                    }
+                    if (((($r_ReceivedQty_Each_PO ?? 0) + $r_ReceivedQty_Each) / ($r_OrderedQty_PO ?? 0)) > (1+$r_OverRCVPercentage)) return '215'.$In_CustomerID.',PONo='.$r_PONO;
+                }
+            }
+        }
+
+        if ($In_ASNNo == '*') $r_DocType = '*';
+        else $r_DocType = 'ASN';
+
+        //RF收货产生新的ID [In_New_TraceID]，自动打印上架标签
+        if ($In_New_TraceID == '*' && ($R_PRT_PTA_LBL == 'Y' || $r_ASN_GEN_TID == 'Y')){
+            if ($R_LoseID_Flag != 'Y'){
+               // $OUT_Return_Code = $this->spcom_getidsequence(); //1331 此SP调用 恒定返回000 无意义调用
+                $OUT_Return_Code = '000';
+            }
+        }
+        //判断目标库位是否冻结 @LocationHold
+        $TABLE_ACT_InventoryHold = DB::connection('oracle')->select(DB::raw("Select count(1) c From ACT_InventoryHold Where HoldBy='2' and HoldFlag='Y' and LocationID='".$In_TOLocation."'"));
+        if ($TABLE_ACT_InventoryHold)$r_nrow = $TABLE_ACT_InventoryHold[0]->c;
+        if ($r_nrow >= 1) $r_LocationHold = 'Y';
+        $r_LogicalFMSequence = null;
+        $r_LogicalToSequence = null;
+        $TABLE_BAS_Location = DB::connection('oracle')->select(DB::raw("select LogicalSequence From BAS_Location Where LocationID= '".$In_PlanToLoc."'"));
+        if (!$TABLE_BAS_Location) $r_LogicalToSequence = 0;
+        else $r_LogicalToSequence = $TABLE_BAS_Location[0]->logicalsequence;
+        $TABLE_BAS_Location = DB::connection('oracle')->select(DB::raw("select LogicalSequence From BAS_Location Where LocationID='".$In_TOLocation."'"));
+        if (!$TABLE_BAS_Location) $r_LogicalFMSequence = 0;
+        else $r_LogicalFMSequence = $TABLE_BAS_Location[0]->logicalsequence;
+        $r_MaxPATaskID_Sequence = 0;
+        $r_MaxQCTaskID_Sequence = 0;
+
+        // <<Loop1>>
+        //批号处理
+        if ($In_Process_Action != '2'){
+            $r_nrow = 1;
+            $query = DB::raw("SELECT LotNum from INV_LOT_ATT where CustomerID='".$In_CustomerID."' and SKU=in_SKU".
+                " and nvl(LotAtt01,'*')=nvl(rtrim('".$In_LotAtt01."'),'*') and nvl(LotAtt02,'*')=nvl(rtrim('".$In_LotAtt02."'),'*') and nvl(LotAtt03,'*')=nvl(rtrim('".$In_LotAtt03."'),'*')".
+                " and nvl(LotAtt04,'*')=nvl(rtrim('".$In_LotAtt04."'),'*') and nvl(LotAtt05,'*')=nvl(rtrim('".$In_LotAtt05."'),'*') and nvl(LotAtt06,'*')=nvl(rtrim('".$In_LotAtt06."'),'*')".
+                " and nvl(LotAtt07,'*')=nvl(rtrim('".$In_LotAtt07."'),'*') and nvl(LotAtt08,'*')=nvl(rtrim('".$In_LotAtt08."'),'*') and nvl(LotAtt09,'*')=nvl(rtrim('".$In_LotAtt09."'),'*')".
+                " and nvl(LotAtt10,'*')=nvl(rtrim('".$In_LotAtt10."'),'*') and nvl(LotAtt11,'*')=nvl(rtrim('".$In_LotAtt11."'),'*') and nvl(LotAtt12,'*')=nvl(rtrim('".$In_LotAtt12."'),'*') and rownum=1");
+            $data = DB::connection('oracle')->select($query);
+            if (!$data) $r_nrow = 0;
+            else $r_Return_LotNum = $data[0]->lotnum;
+
+            //产生新的批号
+            if($r_nrow <= 0){
+                //SP: SPCOM_GetIDSequence(IN_Warehouse,IN_Language,'LOTNumber',r_Return_LotNum,OUT_Return_Code);
+                $r_Return_LotNum = '0';
+                $OUT_Return_Code = '000';
+
+                //TODO CREATE INV_LOT_ATT
+                DB::connection('oracle')->insert(DB::raw("INSERT INTO INV_LOT_ATT (CustomerID,SKU,LotNum,LotAtt01,LotAtt02,LotAtt03,LotAtt04,LotAtt05,LotAtt06,LotAtt07,LotAtt08,LotAtt09,LotAtt10,LotAtt11,LotAtt12,AddTime,AddWho,EditTime,EditWho,ReceivingTime) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"),
+                    [$In_CustomerID,$In_SKU,$r_Return_LotNum,rtrim($In_LotAtt01),rtrim($In_LotAtt02),rtrim($In_LotAtt03),rtrim($In_LotAtt04),rtrim($In_LotAtt05),rtrim($In_LotAtt06)
+                        ,rtrim($In_LotAtt07),rtrim($In_LotAtt08),rtrim($In_LotAtt09),rtrim($In_LotAtt10),rtrim($In_LotAtt11),rtrim($In_LotAtt12)
+                        ,$R_CurrentTime->toDateTimeString(),$In_UserID,$R_CurrentTime->toDateTimeString(),$In_UserID,$R_CurrentTime->toDateTimeString()]);
+            }
+            //预约库存的数量处理
+            $r_Lotnum_Trace = $r_Lotnum_Trace ?? '';
+            $r_PlanToLoc_Trace = $r_PlanToLoc_Trace ?? '';
+            $r_Return_LotNum = $r_Return_LotNum ?? '';
+
+            if ($R_Reserve_Flag == 'Y' && $R_LocationUsage == 'ST' && ($r_Lotnum_Trace ?? '') != $r_Return_LotNum){ //有预约，并且是收到ST库位,批次发生变化
+                //TODO UPDATE
+                DB::connection('oracle')->update(DB::raw('UPDATE INV_LOT_LOC_ID SET QTYPA = QTYPA - ? WHERE lotnum = ? and LocationID = ? and traceid = ?'),
+                    [(int)($r_CancelQty_Trace ?? 0),$r_Lotnum_Trace,$r_PlanToLoc_Trace,$In_FMTraceID]);
+                //TODO DELETE
+                DB::connection('oracle')->delete(DB::raw('DELETE FROM INV_LOT_LOC_ID where lotnum = ? and LocationID = ? and traceid = ? and QTYPA = 0 and qty = 0 and qtyMvin = 0'),
+                    [$r_Lotnum_Trace,$r_PlanToLoc_Trace,$In_FMTraceID]);
+
+                DB::connection('oracle')->select(DB::raw('Select * from INV_LOT_LOC_ID Where LotNum=? and LocationID=? and TraceID=? for update'),[
+                    $r_Return_LotNum, $r_PlanToLoc_Trace, $In_FMTraceID
+                ]);
+                $TABLE_inv_lot_loc_id = DB::connection('oracle')->select(DB::raw(' select count(*) c from inv_lot_loc_id where lotnum = ? and LocationID = ? and traceid = ?'),[
+                    $r_Return_LotNum,$r_PlanToLoc_Trace,$In_FMTraceID
+                ]);
+                if ($TABLE_inv_lot_loc_id[0]->c > 0){
+                    //TODO UPDATE
+                    DB::connection('oracle')->update(DB::raw('update inv_lot_loc_id set QTYPA = QTYPA + ? where lotnum = ? and LocationID = ? and traceid = ?'),[
+                        (int)$r_ReceivedQty_Each,$r_Return_LotNum,$r_PlanToLoc_Trace,$In_FMTraceID
+                    ]);
+                }else{
+                    //TODO CREATE INV_LOT_LOC_ID
+                    DB::connection('oracle')->insert(DB::raw('Insert Into INV_LOT_LOC_ID (LotNum, LocationID, TraceID, CustomerID, SKU, Qty, QtyAllocated, QtyRPIn, QtyRPOut, QtyMVIN, QtyMVOut, QtyOnHold, OnHoldLocker,GrossWeight, NetWeight, Cubic, Price, AddTime, AddWho, EditTime, EditWho, LPN, QTYPA) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)'),[
+                        $r_Return_LotNum,$r_PlanToLoc_Trace,$In_FMTraceID,$In_CustomerID,$In_SKU,0,0,0,0,0,
+                        0,0,0,0,0,0,0,$R_CurrentTime->toDateTimeString(),$In_UserID,$R_CurrentTime->toDateTimeString(),
+                        $In_UserID,null,$r_ReceivedQty_Each
+                    ]);
+                }
+            }
+            //混放批次校验
+            if ($R_Mix_LotFlag == 'N' && $R_LocationUsage != 'ST'){
+                $TABLE_inv_lot_LOC_ID = DB::connection('oracle')->selectOne(DB::raw('select count(distinct LotNUM) c from inv_lot_LOC_ID where LocationID=? and LotNum<>? and Qty>0 and CustomerID=? and SKU=?'),[
+                    $In_TOLocation,$r_Return_LotNum,$In_CustomerID,$In_SKU
+                ]);
+                if ($TABLE_inv_lot_LOC_ID->c >= 1){
+                    DB::rollBack();
+                    return '206'.rtrim($In_TOLocation);
+                }
+            }
+            //货架生命周期，失效日期，自动冻结
+            $r_Flag = '0';
+            if (trim($In_LotAtt02)){
+                if ((strtotime($In_LotAtt02) ? true : false)){
+                    $r_nrow = 1;
+                    $TABLE_BAS_SKU = DB::connection('oracle')->selectOne(DB::raw("SELECT c.OutboundLifeDays,c.InboundLifeDays from BAS_SKU c where c.CustomerID=? and c.SKU=? and c.ShelfLifeFlag='Y' and c.ShelfLifeType='E'"),[
+                        $In_CustomerID,$In_SKU
+                    ]);
+                    if (!$TABLE_BAS_SKU)$r_nrow=0;
+                    else {
+                        $r_OutboundLifeDays = $TABLE_BAS_SKU->outboundlifedays;
+                        $r_InboundLifeDays = $TABLE_BAS_SKU->inboundlifedays;
+                    }
+                }
+                if ($r_nrow > 0)$r_Flag = '1';
+                else $r_Flag = '0';
+                if ($r_nrow > 0 && (($r_OutboundLifeDays > 0 && (Carbon::parse($In_LotAtt02)->diffInDays($R_CurrentTime) <= $r_OutboundLifeDays)) ||
+                        ($r_InboundLifeDays > 0 && (Carbon::parse($In_LotAtt02)->diffInDays($R_CurrentTime) <= $r_InboundLifeDays)))){
+                    if ($r_EXP_CTL == 'Y')return '222'; //过期 拒收
+                    if ($r_EXP_CTL != 'N')$r_Hold_EP = 'Y';
+                }
+            }
+            //货架生命周期，生产日期，自动冻结
+            if ($In_LotAtt01 && !(strtotime($In_LotAtt01) ? true : false) && (!$r_Flag || $r_Flag = '0')){
+                $r_nrow = 1;
+                $TABLE_BAS_SKU = DB::connection('oracle')->selectOne(DB::raw('select c.OutboundLifeDays,c.InboundLifeDays from BAS_SKU c where c.CustomerID=? and c.SKU=? and c.ShelfLifeFlag=? and c.ShelfLifeType=?') ,[
+                    $In_CustomerID,$In_SKU,'Y','M'
+                ]);
+                if (!$TABLE_BAS_SKU)$r_nrow = 0;
+                else {
+                    $r_OutboundLifeDays = $TABLE_BAS_SKU->outboundlifedays;
+                    $r_InboundLifeDays = $TABLE_BAS_SKU->inboundlifedays;
+                }
+                if ($r_nrow > 0 && (($r_OutboundLifeDays > 0 && ($R_CurrentTime->diffInDays(Carbon::parse($In_LotAtt01)) > $r_OutboundLifeDays))  ||
+                        ($r_InboundLifeDays > 0 && ($R_CurrentTime->diffInDays(Carbon::parse($In_LotAtt01)) > $r_InboundLifeDays)))){
+                    if ($r_EXP_CTL == 'Y')return '222'; //有效期受控 拒收
+                    if ($r_EXP_CTL != 'N') $r_Hold_EP ='Y';
+                }
+            }
+            if (trim($In_ContainerID)){
+                DB::connection('oracle')->update(DB::raw('Update DOC_ASN_SerialNo Set LotNum=?,edittime=?,editwho=? Where LocationID=? and TraceID=? and LotNum=?'),[
+                    $r_Return_LotNum,$R_CurrentTime,$In_UserID,$In_TOLocation,$In_New_TraceID,$In_ContainerID
+                ]);
+            }
+        }
+        //计算上架库位 1543-1716 INSERT UPDATE
+
+        //QTYPA 写入INV_LOT_LOC_ID 1719-1752 INSERT UPDATE
+
+        //更新库存MVOut数量 1754-1810 SP:SPASN_Putaway_Calculation INSERT DELETE
+
+        //上架库位处理 QTYPA 写入INV_LOT_LOC_ID 1854-1918 UPDATE
+
+        // 1920-1989 UPDATE
+
+        //任务处理 1992-2105 INSERT
+            //--指定上架任务时此表为空 TMP_Putaway_task
+            //混托盘任务处理
+
+        //拆分上架任务后，需要分别写入收货交易，不然取消收货会导致QTYPA负数错误 库存交易处理 2107-2294   INSERT
+            //产生交易记录 INSERT
+            //更新冻结数 SP:SPINV_Hold_Update
+            //只有质检后才能上架
+            //根据收货交易产生质检明细
+            //获取数据精度
+
+        //2298-2378 UPDATE INSERT SP
+
+        //更新码盘明细 2403-2460 UPDATE
+            //码盘收货
+
+        //更新ASN明细和ASN Header 2462-2617 SP UPDATE
+            //判断拒收是否超量r_RejectedQty_Each_ASN
+            //拒收数量应该< 预期数量-已收数量-已拒数量-本次收货数量，否则报错“拒收数量超量错误”
+        if ($In_ASNNo != '*'){
+            $query = DB::raw('Select PackID,UOM,ExpectedQty,ExpectedQty_Each,RejectedQty,RejectedQty_Each,ReceivedQty,ReceivedQty_Each,POLineNO,PONO From DOC_ASN_Details Where ASNNO=? and ASNLineNO=? for update');
+            $TABLE_DOC_ASN_Details = DB::connection('oracle')->selectOne($query,[$In_ASNNo,$In_ASNLineNo]);
+            if (!$TABLE_DOC_ASN_Details) return '803'.$In_ASNNo;
+            $r_PackID_ASN = $TABLE_DOC_ASN_Details->packid;
+            $r_UOM_ASN = $TABLE_DOC_ASN_Details->uom;
+            $r_ExpectedQty_ASN = $TABLE_DOC_ASN_Details->expectedqty;
+            $r_ExpectedQty_Each_ASN = $TABLE_DOC_ASN_Details->expectedqty_each;
+            $r_RejectedQty_ASN = $TABLE_DOC_ASN_Details->rejectedqty;
+            $r_RejectedQty_Each_ASN = $TABLE_DOC_ASN_Details->rejectedqty_each;
+            $r_ReceivedQty_ASN = $TABLE_DOC_ASN_Details->receivedqty;
+            $r_ReceivedQty_Each_ASN = $TABLE_DOC_ASN_Details->receivedqty_each;
+            $r_POLineNO = $TABLE_DOC_ASN_Details->polineno;
+            $In_PONo = $TABLE_DOC_ASN_Details->pono;
+            //拒收超量
+            if ($R_OverReceiving != 'Y' && (int)$In_RejectedQty > ((int)$r_ExpectedQty_Each_ASN - (int)$r_RejectedQty_Each_ASN - (int)$r_ReceivedQty_Each_ASN - (int)$r_ReceivedQty_Each_ASN))return '220';
+            $r_ReceivedQty_Each_ASN = $r_ReceivedQty_Each + $r_ReceivedQty_Each_ASN;
+            switch ($r_UOM_ASN){
+                case "EA":
+                    $r_UOMQty_ASN = $r_QTY1_P;
+                    break;
+                case "IP":
+                    $r_UOMQty_ASN = $r_QTY2_P;
+                    break;
+                case "CS":
+                    $r_UOMQty_ASN = $r_QTY3_P;
+                    break;
+                case "PL":
+                    $r_UOMQty_ASN = $r_QTY4_P;
+                    break;
+                case "OT":
+                    $r_UOMQty_ASN = $r_QTY5_P;
+                    break;
+                default:
+                    $r_UOMQty_ASN = 0;
+                    break;
+            }
+            if ($r_UOMQty_ASN <= 0)return '103'.rtrim($r_PackID_ASN);
+            if ($r_ReceivedQty_Each_ASN >= $r_ExpectedQty_Each_ASN)$r_LineStatus = '40';
+            else $r_LineStatus = '30';
+            if ($r_ASN_RCV_UPD == 'Y'){
+                $query = DB::raw("Update DOC_ASN_Details Set LineStatus=? ,ReceivedQty= (ReceivedQty_Each+?)/ ?,ReceivedQty_Each=ReceivedQty_Each+?,ReceivedTime=? ,".
+                    "RejectedQty=(RejectedQty_Each + (?))/?,RejectedQty_Each=RejectedQty_Each + (?),Reserve_Flag='Y',HoldRejectCode=?,HoldRejectReason=?,EditTime=? , EditWho=?,".
+                    "LotAtt01=?,LotAtt02=?,LotAtt04=?,LotAtt05=?,LotAtt06=?,LotAtt07=?,LotAtt08=?,LotAtt09=?,LotAtt10=?,LotAtt11=?,LotAtt12=?,Operator= ? Where ASNNO=? and ASNLineNO=?");
+                DB::connection('oracle')->update($query,[$r_LineStatus,(int)$r_ReceivedQty_Each,(int)$r_UOMQty_ASN,(int)$r_ReceivedQty_Each,$R_ReceivingTime->toDateTimeString(),
+                    (int)$In_RejectedQty,(int)$r_UOMQty_ASN,(int)$In_RejectedQty,$In_HoldRejectCode,
+                    $In_HoldRejectReason,$R_CurrentTime->toDateTimeString(),$In_UserID,
+                    $In_LotAtt01,$In_LotAtt02,$In_LotAtt04,$In_LotAtt05,$In_LotAtt06,$In_LotAtt07,$In_LotAtt08,$In_LotAtt09,$In_LotAtt10,$In_LotAtt11,$In_LotAtt12,$In_Operator,$In_ASNNo,$In_ASNLineNo]);
+            }else{
+                $query = DB::raw('Update DOC_ASN_Details Set LineStatus=? ,ReceivedQty= (ReceivedQty_Each+?)/ ?,ReceivedQty_Each=ReceivedQty_Each+?'.
+                    ",ReceivedTime=?,RejectedQty=(RejectedQty_Each + (? ))/?,RejectedQty_Each=RejectedQty_Each + (?),Reserve_Flag='Y',HoldRejectCode=?".
+                    ",HoldRejectReason=?,EditTime=? , EditWho=?,Operator= ? Where ASNNO=? and ASNLineNO=?");
+                DB::connection('oracle')->update($query,[$r_LineStatus,(int)$r_ReceivedQty_Each,(int)$r_UOMQty_ASN,(int)$r_ReceivedQty_Each,
+                    $R_ReceivingTime->toDateTimeString(),(int)$In_RejectedQty,(int)$r_UOMQty_ASN,(int)$In_RejectedQty,$In_HoldRejectCode,
+                    $In_HoldRejectReason,$R_CurrentTime->toDateTimeString(),$In_UserID,$In_Operator,$In_ASNNo,$In_ASNLineNo]);
+            }
+            if ($r_LineStatus == '40'){
+                $count = DB::connection('oracle')->selectOne(DB::raw("Select Count(1) c from DOC_ASN_Details Where ASNNO=? and ASNLineNO<>? and LineStatus < '40'"),[$In_ASNNo,$In_ASNLineNo]);
+                $r_nrow = $count->c;
+                if ($r_nrow > 0) $r_LineStatus = '30';
+            }
+            $query = DB::raw("Update DOC_ASN_Header Set ASNStatus=?,Reserve_Flag='Y',LastReceivingTime=?,EditTime=? , EditWho=? Where ASNNO=?");
+            DB::connection('oracle')->update($query,[$r_LineStatus,$R_ReceivingTime->toDateTimeString(),$R_CurrentTime->toDateTimeString(),$In_UserID, $In_ASNNo]);
+
+            if ($r_RCV_CTL == 'Y' && $r_LineStatus == '40'){
+                $r_nrow = 0;
+                if ($r_PTA_CLS_CHK == 'Y'){
+                    $count = DB::connection('oracle')->selectOne(DB::raw("select count(1) c from TSK_Tasklists Where DocNo=? and TaskProcess='00' And DocType='ASN'"),[$In_ASNNo]);
+                    $r_nrow = $count->c;
+                }
+                if ($r_nrow == 0){
+                    $r_LineStatus = '99';
+                    //断点回滚，关闭ASN如果失败回滚该次操作而不是将上方全部操作回滚
+                    DB::transaction(function (){
+                        //2595-2614 关闭ASN 调用SP SPASN_Close_Process 该SP抛错时不影响全局回滚
+                    });
+                }
+            }
+        }
+
+        //更新PO信息 2620-2697 UPDATE
+
+        //删除TMP_Putaway_Task(上架任务临时表) 2808 DELETE
+        //DB::connection('oracle')->delete(DB::raw('delete from TMP_Putaway_Task where TMPID=?'),[$r_TMPID]);
+
+        //修改UDF_A的调用方式 SP 2812-2828
+
+        //清除0库存 2831-2834 SP
+
+        //结束返回与异常判断
         return $OUT_Return_Code;
     }
 
@@ -594,4 +1084,65 @@ class StoreController extends Controller
         }
         return trim($sys_configuration[0]->value_string);
     }
+
+    /** 码盘调用SP，大概率不会被使用，内部 为游标，UPDATE操作 */
+    private function spasn_reserve_cancel($in_warehouse, $in_by, $in_asnno, $in_asnlineno, $in_traceid, $in_language, $in_userid, $out_return_code){
+        $query = DB::raw('Select TraceID,ASNLineNO,CustomerID,SKU,PackID,UOM,LotNUM,PlanToLoc,ExpectedQty,ExpectedQty_Each,TotalGrossWeight,TotalCubic from DOC_Trace_DETAILS '.
+            "Where (ASNNO='".$in_asnno."' and ReceivedQty_Each=0 and trim(PlanToLoc) is not null and trim(PlanToLoc)<>'*' and Reserve_Flag='Y' and '".$in_by."'='ASNNO') OR".
+            " (ASNNO='".$in_asnno."' and ASNLineNO='".$in_asnlineno."' and ReceivedQty_Each=0 and trim(PlanToLoc) is not null and trim(PlanToLoc)<>'*' and Reserve_Flag='Y' and upper('".$in_by."')=upper('ASNLineNO')) OR".
+            " (ASNNO='".$in_asnno."' and TraceID='".$in_traceid."' and ASNLineNO='".$in_asnlineno."' and ReceivedQty_Each=0 and trim(PlanToLoc) is not null and trim(PlanToLoc)<>'*' and Reserve_Flag='Y' and upper('".$in_by."')=upper('TraceID'))");
+
+        if ($out_return_code == 'NO_COMMIT')$r_no_commit = 'N';
+        else $r_no_commit = 'Y';
+        $sp_sql_r = "''".$in_by."'',''".$in_asnno."'',''".$in_asnlineno."'',''".$in_traceid."'',''".$in_language."'',''".$in_userid."''";
+        $R_CurrentTime = Carbon::now();
+
+        if ($in_by != 'ASNNO' && strtoupper($in_by) != 'ASNLINENO' && strtoupper($in_by) != 'TRACEID')return '887SPASN_Reserve_Cancel';
+
+        $ccur_asns = DB::connection('oracle')->select($query);
+        foreach ($ccur_asns as $crow_asn){
+            $sp_sql_r = 'Fetch cCur_ASN';
+            $TABLE_DOC_Trace_Details = DB::connection('oracle')->select(DB::raw("SELECT 1 c from DOC_Trace_Details Where ASNNO='".$in_asnno."' and  TraceID='".$crow_asn->traceid."'"));
+            if ($TABLE_DOC_Trace_Details && $TABLE_DOC_Trace_Details[0]->c == 1){
+                // TODO UPDATE
+                $rowcount = DB::connection('oracle')->update(DB::raw("UPDATE INV_LOT_LOC_ID SET QTYPA=(QTYPA-".$crow_asn->expectedqty_each."),EditTime=TO_DATE('".$R_CurrentTime->toDateTimeString()."','yyyy-mm-dd hh24:mi:ss'),EditWho='".$in_userid.
+                    "' WHERE LotNum='".$crow_asn->lotnum."' and LocationID='".$crow_asn->plantoloc."' and TraceID='".$crow_asn->traceid."'"));
+                if ($rowcount == 0) return 'INV_LOT_LOC_ID,UPDATE';
+                // TODO UPDATE
+                DB::connection('oracle')->update(DB::raw("UPDATE DOC_Trace_Details set PlanToLoc='' ,Reserve_Flag='N',EditTime= TO_DATE('".$R_CurrentTime->toDateTimeString()."','yyyy-mm-dd hh24:mi:ss'), EditWho='".$in_userid.
+                    "' where ASNNO='".$in_asnno."' and ASNLineNO='".$crow_asn->asnlineno."' and TraceID='".$crow_asn->traceid."'"));
+                $TABLE_DOC_Trace_Details = DB::connection('oracle')->select(DB::raw("SELECT 1 FROM DOC_Trace_Details WHERE ASNNO='".$in_asnno."' and ASNLineNO='".$crow_asn->asnlineno."' and trim(PlanToLoc) is not null and  trim(PlanToLoc)<>'*'"));
+                if (!$TABLE_DOC_Trace_Details){
+                    //TODO UPDATE
+                    DB::connection('oracle')->update(DB::raw("Update DOC_ASN_Details set Reserve_Flag='N'  ,EditTime=TO_DATE('".$R_CurrentTime->toDateTimeString()."','yyyy-mm-dd hh24:mi:ss') , EditWho='".$in_userid."' where ASNNO='".$in_asnno."' and ASNLineNO='".$crow_asn->asnlineno."'"));
+                }
+            }
+            //TODO COMMIT
+            if ($r_no_commit == 'Y')DB::commit();
+        }
+
+        $TABLE_DOC_ASN_Details = DB::connection('oracle')->select(DB::raw("SELECT 1 FROM DOC_ASN_Details Where ASNNO='".$in_asnno."' and  Reserve_Flag='Y'"));
+        if (!$TABLE_DOC_ASN_Details){
+            $sp_sql_r = 'Update DOC_ASN_Header';
+            //TODO UPDATE
+            DB::connection('oracle')->update(DB::raw("Update DOC_ASN_Header set Reserve_Flag='N' ,EditTime=TO_DATE('".$R_CurrentTime->toDateTimeString()."','yyyy-mm-dd hh24:mi:ss') , EditWho='".$in_userid."' where ASNNO='".$in_asnno."'"));
+        }
+        //TODO COMMIT
+        if ($r_no_commit == 'Y')DB::commit();
+
+        return '000';
+    }
+
+    //获取数据表的ID(PO, ASN, SO...) $in_sequence_name_c = TraceID  LOTNumber  TEMPID    Traceid  TransactionID  TaskID QCNO  TransactionID
+    private function spcom_getidsequence($in_warehouse, $in_language, $in_sequence_name_c, $out_returnno, $out_return_code){
+        $out_return_code = '000';
+        $out_returnno = '0';
+        $in_sequence_name = $in_sequence_name_c;
+        $r_id_sequence = -1;
+        $r_length = 0;
+        //TODO $IN_Parameter1 = 'IDSEQUENCE' 单多包裹逻辑校验 应该调用SPUDF_ProcessA 但其中单多部分逻辑已被注释 恒定返回000 此处同理恒定返回000 不会下行执行其他逻辑
+        return;
+        //DB::connection('oracle')->select(DB::raw("Select ID_Sequence,Max_ID_Sequence,Length,PreFix,to_CHar(EditTime,'YYMMDD') ,Date_Format  ,Date_max From SYS_IDSequence where IDName=upper('".$IN_Sequence_Name."') and WareHouseID = upper('".$in_warehouse."') For Update;"));
+        //return [$out_returnno,$out_return_code];
+    }
 }

app/Http/Kernel.php

@@ -19,6 +19,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \App\Http\Middleware\TrustProxies::class,
+        \App\Http\Middleware\DecodingRequest::class,
     ];
 
     /**

app/Http/Middleware/DecodingRequest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\URL;
+
+class DecodingRequest
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($request->method() == "GET"){
+            foreach ($request->input() as $key => $value){
+                if ($value != null)$request->offsetSet($key, str_replace("%20"," ",$value));
+            }
+        }
+        return $next($request);
+    }
+}

app/Providers/AppServiceProvider.php

@@ -3,14 +3,12 @@
 namespace App\Providers;
 
 use App\Http\Controllers\Controller;
-use App\InventoryAccountMission;
 use App\Services\CommodityService;
 use App\Services\common\BatchUpdateService;
 use App\Services\CommodityBarcodeService;
 use App\Services\common\DataHandlerService;
 use App\Services\DepositoryService;
 use App\Services\InventoryAccountMissionService;
-use App\Services\InventoryAccountService;
 use App\Services\InventoryCompareService;
 use App\Services\OracleBasSkuService;
 use App\Services\OracleDocAsnDetailService;

app/Services/PackageStatisticsService.php

@@ -5,6 +5,7 @@ namespace App\Services;
 use App\OrderPackage;
 use App\Services\common\QueryService;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
 Class PackageStatisticsService
@@ -14,21 +15,20 @@ Class PackageStatisticsService
      * @return Builder
      */
     private function conditionQuery(array $params){
-        $query = OrderPackage::query()->select(DB::raw('COUNT(owner_id) AS count'))
-            ->whereNotNull('owner_id')
+        $ownerIds = Auth::user()->getPermittingOwnerIdsAttribute();
+        $query = DB::table('order_packages')->select(DB::raw('COUNT(*) AS count'))
+            ->whereIn('owner_id',$ownerIds)
             ->whereNotNull('logistic_id')
             ->leftJoin('orders','order_packages.order_id','orders.id')
-            ->leftJoin('owners','orders.owner_id','owners.id')
-                ->selectRaw('owners.id owner_id,owners.name owner_name')
-            ->leftJoin('logistics','orders.logistic_id','logistics.id')
-                ->selectRaw('logistics.id logistic_id,logistics.name logistic_name');
+                ->selectRaw('owner_id,logistic_id');
+
         $columnQueryRules=[
-            'date_start' => ['alias' => 'created_at','startDate' => " 00:00:00"],
-            'date_end' => ['alias' => 'created_at','endDate' => " 23:59:59"],
+            'created_at_start' => ['alias' => 'created_at','startDate' => ":00"],
+            'created_at_end' => ['alias' => 'created_at','endDate' => ":59"],
             'logistic_id' => ['multi' => ','],
             'owner_id' => ['multi' => ','],
         ];
-        $query = $query->groupBy(['owners.id','logistics.id']);
+        $query = $query->groupBy('owner_id','logistic_id');
         return app(QueryService::class)->query($params,$query,$columnQueryRules);
     }
 
@@ -36,4 +36,15 @@ Class PackageStatisticsService
         return $this->conditionQuery($params)->get();
     }
 
+    public function getPackageStatistic(array $params)
+    {
+        $query = $this->conditionQuery($params);
+        return DB::table(DB::raw("({$query->sql()}) AS p"))->selectRaw('p.*')
+            ->leftJoin('owners','p.owner_id','owners.id')
+            ->selectRaw('owners.name owner_name')
+            ->leftJoin('logistics','p.logistic_id','logistics.id')
+            ->selectRaw('logistics.name logistic_name')
+            ->get();
+    }
+
 }

app/Services/WaybillService.php

@@ -36,12 +36,12 @@ Class WaybillService
             'origination' => ['like' => ''],
             'destination' => ['like' => ''],
             'source_bill' => ['like' => ''],
-            'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
-            'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
+            'created_at_start' => ['alias' => 'created_at' , 'startDate' => ':00'],
+            'created_at_end' => ['alias' => 'created_at' , 'endDate' => ':59'],
             'uriType' => ['alias' => 'type'],
             'id' => ['multi' => ','],
         ];
-        $waybills = app(QueryService::class)->query($param,$waybills,$columnQueryRules,"waybills");
+        $waybills = app(QueryService::class)->query($param,$waybills,$columnQueryRules,"waybills");//dd($waybills->sql());
         return $waybills;
     }
 

database/migrations/2020_10_20_134819_create_customers_table.php

@@ -0,0 +1,47 @@
+<?php
+
+use App\Authority;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateCustomersTable extends Migration
+{
+    protected $authNames=[
+        '客户管理',
+        '客户管理-项目',
+        '客户管理-项目-报表',
+        '客户管理-项目-查询',
+        '客户管理-项目-录入',
+    ];
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('customers', function (Blueprint $table) {
+            $table->id();
+            $table->string('code')->unique()->comment('客户代码');
+            $table->string('name')->comment('客户名称');
+            $table->timestamp('created_at');
+        });
+        foreach ($this->authNames as $name){
+            if(!Authority::query()->where('name',$name)->first())(new Authority(['name'=>$name,'alias_name'=>$name]))->save();
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('customers');
+        foreach ($this->authNames as $name){
+            Authority::query()->where('name',$name)->delete();
+        }
+    }
+}

database/migrations/2020_10_20_143953_create_owner_reports_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOwnerReportsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('owner_reports', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('owner_id')->index()->comment('外键货主');
+            $table->decimal('storage_duration')->nullable()->comment('在库时长');
+
+            $table->timestamp('created_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('owner_reports');
+    }
+}

public/css/app.css

@@ -228,38 +228,28 @@ table.table-striped tbody tr:hover.td-yellow {
   background: #fdf3db;
 }
 
-table .table-striped > tr.focusing,
-table tr.focusing > td,
-table.table-striped tbody .table-striped > tr.focusing,
-table.table-striped tbody tr.focusing > td {
+table tr.focusing td,
+table.table-striped tbody tr.focusing td {
   background: #d5aba1;
 }
 
-table .table-striped > tr.focusing.td-warm,
-table tr.focusing > td.td-warm,
-table.table-striped tbody .table-striped > tr.focusing.td-warm,
-table.table-striped tbody tr.focusing > td.td-warm {
+table tr.focusing td.td-warm,
+table.table-striped tbody tr.focusing td.td-warm {
   background: #e7ae80;
 }
 
-table .table-striped > tr.focusing.td-cool,
-table tr.focusing > td.td-cool,
-table.table-striped tbody .table-striped > tr.focusing.td-cool,
-table.table-striped tbody tr.focusing > td.td-cool {
+table tr.focusing td.td-cool,
+table.table-striped tbody tr.focusing td.td-cool {
   background: #5f8fcd;
 }
 
-table .table-striped > tr.focusing.td-helpful,
-table tr.focusing > td.td-helpful,
-table.table-striped tbody .table-striped > tr.focusing.td-helpful,
-table.table-striped tbody tr.focusing > td.td-helpful {
+table tr.focusing td.td-helpful,
+table.table-striped tbody tr.focusing td.td-helpful {
   background: #69cb9c;
 }
 
-table .table-striped > tr.focusing.td-yellow,
-table tr.focusing > td.td-yellow,
-table.table-striped tbody .table-striped > tr.focusing.td-yellow,
-table.table-striped tbody tr.focusing > td.td-yellow {
+table tr.focusing td.td-yellow,
+table.table-striped tbody tr.focusing td.td-yellow {
   background: #d9c290;
 }
 

public/js/app.js

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

resources/js/queryForm/queryForm.js

@@ -45,11 +45,11 @@ const query = function getQueryForm(data) {
                     //     }
                     // }
                     // console.log(map.value);
-                    form.append("<input name='" + key + "' value='" + map.value + "'>")
+                    form.append("<input name='" + key + "' value='" + map.value.replace(" ","%20") + "'>");
                     // form.append("<input name='" + key + "' value='" + encodeURIComponent(map.value) + "'>")
                 } else if ('array' === fetchJsType(map.value)) {
                     let string = map.value.join(',');
-                    form.append("<input  name='" + key + "' value='" + string + "'>")
+                    form.append("<input  name='" + key + "' value='" + string.replace(" ","%20") + "'>");
                     // form.append("<input  name='" + key + "' value='" + encodeURIComponent(string) + "'>")
                 }
             }
@@ -63,7 +63,6 @@ const query = function getQueryForm(data) {
             }
             _hidden_div.html('');
             _hidden_div.append(form);
-            // console.log(form);
             form.submit();
         }
 
@@ -749,10 +748,15 @@ const query = function getQueryForm(data) {
                     if (!_data[key].value){
                         if (rules['son'][key].required_without_all_if && Array.isArray(rules['son'][key].required_without_all_if)){
                             let sign = true;
-                            rules['son'][key].required_without_all_if.forEach(function (name) {
-                                if (_data[name].value) sign=false;
+                            rules['son'][key].required_without_all_if.some(function (name) {
+                                if (_data[name].value){ sign=false; return true;}
                             });
-                            if (sign) redenerSearchFormOnData(_data[key].name, rules['son'][key].default, _data[key].mold);
+                            if (sign) {
+                                _data[_data[key].name].mold = _data[key].mold;
+                                _data[_data[key].name].value = rules['son'][key].default;
+                                _data[_data[key].name].select = rules['son'][key].default;
+                                redenerSearchFormOnData(_data[key].name, rules['son'][key].default, _data[key].mold);
+                            }
                         }
                     }
                 }
@@ -1209,8 +1213,7 @@ const query = function getQueryForm(data) {
     // url path on search form option  renderer
     function searchOptionToUrlsearch() {
         let data = (window.location.search);
-        // let data = decodeURIComponent(window.location.search);
-        data = decodeURIComponent(data);
+        data = decodeURIComponent(data).replace('%20'," ");
         if (!!data) {
             data = (data.substr(1)).split('&');
             data = convertArrayToObj(data);

resources/views/customer/menu.blade.php

@@ -0,0 +1,17 @@
+
+<div class="container-fluid nav2" id="nav2">
+    <div class="card">
+        <ul class="nav nav-pills">
+            @can('客户管理-项目')
+            <li class="nav-item">
+                <a class="nav-link" href="{{url('customer/project/report')}}" :class="{active:isActive('project',2)}">项目</a>
+            </li>@endcan
+            <li class="nav-item">
+                <a class="nav-link" href="{{url('customer')}}" :class="{active:isActive('delivering',3)}">财务</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="{{url('customer/relating')}}" :class="{active:isActive('delivering',3)}">相关设置</a>
+            </li>
+        </ul>
+    </div>
+</div>

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

@@ -0,0 +1 @@
+<?php

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

@@ -0,0 +1,14 @@
+<div id="nav2">
+    @component('customer.menu')
+    @endcomponent
+    <div class="container-fluid nav3">
+        <div class="card menu-third" >
+            <ul class="nav nav-pills">
+                @can('客户管理-项目-报表')
+                <li class="nav-item">
+                    <a class="nav-link" href="{{url('customer/project/report')}}" :class="{active:isActive('report',3)}">报表</a>
+                </li> @endcan
+            </ul>
+        </div>
+    </div>
+</div>

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

@@ -0,0 +1,7 @@
+@extends('layouts.app')
+@section('title')
+    称重管理-项目-报表
+@endsection
+@section('content')
+    @component('customer.project.menu')@endcomponent
+@stop

resources/views/customer/relating.blade.php

@@ -0,0 +1,26 @@
+@extends('layouts.app')
+@section('title')相关设置@endsection
+
+@section('content')
+    <div id="nav2">
+        @component('rejected.menu')@endcomponent
+        <div class="container-fluid nav3">
+            <div class="card" >
+                <ul class="nav">
+                    @can('货主')
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" href="{{url('maintenance/owner')}}" :class="{active:isActive('',2)}">货主</a>
+                        </li> @endcan
+                    @can('物流公司')
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" href="{{url('maintenance/logistic')}}" :class="{active:isActive('logistic',2)}">物流公司</a>
+                        </li> @endcan
+                    @can('品质标签')
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" href="{{url('maintenance/qualityLabel')}}" :class="{active:isActive('qualityLabel',2)}">品质标签</a>
+                        </li> @endcan
+                </ul>
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/layouts/menu.blade.php

@@ -37,16 +37,16 @@
                                     :class="{active:isActive('process',1)}">
                     <span class="fa fa-hand-scissors-o" style="color: #726e1b"></span>
                     二次加工管理</a></li> @endcan
+        @can('客户管理')
+            <li class="nav-item"><a href="{{url("customer/project/report")}}" class="nav-link"
+                                    :class="{active:isActive('customer',1)}">
+                    <span class="fa fa-address-book-o" style="color: #72441b"></span>
+                    客户管理</a></li> @endcan
         @can('人事管理')
             <li class="nav-item"><a href="{{url("personnel/laborReport")}}" class="nav-link"
                                     :class="{active:isActive('personnel',1)}">
                     <span class="fa fa-header" style="color: #72441b"></span>
                     人事管理</a></li> @endcan
-        @can('客户管理')
-            <li class="nav-item"><a href="{{url("client/base")}}" class="nav-link"
-                                    :class="{active:isActive('client',1)}">
-                    <span class="fa fa-address-book-o" style="color: #72441b"></span>
-                    客户管理</a></li>@endcan
         @can('基础设置')
             <li class="nav-item"><a href="{{url("maintenance/")}}" class="nav-link"
                                     :class="{active:isActive('maintenance',1)}">

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

@@ -279,8 +279,8 @@
                         {name:'carriername',type:'input',tip:'',placeholder:'承运人'},
                         {name:['notes','addtime'],type:'input_select',tip:['右侧选择查询范围，默认为一月内','查询范围，范围越短搜索越快'],placeholder: ['备注',''],
                             data:[{name:'31',value:'近一月'},{name:'92',value:'近三月'},{name:'183',value:'近半年'},{name:'366',value:'近一年'},{name:'0',value:'不限'},],
-                            rules:[{son:{addtime:{default:'31',required_without_all_if:['orderdate_start','orderdate_end']}}},
-                                {date_relevance:{date:['orderdate_start','orderdate_end'],relevance:'addtime',killing:'date',default:[31,92,183,366]}}]},
+                            rules:{son:{addtime:{default:'31',required_without_all_if:['orderdate_start','orderdate_end']}},
+                                date_relevance:{date:['orderdate_start','orderdate_end'],relevance:'addtime',killing:'date',default:[31,92,183,366]}}},
                         {name:'issuepartyname',type:'input',tip:'',placeholder: '店铺名称'},
                         {name:'edisendflag2',type:'select',tip:'快递获取标记',placeholder: '快递获取标记',data:[{name:'Y',value:'是'},{name:'N',value:'否'},{name:'W',value:'错误'},]},
                         {name:'edisendflag',type:'select',tip:'接口回传标记',placeholder: '接口回传标记',data:[{name:'Y',value:'Y'},{name:'N',value:'N'},{name:'W',value:'W'},{name:'R',value:'R'},]}

resources/views/weight/package/statistics.blade.php

@@ -8,196 +8,71 @@
     </span>
     <div class="d-none" id="statistics">
         <div class="container-fluid">
-            <div class="">
-                    <form  method="GET" action="{{url('package/statistics')}}" id="optionSubmit">
-                        <table class="table  table-sm table-bordered text-nowrap  mb-0">
-                            <tr v-if="isBeingFilterConditions">
-                                <td colspan="10"><div class="col" style="padding:0">
-                                        <a  href="{{url('package/statistics')}}"><span class="btn btn-warning text-dark">清除筛选</span></a>
-                                    </div></td>
-                            </tr>
-                            <tr >
-                                <td>
-                                    <div class="form-inline pl-3" style="height: 100px">
-                                        <div class="align-items-center">
-                                            <div class="text-right form-inline">货主：
-                                                <input type="text" style="width: 100px;opacity: 0.6" class="form-control form-control-sm tooltipTarget" placeholder="定位货主"
-                                                       @input="owner_seek"
-                                                       title="输入关键词快速定位下拉列表"></div>
-                                        </div>
-
-
-                                        <div style="max-height: 90px; overflow-y: scroll;border: solid 1px #ddd;border-radius:5px;opacity:0.5;text-align: center;transform:scale(0.9)"  v-if="ownersCopy.length>0">
-                                            <ul class="list-group tooltipTarget" id="seek" onselectstart="return false;">
-                                                <li  title="单击添加货主"    v-for="ownerCopy in ownersCopy" :id="ownerCopy.name" class="list-group-item list-group-item-action pt-0 pb-0"
-                                                     @click="selectedOwner(ownerCopy)" :class="ownerCopy.style ? 'active' :''"><span style="cursor: default;" :id="ownerCopy.name">@{{ ownerCopy.name }}</span></li>
-                                            </ul>
-                                            <input hidden name="owner_id" :value="selectedOwners">
-                                        </div>
-                                    </div>
-                                </td>
-                                <td >
-                                    <div class="form-inline pl-3" style="height: 100px">
-                                        <div class="align-items-center ">
-                                            <div class="text-right form-inline" >物流公司：
-                                                <input type="text" style="width: 100px;opacity: 0.6" class="form-control form-control-sm tooltipTarget" placeholder="定位物流公司"
-                                                       @input="logistic_seek"
-                                                       title="输入关键词快速定位下拉列表"></div>
-                                        </div>
-                                        <div style="max-height: 90px;overflow-y: scroll;border: solid 1px #ddd;border-radius:5px;text-align: center;transform:scale(0.9)"  v-if="logisticsAll.length>0">
-                                            <ul class="list-group tooltipTarget" onselectstart="return false;">
-                                                <li  title="单击添加物流公司"   v-for="logistic in logisticsAll" class=" list-group-item list-group-item-action pt-0 pb-0"
-                                                     @click="selectedLogistic(logistic)" :class="logistic.style ? 'active' :''" >
-                                                    <span style="cursor: default;" :id="logistic.name">@{{ logistic.name }}</span></li>
-                                            </ul>
-                                            <input hidden name="logistic_id" :value="selectedLogistics">
-                                        </div>
-                                    </div>
-                                </td>
-                                <td  style="position: relative">
-                                    <table class="table table-sm table-borderless">
-                                        <tr>
-                                            <td class="text-right" style="line-height: 60px">
-                                                时间：
-                                            </td>
-                                            <td>
-                                                <div class="form-inline">
-                                                    <div class="form-group">
-                                                        <input  style="width: 170px;transform:scale(0.8)" type="date" v-model="filterData.date_start" class="form-control" @change="makeFilterDuration">
-                                                        <input id="hour_input" type="text" class="form-control"  placeholder="00:00" @change="makeFilterDuration" autocomplete="off"
-                                                               @input="hourFilter($event)" v-model="inputtingAdd_start" style="transform:scale(0.8);width: 80px"
-                                                               @keypress="hourFilter($event)" >
-                                                        <input v-if="filterData.date_start" hidden  name="date_start" :value="filterData.date_start+' '+inputtingAdd_start">
-                                                    </div>
-                                                </div>
-                                                <div class="form-inline">
-                                                    <div class="form-group">
-                                                        <input style="transform:scale(0.8);width: 170px"  type="date" v-model="filterData.date_end" class="form-control" @change="makeFilterDuration">
-                                                        <input type="text" class="form-control"  placeholder="00:00" @change="makeFilterDuration" autocomplete="off"
-                                                               @input="hourFilter($event)" v-model="inputtingAdd_end" style="transform:scale(0.8);width:80px"
-                                                               @keypress="hourFilter($event)" >
-                                                        <input v-if="filterData.date_end" hidden  name="date_end" :value="filterData.date_end+' '+inputtingAdd_end">
-                                                    </div>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="text-center" colspan="2">
-                                                <button class="btn btn-primary btn-sm pl-5 pr-5">提交</button>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <span class="text-muted"
-                                          style="position: absolute;  bottom: 48px;left:30px;transform: scale(0.65)" v-if="filterData.date_start || filterData.date_end">
-                                        @{{ dateTime }}</span>
+            <div id="form_div"></div>
+            <span class="dropdown">
+                <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget"
+                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
+                    导出Excel
+                </button>
+                <div class="dropdown-menu">
+                    <a class="dropdown-item"  @click="statisticExport(false)" href="javascript:">导出勾选内容</a>
+                    <a class="dropdown-item"  @click="statisticExport(true)" href="javascript:">导出所有页</a>
+                </div>
+            </span>
 
-                                </td>
-                                <td>
+            <table class="table table-striped table-sm text-nowrap table-hover">
+                <tr>
+                    <th>
+                        <label for="all">
+                            <input id="all" type="checkbox" @click="checkAll($event)">全选
+                        </label>
+                    </th>
+                    <th>货主</th>
+                    <th>总计</th>
+                    <th v-for="logistic in logistics">@{{ logistic.value }}</th>
+                </tr>
+               <tr v-for="package in packages">
+                    <td>
+                        <input class="checkItem" type="checkbox" :value="package.owner_id" v-model="checkData">
+                    </td>
+                    <th class="text-muted">@{{ package.owner_name }}</th>
+                    <td><p v-if="package.sum">@{{ package.sum }}</p><p v-else>0</p></td>
+                    <td class="text-muted" v-for="logistic in logistics"><span v-if="package[logistic.name]">@{{ package[logistic.name] }}</span><span v-else>0</span></td>
+                </tr>
+            </table>
 
-                                </td>
-                            </tr>
-                            <tr></tr>
-                            <tr>
-                                <td colspan="3">
-                                    <span class="dropdown">
-                                        <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" {{--:class="[rejectedBills_checkBoxes.length>0?'btn-dark text-light':'']"--}}
-                                        data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
-                                            导出Excel
-                                        </button>
-                                        <div class="dropdown-menu">
-                                            <a class="dropdown-item"  @click="statisticExport(false)" href="javascript:">导出勾选内容</a>
-                                            <a class="dropdown-item"  @click="statisticExport(true)" href="javascript:">导出所有页</a>
-                                        </div>
-                                    </span>
-                                </td>
-                            </tr>
-                        </table>
-                    </form>
-                <div class="">
-                    <table class="table table-striped table-sm text-nowrap table-hover">
-                        <tr>
-                            <th>
-                                <label for="all">
-                                    <input id="all" type="checkbox" @click="checkAll($event)">全选
-                                </label>
-                            </th>
-                            <th>货主</th>
-                            <th>总计</th>
-                            <th v-for="logistic in logisticsAll" v-if="logistics[logistic.id]">@{{ logistic.name }}</th>
-                        </tr>
-                        <tr v-for="ownerModel in ownersModel">
-                            <td>
-                                <input class="checkItem" type="checkbox" :value="ownerModel.id" v-model="checkData">
-                            </td>
-                            <th class="text-muted">@{{ ownerModel.name }}</th>
-                            <td><p v-if="ownerModel.sum">@{{ ownerModel.sum }}</p><p v-else>0</p></td>
-                            <td class="text-muted" v-for="logistic in logisticsAll" v-if="logistics[logistic.id]"><p v-if="ownerModel.logistics[logistic.id]">@{{ ownerModel.logistics[logistic.id] }}</p>
-                                <p v-else>0</p></td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
         </div>
     </div>
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{mix('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
     <script>
         new Vue({
             el:"#statistics",
             data:{
-                packages:[
-                        @foreach($packages as $package)
-                    {owner_id:'{{$package->owner_id}}',logistic_id:'{{$package->logistic_id}}',count:'{{$package->count}}',
-                        owner_name:'',logistic_name:''},
+                packages : [
+                    @foreach($packages as $package)
+                    {!! $package !!},
                     @endforeach
                 ],
-                owners:{
+                owners:[
                     @foreach($owners as $owner)
-                    '{{$owner->id}}' : "{{$owner->name}}",
-                    @endforeach
-                },
-                logisticsAll:[
-                    @foreach($logistics as $logistic)
-                    {id:'{{$logistic->id}}', name: '{{$logistic->name}}',style:false},
+                    {name:'{{$owner->id}}', value: '{{$owner->name}}'},
                     @endforeach
                 ],
-                ownersCopy:[
-                        @foreach($owners as $owner)
-                    {id:'{{$owner->id}}',name:"{{$owner->name}}",style:false},
+                logistics:[
+                    @foreach($logistics as $logistic)
+                    {name:'{{$logistic->id}}', value: '{{$logistic->name}}'},
                     @endforeach
                 ],
-                logistics:[],
-                ownersModel:[],
-                filterData:
-                    {date_start:'',date_end:''},
-                selectedOwners:[],
-                selectedLogistics:[],
                 checkData:[],
-                checkSign:'',
-                inputtingAdd_start:'',
-                inputtingAdd_end:'',
-                dateTime:'',
-            },
-            computed:{
-                isBeingFilterConditions:function(){
-                    for(let key in this.filterData){
-                        if(this.filterData[key]){
-                            return true
-                        }
-                    }
-                    if (this.selectedOwners.length>0||this.selectedLogistics.length>0){
-                        return  true;
-                    }
-                    return false;
-                },
-
             },
             watch:{
                 checkData:{
                     handler(){
-                        if (this.checkData.length === this.ownersModel.length){
+                        if (this.checkData.length === this.packages.length){
                             document.querySelector('#all').checked = true;
                         }else {
                             document.querySelector('#all').checked = false;
@@ -207,247 +82,29 @@
                 }
             },
             mounted:function(){
-                let _this=this;
-                let owners=this.owners;
-
-                this.packages.forEach(function (package){
-                    if (owners[package.owner_id]){
-                        package.owner_name=owners[package.owner_id];
-                    }
-
-                    let isEvery=true;
-                    if (_this.ownersModel) {
-                        isEvery=_this.ownersModel.every(function (ownerModel) {
-                            if (ownerModel.name==package.owner_name){
-                                ownerModel.logistics[package.logistic_id]=package.count;
-                                ownerModel.sum=parseInt(ownerModel.sum)+parseInt(package.count);
-                                return false;
-                            }
-                            return true;
-                        });
-                    }
-                    if (isEvery){
-                        let obj={};
-                        _this.logisticsAll.every(function (logistic) {
-                            if (logistic.id==package.logistic_id) {
-                                obj[package.logistic_id]=package.count;
-                                return false;
-                            }
-                            return true;
-                        });
-                        _this.ownersModel.push({'id':package.owner_id,'name':package.owner_name,'sum':package.count,'logistics':obj,});
-                    }
-                });
-                this.initInputs();
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
                 $('#statistics').removeClass('d-none');
-                this.makeFilterDuration();
+                let data = [[
+                    {name:'logistic_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的物流公司'],
+                        placeholder:['物流公司','定位或多选物流公司'],data:this.logistics},
+                    {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
+                        placeholder:['货主','定位或多选货主'],data:this.owners},
+                    {name:'created_at_start',type:'time',tip:['选择显示指定日期的起始时间','选择显示指定日期的起始时间']},
+                    {name:'created_at_end',type:'time',tip:['选择显示指定日期的结束时间','选择显示指定日期的结束时间']},
+                ]];
+                this.form = new query({
+                    el:'#form_div',
+                    condition:data,
+                    isPaginations:false,
+                });
+                this.form.init();
             },
             methods: {
-                makeFilterDuration(){
-                    let date=new Date();
-                    let thisDate=this.getDate(date);
-                    let startTime=this.inputtingAdd_start;
-                    let endTime=this.inputtingAdd_end;
-                    let endDate=this.filterData.date_end;
-                    let startDate=this.filterData.date_start;
-                    if (this.filterData.date_start && !this.inputtingAdd_start)  startTime="00:00";
-                    if (this.filterData.date_end && !this.inputtingAdd_end)  endTime="23:59";
-                    if (this.filterData.date_start && !this.filterData.date_end) endDate=thisDate;
-                    if (this.filterData.date_end && !this.filterData.date_start) startDate="2000-01-01 00:00";
-                    this.dateTime="选择区间："+startDate+" "+startTime+" 至 "+endDate+" "+endTime;
-                },
-                getDate(date){
-                    let da=[
-                        date.getFullYear(),
-                        date.getMonth()+1,
-                        date.getDate(),
-                        date.getHours(),
-                        date.getMinutes(),
-                    ]
-                    return da.slice(0,3).join("-")+" "+
-                        da.slice(3).join(":");
-                },
-                initInputs:function(){
-                    let data=this;
-                    let uriParts =decodeURI(location.href).split("?");
-                    let isLogistic=true;
-                    if(uriParts.length>1){
-                        let params = uriParts[1].split('&');
-                        params.every(function(paramPair){
-                            let pair=paramPair.split('=');
-                            let key = pair[0], val = pair[1];
-                            $('input[name="'+key+'"]').val(val);
-                            $('select[name="'+key+'"]').val(val);
-                            if (key!='owner_id'||key!='logistic_id') {
-                                decodeURI(data.filterData[key]=val);
-                            }
-                            let str=unescape(val);
-                            let strs=new Array();
-                            strs=str.split(",");
-                            if (key=='owner_id' && val){
-                                for (let i=0;i<strs.length;i++){
-                                    data.selectedOwners.push(strs[i]);
-                                    data.ownersCopy.every(function (ownerCopy) {
-                                        if (strs[i]==ownerCopy.id){
-                                            ownerCopy.style=true;
-                                            return false;
-                                        }
-                                        return  true;
-                                    });
-                                }
-                            }
-                            if (key=='logistic_id' && val){
-                                for (let i=0;i<strs.length;i++){
-                                    data.selectedLogistics.push(strs[i]);
-                                    data.logisticsAll.every(function (logistic) {
-                                        if (strs[i]==logistic.id){
-                                            logistic.style=true;
-                                            return false;
-                                        }
-                                        return  true;
-                                    });
-                                }
-                                {{--URL有参数且有logistic字段 --}}
-                                let logistics=data.selectedLogistics;
-                                if (logistics.length>0){
-                                    for (let i=0;i<logistics.length;i++){
-                                        data.logisticsAll.every(function (logistic) {
-                                            if (logistic.id==logistics[i]){
-                                                data.logistics[logistic.id]=logistic.name;
-                                                return false;
-                                            }
-                                            return  true;
-                                        });
-                                    }
-                                }else{
-                                    data.logisticsAll.every(function (logistic) {
-                                        data.logistics[logistic.id]=logistic.name;
-                                        return true;
-                                    });
-                                };
-                                isLogistic=false;
-                            }
-                            if (key=='date_start'){
-                                strs=str.split("+");
-                                if (strs.length!=2) return;
-                                data.filterData.date_start=strs[0];
-                                data.inputtingAdd_start=strs[1];
-                            }
-                            if (key=='date_end'){
-                                strs=str.split("+");
-                                if (strs.length!=2) return;
-                                data.filterData.date_end=strs[0];
-                                data.inputtingAdd_end=strs[1];
-                            }
-                            return true;
-                        });
-                    }
-                    {{--URL无参数以packages所存在物流公司为显示标准 --}}
-                    if (uriParts.length<=1 || isLogistic){
-                        data.packages.every(function (package) {
-                            data.logisticsAll.every(function (logistic) {
-                                if (package.logistic_id==logistic.id){
-                                    data.logistics[logistic.id]=logistic.name;
-                                    return false;
-                                }
-                                return  true;
-                            });
-                            return true;
-                        });
-                    }
-
-                },
-                owner_seek:function (e) {
-                    let _this=this;
-                    let $val=e.target.value;
-                    if($val==='')_this.filterData.owner_id='';
-                    else{
-                        @foreach($owners as $owner)
-                        if ("{{ $owner->name }}".includes($val)){
-                            _this.filterData.owner_id="{{ $owner->id }}";
-                            location.href="#{{$owner->name}}";
-                        }
-                        @endforeach
-                    }
-                    $(e.target).focus();
-                },
-                logistic_seek:function(e){
-                    let _this=this;
-                    let $val=e.target.value;
-                    if($val){
-                        _this.logisticsAll.every(function (logistic) {
-                            let name=logistic.name;
-                            if (name.includes($val)){
-                                location.href="#"+logistic.name;
-                                return false;
-                            }
-                            return true;
-                        });
-                    }
-                    $(e.target).focus();
-                },
-                selectedOwner:function (e) {
-                    let selectedOwners=this.selectedOwners;
-                    let sign = true;
-                    for (let i=0;i<selectedOwners.length;i++){
-                        if (selectedOwners[i]==e.id){
-                            selectedOwners.splice(i,1);
-                            this.ownersCopy.every(function (ownerCopy) {
-                                if (ownerCopy.id==e.id) {
-                                    ownerCopy.style=false;
-                                    return false;
-                                }
-                                return  true;
-                            });
-                            sign=false;
-                            break;
-                        }
-                    }
-                    if (sign) {
-                        this.selectedOwners.push(e.id);
-                        this.ownersCopy.every(function (ownerCopy) {
-                            if (ownerCopy.id==e.id) {
-                                ownerCopy.style=true;
-                                return false;
-                            }
-                            return  true;
-                        });
-                    }
-                },
-                selectedLogistic:function (e) {
-                    let selectedLogistics=this.selectedLogistics;
-                    let sign = true;
-                    for (let i=0;i<selectedLogistics.length;i++){
-                        if (selectedLogistics[i]==e.id){
-                            selectedLogistics.splice(i,1);
-                            this.logisticsAll.every(function (logistic) {
-                                if (logistic.id==e.id) {
-                                    logistic.style=false;
-                                    return false;
-                                }
-                                return  true;
-                            });
-                            sign=false;
-                            break;
-                        }
-                    }
-                    if (sign) {
-                        this.selectedLogistics.push(e.id);
-                        this.logisticsAll.every(function (logistic) {
-                            if (logistic.id==e.id) {
-                                logistic.style=true;
-                                return false;
-                            }
-                            return  true;
-                        });
-                    }
-                },
                 checkAll(e){
                     if (e.target.checked){
-                        this.ownersModel.forEach((el)=>{
-                            if (this.checkData.indexOf(el.id) == '-1'){
-                                this.checkData.push(el.id);
+                        this.packages.forEach((el)=>{
+                            if (this.checkData.indexOf(el.owner_id) === '-1'){
+                                this.checkData.push(el.owner_id);
                             }
                         });
                     }else {
@@ -457,12 +114,9 @@
                 statisticExport:function (checkAllSign) {
                     let url = '{{url('package/statistics/export')}}';
                     let token='{{ csrf_token() }}';
-                    //excelExport 定义在 js/queryForm/export.js
+                    //excelExport 定义在 js/queryForm/export200918.js
                     excelExport(checkAllSign,this.checkData,url,this.sum,token);
                 },
-                hourFilter:function(e){
-                    datetimeRelating.verifyTime(e);
-                },
             }
         });
     </script>

routes/web.php

@@ -456,4 +456,12 @@ Route::group(['prefix'=>'order'],function(){
     Route::post('isRejectedBillExist','OrderController@isRejectedBillExist');
 });
 
+/** 客户 */
+Route::group(['prefix'=>'customer'],function(){
+    /** 项目 */
+    Route::group(['prefix'=>'project'],function(){
+        Route::get('report','CustomerController@projectReport');
+    });
+    Route::get('relating',function (){return view('customer.relating');});
+});
 

serves/excelExportGo/api/controller/controller.go

@@ -43,7 +43,7 @@ func selectCreateFormat(params map[string]string) (row []interface{}, list [][]i
 	}
 	return
 }
-
+//packageStatistic
 func selectModule(params map[string]string) (row []interface{}, list [][]interface{}, mergeRow map[string]string, mergeColumn []string) {
 	var data []map[string]string
 	switch params["type"] {

serves/excelExportGo/logs/2020-10-20.log

@@ -0,0 +1,3 @@
+
+[ERROR]   10:07:43
+   /api/controller/controller.go:184   称重统计数据json解析失败!