From 617a8c4fc0b81ec4b96db8a013a91f4e666b0b96 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 08 一月 2025 14:33:45 +0800
Subject: [PATCH] 出现空指针异常

---
 src/main/java/com/zy/asrs/controller/AgvMobileController.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index a43c796..4c99399 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -171,6 +171,9 @@
     public R pakoutEmpty(@RequestBody AgvMobileStartParam params) {
 
         for (AgvMobileStartParam.Pda pda : params.getPad()) {
+            if (pda == null) {
+                return R.error("缂哄皯绔欑偣淇℃伅");
+            }
             workService.emptyPlateOut(pda.getDevNo(), pda.getContainerType(), getUserId());
         }
 
@@ -409,6 +412,9 @@
                 agvLocMastByContainerCode.setBarcode(barcode1);
                 agvLocMastService.updateById(agvLocMastByContainerCode);
             }
+            // 淇濆瓨璋冩暣璁板綍
+            AdjDetl adjDetl = new AdjDetl();
+
 
             return R.ok("缁存姢鎴愬姛");
         }
@@ -509,6 +515,9 @@
             for (AgvLocDetl agvLocDetl : agvLocDetls) {
                 // 鏇存柊璁㈠崟
                 OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+                if (orderDetl == null) {
+                    throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+                }
                 orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                 if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                     throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
@@ -634,6 +643,7 @@
         Date now = new Date();
         List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
         params.get("dbList");
+        String orderNo = params.get("orderNo").toString();
         for (HashMap<String, String> map : dbList) {
             String locNo = map.get("locNo");
             String barcode = map.get("suppCode");
@@ -664,11 +674,19 @@
                 // 鏇存柊璁㈠崟
                 // 鍏堟煡璇㈠簱璁㈠崟鏄庣粏 鎵�灞炵殑璁㈠崟
 
-                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source",36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
                 orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
-                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("source",36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
+                if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",17).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
                     throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
                 }
+                // 鏇存柊璁㈠崟鐘舵��
+                Order order = orderService.selectByNo(orderNo);
+                Long settle = order.getSettle();
+                if (settle == 1L) {
+                    if (!orderService.updateSettle(order.getId(),2L,getUserId())) {
+                        throw new CoolException("璁㈠崟鍙凤細{"+order.getOrderNo()+"}鏇存柊璁㈠崟鐘舵�侊細1-->2 澶辫触锛�(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)" );
+                    }
+                }
             }
             // 鏇存柊婧愬簱浣�
             AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));

--
Gitblit v1.9.1