From 43a90d017c9c54ca8683b30b61ae79934fe05a85 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 15 十二月 2023 10:31:19 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   79 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index c832de4..77bae09 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -10,6 +10,7 @@
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.MobileAdjustNewParam;
 import com.zy.asrs.entity.param.MobileAdjustParam;
 import com.zy.asrs.entity.param.OffSaleParam;
 import com.zy.asrs.entity.result.MobileAdjustResult;
@@ -23,6 +24,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -95,10 +97,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")
@@ -124,7 +133,7 @@
     @RequestMapping("/pack/comb/auth")
     @ManagerAuth(memo = "涓嬬嚎缁勬墭")
     public R packComb(@RequestBody CombParam combParam){
-        mobileService.packComb(combParam, getUserId());
+//        mobileService.packComb(combParam, getUserId());
         return R.ok("缁勬墭鎴愬姛");
     }
 
@@ -330,6 +339,13 @@
         return R.ok("鐩樼偣鎴愬姛");
     }
 
+    @RequestMapping("/adjustNew/auth")
+    @ManagerAuth(memo = "pda鐩樼偣")
+    public R adjustNew(@RequestBody MobileAdjustNewParam combParam){
+        mobileService.adjustNew(combParam, getUserId());
+        return R.ok("鐩樼偣鎴愬姛");
+    }
+
     @PostMapping("/order/out/pakout/auth")
     @ManagerAuth(memo = "璁㈠崟鍑哄簱")
     public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
@@ -340,4 +356,61 @@
         return R.ok("鍑哄簱鎴愬姛");
     }
 
+    //骞冲簱pda涓婃灦
+    @RequestMapping("/manDetl/in")
+    @ManagerAuth(memo = "璁㈠崟涓婃灦")
+    public R manDetlAdd(@RequestBody JSONObject json){
+        if (json == null){
+            return R.error("浼犲叆鏁版嵁涓虹┖");
+        }
+        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 , getUser());
+    }
+
+    @RequestMapping("/manDetl/in/barcode")
+    @ManagerAuth(memo = "璁㈠崟涓婃灦(鎵樼洏鐮�)")
+    public R manDetlAddbarcode(@RequestBody JSONObject json){
+        if (json == null){
+            return R.error("浼犲叆鏁版嵁涓虹┖");
+        }
+        return mobileService.manDetlInBarcode(json,getUser());
+    }
+
+    @RequestMapping("/manDetl/in/origin")
+    @ManagerAuth(memo = "骞冲簱涓婃灦")
+    public R manDetlIn(@RequestBody JSONObject json){
+        if (json == null){
+            return R.error("浼犲叆鏁版嵁涓虹┖");
+        }
+        return mobileService.manDetlOrigin(json,getUser());
+    }
+
+    @RequestMapping("/manDetl/in/no/origin")
+    @ManagerAuth(memo = "骞冲簱涓婃灦")
+    public R manDetlInNo(@RequestBody JSONObject json){
+        if (json == null){
+            return R.error("浼犲叆鏁版嵁涓虹┖");
+        }
+        return mobileService.manDetlOrigInNo(json,getUser());
+    }
+
+    @RequestMapping("/manDetl/out/origin")
+    @ManagerAuth(memo = "骞冲簱涓嬫灦")
+    public R manDetlout(@RequestBody JSONObject json){
+        if (json == null){
+            return R.error("浼犲叆鏁版嵁涓虹┖");
+        }
+        return mobileService.manDetlOriginOut(json,getUser());
+    }
+
+
 }

--
Gitblit v1.9.1