From d5bd6c5f160a6563168b85cf1555762fb7c1499f Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Thu, 15 Aug 2024 16:08:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9INTTRA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs | 2 +-
 ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs b/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs
index 9540772b..3ecde3f7 100644
--- a/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/EDI/InttraEdiHelper.cs
@@ -869,7 +869,7 @@ namespace DS.WMS.Core.Op.EDI
                 r.WriteLine("UNH+" + bill.ORDERNO + "+IFTMIN:D:99B:UN'");
                 icount = icount + 2;
 
-                if (bill.CARRIEREDICODE == "HLCU" || bill.CARRIEREDICODE == "CMDU" || bill.CARRIEREDICODE == "CHNL")
+                if (bill.CARRIEREDICODE == "HLCU" || bill.CARRIEREDICODE == "CMDU" || bill.CARRIEREDICODE == "CHNL" ||(bill.CARRIEREDICODE == "MAEU" && string.IsNullOrWhiteSpace(bill.MBLNO)))
                 {
                     if (InttrEdi.filerole == "9")
                         r.WriteLine("BGM+335+" + bill.ORDERNO + "SO+9'");
diff --git a/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user b/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user
index fb7be066..da141c5a 100644
--- a/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user
+++ b/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\Source\Repos\DS8\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
   </PropertyGroup>