From 871867d77bf116d9450f2c63c33d3f6e97c8a1e9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 08 九月 2023 13:17:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 232ba46..d091ace 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -23,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -95,10 +96,17 @@
return R.ok();
}
List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
- if (Cools.isEmpty(orderDetls)) {
+ ArrayList<OrderDetl> orderDetls2 = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetls){
+ orderDetl.setAnfme(new BigDecimal(orderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
+ orderDetl.setWorkQty(new BigDecimal(orderDetl.getWorkQty()).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
+ orderDetl.setQty(new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
+ orderDetls2.add(orderDetl);
+ }
+ if (Cools.isEmpty(orderDetls) || Cools.isEmpty(orderDetls2)) {
return R.ok();
}
- return R.ok().add(orderDetls);
+ return R.ok().add(orderDetls2);
}
@RequestMapping("/comb/auth")
@@ -342,20 +350,31 @@
//骞冲簱pda涓婃灦
@RequestMapping("/manDetl/in")
+ @ManagerAuth(memo = "璁㈠崟涓婃灦")
public R manDetlAdd(@RequestBody JSONObject json){
if (json == null){
return R.error("浼犲叆鏁版嵁涓虹┖");
}
- return mobileService.manDetlIn(json);
+ return mobileService.manDetlIn(json, getUser());
}
//骞冲簱pda涓嬫灦
@RequestMapping("/manDetl/out")
+ @ManagerAuth(memo = "璁㈠崟涓嬫灦")
public R manDetlDelete(@RequestBody JSONObject json){
if (json == null){
return R.error("浼犲叆鏁版嵁涓虹┖");
}
- return mobileService.manDetlOut(json);
+ return mobileService.manDetlOut(json , getUser());
+ }
+
+ @RequestMapping("/manDetl/in/barcode")
+ @ManagerAuth(memo = "璁㈠崟涓婃灦(鎵樼洏鐮�)")
+ public R manDetlAddbarcode(@RequestBody JSONObject json){
+ if (json == null){
+ return R.error("浼犲叆鏁版嵁涓虹┖");
+ }
+ return mobileService.manDetlInBarcode(json,getUser());
}
}
--
Gitblit v1.9.1