From 701542ac0a90cf0e3a0a81ec2bb8066b5de68e75 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 11:21:17 +0800
Subject: [PATCH] 更新为正式部署许可证

---
 src/main/java/com/zy/asrs/controller/OutController.java |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index b033501..1119dc3 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -269,8 +269,11 @@
                         }});
                         String agvSta = "";
                         if (locMast.getLocType3() == 2) {
+                            agvSta = "Z-LZP26";
+                        }else if (locType == 2){
 
-                        } else {
+                        }
+                        else {
                             agvSta = orderPakout.getCstmrName();//agv鐩爣绔欑偣浣嶇疆
                         }
                         WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam, ioPri, agvSta);
@@ -309,7 +312,8 @@
                     }});
                     String agvSta = "";
                     if (locMast.getLocType3() == 2) {
-
+                        agvSta = "Z-LZP26";
+                    }else if (locType == 2){
                     } else {
                         agvSta = orderPakout.getCstmrName();//agv鐩爣绔欑偣浣嶇疆
                     }
@@ -375,16 +379,17 @@
                 }
             }
             if (issued > 0) {
-                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
-                locDto.setBrand(orderDetl.getBrand());
-                locDto.setStandby1(orderDetl.getStandby1());
-                locDto.setStandby2(orderDetl.getStandby2());
-                locDto.setStandby3(orderDetl.getStandby3());
-                locDto.setBoxType1(orderDetl.getBoxType1());
-                locDto.setBoxType2(orderDetl.getBoxType2());
-                locDto.setBoxType3(orderDetl.getBoxType3());
-                locDto.setLack(Boolean.TRUE);
-                locDtos.add(locDto);
+//                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+//                locDto.setBrand(orderDetl.getBrand());
+//                locDto.setStandby1(orderDetl.getStandby1());
+//                locDto.setStandby2(orderDetl.getStandby2());
+//                locDto.setStandby3(orderDetl.getStandby3());
+//                locDto.setBoxType1(orderDetl.getBoxType1());
+//                locDto.setBoxType2(orderDetl.getBoxType2());
+//                locDto.setBoxType3(orderDetl.getBoxType3());
+//                locDto.setLack(Boolean.TRUE);
+//                locDtos.add(locDto);
+                return R.error("搴撳瓨涓嶈冻");
             }
         }
         R pakout = pakout(locDtos);

--
Gitblit v1.9.1