From 9216d201432da283e6385106413ab58c6656f2fd Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 5 Jan 2025 22:03:01 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index ef3022d3e..fdc83bb02 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -747,20 +747,19 @@ public class EmisWaybillController extends EmisBaseController
                 list = emisWaybillService.selectWaitGotOrderList(emisWaybill);
             }
             else{
-                // 如果不带查询本人开单的数据
-                if(StringUtils.isEmpty(emisWaybill.getBillCode())){
-                    try {
-                        emisWaybill.setRegisterManCode(getLoginUser().getUser().getEmpCode());
-                    }catch(Exception ex){
-                        ex.printStackTrace();
-                    }
-                }
-
                 // 查询已取消 和转单的订单
                 if( "3".equals(waybillStatType) || "4".equals(waybillStatType) ){
                     list = emisWaybillService.selectOrderList(emisWaybill);
                 }
                 else{
+                    // 如果不带查询本人开单的数据
+//                    if(StringUtils.isEmpty(emisWaybill.getBillCode())){
+//                        try {
+//                            emisWaybill.setRegisterManCode(getLoginUser().getUser().getEmpCode());
+//                        }catch(Exception ex){
+//                            ex.printStackTrace();
+//                        }
+//                    }
                    list = emisWaybillService.selectEmisWaybillList(emisWaybill);
                }