瀏覽代碼

部分需求修改

loustwo 3 年之前
父節點
當前提交
4bc378d7fe

+ 1 - 1
app/Http/Controllers/OrderIssueController.php

@@ -80,7 +80,7 @@ class OrderIssueController extends Controller
         $orderIssueType = $this->orderIssueTypeService->getAllOrderIssueTypes();
         $qualityLabel = QualityLabel::all();
         $logistics = Logistic::all();
-        $userWorkgroup = UserWorkgroup::withTrashed()->get();
+        $userWorkgroup = UserWorkgroup::withTrashed()->orderByDesc("updated_at")->get();
         $userOwnerGroups = UserOwnerGroup::all();
         $warehouses = Warehouse::all();
         return view('order/issue/index', compact('owners', 'orderIssues', 'orderIssueType', 'qualityLabel', 'userWorkgroup', 'logistics', 'userOwnerGroups','warehouses'));

+ 6 - 6
app/Services/weight/WeightService.php

@@ -93,12 +93,12 @@ class WeightService
             return $this->getUpdatePackageMessage($orderPackage);
         }
 
-        // 7、处理波次信息 推送至WMS称重信息
-        try {
-            $this->activityWaveNoProcessing($orderPackage);
-        } catch (\Exception $e) {
-            return $this->getWeightMessage($orderPackage, $e);
-        }
+//        // 7、处理波次信息 推送至WMS称重信息
+//        try {
+//            $this->activityWaveNoProcessing($orderPackage);
+//        } catch (\Exception $e) {
+//            return $this->getWeightMessage($orderPackage, $e);
+//        }
 
         return $this->getSuccessMessage($params, $orderPackage);
     }

+ 1 - 1
routes/api/thirdPart/hengli.php

@@ -7,5 +7,5 @@ use Illuminate\Support\Facades\Route;
 地址前缀:api/thirdPart/hengli
 */
 Route::group(['prefix'=>'weight'],function(){
-    Route::GET('new', "PackageController@new_");        //称重上传
+    Route::ANY('new', "PackageController@new_");        //称重上传
 });