From b141c90208b6a82504680d35eacdaecff1cb7e40 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期日, 14 四月 2024 10:39:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   60 +++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 45 insertions(+), 15 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..9608121 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.AppAuth;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
@@ -19,6 +20,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.List;
 
@@ -54,6 +56,8 @@
     private ManLocDetlMapper manLocDetlMapper;
     @Autowired
     private WrkDetlLogService wrkDetlLogService;
+    @Autowired
+    private RgvOneSignService rgvOneSignService;
 
 
     // 鍟嗗搧涓婃灦
@@ -72,10 +76,14 @@
     }
 
     @RequestMapping("/search/sign/auth/v2")
-//    @ManagerAuth(memo = "鎷嗗彔鐩樻ā寮忓垏鎹�")
+    @ManagerAuth(memo = "鎷嗗彔鐩樻ā寮忓垏鎹�")
     public R orderSearchByBarcodeV2(@RequestParam boolean sign){
-        Integer signRu = 1;
-        return R.ok(signRu);
+        RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
+        if (sign){
+            rgvOneSign.setRgvOneSign(1-rgvOneSign.getRgvOneSign());
+            rgvOneSignService.updateById(rgvOneSign);
+        }
+        return R.ok(rgvOneSign.getRgvOneSign());
     }
 
 
@@ -188,6 +196,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){
@@ -257,12 +266,12 @@
         return R.ok();
     }
 
-    @RequestMapping("/truss/auth")
-    @ManagerAuth(memo = "閫�搴擄紝1妤兼鏋堕��搴�")
-    public R trussComb(@RequestBody TrussCombParam combParam){
-        mobileService.trussComb(combParam, getUserId());
-        return R.ok("缁勬墭鎴愬姛");
-    }
+//    @RequestMapping("/truss/auth")
+//    @ManagerAuth(memo = "閫�搴擄紝1妤兼鏋堕��搴�")
+//    public R trussComb(@RequestBody TrussCombParam combParam){
+//        mobileService.trussComb(combParam, getUserId());
+//        return R.ok("缁勬墭鎴愬姛");
+//    }
 
     @RequestMapping("/truss/order/auth")
     @ManagerAuth(memo = "閫�搴擄紝1妤兼鏋堕��搴擄紝閫�搴撳崟閫�搴�")
@@ -271,12 +280,33 @@
         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妤兼棤闇�妗佹灦鎵嬪姩鍏ュ簱 wms鍏ュ簱")
+    public R PalletizingCompleteTwoFloorParam(@RequestBody PalletizingCompleteTwoFloorParam combParam){
+        mobileService.PalletizingCompleteTwoFloorParam(combParam);
+        return R.ok("缁勬墭鎴愬姛");
+    }
+
+    /**
+     * 涓帶锛�2妤�212鍙墭鐩�
+     */
+    @PostMapping("/balcony/complete/car/auth/v1")
+//    @AppAuth(memo = "涓帶锛�2妤�212鍙墭鐩�")
+    public synchronized R balconyCompleteCar() {
+        mobileService.trussComb2Car(212);
+        return R.ok();
+    }
+
+    /**
+     * 涓帶锛氳幏鍙栫鍨嬬紪鍙�
+     */
+    @PostMapping("/box/type/complete/auth/v1")
+//    @AppAuth(memo = "涓帶锛氳幏鍙栫鍨嬬紪鍙�")
+    public synchronized R boxTypeCompleteCar() {
+        List<Map<String, Object>> maps = mobileService.boxTypeComb();
+        return R.ok().add(maps);
+    }
+
 
     @RequestMapping("/comb/auth")
     @ManagerAuth(memo = "缁勬墭")

--
Gitblit v1.9.1