Merge branch 'master' into LD

app/Console/Commands/SyncBatchTask.php

@@ -50,14 +50,13 @@ class SyncBatchTask extends Command
         if ($batches){
             foreach ($batches as $batch)$map[$batch->code] = $batch->id;
         }
-        $update = [["id","status","remark","updated_at"]];
+        $update = [["id","wms_status","remark","updated_at"]];
         $insert = [];
         foreach ($waves as $wave){
-            $status = $wave->wavestatus == '40' ? "未处理" : ($wave->wavestatus == '90' ? '取消' : '已处理');
             if (isset($map[$wave->waveno])){
                 $update[] = [
                     "id" => $map[$wave->waveno],
-                    "status" => $status,
+                    "wms_status" => $this->wms_status($wave),
                     "remark"=>$wave->descr,
                     "updated_at"=>$wave->edittime,
                 ];
@@ -66,8 +65,9 @@ class SyncBatchTask extends Command
             $owner = app("OwnerService")->codeGetOwner($wave->customerid);
             $insert[] = [
                 "code" => $wave->waveno,
-                "status" => $status,
                 "remark"=>$wave->descr,
+                "status" => '未处理',
+                "wms_status" => $this->wms_status($wave),
                 "created_at"=>$wave->addtime,
                 "updated_at"=>$wave->edittime,
                 "owner_id"=>$owner->id,
@@ -118,11 +118,11 @@ class SyncBatchTask extends Command
             $waves = $this->service->get(["waveno"=>$waveCodes],["waveno"=>"in"]);
             $insert = [];
             foreach ($waves as $wave){
-                $status = $wave->wavestatus == '40' ? "未处理" : ($wave->wavestatus == '90' ? '取消' : '已处理');
                 $owner = app("OwnerService")->codeGetOwner($wave->customerid);
                 $insert[] = [
                     "code" => $wave->waveno,
-                    "status" => $status,
+                    "status" => '未处理',
+                    "wms_status" => $this->wms_status($wave),
                     "remark"=>$wave->descr,
                     "created_at"=>$wave->addtime,
                     "updated_at"=>$wave->edittime,
@@ -143,4 +143,28 @@ class SyncBatchTask extends Command
 
         ValueStore::query()->where("name","wave_last_sync_date")->update(["value"=>Carbon::now()->subSeconds(1)->toDateTimeString()]);
     }
+
+    /**
+     * @param $wave
+     * @return string
+     */
+    public function wms_status($wave): string
+    {
+        switch ($wave->wavestatus) {
+            case 00:
+                $wms_status = '创建';
+                break;
+            case 40:
+                $wms_status = '部分收货';
+                break;
+            case 90:
+                $wms_status = '取消';
+                break;
+            case 99:
+                $wms_status = '完成';
+                break;
+            default:null;
+        }
+        return $wms_status;
+    }
 }

app/Http/Controllers/api/thirdPart/haochuang/SortingController.php

@@ -50,9 +50,6 @@ class SortingController extends Controller
         ]);
     }
 
-    function scanCommodity(Request $request){
-        return ['result'=>'success','data'=>json_encode($request->all())];
-    }
 
     function process(Request $request){
         $token = trim($request->input('token'));

app/Providers/AppServiceProvider.php

@@ -126,113 +126,77 @@ class AppServiceProvider extends ServiceProvider
     }
 
     private function loadingService(){
+        app()->singleton('AllInventoryService',AllInventoryService::class);
+        app()->singleton('AuthorityService',AuthorityService::class);
         app()->singleton('BatchService',BatchService::class);
+        app()->singleton('BatchUpdateService', BatchUpdateService::class);
         app()->singleton('CacheService',CacheService::class);
-        app()->singleton('UserService',UserService::class);
-        app()->singleton('AuthorityService',AuthorityService::class);
-        app()->singleton('WaybillFinancialService',WaybillFinancialService::class);
-        app()->singleton('WeighExceptedService',WeighExceptedService::class);
-        app()->singleton('AllInventoryService',AllInventoryService::class);
+        app()->singleton('CheckActiveMenuService',CheckActiveMenuService::class);
+        app()->singleton('CommodityBarcodeService',CommodityBarcodeService::class);
+        app()->singleton('CommodityService', CommodityService::class);
+        app()->singleton('CustomerService',CustomerService::class);
+        app()->singleton('DataHandlerService',DataHandlerService::class);
+        app()->singleton('DepositoryService',DepositoryService::class);
+        app()->singleton('FeatureService',FeatureService::class);
+        app()->singleton('ForeignHaiRoboticsService',ForeignHaiRoboticsService::class);
         app()->singleton('InventoryDailyLogService',InventoryDailyLogService::class);
+        app()->singleton('InventoryAccountMissionService',InventoryAccountMissionService::class);
+        app()->singleton('LaborReportsCountingRecordService',LaborReportsCountingRecordService::class);
         app()->singleton('LogService',LogService::class);
-        app()->singleton('ProcessService',ProcessService::class);
-        app()->singleton('ProcessStatisticService',ProcessStatisticService::class);
-        app()->singleton('OwnerService',OwnerService::class);
-        app()->singleton('ProcessMethodService',ProcessMethodService::class);
         app()->singleton('LogisticService',LogisticService::class);
-        app()->singleton('PackageStatisticsService',PackageStatisticsService::class);
         app()->singleton('OracleActAllocationDetailService',OracleActAllocationDetailService::class);
-        app()->singleton('ShopService',ShopService::class);
-        app()->singleton('ForeignHaiRoboticsService',ForeignHaiRoboticsService::class);
-        app()->singleton('OrderPackageService',OrderPackageService::class);
-        app()->singleton('OrderIssueService',OrderIssueService::class);
-        app()->singleton('OrderService',OrderService::class);
-        app()->singleton('OracleDocOrderHeaderService',OracleDOCOrderHeaderService::class);
-        app()->singleton('OwnerReportService',OwnerReportService::class);
-        app()->singleton('RejectedBillService',RejectedBillService::class);
-        app()->singleton('RejectedBillItemService',RejectedBillItemService::class);
-        app()->singleton('StoreCheckingReceiveService',StoreCheckingReceiveService::class);
-        app()->singleton('StoreCheckingReceiveItemService',StoreCheckingReceiveItemService::class);
-        app()->singleton('CommodityBarcodeService',CommodityBarcodeService::class);
         app()->singleton('OracleBasCustomerService',OracleBasCustomerService::class);
         app()->singleton('OracleBasSkuService',OracleBasSkuService::class);
         app()->singleton('OracleDocAsnDetailService',OracleDocAsnDetailService::class);
-        app()->singleton('InventoryAccountMissionService',InventoryAccountMissionService::class);
-        app()->singleton('ProcessesContentService',ProcessesContentService::class);
-        app()->singleton('StoreService',StoreService::class);
-        app()->singleton('StationTaskBatchService',StationTaskBatchService::class);
-        app()->singleton('StationTaskBatchTypeService',StationTaskBatchTypeService::class);
-        app()->singleton('StationService',StationService::class);
-        app()->singleton('WarehouseService',WarehouseService::class);
-        app()->singleton('StoreItemService',StoreItemService::class);
-        app()->singleton('PackageService',PackageService::class);
-        app()->singleton('ProcessMethodService',ProcessMethodService::class);
-        app()->singleton('OwnerReportService',OwnerReportService::class);
+        app()->singleton('OracleDocOrderHeaderService',OracleDOCOrderHeaderService::class);
+        app()->singleton('OrderIssueProcessLogService',OrderIssueProcessLogService::class);
+        app()->singleton('OrderCommodityService',OrderCommodityService::class);
+        app()->singleton('OrderCommodityAssignService',OrderCommodityAssignService::class);
+        app()->singleton('OrderCountingRecordService',OrderCountingRecordService::class);
+        app()->singleton('OrderIssueService',OrderIssueService::class);
+        app()->singleton('OrderIssueWorkLoadService',OrderIssueWorkLoadService::class);
+        app()->singleton('OrderIssuePerformanceService',OrderIssuePerformanceService::class);
+        app()->singleton('OrderPackageCommoditiesService',OrderPackageCommoditiesService::class);
+        app()->singleton('OrderPackageService',OrderPackageService::class);
+        app()->singleton('OrderService',OrderService::class);
+        app()->singleton('OrderTrackingService',OrderTrackingService::class);
         app()->singleton('OwnerAreaReportService',OwnerAreaReportService::class);
-        app()->singleton('OwnerFeeDetailService',OwnerFeeDetailService::class);
         app()->singleton('OwnerBillReportService',OwnerBillReportService::class);
+        app()->singleton('OwnerFeeDetailService',OwnerFeeDetailService::class);
+        app()->singleton('OwnerOutStorageRuleService',OwnerOutStorageRuleService::class);
         app()->singleton('OwnerPriceExpressService',OwnerPriceExpressService::class);
         app()->singleton('OwnerPriceLogisticService',OwnerPriceLogisticService::class);
         app()->singleton('OwnerPriceDirectLogisticService',OwnerPriceDirectLogisticService::class);
-        app()->singleton('OrderCommodityAssignService',OrderCommodityAssignService::class);
-
-        $this->loadingOrderModuleService();
-        $this->loadingBasedModuleService();
-        $this->loadingRejectedModuleService();
-        $this->loadingCheckActiveMenuService();
-        $this->loadingRealtimePendingOrdersService();
-        $this->loadingOrderCountingRecordService();
-        $this->loadingLaborReportsCountingRecordService();
-    }
-
-    private function loadingOrderModuleService(){
-        app()->singleton('OrderTrackingService',OrderTrackingService::class);
-        app()->singleton('OrderService',OrderService::class);
-        app()->singleton('OrderPackageService',OrderPackageService::class);
-        app()->singleton('OrderPackageCommoditiesService',OrderPackageCommoditiesService::class);
-        app()->singleton('OrderIssueService',OrderIssueService::class);
-        app()->singleton('OrderIssueWorkLoadService',OrderIssueWorkLoadService::class);
-        app()->singleton('OrderIssuePerformanceService',OrderIssuePerformanceService::class);
-        app()->singleton('OracleDocOrderHeaderService',OracleDOCOrderHeaderService::class);
-        app()->singleton('OracleActAllocationDetailService',OracleActAllocationDetailService::class);
-        app()->singleton('OrderIssueProcessLogService',OrderIssueProcessLogService::class);
-        app()->singleton('OrderCommodityService',OrderCommodityService::class);
-    }
-
-    private function loadingBasedModuleService(){
-        app()->singleton("ShopService", ShopService::class);
-        app()->singleton('CommodityService', CommodityService::class);
-        app()->singleton('BatchUpdateService', BatchUpdateService::class);
-        app()->singleton('DataHandlerService',DataHandlerService::class);
-        app()->singleton('DepositoryService',DepositoryService::class);
-        app()->singleton('UserOwnerGroupService',UserOwnerGroupService::class);
-        app()->singleton('CustomerService',CustomerService::class);
+        app()->singleton('OwnerPriceOperationService',OwnerPriceOperationService::class);
+        app()->singleton('OwnerReportService',OwnerReportService::class);
+        app()->singleton('OwnerService',OwnerService::class);
         app()->singleton('OwnerStoragePriceModelService',OwnerStoragePriceModelService::class);
+        app()->singleton('PackageStatisticsService',PackageStatisticsService::class);
+        app()->singleton('PackageService',PackageService::class);
+        app()->singleton('ProcessesContentService',ProcessesContentService::class);
+        app()->singleton('ProcessMethodService',ProcessMethodService::class);
+        app()->singleton('ProcessService',ProcessService::class);
+        app()->singleton('ProcessStatisticService',ProcessStatisticService::class);
+        app()->singleton('RealtimePendingOrdersService',RealtimePendingOrdersService::class);
+        app()->singleton('RejectedBillItemService',RejectedBillItemService::class);
+        app()->singleton('RejectedBillService',RejectedBillService::class);
+        app()->singleton('RejectedService',RejectedService::class);
+        app()->singleton('ShopService',ShopService::class);
+        app()->singleton('StationService',StationService::class);
+        app()->singleton('StationTaskBatchService',StationTaskBatchService::class);
+        app()->singleton('StationTaskBatchTypeService',StationTaskBatchTypeService::class);
+        app()->singleton('StoreCheckingReceiveService',StoreCheckingReceiveService::class);
+        app()->singleton('StoreCheckingReceiveItemService',StoreCheckingReceiveItemService::class);
+        app()->singleton('StoreItemService',StoreItemService::class);
+        app()->singleton('StoreService',StoreService::class);
         app()->singleton('UnitService',UnitService::class);
-        app()->singleton('OwnerPriceOperationService',OwnerPriceOperationService::class);
-        app()->singleton('FeatureService',FeatureService::class);
-        app()->singleton('OwnerOutStorageRuleService',OwnerOutStorageRuleService::class);
-    }
+        app()->singleton('UserService',UserService::class);
+        app()->singleton('UserOwnerGroupService',UserOwnerGroupService::class);
+        app()->singleton('WarehouseService',WarehouseService::class);
+        app()->singleton('WaybillFinancialService',WaybillFinancialService::class);
+        app()->singleton('WeighExceptedService',WeighExceptedService::class);
 
-    private function loadingRejectedModuleService(){
-        app()->singleton('RejectedService',RejectedService::class);
     }
 
-    private function loadingCheckActiveMenuService()
-    {
-        app()->singleton('CheckActiveMenuService',CheckActiveMenuService::class);
-    }
 
-    private function loadingRealtimePendingOrdersService()
-    {
-        app()->singleton('RealtimePendingOrdersService',RealtimePendingOrdersService::class);
-    }
-    private function loadingOrderCountingRecordService()
-    {
-        app()->singleton('OrderCountingRecordService',OrderCountingRecordService::class);
-    }
-    private function loadingLaborReportsCountingRecordService()
-    {
-        app()->singleton('LaborReportsCountingRecordService',LaborReportsCountingRecordService::class);
-    }
 }

routes/api/thirdPart/haochuang.php

@@ -13,6 +13,5 @@ use Illuminate\Http\Request;
 Route::prefix('sorting')->group(function(){
     Route::post('login', "SortingController@login");
     Route::post('process', "SortingController@process");
-    Route::post('scanCommodity', "SortingController@scanCommodity");
     Route::post('done', "SortingController@done");
 });