From 153136745b568f2903556698b039402855e29ef8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 28 十月 2024 16:17:56 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   47 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 43 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 e241808..99d9852 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -61,6 +61,28 @@
     @Autowired
     private CommonService commonService;
 
+    @RequestMapping("/select/workDetl/barcode")
+    @ManagerAuth
+    public R selectWorkDetlBarcode(@RequestBody Map<String,Object> map) {
+        String barcode = map.get("barcode").toString();
+        if (Cools.isEmpty(barcode)) {
+            return R.error("鏉$爜涓虹┖");
+        }
+        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
+        if (Cools.isEmpty(wrkMast)) {
+            return R.error("鏈壘鍒颁换鍔�");
+        }
+        if (wrkMast.getWrkSts() != 14 && wrkMast.getIoType() != 103) {
+            return R.error("浠诲姟鐘舵�佹湁璇�");
+        }
+        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+        if (Cools.isEmpty(wrkDetls)) {
+            return R.error("宸ヤ綔鏄庣粏鏈夎");
+        }
+        return R.ok(wrkDetls);
+
+    }
+
     @RequestMapping("/leftovers/out")
     @ManagerAuth
     public R leftoversOut(@RequestBody Map<String,Object> map) {
@@ -425,14 +447,16 @@
     @RequestMapping("/ddd/ddd")
     @ManagerAuth()
     public R ddd() {
-        int w = 164;
-        for (int i = 17; i <= 27; i++) {
-        for (int j = 1;j<=21;j++){
+        int w = 64;
+        for (int i = 17; i <= 37; i++) {
+        for (int j = 1;j<=14;j++){
             LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 1));
             LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 2));
             LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 3));
 //            LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", 26).eq("bay1", i).eq("lev1", 1));
-
+            if (locMast.getGro1() == 999){
+                continue;
+            }
 //            locMast.setGro1(w);
             locMast2.setGro1(locMast.getGro1()+100);
             locMast3.setGro1(locMast.getGro1()+200);
@@ -444,6 +468,21 @@
             w++;
         }
         }
+//        for (int i = 17; i <=37; i++) {
+//            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 14).eq("lev1", 1));
+////            LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 10).eq("lev1", 1));
+////            LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 11).eq("lev1", 1));
+////            LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", 1));
+//            locMast.setGro1(w);
+////            locMast2.setGro1(w);
+////            locMast3.setGro1(w);
+////            locMast4.setGro1(w);
+//            locMastService.updateById(locMast);
+////            locMastService.updateById(locMast2);
+////            locMastService.updateById(locMast3);
+////            locMastService.updateById(locMast4);
+//            w++;
+//        }
         return R.ok();
 
     }

--
Gitblit v1.9.1