放单通知的本票业务欠费判断 增加判断本票更改单是否欠费

DSWeb.Common/DB/Comm.cs

@@ -875,6 +875,28 @@ namespace DSWeb.Common.DB
         public string INVLINKGID { get; set; } = "";
     }
 
+    [Table("op_amend")]
+    public partial class op_amend_md
+    {
+
+        [Key]
+        public string GID { get; set; }
+        public string BSNO { get; set; }
+        public string PARENTID { get; set; }
+        public bool? FEESTATUS { get; set; }
+        public string ACCDATE { get; set; }
+        public string CREATEUSER { get; set; }
+        public DateTime? CREATETIME { get; set; }
+        public string REASON { get; set; }
+        public string REMARKS { get; set; }
+        public string AMENDNO { get; set; }
+        public bool? ISVOU { get; set; }
+        public string VOUNO { get; set; }
+        public int? BillFeeStatus { get; set; }
+        public DateTime? BILLFEESTATUSTIME { get; set; }
+        public string SALE { get; set; }
+    }
+
 
     public partial class ch_fee_md
     {

DSWeb.Common/DB/CommonDataContext.cs

@@ -41,6 +41,8 @@ namespace DSWeb.Common.DB
 
         public DbSet<op_other_md> op_other { get; set; }
         public DbSet<ch_fee_md> ch_fee { get; set; }
+        public DbSet<op_amend_md> op_amend { get; set; }
+        
         public DbSet<ch_fee_invoice_md> ch_fee_invoice { get; set; }
         public DbSet<ch_fee_invoicedetail_md> ch_fee_invoicedetail { get; set; }
         public DbSet<ch_fee_invoiceapplication_md> ch_fee_invoiceapplication { get; set; }

DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs

@@ -35,6 +35,7 @@ using System.Linq;
 using DSWeb.SoftMng.DAL;
 using DSWeb.WorkFlow;
 using DSWeb.Areas.MvcShipping.Models.Message.VGM;
+using NPOI.SS.Formula.Functions;
 
 namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
 {
@@ -4261,6 +4262,42 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
             return result;
         }
 
+        public static List<ch_fee_md> 获取业务欠费含更改单(string BSNO) {
+            var cdc = new CommonDataContext();
+            //var bsnoList = headList.Select(s => s.BSNO).ToList();
+            var 欠费FeeList = new List<ch_fee_md>();
+            欠费FeeList = cdc.ch_fee.Where(x => BSNO == x.BSNO && x.SETTLEMENT != null && x.SETTLEMENT < x.AMOUNT && x.FEETYPE == 1).ToList();
+
+            var 更改单List = cdc.op_amend.Where(x => x.PARENTID == BSNO).ToList();
+
+            if (更改单List != null && 更改单List.Count > 0)
+            {
+                var 更改单BSNO = 更改单List.Select(s => s.BSNO).ToList();
+                var 更改单欠费List = cdc.ch_fee.Where(x => BSNO == x.BSNO && x.SETTLEMENT != null && x.SETTLEMENT < x.AMOUNT && x.FEETYPE == 1).ToList();
+
+                if (更改单欠费List != null && 更改单欠费List.Count > 0)
+                {
+                    欠费FeeList.AddRange(更改单欠费List);
+                }
+            }
+            return 欠费FeeList;
+        }
+
+        public static List<ch_fee_md> 获取业务欠费含更改单(List<string> BSNOList)
+        {
+            var result = new List<ch_fee_md>();
+
+            if (BSNOList != null && BSNOList.Count > 0) {
+                foreach (var bsno in BSNOList) {
+                    var _r = 获取业务欠费含更改单(bsno);
+                    if (_r != null && _r.Count > 0) {
+                        result.AddRange(_r);
+                    }
+                }
+            }
+            return result;
+        }
+
         /// <summary>
         /// 存在欠费 则success=true，data返回true；
         /// 不存在欠费 则success=true，data返回false
@@ -4277,7 +4314,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
 
                 var cdc = new CommonDataContext();
                 //var bsnoList = headList.Select(s => s.BSNO).ToList();
-                var 欠费FeeList = cdc.ch_fee.Where(x => head.BSNO== x.BSNO && x.SETTLEMENT != null && x.SETTLEMENT < x.AMOUNT && x.FEETYPE == 1).ToList();
+                var 欠费FeeList = 获取业务欠费含更改单(head.BSNO);
 
                 if (欠费FeeList != null && 欠费FeeList.Count > 0)
                 {

DSWeb/Web.config

@@ -90,19 +90,16 @@
 	<add name="DongShengDB" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
 	<add name="sydevzsh" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
       -->
-    <!-- 深圳彩虹捷运 正式库   rainbow admin admin  		-->
+    <!--    深圳彩虹捷运 正式库   rainbow admin admin 
 	  <add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
 	  <add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
+    -->
+	  <!--  深圳彩虹捷运 测试库   CHJY admin 123456 -->
+	<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=1107;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
+	<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=1107;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
 
-	  <!--  深圳彩虹捷运 测试库   CHJY admin 123456
+
-		<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=1016;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
+</connectionStrings>
-		<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=1016;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-        -->
-		<!--  深圳彩虹捷运 测试库0  CHJY admin 123456
-	   <add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=20220629;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-	   <add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=20220629;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
--->
-   </connectionStrings>
   <!--
     有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。