From e9879295f23ed176fbf2ef69b6281a9753f40b19 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 15 Jul 2024 19:42:41 +0800
Subject: [PATCH] md

---
 .../emis/service/impl/EmisWaybillServiceImpl.java | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 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 24fc990af..5cf8122b9 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
@@ -308,9 +308,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
      */
     private void cvtWaybillDraftToReal(EmisWaybill emisWaybillSave,Boolean isOms) throws EmisBizError {
 
-
-
-
         // 货物名称必填
         if(StringUtils.isEmpty(emisWaybillSave.getGoodsInfo())){
             throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "产品名称不能为空");
@@ -379,6 +376,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         emisWaybillSave.setSendCity(sendCityCode);
         emisWaybillSave.setSendCounty(sendDistrictCode);
 
+        // oms 计算发件网点
+        if(isOms){
+            // 计算目的地
+            EmisDestination sendDestination=calcSendSiteByBase(sendCountryCode,transLine.getLineCode(),sendProviceCode,sendCityCode,sendDistrictCode,emisWaybillSave.getSendAddress());
+            if(sendDestination==null){
+                throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "寄件地址不在服务区");
+            }
+            emisWaybillSave.setSendSiteCode(sendDestination.getSiteCode());
+            emisWaybillSave.setSendSiteName(sendDestination.getSiteName());
+        }
 
         // 取件方式
         String pickupMethod=DictUtils.getDictValue("emis_qujian_fangshi",emisWaybillSave.getPickupMethod());
@@ -518,6 +525,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
 
 
+
+
         // 计算目的地
         EmisDestination destination=calcDestSiteByBase(receiveCountryCode,transLine.getLineCode(),rcvProviceCode,rcvCityCode,rcvDistrictCode,emisWaybillSave.getReceiveAddress());
         if(destination==null){