Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev

2 years ago · b51dc1d0c5
parent ca5f33e8b5 862d39f343
commit b51dc1d0c5
10 changed files with 118 additions and 19 deletions
--- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs
@ -1463,8 +1463,8 @@ namespace DSWeb.MvcShipping.Controllers
                    result = MsOpSeaeEdiDAL.CreateCustomList(headList, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), path, Convert.ToString(Session["COMPANYNAME"]), dcarrier, iscvessel, ftpset, remarks);

                    //增加费用
-
-                    MakeFee(headList, filetype);
+                    if(result.Success)
+                        MakeFee(headList, filetype);


                    var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message, Data = result.Data };
@ -1502,7 +1502,7 @@ namespace DSWeb.MvcShipping.Controllers
        /// </summary>
        /// <param name="bsnos">业务编号 逗号隔开的文本</param>
        /// <param name="filetype">修改类型 B:新增 E:修改 D:删除</param>
-        private void MakeFee(List<MsOpSeae> headlist, string filetype)
+        private void MakeFee(List<MsOpSeae> headlist, string filetype,bool isfen=false)
        {
            var cangdaninfo = new CangDanPriceParam();

@ -1512,13 +1512,11 @@ namespace DSWeb.MvcShipping.Controllers
                var amount = 0M;
                if (filetype == "B")
                {
-
                    amount = cangdaninfo.Price1;
                }
                if (filetype == "E")
                {
                    amount = cangdaninfo.Price2;
-
                }
                if (filetype == "D")
                {
@ -1526,7 +1524,27 @@ namespace DSWeb.MvcShipping.Controllers
                }
                var USERID = Convert.ToString(Session["USERID"]);

-                MsChFeeDAL.MakeNewFee(USERID, item.BSNO, cangdaninfo.DJYName, 2, "舱单费", amount,"单票");
+                var 单量 = 1;
+
+                if (isfen)
+                {
+                    if (filetype == "B")
+                    {
+                        amount = cangdaninfo.FenPrice1;
+                    }
+                    if (filetype == "E")
+                    {
+                        amount = cangdaninfo.FenPrice2;
+                    }
+                    if (filetype == "D")
+                    {
+                        amount = cangdaninfo.FenPrice3;
+                    }
+                    var 分单列表 = MsOpSeaeDAL.GetManifestList($" BSNO='{item.BSNO}' ");
+                    单量 = 分单列表.Count();
+                }
+
+                MsChFeeDAL.MakeNewFee(USERID, item.BSNO, cangdaninfo.DJYName, "其它", 2, "舱单费", amount * 单量, "单票", 单量);

                if (cangdaninfo.NeedYingFu) {

@ -1543,7 +1561,7 @@ namespace DSWeb.MvcShipping.Controllers
                        amount = cangdaninfo.Price6;
                    }

-                    MsChFeeDAL.MakeNewFee(USERID, item.BSNO, item.CUSTOMERNAME, 1, "舱单费", amount, "单票");
+                    MsChFeeDAL.MakeNewFee(USERID, item.BSNO, item.CUSTOMERNAME, "其它", 1, "舱单费", amount, "单票", 单量);
                }
            }

@ -1560,6 +1578,10 @@ namespace DSWeb.MvcShipping.Controllers
            public decimal Price4 { get; set; } = 35M;
            public decimal Price5 { get; set; } = 10M;
            public decimal Price6 { get; set; } = 0M;
+
+            public decimal FenPrice1 { get; set; } = 35M;
+            public decimal FenPrice2 { get; set; } = 10M;
+            public decimal FenPrice3 { get; set; } = 0M;
            public CangDanPriceParam() {
                var paramvalue = MsSysParamSetDAL.GetSysParamValue("CangDanPrice");

@ -1573,6 +1595,9 @@ namespace DSWeb.MvcShipping.Controllers
                Price4 = Convert.ToDecimal(paramvalueList[5]);
                Price5 = Convert.ToDecimal(paramvalueList[6]);
                Price6 = Convert.ToDecimal(paramvalueList[7]);
+                Price4 = Convert.ToDecimal(paramvalueList[8]);
+                Price5 = Convert.ToDecimal(paramvalueList[9]);
+                Price6 = Convert.ToDecimal(paramvalueList[10]);
            }


@ -1824,6 +1849,11 @@ namespace DSWeb.MvcShipping.Controllers
            var result = new DBResult();
            var ftpset = MsCodeFtpSetDAL.GetData("EDINAME=''", Convert.ToString(Session["COMPANYID"]));
            result = MsOpSeaeEdiDAL.CreateCustomListBill_HBLNO(headList, billList, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), path, Convert.ToString(Session["COMPANYNAME"]), dcarrier, iscvessel, ftpset, remarks, filetype);
+
+            //增加费用
+            if (result.Success)
+                MakeFee(headList, filetype);
+
            var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message, Data = result.Data };
            return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
        }
--- a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
@ -6610,7 +6610,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
            return result;
        }

-        public static DBResult MakeNewFee(string USERID, string BSNO, string CUSTOMERNAME, int FEETYPE, string FEENAME, decimal AMOUNT,string UNIT, decimal QUANTITY = 1)
+        public static DBResult MakeNewFee(string USERID, string BSNO, string CUSTOMERNAME, string CUSTOMERTYPE, int FEETYPE, string FEENAME, decimal AMOUNT,string UNIT, decimal QUANTITY = 1)
        {
            var result = new DBResult();
            result.OK("");
--- a/DSWeb/DSWeb.csproj
+++ b/DSWeb/DSWeb.csproj
@ -14697,10 +14697,14 @@
    <Content Include="WMS_ZX\WmsZXInfoGridSource.aspx" />
    <Content Include="WorkFlow\CompanyTree.aspx" />
    <Content Include="WorkFlow\UserTree.aspx" />
-    <Content Include="Web.config">
-      <SubType>Designer</SubType>
-    </Content>
    <None Include="Web References\ServiceReference1\WebInterFace.wsdl" />
+    <Content Include="Web.config" />
+    <None Include="Web.Debug.config">
+      <DependentUpon>Web.config</DependentUpon>
+    </None>
+    <None Include="Web.Release.config">
+      <DependentUpon>Web.config</DependentUpon>
+    </None>
    <None Include="word\ShuJuZiDian.doc" />
    <None Include="word\交运集团\TMS数据字典.Doc" />
    <None Include="word\交运集团\二期%28中烟，码头，海尔%29.Doc" />
--- a/DSWeb/DSWeb.csproj.user
+++ b/DSWeb/DSWeb.csproj.user
@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectView>ShowAllFiles</ProjectView>
-    <NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>H:\DS7\DSWeb\Properties\PublishProfiles\配置文件1.pubxml</NameOfLastUsedPublishProfile>
    <UseIISExpress>true</UseIISExpress>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <Use64BitIISExpress />
--- a/DSWeb/Properties/PublishProfiles/配置文件1.pubxml
+++ b/DSWeb/Properties/PublishProfiles/配置文件1.pubxml
@ -7,11 +7,11 @@
  <PropertyGroup>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <LastUsedPlatform>x64</LastUsedPlatform>
    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>D:\DONGSHENGWEBZC</publishUrl>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <publishUrl>F:\DS7Deploy</publishUrl>
+    <DeleteExistingFiles>true</DeleteExistingFiles>
  </PropertyGroup>
 </Project>
--- a/DSWeb/Properties/PublishProfiles/配置文件1.pubxml.user
+++ b/DSWeb/Properties/PublishProfiles/配置文件1.pubxml.user
@ -5,8 +5,10 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <TimeStampOfAssociatedLegacyPublishXmlFile>2022-06-28T12:17:44.7010000+08:00</TimeStampOfAssociatedLegacyPublishXmlFile>
-    <_PublishTargetUrl>D:\DONGSHENGWEBZC</_PublishTargetUrl>
+    <TimeStampOfAssociatedLegacyPublishXmlFile>2022-07-01T11:51:54.8104015+08:00</TimeStampOfAssociatedLegacyPublishXmlFile>
+    <_PublishTargetUrl>F:\DS7Deploy</_PublishTargetUrl>
+    <History>False|2022-08-29T03:47:46.7317666Z;False|2022-08-29T11:47:01.4649176+08:00;</History>
+    <LastFailureDetails />
  </PropertyGroup>
  <ItemGroup>
    <File Include="About.aspx">
--- a/DSWeb/Web.Debug.config
+++ b/DSWeb/Web.Debug.config
@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 有关使用 web.config 转换的详细信息，请访问 https://go.microsoft.com/fwlink/?LinkId=125889 -->
+
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <!--
+    在下例中，“SetAttributes”转换将更改 
+    “connectionString”的值，以仅在“Match”定位器 
+    找到值为“MyDB”的特性“name”时使用“ReleaseSQLServer”。
+    
+    <connectionStrings>
+      <add name="MyDB" 
+        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
+        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
+    </connectionStrings>
+  -->
+  <system.web>
+    <!--
+      
+      在下例中，“Replace”转换将替换 
+      web.config 文件的整个 <customErrors> 节。
+      请注意，由于 
+      在 <system.web> 节点下仅有一个 customErrors 节，因此不需要使用“xdt:Locator”特性。
+      
+      <customErrors defaultRedirect="GenericError.htm"
+        mode="RemoteOnly" xdt:Transform="Replace">
+        <error statusCode="500" redirect="InternalError.htm"/>
+      </customErrors>
+    -->
+  </system.web>
+</configuration>
--- a/DSWeb/Web.Release.config
+++ b/DSWeb/Web.Release.config
@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- 有关使用 web.config 转换的详细信息，请访问 https://go.microsoft.com/fwlink/?LinkId=125889 -->
+
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <!--
+    在下例中，“SetAttributes”转换将更改 
+    “connectionString”的值，以仅在“Match”定位器 
+    找到值为“MyDB”的特性“name”时使用“ReleaseSQLServer”。
+    
+    <connectionStrings>
+      <add name="MyDB" 
+        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
+        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
+    </connectionStrings>
+  -->
+  <system.web>
+    <compilation xdt:Transform="RemoveAttributes(debug)" />
+    <!--
+      
+      在下例中，“Replace”转换将替换 
+      web.config 文件的整个 <customErrors> 节。
+      请注意，由于 
+      在 <system.web> 节点下仅有一个 customErrors 节，因此不需要使用“xdt:Locator”特性。
+      
+      <customErrors defaultRedirect="GenericError.htm"
+        mode="RemoteOnly" xdt:Transform="Replace">
+        <error statusCode="500" redirect="InternalError.htm"/>
+      </customErrors>
+    -->
+  </system.web>
+</configuration>
--- a/JobYunDang/bin/Debug/JobYunDang.dll
+++ b/JobYunDang/bin/Debug/JobYunDang.dll
--- a/JobYunDang/bin/Debug/JobYunDang.pdb
+++ b/JobYunDang/bin/Debug/JobYunDang.pdb