dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

单一窗口商品明细，增加对“监管要求”的记录和显示；签单条业务明细表增加选择复制

Browse Source
DS7_JinGang
ddlucky 1 year ago
parent 5120927697
commit f7c6993af2
10 changed files with 2535 additions and 16 deletions
Show Stats Download Patch File Download Diff File

4
DSWeb.DJYMQ/DS7Service.cs
Unescape Escape View File

@ -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,

5
DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs
Unescape Escape View File

@ -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);
}

2
DSWeb/Areas/MvcShipping/Models/MsOpApply/MsOpApply.cs
Unescape Escape View File

@ -1044,6 +1044,8 @@ namespace DSWeb.MvcShipping.Models.MsOpApply
get { return _InspectionNotice; }
set { _InspectionNotice = value; }
}
public string cusSupvDmd { get; set; }
#endregion

4
DSWeb/Areas/MvcShipping/Viewsjs/BillCheckOut/BillCheckOutEdit.js
Unescape Escape View File

@ -520,6 +520,10 @@ Ext.extend(Shipping.BillCheckOutEdit, Ext.Panel, {
plugins: [
//this.cellEditingBody
],
viewConfig: {
enableTextSelection: true//, //允许复制数据
},
selModel: this.GridBodyCheckBoxModel,
selType: 'cellmodel',
tbar: [

5
DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js
Unescape Escape View File

@ -1038,6 +1038,11 @@ Ext.extend(Shipping.MsOpApplyIndex, Ext.Panel, {
dataIndex: 'InspectionNotice',
header: '查验通知状态',
width: 120
}, {
sortable: true,
dataIndex: 'cusSupvDmd',
header: '监管要求',
width: 80
}
];

5
DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyModel.js
Unescape Escape View File

@ -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
]
});

30
DSWeb/Areas/SoftMng/DAL/DecList.cs
Unescape Escape View File

@ -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);
}
/// <summary>
@ -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);
}
/// <summary>
@ -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 = {

4
DSWeb/Areas/SoftMng/Model/DecHead.cs
Unescape Escape View File

@ -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;
}
}

2490
DSWeb/Areas/SoftMng/Viewsjs/Export/index_source_by_zxb_24d7a12c-df2d-423b-98d7-163919c03352 - 副本.js
View File

File diff suppressed because it is too large Load Diff

2
DSWeb/Areas/SoftMng/Viewsjs/Export/index_source_by_zxb_24d7a12c-df2d-423b-98d7-163919c03352.js
Unescape Escape View File

@ -175,7 +175,7 @@ $('#table_1').bootstrapTable({
field: 'DutyMode_Text',
title: '征免方式'
}, {
field: '',
field: 'cusSupvDmd',
title: '监管要求'
}]
});

Write Preview
Loading…
Cancel
Save