From f6fca37cb4f694109449a77c3dc5423cde6d1f95 Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Wed, 12 Jul 2023 14:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=B4=A7=E7=BA=B8=E5=86=BB=E6=9F=9C?=
 =?UTF-8?q?=E5=92=8C=E5=8D=B1=E9=99=A9=E5=93=81=E5=BF=85=E5=A1=AB=E9=A1=B9?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Application/EDI/XiahuozhiHelpler.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Myshipping.Application/EDI/XiahuozhiHelpler.cs b/Myshipping.Application/EDI/XiahuozhiHelpler.cs
index 821c0976..eb494241 100644
--- a/Myshipping.Application/EDI/XiahuozhiHelpler.cs
+++ b/Myshipping.Application/EDI/XiahuozhiHelpler.cs
@@ -75,6 +75,17 @@ namespace Myshipping.Application.EDI
                 return new KeyValuePair<bool, string>(false, "海关航次不能为空");
             }
 
+            //2023年7月12日，下货纸为冻柜，需填写温度和通风，危险品需填写等级和编号
+            if (order.CARGOID == "R" && (string.IsNullOrEmpty(order.TEMPSET) || string.IsNullOrEmpty(order.REEFERF)))
+            {
+                return new KeyValuePair<bool, string>(false, "冻柜的温度和通风必须填写");
+            }
+
+            if (order.CARGOID == "D" && (string.IsNullOrEmpty(order.DUNNO) || string.IsNullOrEmpty(order.DCLASS)))
+            {
+                return new KeyValuePair<bool, string>(false, "危险品的等级和编号必须填写");
+            }
+
             var fileOpt = App.GetOptions<BookingAttachOptions>();
             if (string.IsNullOrEmpty(fileOpt.basePath))
             {
@@ -412,7 +423,7 @@ namespace Myshipping.Application.EDI
                     repBookingFile.Insert(attFile);
 
                     //发送邮件
-                    var sendResult = await MailSendHelper.SendMail(userMail, title, "", order.YARDCONTRACTEMAIL,new KeyValuePair<string, byte[]>(ediFileName, msResult.GetBuffer()));
+                    var sendResult = await MailSendHelper.SendMail(userMail, title, "", order.YARDCONTRACTEMAIL, new KeyValuePair<string, byte[]>(ediFileName, msResult.GetBuffer()));
                     if (!sendResult.Key)
                     {
                         return new KeyValuePair<bool, string>(false, sendResult.Value);