From d4d63b20d76df6484e840e3d5fdac9df8ada811d Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 6 Jan 2025 13:22:13 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index ee63721b1..5ec30acd6 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -1322,9 +1322,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
             }else {
 
-                if(OrderStatus.INIT.statusCode.equals(emisWaybillOld.getOrderStatus())){
-                    throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "未接单，不允许修改");
-                }
+//                if(OrderStatus.INIT.statusCode.equals(emisWaybillOld.getOrderStatus())){
+//                    throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "未接单，不允许修改");
+//                }
 
                 // 检查是否已锁单
                 checkDBBillIsLock(emisWaybillOld);
@@ -1537,7 +1537,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         scanInfo.setScanType(ScanType.GOT.opCode);
 
         String dispatchOrSendManCode="";
-        if("1".equals(emisWaybillSave.getPickupMethod())){
+        if("1".equals(emisWaybillSave.getPickupMethod())|| "3".equals(emisWaybillSave.getPickupMethod())){
             dispatchOrSendManCode=emisWaybillSave.getOperateEmployeeCode();
         }
         else if("2".equals(emisWaybillSave.getPickupMethod())){