From 570300c26ff3c562c03ac24e4896f72d33fa4369 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 18 七月 2025 14:23:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/MobileController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index c3ea41f..8462d00 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -150,7 +150,7 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam) {
- logger.info("缁勬墭鍙傛暟锛歿}",combParam);
+ logger.info("缁勬墭鍙傛暟锛歿}", combParam);
if (Cools.isEmpty(combParam.getOrderNo())) {
combParam.setOrderNo(combParam.getBillNo());
}
@@ -495,6 +495,7 @@
return R.ok().add(wrkMastArrayList);
}
+
@RequestMapping("/pick/mat/list")
@ManagerAuth(memo = "鑾峰彇骞舵澘鐗╂枡")
public R pickMats(@RequestParam(required = false) String matnr, @RequestParam(required = false) String orderNo) {
@@ -559,11 +560,11 @@
public R orderListorderNo(@RequestParam String orderNo) {
//鏁伴噺淇敼鎴愪负瀹屾垚鏁伴噺
List<OrderDetl> orderDetl1 = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("orderNo", orderNo));
- List<OrderDetl> orderDetls= new ArrayList<OrderDetl>();
- for (OrderDetl o: orderDetl1) {
- BigDecimal c1 = new BigDecimal(o.getEnableQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ List<OrderDetl> orderDetls = new ArrayList<OrderDetl>();
+ for (OrderDetl o : orderDetl1) {
+ BigDecimal c1 = new BigDecimal(o.getEnableQty()).setScale(2, BigDecimal.ROUND_HALF_UP);
o.setAnfme(c1.doubleValue());
- if (o.getAnfme().equals(0.0)){
+ if (o.getAnfme().equals(0.0)) {
continue;
}
orderDetls.add(o);
@@ -604,12 +605,12 @@
.in("order_id", orderIds)
.like("order_no", orderNo)
);
- if (Cools.isEmpty(orderDetlList)){
+ if (Cools.isEmpty(orderDetlList)) {
return R.error("鏈煡璇㈠埌姝よ鍗曟鐗╂枡鏁版嵁");
}
ArrayList<OrderDetl> orderDetls = new ArrayList<>();
- for(OrderDetl orderDetl:orderDetlList){
+ for (OrderDetl orderDetl : orderDetlList) {
double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
if (count <= 0D) {
continue;
@@ -629,7 +630,7 @@
@RequestMapping("/pda/WarehouseOutPickMerge/v1")
@ManagerAuth
public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) {
- return mobileService.WarehouseOutPickMergeV1(param,getUserId());
+ return mobileService.WarehouseOutPickMergeV1(param, getUserId());
}
}
--
Gitblit v1.9.1