项目关闭前的部分渠道停用

app/Http/Controllers/ProcessController.php

@@ -344,7 +344,7 @@ class ProcessController extends Controller
     }
 
     //根据全名查询临时工
-    public function seekUserLabor($userName,$date){
+    public function usersseekUserLabor($userName,$date){
         $userDetails=UserDetail::with('userLabor')->where('type','临时工')->where('full_name',$userName)->get();
         if (!$userDetails)return ['success'=>false,'data'=>'未找到临时工信息!'];
         if (count($userDetails)==1){

app/Http/Controllers/ProcurementController.php

@@ -38,6 +38,7 @@ class ProcurementController extends Controller
 
     private function newProcurement($param,$userId,$type=0,$status=0): Procurement
     {
+        $this->error("移至SWMS下达采购单，该系统已关闭");
         $procurement=new Procurement([
             'owner_material_id'=>$param['owner_material_id'],
             'quantity'=>$param['quantity'],
@@ -103,6 +104,7 @@ class ProcurementController extends Controller
 
     public function create()
     {
+        $this->error("移至SWMS下达采购单，该系统已关闭");
         if(!Gate::allows('采购管理-采购-新建')){ return ["success"=>false,"data"=>"您无此权限操作!"];  }
         /** @var OwnerMaterialService $ownerMaterialService*/
         $ownerMaterialService=app(OwnerMaterialService::class);
@@ -112,6 +114,7 @@ class ProcurementController extends Controller
 
     public function store(Request $request)
     {
+        $this->error("移至SWMS下达采购单，该系统已关闭");
         $this->gate('采购管理-采购-新建');
         $param=$request->all(['owner_material_id','quantity','amount','unit_price','remark']);
         $procurement=$this->newProcurement($param,Auth::user()['id']);
@@ -119,7 +122,7 @@ class ProcurementController extends Controller
     }
     public function createProcurement(ProcurementRequest $request): array
     {
-
+        $this->error("移至SWMS下达采购单，该系统已关闭");
         $this->gate('采购管理-采购-新建');
         $request->validated();
         $param=$request->all(['owner_material_id','quantity','amount','unit_price','remark']);
@@ -132,6 +135,7 @@ class ProcurementController extends Controller
     //新增询价
     public function createEnquiry(EnquiryRequest $request): array
     {
+        $this->error("移至SWMS下达采购单，该系统已关闭");
         $this->gate('采购管理-采购-新建');
         $request->validated();
         $param=$request->all(['owner_material_id']);
@@ -161,6 +165,7 @@ class ProcurementController extends Controller
     //新增打样
     public function createProof(ProofRequest $request): array
     {
+        $this->error("移至SWMS下达采购单，该系统已关闭");
         $this->gate('采购管理-采购-新建');
         $request->validated();
         $param=$request->all(['owner_material_id']);
@@ -201,6 +206,7 @@ class ProcurementController extends Controller
     //询价单提交采购申请
     public function submitProcurement(ProcurementAmountRequest $request): array
     {
+        $this->error("移至SWMS下达采购单，该系统已关闭");
         $this->gate('采购管理-采购-编辑');
         $request->validated();
         $param=$request->all();
@@ -253,6 +259,7 @@ class ProcurementController extends Controller
     }
     public function createAnew(Request $request): array
     {
+        $this->error("移至SWMS下达采购单，该系统已关闭");
         $this->gate('采购管理-采购-新建');
         $ids=$request->input('checkData');
         if (empty($ids)) return ['success' => false, 'message' => '当前未勾选指定订单!'];
@@ -353,7 +360,7 @@ class ProcurementController extends Controller
         foreach ($procurements as $procurement){
             if (empty($procurement->procurementDeliveries))continue;
             $procurement->receive_amount=$procurement->procurementDeliveries->sum('amount');
-            $procurement->signed_at=$procurement->procurementDeliveries->first()['signed_at'];
+            $procurement->signed_at=$procurement->procurementDeliveries->first()['signed_at'] ?? '';
         }
         return view('procurement/finance/procurementBill',compact('suppliers','materials','owners','paginateParams','procurements'));
     }

app/Http/Controllers/TestController.php

@@ -8,14 +8,18 @@ use App\Components\AsyncResponse;
 use App\Components\Database;
 use App\Components\ErrorPush;
 use App\Exceptions\Exception;
+use App\Jobs\ProcurementCheckConfirmInform;
 use App\OracleDOCWaveDetails;
 use App\Order;
 use App\OrderBin;
 use App\OrderCommodity;
+use App\ProcurementCheckSheet;
+use App\ProcurementTotalBill;
 use App\Rejected;
 use App\RejectedBill;
 use App\RejectedBillItem;
 use App\Services\LogService;
+use App\Services\MeasureMonitorService;
 use App\Services\OracleDocAsnHerderService;
 use App\Services\OracleDOCOrderHeaderService;
 use App\Services\OrderCommodityService;
@@ -64,32 +68,21 @@ class TestController extends Controller
     }
     public function test(Request $request)
     {
-        $waybill = Waybill::query()->where("waybill_number","BSZX2209079840")->first();
-        $json="
-                {
-                    \"request\": [
-                        {
-                            \"OrderNo\": \"{$waybill['wms_bill_number']}\",
-                            \"DELIVERYNO\": \"{$waybill['waybill_number']}\"
-                        }
-                    ]
-                }
-                ";
-        $sendingJson = json_decode($json,true);
-        $url=url(config('api.flux.waybill.new'));
-        try{
-            $response = Zttp::post($url, $sendingJson);
-        }catch (\Exception $exception){
-            dd('CURL请求异常：'.$exception->getMessage());
-            return false;
-        }
-        $responseJson = $response->json();
-        if(!$responseJson||!isset($responseJson['Response'])||!$responseJson['Response']['return']['returnFlag']=='1'){
-            dd("向WMS提交运单失败！！SO单号：{$waybill['wms_bill_number']}。提交：{$json}，返回：{$response->body()}, URL：{$url}");
-            return false;
-        }
-        Controller::logS(__METHOD__,''.__FUNCTION__,"向WMS提交运单成功，SO单号：{$waybill['wms_bill_number']}。返回：{$response->body()}",0);
-        return true;
+        dd(now()->toDateTimeString());
+        $body = json_encode([
+            'collectUploadDTOS' => json_decode('[{"appId":"GJWL","billCode":"78682514658502","importDate":"2023-05-05 16:25:17","weight":0.01}]'),
+        ], JSON_UNESCAPED_UNICODE);
+        $data_digest = base64_encode(md5($body . '9f664e3ab08049874aa417720840161a', TRUE));
+        dd($data_digest);
+        $headers = [
+            'Content-Type' => 'application/json; charset=UTF-8',
+            'x-companyid' => "c51c718eb899e9f706979",
+            'x-datadigest' => $data_digest,
+        ];
+
+        $val = "{\"collectUploadDTOS\":[{\"appId\":\"GJWL\",\"billCode\":\"78682514658502\",\"importDate\":\"2023-05-05 16:04:38\",\"weight\":0.01}]}9f664e3ab08049874aa417720840161a";
+        dd(md5($val, TRUE));
+        dd(base64_encode(md5($val, TRUE)));
     }
 }
 

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

@@ -89,6 +89,7 @@ class PackageController extends Controller
 //    }
     public function accomplishToWMS(OrderPackage $package)
     {
+        return ['result'=>'success'];// 转由JAVA处理
         try{
             $idxAsrsReceive=OracleIdxAsrsReceive::where('userdefine1',$package['logistic_number'])->first();
             if(!$idxAsrsReceive){
@@ -106,6 +107,7 @@ class PackageController extends Controller
         }
     }
     public function markWMSOnBatch($batchNumber,$weight){
+        return ['result'=>true];// 转由JAVA处理
         $batchNumber = strtoupper($batchNumber);
         $docWaveHeader=OracleDOCWaveHeader::query()->where('waveno',$batchNumber)->first();
         if(!$docWaveHeader){

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

@@ -32,10 +32,10 @@ class WaybillController extends Controller
             return response()->json(['response'=>['return'=>['returnFlag'=>'0','returnCode'=>'0001','returnDesc'=>'消息处理失败:Failure','resultInfo'=>'',
                 'errors'=>$errors]]])
                 ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
-        }
+        }/*
         try {
             Http::post("https://api.baoshi56.com/oapi/device/check/waybill/create", $request->input());
-        } catch (\Exception $e){}
+        } catch (\Exception $e){}*/
         $receivedInputtings=$request->input('request');
         foreach ($receivedInputtings as $receiveInputting){
             if(!WMSWaybill::query()->create($receiveInputting)){

app/Jobs/BatchTaskJob.php

@@ -12,6 +12,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 波次任务同步
+ */
 class BatchTaskJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/BroadcastBatchToZhengCangJob.php

@@ -13,6 +13,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 侦仓任务推送
+ */
 class BroadcastBatchToZhengCangJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/CacheShelfTaskJob.php

@@ -18,6 +18,10 @@ use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 
+/**
+ *
+ * @Deprecated 缓存架任务
+ */
 class CacheShelfTaskJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, ErrorPush;

app/Jobs/CalculationArrivedManNumJob.php

@@ -11,6 +11,7 @@ use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 
 /**
+ * @Deprecated 临时工到岗分配
  * 按照给定的申请日期计算到岗人数
  */
 class CalculationArrivedManNumJob implements ShouldQueue

app/Jobs/DeleteRepetitionSkuItem.php

@@ -22,6 +22,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 重复SKU清理
+ */
 class DeleteRepetitionSkuItem implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/DeliveryAppointmentCheck.php

@@ -10,6 +10,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 入库预约自动关单
+ */
 class DeliveryAppointmentCheck implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable;

app/Jobs/ExecutePostBillHandler.php

@@ -11,6 +11,9 @@ use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 
+/**
+ * @Deprecated 结算账单计费
+ */
 class ExecutePostBillHandler implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable;

app/Jobs/FetchPackageFromOracle.php

@@ -10,6 +10,9 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 
+/**
+ * @Deprecated 包裹的波次信息获取
+ */
 class FetchPackageFromOracle implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/HandleExceptionWaybill.php

@@ -9,6 +9,9 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 
+/**
+ * @Deprecated 订单与物流单关联
+ */
 class HandleExceptionWaybill implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable;

app/Jobs/HandlePastBill.php

@@ -8,6 +8,9 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 
+/**
+ * @Deprecated 结算历史账单处理
+ */
 class HandlePastBill implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable;

app/Jobs/LaborApplyRecordJob.php

@@ -11,6 +11,9 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
 
+/**
+ * @Deprecated 临时工分配记录
+ */
 class LaborApplyRecordJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/LogisticAliJiSuSync.php

@@ -12,6 +12,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 快递路由-阿里极速
+ */
 class LogisticAliJiSuSync implements ShouldQueue
 {
     public $tries = 2;

app/Jobs/LogisticSFSync.php

@@ -12,6 +12,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 快递路由-顺丰
+ */
 class LogisticSFSync implements ShouldQueue
 {
     public $tries = 2;

app/Jobs/LogisticYDSync.php

@@ -13,6 +13,9 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Cache;
 
+/**
+ * @Deprecated 快递路由-圆通
+ */
 class LogisticYDSync implements ShouldQueue
 {
     const TAG = 'LOGISTIC_YD_SYNC';

app/Jobs/LogisticYTOSync.php

@@ -12,6 +12,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 快递路由-韵达
+ */
 class LogisticYTOSync implements ShouldQueue
 {
     public $tries = 2;

app/Jobs/LogisticZopSync.php

@@ -13,6 +13,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 快递路由-中通
+ */
 class LogisticZopSync implements ShouldQueue
 {
     public $tries = 2;

app/Jobs/MarkPackageExcepted.php

@@ -10,6 +10,9 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 
+/**
+ * @Deprecated 异常包裹标记
+ */
 class MarkPackageExcepted implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/MeasuringMachineQueue.php

@@ -12,6 +12,9 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 
+/**
+ * @Deprecated 设备状态推送
+ */
 class MeasuringMachineQueue implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/OrderCreateInstantBill.php

@@ -12,6 +12,9 @@ use Illuminate\Database\QueryException;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 
+/**
+ * @Deprecated 即时账单生成
+ */
 class OrderCreateInstantBill implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, ErrorPush;

app/Jobs/OrderCreateWaybill.php

@@ -8,6 +8,9 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 
+/**
+ * @Deprecated 订单生成物流单
+ */
 class OrderCreateWaybill implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable;

app/Jobs/OrderFreeze.php

@@ -12,6 +12,9 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\DB;
 
+/**
+ * @Deprecated 订单自动冻结
+ */
 class OrderFreeze implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable;

app/Jobs/PackageCollectingAllocation.php

@@ -11,6 +11,9 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 
+/**
+ * @Deprecated 中通一键揽收
+ */
 class PackageCollectingAllocation implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable;

app/Jobs/ProcessCreateInstantBill.php

@@ -11,6 +11,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 入库单生成即时账单
+ */
 class ProcessCreateInstantBill implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/ProcessReceiveCombinedJob.php

@@ -13,6 +13,9 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 
+/**
+ * @Deprecated 笕尚退货接口标记
+ */
 class ProcessReceiveCombinedJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/ProcurementCheckConfirmInform.php

@@ -10,6 +10,9 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Collection;
 
+/**
+ * @Deprecated 采购对账单生成
+ */
 class ProcurementCheckConfirmInform implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/ProcurementConfirmInform.php

@@ -10,6 +10,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 采购确认账单
+ */
 class ProcurementConfirmInform implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/ProcurementEnquiry.php

@@ -15,6 +15,9 @@ use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Cache;
 
+/**
+ * @Deprecated 采购供应商选择
+ */
 class ProcurementEnquiry implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/ProcurementReceive.php

@@ -9,6 +9,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 采购收货
+ */
 class ProcurementReceive implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/ProcurementWaitConfirmInform.php

@@ -12,6 +12,9 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Carbon;
 
+/**
+ * @Deprecated 采购单确认申请
+ */
 class ProcurementWaitConfirmInform implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/RejectedBillCreateInstantBill.php

@@ -9,6 +9,9 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 
+/**
+ * @Deprecated 退货生成即时账单
+ */
 class RejectedBillCreateInstantBill implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, ErrorPush;

app/Jobs/RejectedPushJob.php

@@ -12,6 +12,9 @@ use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 
+/**
+ * @Deprecated 退货推单
+ */
 class RejectedPushJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/ResetInstantBill.php

@@ -21,6 +21,9 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 
+/**
+ * @Deprecated 即时账单重置
+ */
 class ResetInstantBill implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable;

app/Jobs/SettlementBillReportJob.php

@@ -17,6 +17,9 @@ use Illuminate\Queue\SerializesModels;
  * Class SettlementBillReportTask
  * @package App\Jobs
  */
+/**
+ * @Deprecated 月度账单生成
+ */
 class SettlementBillReportJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/StoreCreateInstantBill.php

@@ -12,6 +12,9 @@ use Illuminate\Database\QueryException;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 
+/**
+ * @Deprecated 入库生成即时账单
+ */
 class StoreCreateInstantBill implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, ErrorPush;

app/Jobs/SyncOrderIssueOrWorkOrderBySWMS.php

@@ -11,6 +11,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 订单问题件通知SWMS
+ */
 class SyncOrderIssueOrWorkOrderBySWMS implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/SyncOrderRejectingStatusJob.php

@@ -9,6 +9,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 订单退回状态
+ */
 class SyncOrderRejectingStatusJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/SyncRejectedBillRejectingStatusJob.php

@@ -9,6 +9,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 退货单退货状态
+ */
 class SyncRejectedBillRejectingStatusJob implements ShouldQueue
 {
 

app/Jobs/WaybillCreateInstantBill.php

@@ -11,6 +11,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
+/**
+ * @Deprecated 物流单生成即时账单
+ */
 class WaybillCreateInstantBill implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

app/Jobs/WeightUpdateInstantBill.php

@@ -11,6 +11,9 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 
+/**
+ * @Deprecated 称重计费重置
+ */
 class WeightUpdateInstantBill implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, ErrorPush;

app/Services/DbOpenService.php

@@ -22,6 +22,7 @@ class DbOpenService
      */
     public function getDbOrderNo($waybill):?array
     {
+        return null;
         $header = [
             'Content-Type' => 'application/x-www-form-urlencoded;charset=utf-8',
             "Accept" => "application/json"

app/Services/OrderPackageService.php

@@ -483,6 +483,7 @@ class OrderPackageService
             'x-companyid' => $xAppKey,
             'x-datadigest' => $data_digest,
         ];
+        Log::info("中通自动揽收", [json_encode($headers), $body]);
         return Http::withHeaders($headers)->withBody($body, 'application/json')->post($url);
     }
 

package.json

@@ -41,7 +41,7 @@
     "pusher-js": "^5.1.1",
     "qrcode": "^1.4.4",
     "socket.io-client": "^2.3.0",
-    "vue-drag-resize": "^1.5.4",
+        "vue-drag-resize": "^1.5.4",
     "yarn": "^1.22.10"
   },
   "name": "bswas",

resources/js/lodop/lodop/LodopFuncs.js

@@ -0,0 +1,134 @@
+var CreatedOKLodop7766=null;
+
+//====判断是否需要安装CLodop云打印服务器:====
+function needCLodop(){
+    try{
+	var ua=navigator.userAgent;
+	if (ua.match(/Windows\sPhone/i) !=null) return true;
+	if (ua.match(/iPhone|iPod/i) != null) return true;
+	if (ua.match(/Android/i) != null) return true;
+	if (ua.match(/Edge\D?\d+/i) != null) return true;
+	if (ua.match(/QQBrowser/i) != null) return false;
+	var verTrident=ua.match(/Trident\D?\d+/i);
+	var verIE=ua.match(/MSIE\D?\d+/i);
+	var verOPR=ua.match(/OPR\D?\d+/i);
+	var verFF=ua.match(/Firefox\D?\d+/i);
+	var x64=ua.match(/x64/i);
+	if ((verTrident==null)&&(verIE==null)&&(x64!==null))
+		return true; else
+	if ( verFF !== null) {
+		verFF = verFF[0].match(/\d+/);
+		if ( verFF[0] >= 42 ) return true;
+	} else
+	if ( verOPR !== null) {
+		verOPR = verOPR[0].match(/\d+/);
+		if ( verOPR[0] >= 32 ) return true;
+	} else
+	if ((verTrident==null)&&(verIE==null)) {
+		var verChrome=ua.match(/Chrome\D?\d+/i);
+		if ( verChrome !== null ) {
+			verChrome = verChrome[0].match(/\d+/);
+			if (verChrome[0]>=42) return true;
+		};
+	};
+        return false;
+    } catch(err) {return true;};
+};
+
+//====页面引用CLodop云打印必须的JS文件：====
+if (needCLodop()) {
+	var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
+	var oscript = document.createElement("script");
+	var ishttps = 'https:' == document.location.protocol ? true: false;
+    ishttps = false;
+	if(ishttps){
+		oscript.src ="https://localhost:8443/CLodopfuncs.js?priority=1";
+		head.insertBefore( oscript,head.firstChild );
+		//本机云打印的后补端口8444：
+		oscript = document.createElement("script");
+		oscript.src ="https://localhost:8444/CLodopfuncs.js?priority=2";
+		head.insertBefore( oscript,head.firstChild );
+	}else{
+		oscript.src ="http://localhost:8000/CLodopfuncs.js?priority=1";
+		head.insertBefore( oscript,head.firstChild );
+		//本机云打印的后补端口8001：
+		oscript = document.createElement("script");
+		oscript.src ="http://localhost:8001/CLodopfuncs.js?priority=2";
+		head.insertBefore( oscript,head.firstChild );
+	}
+
+
+};
+
+//====获取LODOP对象的主过程：====
+function getLodop(oOBJECT,oEMBED){
+
+    var strHtmInstall="<br><font color='#FF00FF'><a href='../../js/lodop/install_lodop32.exe' target='_self'>打印控件未安装!点击这里执行安装,安装后请刷新页面或重新进入。</a></font>";
+    var strHtmUpdate="<br><font color='#FF00FF'><a href='../../js/lodop/install_lodop32.exe' target='_self'>打印控件需要升级!点击这里执行升级,升级后请重新进入。</a></font>";
+    var strHtm64_Install="<br><font color='#FF00FF'><a href='../../js/lodop/install_lodop64.exe' target='_self'>打印控件未安装!点击这里执行安装,安装后请刷新页面或重新进入。</a></font>";
+    var strHtm64_Update="<br><font color='#FF00FF'><a href='../../js/lodop/install_lodop64.exe' target='_self'>打印控件需要升级!点击这里执行升级,升级后请重新进入。</a></font>";
+    var strHtmFireFox="<br><br><font color='#FF00FF'>（注意：如曾安装过Lodop旧版附件npActiveXPLugin,请在【工具】->【附加组件】->【扩展】中先卸它）</font>";
+    var strHtmChrome="<br><br><font color='#FF00FF'>(如果此前正常，仅因浏览器升级或重安装而出问题，需重新执行以上安装）</font>";
+    var strCLodopInstall="<br><font color='#FF00FF'><a href='../../js/lodop/CLodop_Setup_for_Win32NT.exe' target='_self'>CLodop云打印服务(本地)未安装启动!点击这里执行安装,安装后请刷新页面。</a></font>";
+    var strCLodopUpdate="<br><font color='#FF00FF'><a href='../../js/lodop/CLodop_Setup_for_Win32NT.exe' target='_self'>CLodop云打印服务需升级!点击这里执行升级,升级后请刷新页面。</a></font>";
+    var LODOP;
+    try{
+        var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0);
+        if (needCLodop()) {
+            try{ LODOP=getCLodop();} catch(err) {};
+	    if (!LODOP && document.readyState!=="complete") {/*alert("C-Lodop没准备好，请稍后再试！");*/ return;};
+            if (!LODOP) {
+		 if (isIE) document.write(strCLodopInstall); else
+		  $("#lodopTips").append(strCLodopInstall);
+                 return;
+            } else {
+
+	         if (CLODOP.CVERSION<"2.0.6.8") {
+			if (isIE) document.write(strCLodopUpdate); else
+			 $("#lodopTips").append(strCLodopUpdate);
+		 };
+		 if (oEMBED && oEMBED.parentNode) oEMBED.parentNode.removeChild(oEMBED);
+		 if (oOBJECT && oOBJECT.parentNode) oOBJECT.parentNode.removeChild(oOBJECT);
+	    };
+        } else {
+            var is64IE  = isIE && (navigator.userAgent.indexOf('x64')>=0);
+            //=====如果页面有Lodop就直接使用，没有则新建:==========
+            if (oOBJECT!=undefined || oEMBED!=undefined) {
+                if (isIE) LODOP=oOBJECT; else  LODOP=oEMBED;
+            } else if (CreatedOKLodop7766==null){
+                LODOP=document.createElement("object");
+                LODOP.setAttribute("width",0);
+                LODOP.setAttribute("height",0);
+                LODOP.setAttribute("style","position:absolute;left:0px;top:-100px;width:0px;height:0px;");
+                if (isIE) LODOP.setAttribute("classid","clsid:2105C259-1E0C-4534-8141-A753534CB4CA");
+                else LODOP.setAttribute("type","application/x-print-lodop");
+                document.documentElement.appendChild(LODOP);
+                CreatedOKLodop7766=LODOP;
+             } else LODOP=CreatedOKLodop7766;
+            //=====Lodop插件未安装时提示下载地址:==========
+            if ((LODOP==null)||(typeof(LODOP.VERSION)=="undefined")) {
+                 if (navigator.userAgent.indexOf('Chrome')>=0)
+                      $("#lodopTips").append(strHtmChrome);
+                 if (navigator.userAgent.indexOf('Firefox')>=0)
+                      $("#lodopTips").append(strHtmFireFox);
+                 if (is64IE) document.write(strHtm64_Install); else
+                 if (isIE)   document.write(strHtmInstall);    else
+                      $("#lodopTips").append(strHtmInstall);
+                 return LODOP;
+            };
+        };
+        if (LODOP.VERSION<"6.2.0.8") {
+            if (needCLodop())
+             $("#lodopTips").append(strCLodopUpdate); else
+            if (is64IE)  $("#lodopTips").append(strHtm64_Update); else
+            if (isIE)  $("#lodopTips").append(strHtmUpdate); else
+             $("#lodopTips").append(strHtmUpdate);
+            return LODOP;
+        };
+        //===如下空白位置适合调用统一功能(如注册语句、语言选择等):===
+        LODOP.SET_LICENSES("","8547576574263FCEE0D67DA8BFE4BECC","C94CEE276DB2187AE6B65D56B3FC2848","");
+        //===========================================================
+        return LODOP;
+    } catch(err) {alert("getLodop出错:"+err);};
+};
+export {getLodop}

resources/js/lodop/lodop/jquery.PrintArea.js

@@ -0,0 +1,37 @@
+// JavaScript Document
+(function($) {
+var printAreaCount = 0;
+$.fn.printArea = function()
+{
+var ele = $(this);
+var idPrefix = "printArea_";
+removePrintArea( idPrefix + printAreaCount );
+printAreaCount++;
+var iframeId = idPrefix + printAreaCount;
+var iframeStyle = 'position:absolute;width:0px;height:0px;left:-500px;top:-500px;';
+iframe = document.createElement('IFRAME');
+$(iframe).attr({ style : iframeStyle,
+id    : iframeId
+});
+document.body.appendChild(iframe);
+var doc = iframe.contentWindow.document;
+$(document).find("link")
+.filter(function(){
+return $(this).attr("rel").toLowerCase() == "stylesheet";
+})
+.each(function(){
+doc.write('<link type="text/css" rel="stylesheet" href="' +
+$(this).attr("href") + '" >');
+});
+doc.write('<div class="' + $(ele).attr("class") + '">' + $(ele).html() + '</div>');
+doc.close();
+var frameWindow = iframe.contentWindow;
+frameWindow.close();
+frameWindow.focus();
+frameWindow.print();
+}
+var removePrintArea = function(id)
+{
+$( "iframe#" + id ).remove();
+};
+})(jQuery);

resources/views/equipment/_location.blade.php

@@ -104,8 +104,14 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button v-if="!batchSign && (current.children && current.children[currentEqChildIndex] && current.children[currentEqChildIndex].row>0 && current.children[currentEqChildIndex].column>0)" @click="removeLocationBind()"
-                        class="pull-right btn btn-danger">解除该设备库位绑定</button>
+                <div v-if="!batchSign && (current.children && current.children[currentEqChildIndex] &&
+                current.children[currentEqChildIndex].row>0 && current.children[currentEqChildIndex].column>0)">
+                    <button  @click="removeLocationBind()"
+                             class="pull-right btn btn-danger">解除该设备库位绑定</button>
+                    <button  @click="relieveBind()"
+                             class="pull-right btn btn-warning small">取消关联库位</button>
+                </div>
+
                 <button v-else @click="locationBind()" class="pull-right btn btn-success">根据行列自动构建库位</button>
             </div>
         </div>

resources/views/equipment/index.blade.php

@@ -177,6 +177,15 @@
                             <button class="btn btn-sm btn-success" @click="openBuildEquipmentGroup()">构建设备组</button>
                         </label>
                     </div>
+                    <div class="form-check mt-1">
+                        <label class="form-check-label">
+                            <button @click="clickEditOrSave()" :class="isNotEdit ? 'btn-info' : 'btn-success'"
+                                    class="btn btn-sm">
+                                <span v-if="isNotEdit">开启场景编辑</span>
+                                <span v-else>保存更改</span>
+                            </button>
+                        </label>
+                    </div>
                 </div>
             </div>
             <p class="font-weight-bold p-0 mb-0 mt-5 h5">全局</p>
@@ -216,11 +225,11 @@
                     </div>
                 </div>
             </div>
-            <button @click="clickEditOrSave()" :class="isNotEdit ? 'btn-info' : 'btn-success'"
+<!--            <button @click="clickEditOrSave()" :class="isNotEdit ? 'btn-info' : 'btn-success'"
                     style="position:absolute;bottom: 20px;cursor: pointer" class="btn col-10 text-white">
                 <span v-if="isNotEdit">开启场景编辑</span>
                 <span v-else>保存更改</span>
-            </button>
+            </button>-->
         </div>
         <div class="col-10 p-0">
             <div class="w-100 bg-secondary" id="canvasApp" style="height: 100vh;overflow: auto;user-select: none;">
@@ -333,7 +342,7 @@
             turn:true,                                                  //设备是否翻转
             isLoadLocation:false,                                       //开启加载库位
             //baseUrl:"http://127.0.0.1:8112/",
-            baseUrl:"https://api.baoshi56.com/",
+            baseUrl:"https://api-back.baoshi56.com/",
             current:{},                                                 //当前操作的设备
             error:{},
             locations:[],                   //库位信息
@@ -1187,6 +1196,34 @@
                 eq.children = equipment.children;
                 return eq;
             },
+            relieveBind() {
+                if (this.isLoadLocation)return;
+                this.isLoadLocation = true;
+                $.ajax({
+                    url : this.baseUrl+"api/base/equipment/relieveBind?id="+this.current.children[this.currentEqChildIndex].id,
+                    type : "get",
+                    success : (res)=>{
+                        switch (res.code){
+                            case 200:
+                                this.current.children[this.currentEqChildIndex].row = 0;
+                                this.current.children[this.currentEqChildIndex].column = 0;
+                                this.locations = [];
+                                window.toast.success("解除成功！");
+                                break;
+                            default:
+                                window.toast.error("服务错误，解除失败");
+                        }
+                    },
+                    error : (err)=>{
+                        window.tempTip.setIndex(999);
+                        window.tempTip.show("网络错误");
+                    },
+                    complete:()=>{
+                        this.isLoadLocation = false;
+                    },
+                    timeout:3000,
+                })
+            },
             removeLocationBind(){
                 if (this.isLoadLocation)return;
                 this.isLoadLocation = true;

resources/views/maintenance/containerManage/create.blade.php

@@ -111,6 +111,8 @@
                     if (JSON.stringify(error)!=='{}'){this.errors = error;}
                 },
                 submit() {
+                    window.tempTip.show("功能关闭，移至SWMS系统进行操作");
+                    return;
                     this.errors={};//初始errors状态
                     this.check();
                     if(JSON.stringify(this.errors)!=='{}')return;
@@ -145,7 +147,7 @@
                     if (env === 'local') {
                         url = 'http://127.0.0.1:8112'
                     } else if (env === 'production') {
-                        url = 'https://api.baoshi56.com'
+                        url = 'https://api-back.baoshi56.com'
                     }
                     return url;
                 },

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

@@ -138,6 +138,8 @@
                 current: 1,
             },
             created() {
+                window.tempTip.show("功能关闭，移至SWMS系统进行操作");
+                return
                 let url = this.getBaseUrl() + `/api/wms/containerManage/list?size=${this.size}&current=${this.current}`;
                 this.getPageResult(url);
             },
@@ -206,7 +208,7 @@
                     if (env === 'local') {
                         url = 'http://127.0.0.1:8112'
                     } else if (env === 'production') {
-                        url = 'https://api.baoshi56.com'
+                        url = 'https://api-back.baoshi56.com'
                     }
                     return url;
                 },

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

@@ -33,6 +33,8 @@
                 details: [],
             },
             created() {
+                window.tempTip.show("功能关闭，移至SWMS系统进行操作");
+                return
                 let url = this.getBaseUrl();
                 url += '/api/report/scanDeviceMonitor/list';
                 axios.get(url, this.search).then(res => {
@@ -51,7 +53,7 @@
                     if (env === 'local') {
                         url = 'http://127.0.0.1:8111'
                     } else if (env === 'production') {
-                        url = 'https://api.baoshi56.com'
+                        url = 'https://api-back.baoshi56.com'
                     }
                     return url;
                 },

resources/views/rejected/rejectedPushTask/index.blade.php

@@ -617,6 +617,8 @@
                 },
                 //停止攒单
                 stopStoreUp(id = null) {
+                    window.tempTip.show("功能关闭，移至SWMS系统进行操作");
+                    return;
                     let idList = null
                     let url = this.getBaseUrl() + `/api/wms/rejectedPushTask/stopStoreUp/`;
 
@@ -652,7 +654,7 @@
                     if (env === 'local') {
                         url = 'http://127.0.0.1:8112'
                     } else if (env === 'production') {
-                        url = 'https://api.baoshi56.com'
+                        url = 'https://api-back.baoshi56.com'
                     }
                     return url;
                 },

resources/views/store/receivingDashboard/punctualityProgress/index.blade.php

@@ -205,7 +205,8 @@
                 current: 1,
             },
             created() {
-                console.log(this.search.ownerIdList)
+                window.tempTip.show("功能关闭，移至SWMS系统进行操作");
+                return
                 let url = this.getBaseUrl() + `/api/device/check/receiveBoard/agingScheduleList?size=${this.size}&current=${this.current}`
                 this.initSearchDate();
                 this.getPageResult(url);
@@ -318,7 +319,7 @@
                     if (env === 'local') {
                         url = 'http://127.0.0.1:8116'
                     } else if (env === 'production') {
-                        url = 'https://api.baoshi56.com'
+                        url = 'https://api-back.baoshi56.com'
                     }
                     return url;
                 },

resources/views/store/receivingDashboard/receivingTableList/index.blade.php

@@ -235,6 +235,8 @@
                 current: 1,
             },
             created() {
+                window.tempTip.show("功能关闭，移至SWMS系统进行操作");
+                return
                 let url = this.getBaseUrl() + `/api/device/check/receiveBoard/formList?size=${this.size}&current=${this.current}`
                 this.initSearchDate();
                 this.getPageResult(url);
@@ -347,7 +349,7 @@
                     if (env === 'local') {
                         url = 'http://127.0.0.1:8116'
                     } else if (env === 'production') {
-                        url = 'https://api.baoshi56.com'
+                        url = 'https://api-back.baoshi56.com'
                     }
                     return url;
                 },

resources/views/store/receivingDashboard/stayPutawayList.blade.php

@@ -149,6 +149,8 @@
                 current: 1,
             },
             created() {
+                window.tempTip.show("功能关闭，移至SWMS系统进行操作");
+                return;
                 let url = this.getBaseUrl() + `/api/device/check/receiveBoard/stayPutawayList?size=${this.size}&current=${this.current}`
                 this.initSearchDate();
                 this.getPageResult(url);
@@ -238,7 +240,7 @@
                     if (env === 'local') {
                         url = 'http://127.0.0.1:8116'
                     } else if (env === 'production') {
-                        url = 'https://api.baoshi56.com'
+                        url = 'https://api-back.baoshi56.com'
                     }
                     return url;
                 },