佣金导入改为只导入正常和退舱的业务，删单和申请删单的不导入费用；

.gitignore

@@ -60,3 +60,26 @@ DSWeb/UploadFiles/MsOpFiles/*
 DSWeb/ocr_temp_files/*
 /DSWeb/Areas/Account/Files/CCHN22080359
 /packages/Microsoft.Bcl.Build.1.0.14/tools/Microsoft.Bcl.Build.Tasks.dll
+/DSWeb/bin/DSWeb.XmlSerializers.dll
+/DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
+/DSWeb/DSWeb.csproj.user
+/DSWeb.Common/bin/Release/DSWeb.Common.dll
+/DSWeb.Common/bin/Release/DSWeb.Common.pdb
+/DSWeb.Common/obj/Debug/DSWeb.Common.csproj.CoreCompileInputs.cache
+/DSWeb.Interface/bin/Debug/HcDBUtility.pdb
+/DSWeb.Interface/bin/Debug/HcDBUtility.dll
+/DSWeb.Interface/bin/Debug/DSWeb.Interface.pdb
+/DSWeb.Interface/bin/Debug/DSWeb.Interface.dll
+/DSWeb.Interface/bin/Release/HcDBUtility.pdb
+/DSWeb.Interface/bin/Release/HcDBUtility.dll
+/DSWeb.Interface/bin/Release/DSWeb.Interface.pdb
+/DSWeb.Interface/bin/Release/DSWeb.Interface.dll
+/DSWeb.Interface/bin/Release/DSWeb.Common.pdb
+/DSWeb.Interface/bin/Release/DSWeb.Common.dll
+/HcDBUtility/bin/Debug/HcDBUtility.pdb
+/HcDBUtility/bin/Debug/HcDBUtility.dll
+/DSWeb.Interface/obj/Debug/DSWeb.Interface.pdb
+/DSWeb.Interface/obj/Debug/DSWeb.Interface.dll
+/DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.CoreCompileInputs.cache
+/HcDBUtility/bin/Release/HcDBUtility.pdb
+/HcDBUtility/bin/Release/HcDBUtility.dll

DSWeb.Common/obj/Debug/DSWeb.Common.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-aa4bd8239d6c2c69aa5ded6fda2df055da35f383

DSWeb.Interface/obj/Debug/DSWeb.Interface.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-b48f99bd0c123217fea27b4854478c3d134db780

DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs

@@ -1717,7 +1717,8 @@ namespace DSWeb.MvcShipping.Controllers
                     var MBLNO = Convert.ToString(row["主提单号"]);
                     if (MBLNO != "")
                     {
-                        var BSNO = T_ALL_DA.GetStrSQL("BSNO", "select BSNO from V_OP_BS where FEESTATUS=1 AND MBLNO='" + MBLNO + "'");
+                    
+                        var BSNO = T_ALL_DA.GetStrSQL("BSNO", "select BSNO from V_OP_BS where FEESTATUS=1 and isnull(iscancel,0) in(0,3) AND MBLNO='" + MBLNO + "'");
                         //20221202 如果该业务已费用锁定【feestatus=1】 采用生成费用更改单的方式生成费用
                         if (string.IsNullOrWhiteSpace(BSNO)) continue;
                         //如否 则仍按原逻辑生成费用
@@ -1795,9 +1796,9 @@ namespace DSWeb.MvcShipping.Controllers
                     var MBLNO = Convert.ToString(row["主提单号"]);
                     if (MBLNO != "")
                     {
-                        var BSNO = T_ALL_DA.GetStrSQL("BSNO", "select BSNO from V_OP_BS where isnull(FEESTATUS,0)=0 AND MBLNO='" + MBLNO + "'");
+                        var BSNO = T_ALL_DA.GetStrSQL("BSNO", "select BSNO from V_OP_BS where isnull(FEESTATUS,0)=0 and isnull(iscancel,0) in (0,3) AND MBLNO='" + MBLNO + "'");
 
-                        var AmendBSNO = T_ALL_DA.GetStrSQL("BSNO", "select BSNO from V_OP_BS where isnull(FEESTATUS,0)=1 AND MBLNO='" + MBLNO + "'");
+                        var AmendBSNO = T_ALL_DA.GetStrSQL("BSNO", "select BSNO from V_OP_BS where isnull(FEESTATUS,0)=0 and isnull(iscancel,0) in (0,3) AND MBLNO='" + MBLNO + "'");
 
                         if (string.IsNullOrWhiteSpace(BSNO) && string.IsNullOrWhiteSpace(AmendBSNO))
                         {

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

@@ -584,6 +584,17 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
         public static int getSpTotalCount(string strCondition, string userid, string usercode, string companyid)
         {
 
+            var rangstr = GetRangDAStr("index", userid, usercode, companyid);
+            if (!string.IsNullOrEmpty(rangstr)) {
+                if (string.IsNullOrWhiteSpace(strCondition))
+                {
+                    strCondition = rangstr;
+                }
+                else {
+                    strCondition += " and " + rangstr;
+                }
+            }
+
             StringBuilder strSql = new StringBuilder();
             strSql.Append("select count(*) ");
             strSql.Append(" from  op_blissuelist ob  ");

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js

@@ -3011,7 +3011,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
                         }]
                     }, {
                         text: Zi.LAN.TuiCangCaoZuo2, //"退舱",
-                        id: "btnOpTui",
+                        id: "btnOpTui2",
                         menu: [
                             {
                                 text: Zi.LAN.ConfirmCancelShippingOrder2, //"确认退舱",
@@ -14199,7 +14199,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
         var btnShenTui = Ext.getCmp('btnShenTui');
         var btnCancelShenTui = Ext.getCmp('btnCancelShenTui');
         var btnOpTui = Ext.getCmp('btnOpTui');
-
+        var btnOpTui2 = Ext.getCmp('btnOpTui2');
         Ext.Ajax.request({
             waitMsg: '',
             url: '/MvcShipping/MsSysParamSet/GetData',
@@ -14216,11 +14216,13 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
                         if (data.PARAMVALUE == '1') {
                             btnShenTui.setVisible(true);
                             btnOpTui.setVisible(false);
+                            btnOpTui2.setVisible(false);
                             btnCancelShenTui.setVisible(true);
                         } else {
                             btnCancelShenTui.setVisible(false);
                             btnShenTui.setVisible(false);
                             btnOpTui.setVisible(true);
+                            btnOpTui2.setVisible(true);
                         }
 
                     }

DSWeb/DSWeb.csproj.user

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
-    <NameOfLastUsedPublishProfile>E:\DS7_CHJY\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
-    <Use64BitIISExpress />
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-  </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <StartPageUrl>
-          </StartPageUrl>
-          <StartAction>CurrentPage</StartAction>
-          <AspNetDebugging>True</AspNetDebugging>
-          <SilverlightDebugging>False</SilverlightDebugging>
-          <NativeDebugging>False</NativeDebugging>
-          <SQLDebugging>False</SQLDebugging>
-          <ExternalProgram>
-          </ExternalProgram>
-          <StartExternalURL>
-          </StartExternalURL>
-          <StartCmdLineArguments>
-          </StartCmdLineArguments>
-          <StartWorkingDirectory>
-          </StartWorkingDirectory>
-          <EnableENC>True</EnableENC>
-          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>