设备管理变更

app/Http/Controllers/TestController.php

@@ -5,42 +5,7 @@ namespace App\Http\Controllers;
 use App\Components\AsyncResponse;
 use App\Components\Database;
 use App\Components\ErrorPush;
-use App\DeliveryAppointment;
-use App\Logistic;
-use App\MaterialBox;
-use App\MaterialBoxModel;
-use App\OracleDOCASNHeader;
-use App\Order;
-use App\OrderDetail;
-use App\OrderIssue;
-use App\OrderIssueRejectedBill;
-use App\RejectedBill;
-use App\Role;
-use App\Services\common\BatchUpdateService;
-use App\Services\DeliveryAppointmentService;
-use App\Services\LogisticService;
-use App\Services\ObligationService;
-use App\Services\OracleDocAsnHerderService;
-use App\Services\OrderRejectedBillRelationService;
-use App\Services\OrderRejectingStatusService;
-use App\Services\OwnerService;
-use App\Services\RejectedService;
-use App\Services\UserService;
-use App\Services\WaybillService;
-use App\User;
-use App\Waybill;
-use App\WorkOrder;
-use Illuminate\Database\Capsule\Manager;
-use Illuminate\Database\DatabaseManager;
-use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Log;
-use Oursdreams\Export\Export;
-use Workerman\Worker;
 
 class TestController extends Controller
 {

app/Services/WaybillService.php

@@ -373,7 +373,7 @@ SQL;
             $updateRow = DB::connection("oracle")->update($sql,[
                 $waybill->carrier_bill,$waybill->carrier_bill,$waybill->wms_bill_number
             ]);
-            if ($updateRow!=1)Log::warning("德邦单号修改分配失败",["param"=>$w,"row"=>$updateRow]);
+            if ($updateRow==0)Log::warning("德邦单号修改分配失败",["param"=>$w,"row"=>$updateRow]);
             return true;
         }
         return false;

resources/views/equipment/index.blade.php

@@ -342,8 +342,8 @@
             grid:false,                                                  //设备拖拽是否开启网格
             turn:true,                                                  //设备是否翻转
             isLoadLocation:false,                                       //开启加载库位
-            //baseUrl:"http://127.0.0.1:8112/",
-            baseUrl:"https://swms.baoshi56.com/",
+            baseUrl:"http://127.0.0.1:8112/",
+            //baseUrl:"https://swms.baoshi56.com/",
             current:{},                                                 //当前操作的设备
             error:{},
             locations:[],                   //库位信息
@@ -1175,7 +1175,7 @@
                         failTipList[eq.code]="详情尚未加载完毕";
                     }else{
                         let item = eq.children[this.currentEqChildIndex];
-                        let code = eq.code+'-'+((this.currentEqChildIndex+1)<10 ? '0'+(this.currentEqChildIndex+1) : (this.currentEqChildIndex+1));
+                        let code = eq.code+'-'+(this.currentEqChildIndex+1);
                         request.push(Object.assign({id:item.id,code:code},
                             this.buildPool))
                     }