From 74c77073c906f5f1a3e1cd2e8ba2c441a0b5e2b6 Mon Sep 17 00:00:00 2001 From: ddlucky Date: Mon, 13 Mar 2023 16:46:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=20=E6=B4=BE=E8=BD=A6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=95=B4=E7=A5=A8=E6=8F=90=E4=BA=A4=202=E3=80=81=20?= =?UTF-8?q?=E6=8A=A5=E5=85=B3=E3=80=81=E5=BF=AB=E9=80=92=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E3=80=81=E8=88=B1=E5=8D=95=E4=B8=9A=E5=8A=A1=E7=AD=89=EF=BC=88?= =?UTF-8?q?=E6=88=91=E6=B2=A1=E6=B5=8B=E8=AF=95=E5=85=A8=EF=BC=8C=E7=9B=91?= =?UTF-8?q?=E7=AE=A1=E8=BD=A6=E8=BF=98=E6=B2=A1=EF=BC=89=E6=95=B4=E7=A5=A8?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=E5=AE=A1=E6=A0=B8=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E8=B4=B9=E7=94=A8=E5=90=8D?= =?UTF-8?q?=EF=BC=8C=E4=B8=9A=E5=8A=A1=E7=BC=96=E5=8F=B7=EF=BC=9AOP2106000?= =?UTF-8?q?04=203=E3=80=81=E7=9B=91=E7=AE=A1=E8=BD=A6=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E8=AF=B7=E6=A0=B8=E4=B8=8D=E4=BA=86=20--------=E5=B7=B2?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs | 1200 +++++++++-------- .../MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs | 61 +- .../MsOp_SuperVision_TruckDAL.cs | 6 +- .../MsOp_SuperVision_Truck.cs | 14 +- .../MsOp_SuperVision_TruckIndex.js | 126 +- .../DAL/MsRptPcHeadEdit/MsRptPcHeadEditDAL.cs | 18 +- .../TruckMng/Models/MsWlBs/MsWlPcHead.cs | 2 +- .../Viewsjs/MsWlBs/MsPcEdit_WFSDIndex.js | 257 +++- 8 files changed, 1055 insertions(+), 629 deletions(-) diff --git a/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs index 7209ca6c..d2f3ef79 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs +++ b/DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs @@ -53,52 +53,51 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL } #endregion - var WorkFlowNameM = "FeeOpOtherModifyAudit"; - var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - if (optype == "op_seae" || optype == "op_seaeorder") - { - WorkFlowNameM = "FeeModifyAudit"; - WorkFlowName = "FeeRecvPayAudit"; - } if (optype == "op_seai") - { - WorkFlowNameM = "FeeSeaiModifyAudit"; - WorkFlowName = "FeeSeaiRecvPayAudit"; - - } if (optype == "op_aire") - { - WorkFlowNameM = "AireFeeModify"; - WorkFlowName = "AireFeeAudit"; - - } if (optype == "op_airi") - { - WorkFlowNameM = "AiriFeeModify"; - WorkFlowName = "AiriFeeAudit"; - - } if (optype == "op_apply") - { - WorkFlowNameM = "ApplyFeeModify"; - WorkFlowName = "ApplyFeeAudit"; - - } if (optype == "op_bulk") - { - WorkFlowNameM = "BulkFeeModify"; - WorkFlowName = "BulkFeeAudit"; - } if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") - { - WorkFlowNameM = "FeeOpOtherModifyAudit"; - WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - } if (optype == "op_railway") - { - WorkFlowNameM = "RailwayFeeModify"; - WorkFlowName = "RailwayFeeAudit"; - } - - if (optype == "op_railway") - { - WorkFlowNameM = "RailwayFeeModify"; - WorkFlowName = "RailwayFeeAudit"; - } - + //var WorkFlowNameM = "FeeOpOtherModifyAudit"; + //var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + //if (optype == "op_seae" || optype == "op_seaeorder") + //{ + // WorkFlowNameM = "FeeModifyAudit"; + // WorkFlowName = "FeeRecvPayAudit"; + //} if (optype == "op_seai") + //{ + // WorkFlowNameM = "FeeSeaiModifyAudit"; + // WorkFlowName = "FeeSeaiRecvPayAudit"; + + //} if (optype == "op_aire") + //{ + // WorkFlowNameM = "AireFeeModify"; + // WorkFlowName = "AireFeeAudit"; + + //} if (optype == "op_airi") + //{ + // WorkFlowNameM = "AiriFeeModify"; + // WorkFlowName = "AiriFeeAudit"; + + //} if (optype == "op_apply") + //{ + // WorkFlowNameM = "ApplyFeeModify"; + // WorkFlowName = "ApplyFeeAudit"; + + //} if (optype == "op_bulk") + //{ + // WorkFlowNameM = "BulkFeeModify"; + // WorkFlowName = "BulkFeeAudit"; + //} if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") + //{ + // WorkFlowNameM = "FeeOpOtherModifyAudit"; + // WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowNameM = "RailwayFeeModify"; + // WorkFlowName = "RailwayFeeAudit"; + //} + + //if (optype == "op_railway") + //{ + // WorkFlowNameM = "RailwayFeeModify"; + // WorkFlowName = "RailwayFeeAudit"; + //} var strSql = new StringBuilder(); strSql.Append("SELECT "); @@ -980,42 +979,43 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL #endregion - - - public static DBResult SubmitAudit(String optype, String USERID, String bill, string bsno, string WorkFlowstr,string companyid) - { - var result = new DBResult(); - var mblno = ""; - T_ALL_DA T_ALL_DA = new T_ALL_DA(); + public static string GetWorkFlowNameByOptype(string optype) { + optype = optype.ToLower(); var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - - if (optype == "op_Seae" || optype == "op_SeaeOrder") + if (optype == "op_seae" || optype == "op_seaeorder") { WorkFlowName = "FeeRecvPayAudit"; - } if (optype == "op_Seai") + } + if (optype == "op_seai") { WorkFlowName = "FeeSeaiRecvPayAudit"; - } if (optype == "op_Aire") + } + if (optype == "op_aire") { WorkFlowName = "AireFeeAudit"; - } if (optype == "op_Airi") + } + if (optype == "op_airi") { WorkFlowName = "AiriFeeAudit"; - } if (optype == "op_Apply") + } + if (optype == "op_apply") { WorkFlowName = "ApplyFeeAudit"; - } if (optype == "op_Bulk") + } + if (optype == "op_bulk") { WorkFlowName = "BulkFeeAudit"; - } if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") + } + if (optype == "op_other" || optype == "tmswlpchead" || optype == "opctnbscard" || optype == "import_main" || optype == "op_supervision_truck") { WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - } if (optype == "op_railway") + } + if (optype == "op_railway") { WorkFlowName = "RailwayFeeAudit"; } @@ -1024,6 +1024,105 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); if (value == "1") WorkFlowName = "FeeSeaiRecvPayAudit"; } + return WorkFlowName; + } + + + + public static string GetWorkFlowNameByOptype_Modify(string optype) + { + optype = optype.ToLower(); + var WorkFlowName = "FeeOpOtherModifyAudit"; + + if (optype == "op_seae" || optype == "op_seaeorder") + { + WorkFlowName = "FeeModifyAudit"; + + } + if (optype == "op_seai") + { + WorkFlowName = "FeeSeaiModifyAudit"; + + } + if (optype == "op_aire") + { + WorkFlowName = "AireFeeModify"; + + } + if (optype == "op_airi") + { + WorkFlowName = "AiriFeeModify"; + + } + if (optype == "op_apply") + { + WorkFlowName = "ApplyFeeModify"; + + } + if (optype == "op_bulk") + { + WorkFlowName = "BulkFeeModify"; + } + if (optype == "op_other" || optype == "tmswlpchead" || optype == "opctnbscard" || optype == "import_main" || optype == "op_supervision_truck") + { + WorkFlowName = "FeeOpOtherModifyAudit"; + } + if (optype == "op_railway") + { + WorkFlowName = "RailwayFeeModify"; + } + if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") + { + var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; + } + return WorkFlowName; + } + + public static DBResult SubmitAudit(String optype, String USERID, String bill, string bsno, string WorkFlowstr,string companyid) + { + var result = new DBResult(); + var mblno = ""; + T_ALL_DA T_ALL_DA = new T_ALL_DA(); + + var WorkFlowName = GetWorkFlowNameByOptype(optype); + //var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + + //if (optype == "op_Seae" || optype == "op_SeaeOrder") + //{ + // WorkFlowName = "FeeRecvPayAudit"; + + //} if (optype == "op_Seai") + //{ + // WorkFlowName = "FeeSeaiRecvPayAudit"; + + //} if (optype == "op_Aire") + //{ + // WorkFlowName = "AireFeeAudit"; + + //} if (optype == "op_Airi") + //{ + // WorkFlowName = "AiriFeeAudit"; + + //} if (optype == "op_Apply") + //{ + // WorkFlowName = "ApplyFeeAudit"; + + //} if (optype == "op_Bulk") + //{ + // WorkFlowName = "BulkFeeAudit"; + //} if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") + //{ + // WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeAudit"; + //} + //if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") + //{ + // var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + // if (value == "1") WorkFlowName = "FeeSeaiRecvPayAudit"; + //} if (WorkFlowstr != "") WorkFlowName = WorkFlowstr; @@ -1540,44 +1639,44 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL result.Success = true; var msg = ""; - var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - optype = optype.ToLower(); - if (optype == "op_seae"|| optype == "op_seaeorder") - { - WorkFlowName = "FeeRecvPayAudit"; - - } if (optype == "op_seai") - { - WorkFlowName = "FeeSeaiRecvPayAudit"; - - } if (optype == "op_aire") - { - WorkFlowName = "AireFeeAudit"; - - } if (optype == "op_airi") - { - WorkFlowName = "AiriFeeAudit"; - - } if (optype == "op_apply") - { - WorkFlowName = "ApplyFeeAudit"; - - } if (optype == "op_bulk") - { - WorkFlowName = "BulkFeeAudit"; - } if (optype == "op_other" || optype == "tmswlpchead" || optype == "opctnbscard" || optype == "import_main") - { - WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - } if (optype == "op_railway") - { - WorkFlowName = "RailwayFeeAudit"; - } - if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") - { - var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); - if (value == "1") WorkFlowName = "FeeSeaiRecvPayAudit"; - } - + //var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + //optype = optype.ToLower(); + //if (optype == "op_seae"|| optype == "op_seaeorder") + //{ + // WorkFlowName = "FeeRecvPayAudit"; + + //} if (optype == "op_seai") + //{ + // WorkFlowName = "FeeSeaiRecvPayAudit"; + + //} if (optype == "op_aire") + //{ + // WorkFlowName = "AireFeeAudit"; + + //} if (optype == "op_airi") + //{ + // WorkFlowName = "AiriFeeAudit"; + + //} if (optype == "op_apply") + //{ + // WorkFlowName = "ApplyFeeAudit"; + + //} if (optype == "op_bulk") + //{ + // WorkFlowName = "BulkFeeAudit"; + //} if (optype == "op_other" || optype == "tmswlpchead" || optype == "opctnbscard" || optype == "import_main" || optype == "OP_SuperVision_Truck") + //{ + // WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeAudit"; + //} + //if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") + //{ + // var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + // if (value == "1") WorkFlowName = "FeeSeaiRecvPayAudit"; + //} + var WorkFlowName = GetWorkFlowNameByOptype(optype); if (WorkFlowstr != "") WorkFlowName = WorkFlowstr; @@ -1755,38 +1854,40 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL { var result = new DBResult(); - var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + //var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - if (optype == "op_seae" || optype == "op_seaeorder") - { - WorkFlowName = "FeeRecvPayAudit"; - - } if (optype == "op_seai") - { - WorkFlowName = "FeeSeaiRecvPayAudit"; + //if (optype == "op_seae" || optype == "op_seaeorder") + //{ + // WorkFlowName = "FeeRecvPayAudit"; - } if (optype == "op_aire") - { - WorkFlowName = "AireFeeAudit"; + //} if (optype == "op_seai") + //{ + // WorkFlowName = "FeeSeaiRecvPayAudit"; - } if (optype == "op_airi") - { - WorkFlowName = "AiriFeeAudit"; + //} if (optype == "op_aire") + //{ + // WorkFlowName = "AireFeeAudit"; - } if (optype == "op_apply") - { - WorkFlowName = "ApplyFeeAudit"; + //} if (optype == "op_airi") + //{ + // WorkFlowName = "AiriFeeAudit"; - } if (optype == "op_bulk") - { - WorkFlowName = "BulkFeeAudit"; - } if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") - { - WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - } if (optype == "op_railway") - { - WorkFlowName = "RailwayFeeAudit"; - } + //} if (optype == "op_apply") + //{ + // WorkFlowName = "ApplyFeeAudit"; + + //} if (optype == "op_bulk") + //{ + // WorkFlowName = "BulkFeeAudit"; + //} if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") + //{ + // WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeAudit"; + //} + + var WorkFlowName = GetWorkFlowNameByOptype(optype); T_ALL_DA T_ALL_DA = new T_ALL_DA(); var BLSTLAUTOAUDIT = MsSysParamSetDAL.GetData("PARAMNAME='BLSTLAUTOAUDIT'"); Database db = DatabaseFactory.CreateDatabase(); @@ -2060,43 +2161,43 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL { var result = new DBResult(); - var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - - if (optype == "op_Seae" || optype == "op_SeaeOrder") - { - WorkFlowName = "FeeRecvPayAudit"; - - } if (optype == "op_Seai") - { - WorkFlowName = "FeeSeaiRecvPayAudit"; - - } if (optype == "op_Aire") - { - WorkFlowName = "AireFeeAudit"; - - } if (optype == "op_Airi") - { - WorkFlowName = "AiriFeeAudit"; - - } if (optype == "op_Apply") - { - WorkFlowName = "ApplyFeeAudit"; - - } if (optype == "op_Bulk") - { - WorkFlowName = "BulkFeeAudit"; - } if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") - { - WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - } if (optype == "op_railway") - { - WorkFlowName = "RailwayFeeAudit"; - } - if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") { - var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); - if (value=="1") WorkFlowName = "FeeSeaiRecvPayAudit"; - } - + //var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + + //if (optype == "op_Seae" || optype == "op_SeaeOrder") + //{ + // WorkFlowName = "FeeRecvPayAudit"; + + //} if (optype == "op_Seai") + //{ + // WorkFlowName = "FeeSeaiRecvPayAudit"; + + //} if (optype == "op_Aire") + //{ + // WorkFlowName = "AireFeeAudit"; + + //} if (optype == "op_Airi") + //{ + // WorkFlowName = "AiriFeeAudit"; + + //} if (optype == "op_Apply") + //{ + // WorkFlowName = "ApplyFeeAudit"; + + //} if (optype == "op_Bulk") + //{ + // WorkFlowName = "BulkFeeAudit"; + //} if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") + //{ + // WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeAudit"; + //} + //if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") { + // var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + // if (value=="1") WorkFlowName = "FeeSeaiRecvPayAudit"; + //} + var WorkFlowName = GetWorkFlowNameByOptype(optype); if (WorkFlowstr != "") WorkFlowName = WorkFlowstr; @@ -2277,44 +2378,44 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL if (worktype == "BLAUDIT") WorkFlowstr = "BLFeeAudit"; - var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - - if (optype == "op_seae" || optype == "op_seaeorder") - { - WorkFlowName = "FeeRecvPayAudit"; - - } if (optype == "op_seai") - { - WorkFlowName = "FeeSeaiRecvPayAudit"; - - } if (optype == "op_aire") - { - WorkFlowName = "AireFeeAudit"; - - } if (optype == "op_airi") - { - WorkFlowName = "AiriFeeAudit"; - - } if (optype == "op_apply") - { - WorkFlowName = "ApplyFeeAudit"; - - } if (optype == "op_bulk") - { - WorkFlowName = "BulkFeeAudit"; - } if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") - { - WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - } if (optype == "op_railway") - { - WorkFlowName = "RailwayFeeAudit"; - } - if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") - { - var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); - if (value == "1") WorkFlowName = "FeeSeaiRecvPayAudit"; - } - + //var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + + //if (optype == "op_seae" || optype == "op_seaeorder") + //{ + // WorkFlowName = "FeeRecvPayAudit"; + + //} if (optype == "op_seai") + //{ + // WorkFlowName = "FeeSeaiRecvPayAudit"; + + //} if (optype == "op_aire") + //{ + // WorkFlowName = "AireFeeAudit"; + + //} if (optype == "op_airi") + //{ + // WorkFlowName = "AiriFeeAudit"; + + //} if (optype == "op_apply") + //{ + // WorkFlowName = "ApplyFeeAudit"; + + //} if (optype == "op_bulk") + //{ + // WorkFlowName = "BulkFeeAudit"; + //} if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") + //{ + // WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeAudit"; + //} + //if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") + //{ + // var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + // if (value == "1") WorkFlowName = "FeeSeaiRecvPayAudit"; + //} + var WorkFlowName = GetWorkFlowNameByOptype(optype); var defcustname = ""; var ORDERCREATEOPFEE = MsSysParamSetDAL.GetData("PARAMNAME='ORDERCREATEOPFEE'"); @@ -2449,43 +2550,44 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL if (worktype == "BLAUDIT") WorkFlowstr = "BLFeeAudit"; - var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - - if (optype == "op_seae" || optype == "op_seaeorder") - { - WorkFlowName = "FeeRecvPayAudit"; - - } if (optype == "op_seai") - { - WorkFlowName = "FeeSeaiRecvPayAudit"; - - } if (optype == "op_aire") - { - WorkFlowName = "AireFeeAudit"; - - } if (optype == "op_airi") - { - WorkFlowName = "AiriFeeAudit"; - - } if (optype == "op_apply") - { - WorkFlowName = "ApplyFeeAudit"; - - } if (optype == "op_bulk") - { - WorkFlowName = "BulkFeeAudit"; - } if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") - { - WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - } if (optype == "op_railway") - { - WorkFlowName = "RailwayFeeAudit"; - } - if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") - { - var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); - if (value == "1") WorkFlowName = "FeeSeaiRecvPayAudit"; - } + //var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + + //if (optype == "op_seae" || optype == "op_seaeorder") + //{ + // WorkFlowName = "FeeRecvPayAudit"; + + //} if (optype == "op_seai") + //{ + // WorkFlowName = "FeeSeaiRecvPayAudit"; + + //} if (optype == "op_aire") + //{ + // WorkFlowName = "AireFeeAudit"; + + //} if (optype == "op_airi") + //{ + // WorkFlowName = "AiriFeeAudit"; + + //} if (optype == "op_apply") + //{ + // WorkFlowName = "ApplyFeeAudit"; + + //} if (optype == "op_bulk") + //{ + // WorkFlowName = "BulkFeeAudit"; + //} if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") + //{ + // WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeAudit"; + //} + //if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") + //{ + // var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + // if (value == "1") WorkFlowName = "FeeSeaiRecvPayAudit"; + //} + var WorkFlowName = GetWorkFlowNameByOptype(optype); var defcustname = ""; var ORDERCREATEOPFEE = MsSysParamSetDAL.GetData("PARAMNAME='ORDERCREATEOPFEE'"); @@ -2623,46 +2725,46 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL if (worktype == "BLAUDIT") WorkFlowstr = "BLFeeAudit"; var WorkFlowid = ""; - var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + //var WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + + //if (optype == "op_seae" || optype == "op_seaeorder") + //{ + // WorkFlowName = "FeeRecvPayAudit"; + + //} if (optype == "op_seai") + //{ + // WorkFlowName = "FeeSeaiRecvPayAudit"; + + //} if (optype == "op_aire") + //{ + // WorkFlowName = "AireFeeAudit"; + + //} if (optype == "op_airi") + //{ + // WorkFlowName = "AiriFeeAudit"; + + //} if (optype == "op_apply") + //{ + // WorkFlowName = "ApplyFeeAudit"; + + //} if (optype == "op_bulk") + //{ + // WorkFlowName = "BulkFeeAudit"; + //} if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") + //{ + // WorkFlowName = "FeeOpOpOtherRecvPayAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeAudit"; + //} + //if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") + //{ + // var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + // if (value == "1") WorkFlowName = "FeeSeaiRecvPayAudit"; + //} + var WorkFlowName = GetWorkFlowNameByOptype(optype); - if (optype == "op_seae" || optype == "op_seaeorder") - { - WorkFlowName = "FeeRecvPayAudit"; - - } if (optype == "op_seai") - { - WorkFlowName = "FeeSeaiRecvPayAudit"; - - } if (optype == "op_aire") - { - WorkFlowName = "AireFeeAudit"; - - } if (optype == "op_airi") - { - WorkFlowName = "AiriFeeAudit"; - - } if (optype == "op_apply") - { - WorkFlowName = "ApplyFeeAudit"; - - } if (optype == "op_bulk") - { - WorkFlowName = "BulkFeeAudit"; - } if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard" || optype == "import_main") - { - WorkFlowName = "FeeOpOpOtherRecvPayAudit"; - } if (optype == "op_railway") - { - WorkFlowName = "RailwayFeeAudit"; - } - if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") - { - var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); - if (value == "1") WorkFlowName = "FeeSeaiRecvPayAudit"; - } - - - if (WorkFlowstr != "") WorkFlowName = WorkFlowstr; + if (WorkFlowstr != "") WorkFlowName = WorkFlowstr; var i = 0; T_ALL_DA T_ALL_DA = new T_ALL_DA(); @@ -2844,44 +2946,44 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL { var result = new DBResult(); - var WorkFlowName = "FeeOpOtherModifyAudit"; - - if (optype == "op_Seae" || optype == "op_SeaeOrder") - { - WorkFlowName = "FeeModifyAudit"; - - } if (optype == "op_Seai") - { - WorkFlowName = "FeeSeaiModifyAudit"; - - } if (optype == "op_Aire") - { - WorkFlowName = "AireFeeModify"; - - } if (optype == "op_Airi") - { - WorkFlowName = "AiriFeeModify"; - - } if (optype == "op_Apply") - { - WorkFlowName = "ApplyFeeModify"; - - } if (optype == "op_Bulk") - { - WorkFlowName = "BulkFeeModify"; - } if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") - { - WorkFlowName = "FeeOpOtherModifyAudit"; - } if (optype == "op_railway") - { - WorkFlowName = "RailwayFeeModify"; - } - if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") - { - var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); - if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; - } - + //var WorkFlowName = "FeeOpOtherModifyAudit"; + + //if (optype == "op_Seae" || optype == "op_SeaeOrder") + //{ + // WorkFlowName = "FeeModifyAudit"; + + //} if (optype == "op_Seai") + //{ + // WorkFlowName = "FeeSeaiModifyAudit"; + + //} if (optype == "op_Aire") + //{ + // WorkFlowName = "AireFeeModify"; + + //} if (optype == "op_Airi") + //{ + // WorkFlowName = "AiriFeeModify"; + + //} if (optype == "op_Apply") + //{ + // WorkFlowName = "ApplyFeeModify"; + + //} if (optype == "op_Bulk") + //{ + // WorkFlowName = "BulkFeeModify"; + //} if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") + //{ + // WorkFlowName = "FeeOpOtherModifyAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeModify"; + //} + //if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") + //{ + // var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + // if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; + //} + var WorkFlowName = GetWorkFlowNameByOptype_Modify(optype); if (WorkFlowstr != "") WorkFlowName = WorkFlowstr; @@ -3131,44 +3233,44 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL var result = new DBResult(); - var WorkFlowName = "FeeOpOtherModifyAudit"; - - if (optype == "op_Seae" || optype == "op_SeaeOrder") - { - WorkFlowName = "FeeModifyAudit"; - - } if (optype == "op_Seai") - { - WorkFlowName = "FeeSeaiModifyAudit"; - - } if (optype == "op_Aire") - { - WorkFlowName = "AireFeeModify"; - - } if (optype == "op_Airi") - { - WorkFlowName = "AiriFeeModify"; - - } if (optype == "op_Apply") - { - WorkFlowName = "ApplyFeeModify"; - - } if (optype == "op_Bulk") - { - WorkFlowName = "BulkFeeModify"; - } if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") - { - WorkFlowName = "FeeOpOtherModifyAudit"; - } if (optype == "op_railway") - { - WorkFlowName = "RailwayFeeModify"; - } - if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") - { - var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); - if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; - } - + //var WorkFlowName = "FeeOpOtherModifyAudit"; + + //if (optype == "op_Seae" || optype == "op_SeaeOrder") + //{ + // WorkFlowName = "FeeModifyAudit"; + + //} if (optype == "op_Seai") + //{ + // WorkFlowName = "FeeSeaiModifyAudit"; + + //} if (optype == "op_Aire") + //{ + // WorkFlowName = "AireFeeModify"; + + //} if (optype == "op_Airi") + //{ + // WorkFlowName = "AiriFeeModify"; + + //} if (optype == "op_Apply") + //{ + // WorkFlowName = "ApplyFeeModify"; + + //} if (optype == "op_Bulk") + //{ + // WorkFlowName = "BulkFeeModify"; + //} if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") + //{ + // WorkFlowName = "FeeOpOtherModifyAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeModify"; + //} + //if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") + //{ + // var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + // if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; + //} + var WorkFlowName = GetWorkFlowNameByOptype_Modify(optype); if (WorkFlowstr != "") WorkFlowName = WorkFlowstr; if (OldFee.IsOpen == "True" || OldFee.IsOpen == "1") WorkFlowName = "YjFeefyAudit"; @@ -3374,51 +3476,51 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL var result = new DBResult(); - var WorkFlowName = "FeeOpOtherModifyAudit"; - - if (optype == "op_Seae" || optype == "op_SeaeOrder") - { - WorkFlowName = "FeeModifyAudit"; - - } - if (optype == "op_Seai") - { - WorkFlowName = "FeeSeaiModifyAudit"; - - } - if (optype == "op_Aire") - { - WorkFlowName = "AireFeeModify"; - - } - if (optype == "op_Airi") - { - WorkFlowName = "AiriFeeModify"; - - } - if (optype == "op_Apply") - { - WorkFlowName = "ApplyFeeModify"; - - } - if (optype == "op_Bulk") - { - WorkFlowName = "BulkFeeModify"; - } - if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") - { - WorkFlowName = "FeeOpOtherModifyAudit"; - } - if (optype == "op_railway") - { - WorkFlowName = "RailwayFeeModify"; - } - if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") - { - var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); - if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; - } - + //var WorkFlowName = "FeeOpOtherModifyAudit"; + + //if (optype == "op_Seae" || optype == "op_SeaeOrder") + //{ + // WorkFlowName = "FeeModifyAudit"; + + //} + //if (optype == "op_Seai") + //{ + // WorkFlowName = "FeeSeaiModifyAudit"; + + //} + //if (optype == "op_Aire") + //{ + // WorkFlowName = "AireFeeModify"; + + //} + //if (optype == "op_Airi") + //{ + // WorkFlowName = "AiriFeeModify"; + + //} + //if (optype == "op_Apply") + //{ + // WorkFlowName = "ApplyFeeModify"; + + //} + //if (optype == "op_Bulk") + //{ + // WorkFlowName = "BulkFeeModify"; + //} + //if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") + //{ + // WorkFlowName = "FeeOpOtherModifyAudit"; + //} + //if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeModify"; + //} + //if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") + //{ + // var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + // if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; + //} + var WorkFlowName = GetWorkFlowNameByOptype_Modify(optype); if (WorkFlowstr != "") WorkFlowName = WorkFlowstr; if (OldFee.IsOpen == "True" || OldFee.IsOpen == "1") WorkFlowName = "YjFeefyAudit"; @@ -3630,43 +3732,44 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL var result = new DBResult(); - var WorkFlowName = "FeeOpOtherModifyAudit"; - - if (optype == "op_Seae" || optype == "op_SeaeOrder") - { - WorkFlowName = "FeeModifyAudit"; - - } if (optype == "op_Seai") - { - WorkFlowName = "FeeSeaiModifyAudit"; - - } if (optype == "op_Aire") - { - WorkFlowName = "AireFeeModify"; - - } if (optype == "op_Airi") - { - WorkFlowName = "AiriFeeModify"; - - } if (optype == "op_Apply") - { - WorkFlowName = "ApplyFeeModify"; - - } if (optype == "op_Bulk") - { - WorkFlowName = "BulkFeeModify"; - } if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") - { - WorkFlowName = "FeeOpOtherModifyAudit"; - } if (optype == "op_railway") - { - WorkFlowName = "RailwayFeeModify"; - } - if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") - { - var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); - if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; - } + //var WorkFlowName = "FeeOpOtherModifyAudit"; + + //if (optype == "op_Seae" || optype == "op_SeaeOrder") + //{ + // WorkFlowName = "FeeModifyAudit"; + + //} if (optype == "op_Seai") + //{ + // WorkFlowName = "FeeSeaiModifyAudit"; + + //} if (optype == "op_Aire") + //{ + // WorkFlowName = "AireFeeModify"; + + //} if (optype == "op_Airi") + //{ + // WorkFlowName = "AiriFeeModify"; + + //} if (optype == "op_Apply") + //{ + // WorkFlowName = "ApplyFeeModify"; + + //} if (optype == "op_Bulk") + //{ + // WorkFlowName = "BulkFeeModify"; + //} if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") + //{ + // WorkFlowName = "FeeOpOtherModifyAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeModify"; + //} + //if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") + //{ + // var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + // if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; + //} + var WorkFlowName = GetWorkFlowNameByOptype_Modify(optype); if (WorkFlowstr != "") WorkFlowName = WorkFlowstr; @@ -3780,43 +3883,44 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL var result = new DBResult(); - var WorkFlowName = "FeeOpOtherModifyAudit"; - - if (optype == "op_seae" || optype == "op_seaeorder") - { - WorkFlowName = "FeeModifyAudit"; - - } if (optype == "op_seai") - { - WorkFlowName = "FeeSeaiModifyAudit"; - - } if (optype == "op_aire") - { - WorkFlowName = "AireFeeModify"; - - } if (optype == "op_airi") - { - WorkFlowName = "AiriFeeModify"; - - } if (optype == "op_apply") - { - WorkFlowName = "ApplyFeeModify"; - - } if (optype == "op_bulk") - { - WorkFlowName = "BulkFeeModify"; - } if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") - { - WorkFlowName = "FeeOpOtherModifyAudit"; - } if (optype == "op_railway") - { - WorkFlowName = "RailwayFeeModify"; - } - if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") - { - var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); - if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; - } + //var WorkFlowName = "FeeOpOtherModifyAudit"; + + //if (optype == "op_seae" || optype == "op_seaeorder") + //{ + // WorkFlowName = "FeeModifyAudit"; + + //} if (optype == "op_seai") + //{ + // WorkFlowName = "FeeSeaiModifyAudit"; + + //} if (optype == "op_aire") + //{ + // WorkFlowName = "AireFeeModify"; + + //} if (optype == "op_airi") + //{ + // WorkFlowName = "AiriFeeModify"; + + //} if (optype == "op_apply") + //{ + // WorkFlowName = "ApplyFeeModify"; + + //} if (optype == "op_bulk") + //{ + // WorkFlowName = "BulkFeeModify"; + //} if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") + //{ + // WorkFlowName = "FeeOpOtherModifyAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeModify"; + //} + //if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") + //{ + // var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + // if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; + //} + var WorkFlowName = GetWorkFlowNameByOptype_Modify(optype); if (WorkFlowstr != "") WorkFlowName = WorkFlowstr; @@ -3958,43 +4062,44 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL var result = new DBResult(); - var WorkFlowName = "FeeOpOtherModifyAudit"; - - if (optype == "op_seae" || optype == "op_seaeorder") - { - WorkFlowName = "FeeModifyAudit"; - - } if (optype == "op_seai") - { - WorkFlowName = "FeeSeaiModifyAudit"; - - } if (optype == "op_aire") - { - WorkFlowName = "AireFeeModify"; - - } if (optype == "op_airi") - { - WorkFlowName = "AiriFeeModify"; - - } if (optype == "op_apply") - { - WorkFlowName = "ApplyFeeModify"; - - } if (optype == "op_bulk") - { - WorkFlowName = "BulkFeeModify"; - } if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") - { - WorkFlowName = "FeeOpOtherModifyAudit"; - } if (optype == "op_railway") - { - WorkFlowName = "RailwayFeeModify"; - } - if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") - { - var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); - if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; - } + //var WorkFlowName = "FeeOpOtherModifyAudit"; + + //if (optype == "op_seae" || optype == "op_seaeorder") + //{ + // WorkFlowName = "FeeModifyAudit"; + + //} if (optype == "op_seai") + //{ + // WorkFlowName = "FeeSeaiModifyAudit"; + + //} if (optype == "op_aire") + //{ + // WorkFlowName = "AireFeeModify"; + + //} if (optype == "op_airi") + //{ + // WorkFlowName = "AiriFeeModify"; + + //} if (optype == "op_apply") + //{ + // WorkFlowName = "ApplyFeeModify"; + + //} if (optype == "op_bulk") + //{ + // WorkFlowName = "BulkFeeModify"; + //} if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") + //{ + // WorkFlowName = "FeeOpOtherModifyAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeModify"; + //} + //if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") + //{ + // var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + // if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; + //} + var WorkFlowName = GetWorkFlowNameByOptype_Modify(optype); if (WorkFlowstr != "") WorkFlowName = WorkFlowstr; //var dataList = GetModifyData(billno); @@ -4137,43 +4242,44 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL { var result = new DBResult(); - var WorkFlowName = "FeeOpOtherModifyAudit"; - - if (optype == "op_seae" || optype == "op_seaeorder") - { - WorkFlowName = "FeeModifyAudit"; - - } if (optype == "op_seai") - { - WorkFlowName = "FeeSeaiModifyAudit"; - - } if (optype == "op_aire") - { - WorkFlowName = "AireFeeModify"; - - } if (optype == "op_airi") - { - WorkFlowName = "AiriFeeModify"; - - } if (optype == "op_apply") - { - WorkFlowName = "ApplyFeeModify"; - - } if (optype == "op_bulk") - { - WorkFlowName = "BulkFeeModify"; - } if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") - { - WorkFlowName = "FeeOpOtherModifyAudit"; - } if (optype == "op_railway") - { - WorkFlowName = "RailwayFeeModify"; - } - if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") - { - var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); - if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; - } + //var WorkFlowName = "FeeOpOtherModifyAudit"; + + //if (optype == "op_seae" || optype == "op_seaeorder") + //{ + // WorkFlowName = "FeeModifyAudit"; + + //} if (optype == "op_seai") + //{ + // WorkFlowName = "FeeSeaiModifyAudit"; + + //} if (optype == "op_aire") + //{ + // WorkFlowName = "AireFeeModify"; + + //} if (optype == "op_airi") + //{ + // WorkFlowName = "AiriFeeModify"; + + //} if (optype == "op_apply") + //{ + // WorkFlowName = "ApplyFeeModify"; + + //} if (optype == "op_bulk") + //{ + // WorkFlowName = "BulkFeeModify"; + //} if (optype == "op_other" || optype == "tMsWlPcHead" || optype == "OpCtnBsCard") + //{ + // WorkFlowName = "FeeOpOtherModifyAudit"; + //} if (optype == "op_railway") + //{ + // WorkFlowName = "RailwayFeeModify"; + //} + //if (optype.ToLower() == "wms" || optype.ToLower() == "wms_in" || optype.ToLower() == "wms_out") + //{ + // var value = WMSNewDAL.WMSNewDAL.GetSysFeeConfig(""); + // if (value == "1") WorkFlowName = "FeeSeaiModifyAudit"; + //} + var WorkFlowName = GetWorkFlowNameByOptype_Modify(optype); if (WorkFlowstr != "") WorkFlowName = WorkFlowstr; diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs index f320d88a..11da387a 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs @@ -9505,37 +9505,54 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL string sqlLb = "select oplb from v_op_bs where bsno = " + item + ""; string oplb = db.ExecuteScalar(CommandType.Text, sqlLb).ToString(); + + var OPLBDic = new Dictionary + { + { "op_seae", "op_Seae" }, + { "op_seai","op_Seai"}, + { "op_airi","op_Airi"}, + { "op_aire","op_Aire"}, + { "op_appy","op_Apply"}, + { "OP_SuperVision_Truck","OP_SuperVision_Truck"}, + { "tMsWlPcHead","tMsWlPcHead"} + }; + if (oplb == "" || oplb == null) { continue; } - if (oplb != "op_seae" && oplb != "op_seai" && oplb != "op_airi" && oplb != "op_aire" && oplb != "op_other" && oplb != "op_apply") + //if (oplb != "op_seae" && oplb != "op_seai" && oplb != "op_airi" && oplb != "op_aire" && oplb != "op_other" && oplb != "op_apply") + //{ + // continue; + //} + if (!OPLBDic.ContainsKey(oplb)) { continue; } //费用提交 string condition = "BsNo=" + item; - string oplb2 = oplb; - switch (oplb) - { - case "op_seae": - oplb2 = "op_Seae"; - break; - case "op_seai": - oplb2 = "op_Seai"; - break; - case "op_airi": - oplb2 = "op_Airi"; - break; - case "op_aire": - oplb2 = "op_Aire"; - break; - case "op_appy": - oplb2 = "op_Apply"; - break; - default: - break; - } + string oplb2 = OPLBDic[oplb]; + //string oplb2 = oplb; + //switch (oplb) + //{ + // case "op_seae": + // oplb2 = "op_Seae"; + // break; + // case "op_seai": + // oplb2 = "op_Seai"; + // break; + // case "op_airi": + // oplb2 = "op_Airi"; + // break; + // case "op_aire": + // oplb2 = "op_Aire"; + // break; + // case "op_appy": + // oplb2 = "op_Apply"; + // break; + // default: + // break; + //} DBResult result = new DBResult(); if (statusvalue != 0) { diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckDAL.cs index 16e1f3ba..91025ac8 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckDAL.cs @@ -491,7 +491,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL data.SJDH = Convert.ToString(reader["SJDH"]); data.REMARK = Convert.ToString(reader["REMARK"]); data.TimeMark = Convert.ToDecimal(reader["TimeMark_int"]); - + + data.BillFeeStatus = Convert.ToString(reader["BillFeeStatus"]); + if (reader["BILLFEESTATUSTIME"] != DBNull.Value) + data.BILLFEESTATUSTIME = Convert.ToString(reader["BILLFEESTATUSTIME"]); + #endregion headList.Add(data); } diff --git a/DSWeb/Areas/MvcShipping/Models/MsOp_SuperVision_Truck/MsOp_SuperVision_Truck.cs b/DSWeb/Areas/MvcShipping/Models/MsOp_SuperVision_Truck/MsOp_SuperVision_Truck.cs index 0532e35d..8cd7e01b 100644 --- a/DSWeb/Areas/MvcShipping/Models/MsOp_SuperVision_Truck/MsOp_SuperVision_Truck.cs +++ b/DSWeb/Areas/MvcShipping/Models/MsOp_SuperVision_Truck/MsOp_SuperVision_Truck.cs @@ -92,18 +92,8 @@ namespace DSWeb.MvcShipping.Models.MsOp_SuperVision_Truck public decimal? TimeMark{get;set;} - public string BillFeeStatus - { - get { - if (FEESTATUS == true) { - return "1"; - } - else { - return "0"; - } - } - } - + public string BillFeeStatus{ get;set; } + public string BILLFEESTATUSTIME { get; set; } #endregion public OP_SuperVision_Truck_md() diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckIndex.js index 7b2fec78..2ecd4d0b 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckIndex.js @@ -857,11 +857,17 @@ Ext.extend(Shipping.MsOp_SuperVision_TruckIndex, Ext.Panel, { handler: function (menu, event) { _this.onFeeEditClick(menu, event); } - }, { text: "批量费用提交", - handler: function (menu, event) { - _this.onPiLiangSubmitClick(menu, event, 1); - } - }, { text: "服务模板费用", + } + + //, { + // text: "批量费用提交", + // handler: function (menu, event) { + // _this.onPiLiangSubmitClick(menu, event, 1); + // } + //} + + , { + text: "服务模板费用", handler: function (menu, event) { _this.onPiLiangServiceFeeClick(menu, event); } @@ -883,12 +889,19 @@ Ext.extend(Shipping.MsOp_SuperVision_TruckIndex, Ext.Panel, { // scope: this //} - , { - text: '批量整票提交', //"批量整票提交", - handler: function (menu, event) { - _this.onPiLiangZhengPiaoTiJiaoClick(); - } - }], + { + text: '批量请核', //"批量整票提交", + handler: function (menu, event) { + _this.onPiLiangZhengPiaoTiJiaoClick(menu, event, 1); + } + }, { + text: '批量撤销', //"批量整票提交", + handler: function (menu, event) { + _this.onCancelPiLiangZhengPiaoTiJiaoClick(menu, event, 0); + } + } + + ], scope: this }] }); @@ -1734,6 +1747,97 @@ Ext.extend(Shipping.MsOp_SuperVision_TruckIndex, Ext.Panel, { } + + , + onCancelPiLiangZhengPiaoTiJiaoClick: function (menu, event, type) { + + var selections = this.GridCheckBoxModel.selected.items; + if (selections.length == 0) { + Ext.Msg.show({ title: "提示", msg: "请先选择业务!", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //请先选择要更新的业务! + return; + } + + var BSNOStr = ''; + + + var icount = 0; + for (var i = 0; i < selections.length; i++) { + var rec = selections[i]; + var isdelete = true; + if (rec.data.BillFeeStatus == '2') { + Ext.Msg.show({ title: "警告", msg: 'MAWB NO:' + rec.data.MBLNO + '已财务审核,不允许撤销请核！', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); + isdelete = false; + return; + } + if (rec.data.BillFeeStatus == '4') { + Ext.Msg.show({ title: "警告", msg: 'MAWB NO:' + rec.data.MBLNO + '已整票驳回,不允许撤销请核！', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); + isdelete = false; + return; + } + if (rec.data.BillFeeStatus == '1') { + if (rec.data.ISAPPLY != '1') { + Ext.Msg.show({ title: "警告", msg: 'MAWB NO:' + rec.data.MBLNO + '已经理审核,不允许撤销请核！', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); + isdelete = false; + return; + } + } + + + if (isdelete) { + var BSNO = rec.data.BSNO; + if (BSNOStr == '') + BSNOStr = BSNO; + else { + BSNOStr = BSNOStr + ',' + BSNO; + } + icount = icount + 1; + } + } + + if (BSNOStr == '') { + Ext.Msg.show({ title: "提示", msg: "没有需要处理的业务", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + return; + } else { + + + + var urlStr = '/Account/Chfee_Audit/CancelAuditBLList'; + Ext.Ajax.request({ + waitMsg: '正在查询主表数据...', //'正在添加数据...', + url: urlStr, + params: { + bsnos: BSNOStr + }, + callback: function (options, success, response) { + if (success) { + var result = Ext.JSON.decode(response.responseText); + if (!result.Success) { + if (result.Message != '') { + Ext.Msg.show({ + title: '提示', + msg: result.Message, + icon: Ext.MessageBox.ERROR, + buttons: Ext.Msg.OK + }); + } + return; + } else { + + _this.storeList.reload(); + + } + + } else { + Ext.MessageBox.alert('请求出现错误,请重试', response.responseText); + } + }, + scope: this + }); + } + + + } + //#endregion , GetCompanyInfo: function (CORPID) { diff --git a/DSWeb/Areas/TruckMng/DAL/MsRptPcHeadEdit/MsRptPcHeadEditDAL.cs b/DSWeb/Areas/TruckMng/DAL/MsRptPcHeadEdit/MsRptPcHeadEditDAL.cs index 78c997e4..2aa32580 100644 --- a/DSWeb/Areas/TruckMng/DAL/MsRptPcHeadEdit/MsRptPcHeadEditDAL.cs +++ b/DSWeb/Areas/TruckMng/DAL/MsRptPcHeadEdit/MsRptPcHeadEditDAL.cs @@ -535,7 +535,10 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit strSql.Append(",dbo.F_GetBillCrFeeStatus(t.GId) CRFEESTATUS"); strSql.Append(",t.SALECORPID,(select [NAME] from [company] where GID=t.SALECORPID) as SALECORP"); - strSql.Append(" ,INVOICENO,KINDPKGS,CUSTNO,SalesName,GoodsName,PORTLOAD,DESTINATION,RtnDocStatus,RtnDocTime,ACCDATE,(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF from tMsWlPcHead t "); + strSql.Append(" ,INVOICENO,KINDPKGS,CUSTNO,SalesName,GoodsName,PORTLOAD,DESTINATION,RtnDocStatus,RtnDocTime,ACCDATE,(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF "); + strSql.Append(" ,isnull(BillFeeStatus,0) BillFeeStatus "); + + strSql.Append(" from tMsWlPcHead t "); if (!string.IsNullOrEmpty(strCondition)) { //strSql.Append(" where 1=1 AND " + strCondition); @@ -582,7 +585,10 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit strSql.Append(",dbo.F_GetBillDrFeeStatus(t.GId) DRFEESTATUS"); strSql.Append(",dbo.F_GetBillCrFeeStatus(t.GId) CRFEESTATUS"); strSql.Append(",t.SALECORPID,(select [NAME] from [company] where GID=t.SALECORPID) as SALECORP"); - strSql.Append(" ,INVOICENO,KINDPKGS,CUSTNO,SalesName,GoodsName,PORTLOAD,DESTINATION,RtnDocStatus,RtnDocTime,ACCDATE,(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF from tMsWlPcHead t "); + strSql.Append(" ,INVOICENO,KINDPKGS,CUSTNO,SalesName,GoodsName,PORTLOAD,DESTINATION,RtnDocStatus,RtnDocTime,ACCDATE,(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF "); + strSql.Append(" ,isnull(BillFeeStatus,0) BillFeeStatus "); + + strSql.Append(" from tMsWlPcHead t "); if (!string.IsNullOrEmpty(strCondition)) { strSql.Append(" where " + strCondition.Replace("~", ""));//str.Replace("b","**"); @@ -620,7 +626,10 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit strSql.Append(",dbo.F_GetBillDrFeeStatus(t.GId) DRFEESTATUS"); strSql.Append(",dbo.F_GetBillCrFeeStatus(t.GId) CRFEESTATUS"); strSql.Append(",t.SALECORPID,(select [NAME] from [company] where GID=t.SALECORPID) as SALECORP"); - strSql.Append(" ,INVOICENO,KINDPKGS,CUSTNO,SalesName,GoodsName,PORTLOAD,DESTINATION,RtnDocStatus,RtnDocTime,ACCDATE,(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF from tMsWlPcHead t "); + strSql.Append(" ,INVOICENO,KINDPKGS,CUSTNO,SalesName,GoodsName,PORTLOAD,DESTINATION,RtnDocStatus,RtnDocTime,ACCDATE,(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF "); + strSql.Append(" ,isnull(BillFeeStatus,0) BillFeeStatus "); + strSql.Append(" from tMsWlPcHead t "); + if (!string.IsNullOrEmpty(condition)) { strSql.Append(" where " + condition.Replace("~", ""));//str.Replace("b","**"); @@ -731,6 +740,9 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit data.SealNo = Convert.ToString(reader["SealNo"]); data.SALECORP = Convert.ToString(reader["SALECORP"]); data.SALECORPID = Convert.ToString(reader["SALECORPID"]); + + data.BillFeeStatus = Convert.ToString(reader["BillFeeStatus"]); + #endregion headList.Add(data); } diff --git a/DSWeb/Areas/TruckMng/Models/MsWlBs/MsWlPcHead.cs b/DSWeb/Areas/TruckMng/Models/MsWlBs/MsWlPcHead.cs index fc2596b4..4ab0222d 100644 --- a/DSWeb/Areas/TruckMng/Models/MsWlBs/MsWlPcHead.cs +++ b/DSWeb/Areas/TruckMng/Models/MsWlBs/MsWlPcHead.cs @@ -2376,7 +2376,7 @@ namespace DSWeb.Areas.TruckMng.Models.MsWlBs set { _accdate = value; } } - + public string BillFeeStatus { set; get; } #endregion public MsWlPcHead_WFSDEdit ( ) diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_WFSDIndex.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_WFSDIndex.js index 78b95b11..a15215f1 100644 --- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_WFSDIndex.js +++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_WFSDIndex.js @@ -104,7 +104,8 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, { { name: 'DRFEESTATUS', type: 'string' }, { name: 'CRFEESTATUS', type: 'string' }, { name: 'ChangedReson', type: 'string' }, - { name: 'CargoID', type: 'string' } + { name: 'CargoID', type: 'string' }, + { name: 'BillFeeStatus', type: 'string' } ] }); @@ -1376,10 +1377,22 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, { }, '-', { text: '其他操作', //"拼箱操作", menu: [ + //{ + // text: "批量费用提交", //"批量费用提交", + // handler: function (menu, event) { + // _this.onPiLiangSubmitClick(menu, event, 1); + // } + //}, + { - text: "批量费用提交", //"批量费用提交", + text: '批量请核', //"批量整票提交", handler: function (menu, event) { - _this.onPiLiangSubmitClick(menu, event, 1); + _this.onPiLiangZhengPiaoTiJiaoClick(menu, event, 1); + } + }, { + text: '批量撤销', //"批量整票提交", + handler: function (menu, event) { + _this.onCancelPiLiangZhengPiaoTiJiaoClick(menu, event, 0); } }], scope: this @@ -2656,44 +2669,224 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, { }, - onPiLiangSubmitClick: function (menu, event, type) { + //onPiLiangSubmitClick: function (menu, event, type) { + + + // var selectedRecords = this.gridList.selModel.getSelection(); + // this.storePLList.removeAll(); + // for (var i = 0; i < selectedRecords.length; i++) { + // var rec = selectedRecords[i]; + // var record = Ext.create('MsOpBill', { + // 'BSNO': rec.data.gId, + // 'PARENTID': rec.data.gId, + // 'BSSTATUS': rec.data.BillStatus, + // 'FEESTATUS': rec.data.FEESTATUS, + // 'BSSTATUSREF': '未锁定', + // 'FEESTATUSREF': rec.data.FEESTATUS, + // 'BSSOURCE': '', + // 'BSSOURCEDETAIL': '', + // 'ACCDATE': rec.data.ACCDATE, + // 'OPLB': 'tMsWlPcHead', + // 'OPTYPE': '普通货', + // 'OPLBNAME': '陆运派车单', + // 'MBLNO': rec.data.MblNo, + // 'HBLNO': '', + // 'CUSTNO': rec.data.BillNo, + // 'CUSTOMERNAME': rec.data.CustomerName, + // 'ETD': rec.data.ExpDate, + // 'PORTLOAD': rec.data.LoadPlace, + // 'PORTDISCHARGE': rec.data.DetiNation + // }); + // this.storePLList.add(record); + // } + + // if (this.storePLList.getCount()==0) { + // Ext.Msg.show({ title:'提示', msg:'没有要提交的业务', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + // return; + + // } else { + + // window.open('/Account/Chfee_Audit/PiLiangSubmit', "PILIANGSUBMIT", 'width=1200,height=600,top=0,left=0,resizable=yes,status=yes,menubar=no,scrollbars=yes'); + // } + + + //}, + + onPiLiangZhengPiaoTiJiaoClick: function (menu, event, type) { + + var selections = this.GridCheckBoxModel.selected.items; + if (selections.length == 0) { + Ext.Msg.show({ title: "提示", msg: "请先选择业务!", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //请先选择要更新的业务! + return; + } + var BSNOStr = ''; + for (var i = 0; i < selections.length; i++) { + var rec = selections[i]; + if (rec.data.BillFeeStatus == '0' || rec.data.BillFeeStatus == '4') { + var BSNO = rec.data.BSNO; + if (BSNOStr == '') + BSNOStr = BSNO; + else { + BSNOStr = BSNOStr + ',' + BSNO; + } + } + } + if (BSNOStr == '') { + Ext.Msg.show({ title: "提示", msg: "没有需处理的业务!", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + return; - var selectedRecords = this.gridList.selModel.getSelection(); - this.storePLList.removeAll(); - for (var i = 0; i < selectedRecords.length; i++) { - var rec = selectedRecords[i]; - var record = Ext.create('MsOpBill', { - 'BSNO': rec.data.gId, - 'PARENTID': rec.data.gId, - 'BSSTATUS': rec.data.BillStatus, - 'FEESTATUS': rec.data.FEESTATUS, - 'BSSTATUSREF': '未锁定', - 'FEESTATUSREF': rec.data.FEESTATUS, - 'BSSOURCE': '', - 'BSSOURCEDETAIL': '', - 'ACCDATE': rec.data.ACCDATE, - 'OPLB': 'tMsWlPcHead', - 'OPTYPE': '普通货', - 'OPLBNAME': '陆运派车单', - 'MBLNO': rec.data.MblNo, - 'HBLNO': '', - 'CUSTNO': rec.data.BillNo, - 'CUSTOMERNAME': rec.data.CustomerName, - 'ETD': rec.data.ExpDate, - 'PORTLOAD': rec.data.LoadPlace, - 'PORTDISCHARGE': rec.data.DetiNation + } else { + + var urlStr = '/Account/Chfee_Audit/PLSubmitAuditBL'; + Ext.Ajax.request({ + waitMsg: '正在查询主表数据...', //'正在添加数据...', + url: urlStr, + params: { + optype: 'op_seae', + bsnos: BSNOStr + }, + callback: function (options, success, response) { + if (success) { + var result = Ext.JSON.decode(response.responseText); + if (!result.Success) { + if (result.Message != '') { + Ext.Msg.show({ + title: '提示', + msg: result.Message, + icon: Ext.MessageBox.ERROR, + buttons: Ext.Msg.OK + }); + if (result.Message4 != '') { + _this.onDsQuery(); + } + + } else { + if (_this.winAccess) { _this.winAccess.close(); } + _this.winAccess = new Shipping.DsAudit({ + + }); + _this.winAccess.Record = result.Data; + _this.winAccess.BsNo = result.Message2; + _this.winAccess.Mblno = result.Message3; + _this.winAccess.stroplb = 'op_seae'; + _this.winAccess.Parentformname = 'op_seae'; + _this.winAccess.show(); + + return; + + + } + return; + } else { + + _this.onDsQuery(); + + + if (result.Data != '' && result.Data != null) { + Ext.Msg.show({ + title: '提示', + msg: '已提交审核,' + result.Data, + icon: Ext.MessageBox.ERROR, + buttons: Ext.Msg.OK + }); + } + + } + + } else { + Ext.MessageBox.alert('请求出现错误,请重试', response.responseText); + } + }, + scope: this }); - this.storePLList.add(record); } + }, + + onCancelPiLiangZhengPiaoTiJiaoClick: function (menu, event, type) { - if (this.storePLList.getCount()==0) { - Ext.Msg.show({ title:'提示', msg:'没有要提交的业务', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + var selections = this.GridCheckBoxModel.selected.items; + if (selections.length == 0) { + Ext.Msg.show({ title: "提示", msg: "请先选择业务!", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); //请先选择要更新的业务! return; + } + + var BSNOStr = ''; + + + var icount = 0; + for (var i = 0; i < selections.length; i++) { + var rec = selections[i]; + var isdelete = true; + if (rec.data.BillFeeStatus == '2') { + Ext.Msg.show({ title: "警告", msg: '主提单号:' + rec.data.MBLNO + '已财务审核,不允许撤销请核！', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); + isdelete = false; + return; + } + if (rec.data.BillFeeStatus == '4') { + Ext.Msg.show({ title: "警告", msg: '主提单号:' + rec.data.MBLNO + '已整票驳回,不允许撤销请核！', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); + isdelete = false; + return; + } + if (rec.data.BillFeeStatus == '1') { + if (rec.data.ISAPPLY != '1') { + Ext.Msg.show({ title: "警告", msg: '主提单号:' + rec.data.MBLNO + '已经理审核,不允许撤销请核！', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); + isdelete = false; + return; + } + } + + + if (isdelete) { + var BSNO = rec.data.BSNO; + if (BSNOStr == '') + BSNOStr = BSNO; + else { + BSNOStr = BSNOStr + ',' + BSNO; + } + icount = icount + 1; + } + } + if (BSNOStr == '') { + Ext.Msg.show({ title: "提示", msg: "没有需要处理的业务", icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); + return; } else { - window.open('/Account/Chfee_Audit/PiLiangSubmit', "PILIANGSUBMIT", 'width=1200,height=600,top=0,left=0,resizable=yes,status=yes,menubar=no,scrollbars=yes'); + + + var urlStr = '/Account/Chfee_Audit/CancelAuditBLList'; + Ext.Ajax.request({ + waitMsg: '正在查询主表数据...', //'正在添加数据...', + url: urlStr, + params: { + bsnos: BSNOStr + }, + callback: function (options, success, response) { + if (success) { + var result = Ext.JSON.decode(response.responseText); + if (!result.Success) { + if (result.Message != '') { + Ext.Msg.show({ + title: '提示', + msg: result.Message, + icon: Ext.MessageBox.ERROR, + buttons: Ext.Msg.OK + }); + } + return; + } else { + + _this.storeList.reload(); + + } + + } else { + Ext.MessageBox.alert('请求出现错误,请重试', response.responseText); + } + }, + scope: this + }); } From eecdfa4c2d184f45cf1b653390cc03f60c70f45d Mon Sep 17 00:00:00 2001 From: ddlucky Date: Mon, 13 Mar 2023 18:02:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=B3=E8=B4=B8=E4=BA=91=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=A4=84=E7=90=86=20=E9=99=A4=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DSWeb/Areas/MvcShipping/DAL/MsOpTask/MsOpTaskDAL.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpTask/MsOpTaskDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpTask/MsOpTaskDAL.cs index 0d3b58f4..fe4718bf 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpTask/MsOpTaskDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpTask/MsOpTaskDAL.cs @@ -1002,10 +1002,13 @@ namespace DSWeb.Areas.MvcShipping.DAL //提取两个op_logicinfo中的json var 报关业务logic = BasicDataRefDAL.GetLogicInfo(TASKNO, "关贸云报关"); - var 报关业务json = 报关业务logic["JSONSTR"]; + var 报关业务json = ""; + + if(报关业务logic.ContainsKey("JSONSTR")) 报关业务json = 报关业务logic["JSONSTR"]; var 报关费用logic = BasicDataRefDAL.GetLogicInfo(TASKNO, "关贸云费用"); - var 报关费用json = 报关费用logic["JSONSTR"]; + var 报关费用json = ""; + if (报关费用logic.ContainsKey("JSONSTR")) 报关费用json = 报关费用logic["JSONSTR"]; var headinfo = JsonConvert.Deserialize(报关业务json);