From 04b1ba2cf7f144079f1ae65d5d24fdcda330d1f9 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 21 一月 2024 16:09:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 1cd79f7..ecefece 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -188,6 +188,7 @@
combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setWeight(orderDetl.getWeight());
combMats.add(combMat);
}
if (combMats.size()==0){
@@ -271,12 +272,12 @@
return R.ok("缁勬墭鎴愬姛");
}
-// @RequestMapping("/truss/comd/auth")
-// @ManagerAuth(memo = "鎵嬪姩鍏ュ簱锛�2妤兼棤闇�妗佹灦鎵嬪姩鍏ュ簱")
-// public R trussComb2(@RequestBody PalletizingCompleteParam combParam){
-// mobileService.trussComb2(combParam, getUserId());
-// return R.ok("缁勬墭鎴愬姛");
-// }
+ @RequestMapping("/truss/comd/auth")
+ @ManagerAuth(memo = "鎵嬪姩鍏ュ簱锛�2妤兼棤闇�妗佹灦鎵嬪姩鍏ュ簱")
+ public R trussComb2(@RequestBody PalletizingCompleteParam combParam){
+ mobileService.trussComb2(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
--
Gitblit v1.9.1