From af77f34df92c4e172a7de94f6d4a6345e21d5585 Mon Sep 17 00:00:00 2001 From: ddlucky Date: Wed, 15 Feb 2023 09:59:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=A5=E6=A3=80=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4=EF=BC=8C=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=BA=9B=E6=8A=A5=E5=85=B3=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=8B=AC=E6=9C=89=E7=9A=84=E9=83=A8=E5=88=86=EF=BC=9B=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8A=A5=E6=A3=80=E4=B8=9A=E5=8A=A1=E5=A4=A7=E5=BA=A6?= =?UTF-8?q?=E7=9A=84=E5=A7=94=E6=89=98=E7=BC=96=E5=8F=B7=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs | 12 ++- .../Views/MsOpApply/InspectionEdit.aspx | 2 +- .../Viewsjs/MsOpApply/Inspection_Edit.js | 27 +++--- .../Viewsjs/MsOpApply/Inspection_Index.js | 85 ++----------------- 4 files changed, 32 insertions(+), 94 deletions(-) diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs index 5db1d10a..6db01b56 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs @@ -17,6 +17,7 @@ using DSWeb.MvcShipping.DAL.MsSysBillNoSet; using DSWeb.MvcShipping.DAL.MsSysParamSet; using HcUtility.Core; using DSWeb.SoftMng.Model; +using DSWeb.MvcShipping.Models.MsSysBillNoSet; namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL { @@ -1338,14 +1339,21 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL var result = new DBResult(); //20200121 此处为防止从编码规则当中的 单一窗口编码规则 中获得业务编号 - var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='报关业务' and RULEBLNO='委托编号'", COMPANYID, dbname); + + var billnoset = new SysBillNoSet(); + if (headData.BSTYPE2 == "报关") + MsSysBillNoSetDAL.GetData("OPLBNAME='报关业务' and RULEBLNO='委托编号'", COMPANYID, dbname); + if (headData.BSTYPE2 == "报检") + MsSysBillNoSetDAL.GetData("OPLBNAME='报检业务' and RULEBLNO='委托编号'", COMPANYID, dbname); + + if (billnoset.BILLTYPE != "") { } else { - result.SetErrorInfo("请检查命名规则 增加【报关业务 委托编号】！"); + result.SetErrorInfo($"请检查命名规则 增加【{headData.BSTYPE2}业务 委托编号】！"); return result; } //if (isuse) diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpApply/InspectionEdit.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpApply/InspectionEdit.aspx index 2ab9957e..912433a0 100644 --- a/DSWeb/Areas/MvcShipping/Views/MsOpApply/InspectionEdit.aspx +++ b/DSWeb/Areas/MvcShipping/Views/MsOpApply/InspectionEdit.aspx @@ -48,7 +48,7 @@ - + diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Inspection_Edit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Inspection_Edit.js index 99d0fdf5..3697aa40 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Inspection_Edit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Inspection_Edit.js @@ -1,12 +1,12 @@ Ext.namespace('Shipping'); -Shipping.MsOpApplyEdit = function (config) { +Shipping.InspectionEdit = function (config) { Ext.applyIf(this, config); this.initUIComponents(); - window.Shipping.MsOpApplyEdit.superclass.constructor.call(this); + window.Shipping.InspectionEdit.superclass.constructor.call(this); }; -Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, { +Ext.extend(Shipping.InspectionEdit, Ext.Panel, { ParentWin: null, OpStatus: 'add', @@ -14,7 +14,7 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, { editRecord: null, Editdata: null, stroplb: '报关业务', - BSTYPE2: '报关', + BSTYPE2: '报检', initUIComponents: function () { this.serialNo = 0; @@ -660,7 +660,7 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, { this.comboxISDY = Ext.create('DsExt.ux.RefTableCombox', { store: this.storeISDY, - labelWidth: 85, + labelWidth: 85,hidden:true, fieldLabel: '单一窗口读取', valueField: 'FType', ReadOnly: true, @@ -686,7 +686,7 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, { store: this.store_etps_category, fieldLabel: '报关企业类别', forceSelection: true, - flex: 1, + flex: 1,hidden:true, name: 'ETPS_CATEGORY' }); @@ -706,7 +706,7 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, { store: this.storeCdnType, fieldLabel: '单据类型', queryMode: 'local', - width: 110, + width: 110, hidden: true, id: 'cdnType', name: 'CDNTYPE', forceSelection: true, @@ -794,7 +794,10 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, { items: [this.comboxOp, this.comboxSalesCode, this.comboxBsType, { fieldLabel: '报关单号', name: 'CUSTOMNO' - }, this.comboxWmsNo, this.comboxISDY + }, this.comboxWmsNo, this.comboxISDY, { + flex: 1, + xtype: 'hiddenfield' + } ] }, { xtype: 'container', @@ -803,11 +806,13 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, { defaultType: 'textfield', items: [ this.combox_etps_category, - this.comboxcdnType, this.comboxCustservice, this.comboxInfoClientContact, + this.comboxcdnType, + + this.comboxCustservice, this.comboxInfoClientContact, this.comboxCUSTOMERNAME2, { - flex: 1, + flex: 3, xtype: 'hiddenfield' } ] @@ -2072,7 +2077,7 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, { this.tabtree = new Ext.tree.Panel({ region: 'west', - title: '报关业务操作', + title: '报检业务操作', split: true, width: 180, collapsible: true, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Inspection_Index.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Inspection_Index.js index f4f5b385..2a60c7c0 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Inspection_Index.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/Inspection_Index.js @@ -1541,31 +1541,8 @@ Ext.extend(Shipping.InspectionIndex, Ext.Panel, { scope: this } + , '-', { - text: "EDI报文", - menu: [{ - text: "导出易航线", - handler: function (menu, event) { - _this.onCreateELineEDIClick(menu, event); - } - },'-', { - text: "导入博世报文", - handler: function (menu, event) { - _this.ImortBsXml(menu, event); - } - }, { - text: "导出博世报文", - handler: function (menu, event) { - _this.onCreateBsXml(menu, event); - } - }, { - text: "上传博世报文", - handler: function (menu, event) { - _this.onUpdateBsXml(menu, event); - } - }], - scope: this - }, '-', { text: '导出EXCEL', //"EXCEL模板导出", iconCls: "btnexportexcel", handler: function (button, event) { @@ -1578,11 +1555,7 @@ Ext.extend(Shipping.InspectionIndex, Ext.Panel, { , { text: "其他操作", menu: [ - { text: "批量状态更新", - handler: function (menu, event) { - _this.onUpOpStatusClick(menu, event, 1); - } - }, { + { text: "业务批量修改", //"业务批量修改", handler: function (menu, event) { _this.winModifyShow.show(); @@ -1604,33 +1577,10 @@ Ext.extend(Shipping.InspectionIndex, Ext.Panel, { handler: function (menu, event) { _this.onPiLiangServiceFeeClick(menu, event); } - }, { text: "刷新舱单状态", - handler: function (menu, event) { - _this.onCustomRefreshStatusClick(menu, event); - } - }, { text: "烟台码头状态", - handler: function (menu, event) { - _this.onYanTaiYardStatusClick(menu, event); - } - }, { text: "QQCT|QQCTU海关放行", - handler: function (menu, event) { - _this.onQQCTQQCTUBILLClick(menu, event); - } }], scope: this } - , '-', { - text: "批量读取单一窗口信息", - id: "btnGetSingle", - hidden: true, - handler: function (button, event) { - _this.GetDecHead_Port_Time(); - }, - scope: this - }, this.comboxcdnType - ,this.comboxisSecondApply - , this.comboxIES - , this.comboxisdownload + ] }); @@ -2196,31 +2146,6 @@ Ext.extend(Shipping.InspectionIndex, Ext.Panel, { //#endregion - Ext.Ajax.request({ - waitMsg: '', - url: '/MvcShipping/MsBaseInfo/GetUserModuleEnable', - params: { - modulename: "modGetSingle" - }, - callback: function (options, success, response) { - if (success) { - var result = Ext.JSON.decode(response.responseText); - if (result.Success != true) { - - } else { - - var btnEdit = Ext.getCmp('btnGetSingle'); - btnEdit.setVisible(true); - } - } else { - - } - }, - scope: this - }); - - - }, //end initUIComponents InitGrid: function () { @@ -3455,7 +3380,7 @@ Ext.extend(Shipping.InspectionIndex, Ext.Panel, { var jsonresult = Ext.JSON.decode(response.responseText); if (jsonresult.Success) { var returnstr = jsonresult.data; - var printType = 'MSOPAPPLYLIST'; + var printType = 'INSPECTIONLIST'; var sql1 = returnstr; var sql2 = "select * from op_apply where BSNO='" + bsno + "'"; var sql3 = ""; @@ -3519,7 +3444,7 @@ Ext.extend(Shipping.InspectionIndex, Ext.Panel, { bsno = record.data.BSNO; } - var printType = 'MSOPAPPLYLISTSELECT'; + var printType = 'INSPECTIONSELECT'; var sql1 = "select *,(SELECT TOP 1 STATUS FROM OP_STATUS WHERE BSNO=op_apply.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS from op_apply WHERE BSNO IN (" + feeGidSql + ") order by " + sortstr; var sql2 = "select *,(SELECT TOP 1 STATUS FROM OP_STATUS WHERE BSNO=op_apply.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS from op_apply where BSNO='" + bsno + "'"; var sql3 = ""; From 2eda09391e981d02a1c193176dc03ed25ca28a78 Mon Sep 17 00:00:00 2001 From: ddlucky Date: Wed, 15 Feb 2023 10:02:35 +0800 Subject: [PATCH 2/2] 1 --- DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/ApplyAmendFee.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/ApplyAmendFee.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/ApplyAmendFee.js index 1ace7937..010f2eb4 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/ApplyAmendFee.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/ApplyAmendFee.js @@ -38,6 +38,11 @@ Ext.extend(Shipping.ApplyAmendFee, Ext.Panel, { //按钮Toolbar var mainform = Ext.getCmp('OpApplyEdit'); + if (!mainform) { + Ext.getCmp('InspectionEdit'); + } + + EditRecord = mainform.editRecord; this.bsno = EditRecord.get('BSNO'); this.formHead = Ext.widget('form', {