diff --git a/DSWeb.Service.Output/DoReadApply.cs b/DSWeb.Service.Output/DoReadApply.cs index efec4e36..5a0f3587 100644 --- a/DSWeb.Service.Output/DoReadApply.cs +++ b/DSWeb.Service.Output/DoReadApply.cs @@ -101,7 +101,8 @@ namespace DSWeb.Service.Output var dic = new Dictionary { { "bsno",readrec.BSNO}, { "userid",USERID}, - { "username",USERNAME} + { "username",USERNAME}, + { "withdoc","true"} }; log.Debug("url=" + DS7URL+";dic="+JsonConvert.SerializeObject(dic)); diff --git a/DSWeb.Service.Output/quartz_jobs.xml b/DSWeb.Service.Output/quartz_jobs.xml index 7b0304f3..254f3da7 100644 --- a/DSWeb.Service.Output/quartz_jobs.xml +++ b/DSWeb.Service.Output/quartz_jobs.xml @@ -38,7 +38,7 @@ --> - MakeNeedReadApply System @@ -61,21 +61,21 @@ 1000 ---> - - + + + + MakeNeedReadApply + System + 定时生成待读取业务列表触发器 + MakeNeedReadApply + System + 00 00 1 * * ? * + + + + + DoReadApply System @@ -84,7 +84,7 @@ true false - TriggerDoReadApply @@ -95,6 +95,6 @@ 0 4/1 1,2 * * ? * - --> - + + \ No newline at end of file diff --git a/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs b/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs index 39673e41..2d6f0b73 100644 --- a/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs +++ b/DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs @@ -1005,9 +1005,10 @@ namespace DSWeb.Areas.CommMng.DAL } + var cdc = new CommonDataContext(); + var currHead = cdc.ch_fee_payapplication.First(x => x.BILLNO == headdata.BILLNO); - - if (!string.IsNullOrWhiteSpace(headdata.PAYAPPID)) + if (!string.IsNullOrWhiteSpace(currHead.PAYAPPID)) { result.SetErrorInfo("业务已经提交至泛微OA"); return result; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js index 5db325d4..4695d976 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js @@ -384,7 +384,7 @@ Ext.extend(Shipping.MsOpApplyIndex, Ext.Panel, { width: 60, renderer: function (value, meta) { - if (value == '报关单可正式申报') { + if (value == '报关单可正式申报' || value == '报关单复核完成') { meta.tdCls = 'feestatus_pass'; } else if (value == '报关单待复核') { meta.tdCls = 'feestatus_refer'; diff --git a/DSWeb/Areas/SoftMng/Controllers/ExportController.cs b/DSWeb/Areas/SoftMng/Controllers/ExportController.cs index 83c98842..c765916a 100644 --- a/DSWeb/Areas/SoftMng/Controllers/ExportController.cs +++ b/DSWeb/Areas/SoftMng/Controllers/ExportController.cs @@ -1293,7 +1293,14 @@ namespace DSWeb.SoftMng.Controllers Select NEWID(),BSNO,@STATUS,@ISCOMP,@COMPTIME,@COMPOP,@INPUTTIME,'1',@REMARK FROM DecHead WHERE GID IN ('" + billGID + "') "); var statusstr ="报关单待复核"; - if (billState == "P") statusstr = "报关单可正式申报"; + if (billState == "P") { + statusstr = "报关单可正式申报"; + if (BasicDataRefDAL.具有webconfig公司代码("JGWL")) + { + //20230904 金港物流 【系统中复审通过的“报关单可正式申报”状态改为“报关单复核完成”)】 + statusstr = "报关单复核完成"; + } + } if (billState == "R") statusstr = "报关单复核驳回";