From f7c6993af281fb09c70e17fe8e652f9e5265c4a4 Mon Sep 17 00:00:00 2001 From: ddlucky Date: Mon, 19 Jun 2023 10:06:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=B8=80=E7=AA=97=E5=8F=A3=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=98=8E=E7=BB=86=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E2=80=9C=E7=9B=91=E7=AE=A1=E8=A6=81=E6=B1=82=E2=80=9D=E7=9A=84?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=92=8C=E6=98=BE=E7=A4=BA=EF=BC=9B=E7=AD=BE?= =?UTF-8?q?=E5=8D=95=E6=9D=A1=E4=B8=9A=E5=8A=A1=E6=98=8E=E7=BB=86=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=89=E6=8B=A9=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DSWeb.DJYMQ/DS7Service.cs | 4 +- .../MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs | 5 +- .../MvcShipping/Models/MsOpApply/MsOpApply.cs | 2 + .../Viewsjs/BillCheckOut/BillCheckOutEdit.js | 4 + .../Viewsjs/MsOpApply/MsOpApplyIndex.js | 5 + .../Viewsjs/MsOpApply/MsOpApplyModel.js | 5 +- DSWeb/Areas/SoftMng/DAL/DecList.cs | 30 +- DSWeb/Areas/SoftMng/Model/DecHead.cs | 4 +- ...2c-df2d-423b-98d7-163919c03352 - 副本.js | 2490 +++++++++++++++++ ...xb_24d7a12c-df2d-423b-98d7-163919c03352.js | 2 +- 10 files changed, 2535 insertions(+), 16 deletions(-) create mode 100644 DSWeb/Areas/SoftMng/Viewsjs/Export/index_source_by_zxb_24d7a12c-df2d-423b-98d7-163919c03352 - 副本.js diff --git a/DSWeb.DJYMQ/DS7Service.cs b/DSWeb.DJYMQ/DS7Service.cs index e5888742..74f1d5d4 100644 --- a/DSWeb.DJYMQ/DS7Service.cs +++ b/DSWeb.DJYMQ/DS7Service.cs @@ -2412,7 +2412,7 @@ SELECT @ps_BillNo as N'billno'"; 开船日期 = SetDayMinute(etd), ETD = SetDayMinute(YgtETD), ETA = SetDayZero(eta), - 预抵日期 = SetDayZero(atd), + 预抵日期 = SetDayMinute(atd), 截港日期 = SetDayZero(closingdate), 装港代码 = portloadid, @@ -2965,7 +2965,7 @@ SELECT @ps_BillNo as N'billno'"; 航次 = item.voynoinner, 开船日期 = SetDayMinute(item.etd), 截港日期 = SetDayZero(item.closingdate), - 预抵日期 = SetDayZero(item.eta), + 预抵日期 = SetDayMinute(item.eta), 装港代码 = item.portloadid, 装货港 = item.portload, diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs index 15f4d9f9..89157fd4 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs @@ -84,6 +84,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL strSql.Append(",(select top 1 AgentStatus from decHead where decHead.BSNO=OP_APPLY.BSNO) AgentStatus"); strSql.Append(",InspectionNotice"); + strSql.Append(",STUFF(( SELECT ',' + cusSupvDmd FROM declist t WHERE t.pid in (select gid from dechead where bsno=op_apply.bsno) group by cusSupvDmd FOR xml path('')),1, 1, '') AS cusSupvDmd"); strSql.Append(" from OP_APPLY "); strSql.Append(" LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=OP_APPLY.BSNO) "); @@ -285,6 +286,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL strSql.Append(",(select top 1 AgentStatus from decHead where decHead.BSNO=OP_APPLY.BSNO) AgentStatus"); strSql.Append(",InspectionNotice"); + strSql.Append(",STUFF(( SELECT ',' + cusSupvDmd FROM declist t WHERE t.pid in (select gid from dechead where bsno=op_apply.bsno) group by cusSupvDmd FOR xml path('')),1, 1, '') AS cusSupvDmd"); strSql.Append(" from OP_APPLY "); @@ -502,7 +504,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL data.OPERATORCODE = Convert.ToString(reader["OPERATORCODE"]);// data.AgentStatus = Convert.ToString(reader["AgentStatus"]);// data.InspectionNotice = Convert.ToString(reader["InspectionNotice"]);// - + data.cusSupvDmd = Convert.ToString(reader["cusSupvDmd"]);// + #endregion headList.Add(data); } diff --git a/DSWeb/Areas/MvcShipping/Models/MsOpApply/MsOpApply.cs b/DSWeb/Areas/MvcShipping/Models/MsOpApply/MsOpApply.cs index 8868dec4..2d8c9673 100644 --- a/DSWeb/Areas/MvcShipping/Models/MsOpApply/MsOpApply.cs +++ b/DSWeb/Areas/MvcShipping/Models/MsOpApply/MsOpApply.cs @@ -1044,6 +1044,8 @@ namespace DSWeb.MvcShipping.Models.MsOpApply get { return _InspectionNotice; } set { _InspectionNotice = value; } } + + public string cusSupvDmd { get; set; } #endregion diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/BillCheckOut/BillCheckOutEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/BillCheckOut/BillCheckOutEdit.js index 4b60553c..a88f9b03 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/BillCheckOut/BillCheckOutEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/BillCheckOut/BillCheckOutEdit.js @@ -520,6 +520,10 @@ Ext.extend(Shipping.BillCheckOutEdit, Ext.Panel, { plugins: [ //this.cellEditingBody ], + viewConfig: { + enableTextSelection: true//, //允许复制数据 + + }, selModel: this.GridBodyCheckBoxModel, selType: 'cellmodel', tbar: [ diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js index 0f510f02..5db325d4 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js @@ -1038,6 +1038,11 @@ Ext.extend(Shipping.MsOpApplyIndex, Ext.Panel, { dataIndex: 'InspectionNotice', header: '查验通知状态', width: 120 + }, { + sortable: true, + dataIndex: 'cusSupvDmd', + header: '监管要求', + width: 80 } ]; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyModel.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyModel.js index 2104192a..3daf4d25 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyModel.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyModel.js @@ -132,7 +132,10 @@ { name: 'ETPS_CATEGORY', type: 'string' },//报关企业类别 用于保存 ACD { name: 'CDNTYPE', type: 'decimal' },//报关单类型 0-4共5种 { name: 'AgentStatus', type: 'string' }, - { name: 'InspectionNotice', type: 'string' } //查验通知 + { name: 'InspectionNotice', type: 'string' },//查验通知 + { name: 'cusSupvDmd', type: 'string' } //关联 单一窗口明细declist.cusSupvDmd + + ] }); diff --git a/DSWeb/Areas/SoftMng/DAL/DecList.cs b/DSWeb/Areas/SoftMng/DAL/DecList.cs index cf919767..5bcb982a 100644 --- a/DSWeb/Areas/SoftMng/DAL/DecList.cs +++ b/DSWeb/Areas/SoftMng/DAL/DecList.cs @@ -30,9 +30,9 @@ namespace DSWeb.SoftMng.DAL { StringBuilder strSql=new StringBuilder(); strSql.Append("insert into DecList("); - strSql.Append("GID,GNo,ContrItem,CodeTS,CiqCode,CiqCode_Text,GName,GModel,GQty,GUnit,GUnit_Text,DeclPrice,DeclTotal,TradeCurr,TradeCurr_Text,FirstQty,FirstUnit,FirstUnit_Text,ExgVersion,ExgNo,DestinationCountry,DestinationCountry_Text,SecondQty,SecondUnit,SecondUnit_Text,OriginCountry,OriginCountry_Text,DistrictCode,DistrictCode_Text,DestCode,DestCode_Text,DutyMode,DutyMode_Text,GoodsAttr,GoodsAttr_Text,Purpose,Purpose_Text,NoDangFlag,Uncode,DangName,DangPackType,DangPackSpec,DangPackSpec_Text,Stuff,ProdValidDt,ProdQgp,EngManEntCnm,GoodsSpec,GoodsModel,GoodsBrand,ProduceDate,ProdBatchNo,MnufctrRegNo,PID"); + strSql.Append("GID,GNo,ContrItem,CodeTS,CiqCode,CiqCode_Text,GName,GModel,GQty,GUnit,GUnit_Text,DeclPrice,DeclTotal,TradeCurr,TradeCurr_Text,FirstQty,FirstUnit,FirstUnit_Text,ExgVersion,ExgNo,DestinationCountry,DestinationCountry_Text,SecondQty,SecondUnit,SecondUnit_Text,OriginCountry,OriginCountry_Text,DistrictCode,DistrictCode_Text,DestCode,DestCode_Text,DutyMode,DutyMode_Text,GoodsAttr,GoodsAttr_Text,Purpose,Purpose_Text,NoDangFlag,Uncode,DangName,DangPackType,DangPackSpec,DangPackSpec_Text,Stuff,ProdValidDt,ProdQgp,EngManEntCnm,GoodsSpec,GoodsModel,GoodsBrand,ProduceDate,ProdBatchNo,MnufctrRegNo,cusSupvDmd,PID"); strSql.Append(") values ("); - strSql.Append("@GID,@GNo,@ContrItem,@CodeTS,@CiqCode,@CiqCode_Text,@GName,@GModel,@GQty,@GUnit,@GUnit_Text,@DeclPrice,@DeclTotal,@TradeCurr,@TradeCurr_Text,@FirstQty,@FirstUnit,@FirstUnit_Text,@ExgVersion,@ExgNo,@DestinationCountry,@DestinationCountry_Text,@SecondQty,@SecondUnit,@SecondUnit_Text,@OriginCountry,@OriginCountry_Text,@DistrictCode,@DistrictCode_Text,@DestCode,@DestCode_Text,@DutyMode,@DutyMode_Text,@GoodsAttr,@GoodsAttr_Text,@Purpose,@Purpose_Text,@NoDangFlag,@Uncode,@DangName,@DangPackType,@DangPackSpec,@DangPackSpec_Text,@Stuff,@ProdValidDt,@ProdQgp,@EngManEntCnm,@GoodsSpec,@GoodsModel,@GoodsBrand,@ProduceDate,@ProdBatchNo,@MnufctrRegNo,@PID"); + strSql.Append("@GID,@GNo,@ContrItem,@CodeTS,@CiqCode,@CiqCode_Text,@GName,@GModel,@GQty,@GUnit,@GUnit_Text,@DeclPrice,@DeclTotal,@TradeCurr,@TradeCurr_Text,@FirstQty,@FirstUnit,@FirstUnit_Text,@ExgVersion,@ExgNo,@DestinationCountry,@DestinationCountry_Text,@SecondQty,@SecondUnit,@SecondUnit_Text,@OriginCountry,@OriginCountry_Text,@DistrictCode,@DistrictCode_Text,@DestCode,@DestCode_Text,@DutyMode,@DutyMode_Text,@GoodsAttr,@GoodsAttr_Text,@Purpose,@Purpose_Text,@NoDangFlag,@Uncode,@DangName,@DangPackType,@DangPackSpec,@DangPackSpec_Text,@Stuff,@ProdValidDt,@ProdQgp,@EngManEntCnm,@GoodsSpec,@GoodsModel,@GoodsBrand,@ProduceDate,@ProdBatchNo,@MnufctrRegNo,@cusSupvDmd,@PID"); strSql.Append(") "); SqlParameter[] parameters = { @@ -88,7 +88,9 @@ namespace DSWeb.SoftMng.DAL new SqlParameter("@GoodsBrand", SqlDbType.NVarChar,50) , new SqlParameter("@ProduceDate", SqlDbType.NVarChar,100) , new SqlParameter("@ProdBatchNo", SqlDbType.NVarChar,50) , - new SqlParameter("@MnufctrRegNo", SqlDbType.VarChar,50) , + new SqlParameter("@MnufctrRegNo", SqlDbType.VarChar,50) , + new SqlParameter("@cusSupvDmd", SqlDbType.VarChar,50) , + new SqlParameter("@PID", SqlDbType.VarChar,50) }; @@ -145,8 +147,11 @@ namespace DSWeb.SoftMng.DAL parameters[49].Value = model.GoodsBrand??(Object)DBNull.Value; parameters[50].Value = model.ProduceDate??(Object)DBNull.Value; parameters[51].Value = model.ProdBatchNo??(Object)DBNull.Value; - parameters[52].Value = model.MnufctrRegNo??(Object)DBNull.Value; - parameters[53].Value = model.PID??(Object)DBNull.Value; + parameters[52].Value = model.MnufctrRegNo??(Object)DBNull.Value; + parameters[53].Value = model.cusSupvDmd ?? (Object)DBNull.Value; + + + parameters[54].Value = model.PID??(Object)DBNull.Value; return DbHelperSQL.ExecuteSql(strSql.ToString(),parameters); } /// @@ -209,8 +214,9 @@ namespace DSWeb.SoftMng.DAL strSql.Append(" GoodsBrand = @GoodsBrand,"); strSql.Append(" ProduceDate = @ProduceDate,"); strSql.Append(" ProdBatchNo = @ProdBatchNo,"); - strSql.Append(" MnufctrRegNo = @MnufctrRegNo,"); - strSql.Append(" PID = @PID"); + strSql.Append(" MnufctrRegNo = @MnufctrRegNo,"); + strSql.Append(" cusSupvDmd = @cusSupvDmd,"); + strSql.Append(" PID = @PID"); strSql.Append(" where GID=@GID "); SqlParameter[] parameters = { new SqlParameter("@GID", SqlDbType.VarChar,50) , @@ -266,6 +272,8 @@ namespace DSWeb.SoftMng.DAL new SqlParameter("@ProduceDate", SqlDbType.NVarChar,50) , new SqlParameter("@ProdBatchNo", SqlDbType.NVarChar,50) , new SqlParameter("@MnufctrRegNo", SqlDbType.VarChar,50) , + new SqlParameter("@cusSupvDmd", SqlDbType.VarChar,50) , + new SqlParameter("@PID", SqlDbType.VarChar,50) }; @@ -321,8 +329,10 @@ namespace DSWeb.SoftMng.DAL parameters[49].Value = model.GoodsBrand??(Object)DBNull.Value; parameters[50].Value = model.ProduceDate??(Object)DBNull.Value; parameters[51].Value = model.ProdBatchNo??(Object)DBNull.Value; - parameters[52].Value = model.MnufctrRegNo??(Object)DBNull.Value; - parameters[53].Value = model.PID??(Object)DBNull.Value; + parameters[52].Value = model.MnufctrRegNo??(Object)DBNull.Value; + parameters[53].Value = model.cusSupvDmd ?? (Object)DBNull.Value; + + parameters[54].Value = model.PID??(Object)DBNull.Value; return DbHelperSQL.ExecuteSql(strSql.ToString(),parameters); } /// @@ -358,7 +368,7 @@ namespace DSWeb.SoftMng.DAL public DataSet GetModel(string GID) { StringBuilder strSql=new StringBuilder(); - strSql.Append("select GID, GNo, ContrItem, CodeTS, CiqCode, CiqCode_Text, GName, GModel, GQty, GUnit, GUnit_Text, DeclPrice, DeclTotal, TradeCurr, TradeCurr_Text, FirstQty, FirstUnit, FirstUnit_Text, ExgVersion, ExgNo, DestinationCountry, DestinationCountry_Text, SecondQty, SecondUnit, SecondUnit_Text, OriginCountry, OriginCountry_Text, DistrictCode, DistrictCode_Text, DestCode, DestCode_Text, DutyMode, DutyMode_Text, GoodsAttr, GoodsAttr_Text, Purpose, Purpose_Text, NoDangFlag, Uncode, DangName, DangPackType, DangPackSpec, DangPackSpec_Text, Stuff, ProdValidDt, ProdQgp, EngManEntCnm, GoodsSpec, GoodsModel, GoodsBrand, ProduceDate, ProdBatchNo, MnufctrRegNo, PID "); + strSql.Append("select GID, GNo, ContrItem, CodeTS, CiqCode, CiqCode_Text, GName, GModel, GQty, GUnit, GUnit_Text, DeclPrice, DeclTotal, TradeCurr, TradeCurr_Text, FirstQty, FirstUnit, FirstUnit_Text, ExgVersion, ExgNo, DestinationCountry, DestinationCountry_Text, SecondQty, SecondUnit, SecondUnit_Text, OriginCountry, OriginCountry_Text, DistrictCode, DistrictCode_Text, DestCode, DestCode_Text, DutyMode, DutyMode_Text, GoodsAttr, GoodsAttr_Text, Purpose, Purpose_Text, NoDangFlag, Uncode, DangName, DangPackType, DangPackSpec, DangPackSpec_Text, Stuff, ProdValidDt, ProdQgp, EngManEntCnm, GoodsSpec, GoodsModel, GoodsBrand, ProduceDate, ProdBatchNo, MnufctrRegNo,cusSupvDmd, PID "); strSql.Append(" from DecList "); strSql.Append(" where GID=@GID "); SqlParameter[] parameters = { diff --git a/DSWeb/Areas/SoftMng/Model/DecHead.cs b/DSWeb/Areas/SoftMng/Model/DecHead.cs index 56722090..e59dcf3b 100644 --- a/DSWeb/Areas/SoftMng/Model/DecHead.cs +++ b/DSWeb/Areas/SoftMng/Model/DecHead.cs @@ -2549,7 +2549,7 @@ namespace DSWeb.SoftMng.Model{ public string packTypeName { get; set; } public string packSpec { get; set; } - + public string cusSupvDmd { get; set; } public DecList getDecListValue(DecList DecList) { @@ -2618,6 +2618,8 @@ namespace DSWeb.SoftMng.Model{ DecList.DangPackSpec = packSpec; DecList.DangPackSpec_Text = packSpec; + DecList.cusSupvDmd = cusSupvDmd; + return DecList; } } diff --git a/DSWeb/Areas/SoftMng/Viewsjs/Export/index_source_by_zxb_24d7a12c-df2d-423b-98d7-163919c03352 - 副本.js b/DSWeb/Areas/SoftMng/Viewsjs/Export/index_source_by_zxb_24d7a12c-df2d-423b-98d7-163919c03352 - 副本.js new file mode 100644 index 00000000..3af78f87 --- /dev/null +++ b/DSWeb/Areas/SoftMng/Viewsjs/Export/index_source_by_zxb_24d7a12c-df2d-423b-98d7-163919c03352 - 副本.js @@ -0,0 +1,2490 @@ +/*构造器定义*/ +//label +var pTag = function (label, classex) +{ + return ''.concat('
' + label + '
'); +}; +//input +var iTag = function (name, classex, attr) +{ + return ''.concat(''); +}; +//传统 select +var xTag = function (name, arr, attr, classex) +{ + var str = ''); +}; +//select2 +var sTag = function (name, attr,classex) +{ + return ''.concat(''); +}; +//checkbox +var cTag = function (label, name, value, attr) +{ + return ''.concat(''); +}; +var rTag = function (label, name, value, attr) +{ + return ''.concat(''); +}; +//传统 select 下拉项 +var YesNoOption = [{ '': '请选择...' }, { '0': '否' }, { '1': '是' }, { '9': '空' }]; +var EnabledOption = [{ '': '请选择...' }, { '0': '否' }, { '1': '是' }]; +var DancerTypeOption = [{ '': '请选择...' }, { '1': '一类' }, { '2': '二类' }, { '3': '三类' }]; +var GbrandOption = [{ '': '请选择...' }, { '0': '无品牌' }, { '1': '境内自主品牌' }, { '2': '境内收购品牌' }, { '3': '境外品牌(贴牌生产)' }, { '4': '境外品牌(其它)' }]; +var ExportOption = [{ '': '请选择...' }, { '0': '出口货物在最终目的国(地区)不享受优惠关税' }, { '1': '出口货物在最终目的国(地区)享受优惠关税' }, { '2': '不能确定在最终目的国(地区)享受优惠关税' }, { '3': '不适用于进口报关单' }]; +//产品资质列表 +var _decGoodsLimit = []; +//许可证VIN信息 +var _decGoodsLimitVin = []; +//申报要素 +var _decRequestCert = []; +//其他包装 +var _decOtherPack = []; +//企业资质类别 +var _decCopLimit = []; +//设置默认值 +$("#TrafMode").append("