From 756c46d57f8b87a025902da2ca7868f2df479bab Mon Sep 17 00:00:00 2001
From: dengyu <ddlucky@sina.com>
Date: Mon, 4 Sep 2023 10:52:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E8=B4=B9=E7=94=B3=E8=AF=B7=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=EF=BC=8Cdebug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChPayapplicationAudit.js                  |  1 +
 .../SoftMng/Controllers/ExportController.cs   | 34 +++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationAudit.js b/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationAudit.js
index cc78d628..0393e318 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationAudit.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationAudit.js
@@ -809,6 +809,7 @@ Ext.extend(Shipping.ChPayapplicationAudit, Ext.Panel, {
                     } else {
                         return "";
                     }
+                }
             }, {
                 sortable: true,
                 dataIndex: 'CURRENCY',
diff --git a/DSWeb/Areas/SoftMng/Controllers/ExportController.cs b/DSWeb/Areas/SoftMng/Controllers/ExportController.cs
index d4ed48b6..83c98842 100644
--- a/DSWeb/Areas/SoftMng/Controllers/ExportController.cs
+++ b/DSWeb/Areas/SoftMng/Controllers/ExportController.cs
@@ -1418,9 +1418,31 @@ namespace DSWeb.SoftMng.Controllers
                     //头表没有金额合计 放弃
                 }
 
-                //if (checktype == "原产国") { 
-                //    //对比
-                //}
+                if (checktype == "国家比对")
+                {
+                    //1 头表ieflag=e时 对比头表的tradecountry 和明细的DestinationCountry
+                    //2 头表ieflag=i时 对比头表的tradecountry 和明细的originCountry
+                    var headcountry = head.TradeCountry;
+                    if (head.IEFlag == "E") {
+                        foreach (var item in body) {
+                            if (item.DestinationCountry != headcountry) {
+                                result.SetErrorInfo($"报关单国别{headcountry}与商品明细值{item.DestinationCountry}不一致，请注意核对！");
+                                return result;
+                            }
+                        }
+                    }
+                    if (head.IEFlag == "I")
+                    {
+                        foreach (var item in body)
+                        {
+                            if (item.OriginCountry != headcountry)
+                            {
+                                result.SetErrorInfo($"报关单国别{headcountry}与商品明细值{item.OriginCountry}不一致，请注意核对！");
+                                return result;
+                            }
+                        }
+                    }
+                }
                 return result;
 
 
@@ -1439,6 +1461,12 @@ namespace DSWeb.SoftMng.Controllers
                 {
                     errorstr += "<br>序号：9002 (" + _r.Message + ")";
                 }
+
+                _r = DoCheck("国家比对");
+                if (!_r.Success)
+                {
+                    errorstr += "<br>序号：9003 (" + _r.Message + ")";
+                }
             }
         }