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

Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev

Browse Source
DS7_JinGang
hanxuntao 2 years ago
parent 79461ea289 ccedf9d70f
commit dbb912234a
5 changed files with 591 additions and 175 deletions
Show Stats Download Patch File Download Diff File

61
DSWeb.Common/DB/DS6Comm.cs
Unescape Escape View File

@ -310,6 +310,9 @@ namespace DSWeb.Common.DB
public string 成交方式 { get; set; }
public decimal? 净重 { get; set; }
public string 单价 { get; set; }
/// <summary>
/// 第一层包装皮重
/// </summary>
public string 总价 { get; set; }
public string 商品名称 { get; set; }
public string 数量单位 { get; set; }
@ -621,6 +624,8 @@ namespace DSWeb.Common.DB
public string 运输方式 { get; set; }
public bool? 是否自有箱 { get; set; }
public string 运费协议号 { get; set; }
public long DJYCHILDRENID { get; set; }
}
[Table("t_op_state")]
@ -680,6 +685,8 @@ namespace DSWeb.Common.DB
public DateTime? 装船时间 { get; set; }
public decimal? 皮重 { get; set; }
public int? 堆存天数 { get; set; }
public long? DJYCTNID { get; set; }
}
[Table("t_op_ams")]
@ -815,6 +822,58 @@ namespace DSWeb.Common.DB
public string 货物描述 { get; set; }
}
[Table("t_ch_fee")]
public partial class t_ch_fee_md {
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public string CH_ID { get; set; }
public string 类型 { get; set; }
public string 费用状态 { get; set; }
public string 费用原因 { get; set; }
public string 编号 { get; set; }
public string 费用名称 { get; set; }
public string 结算单位 { get; set; }
public string 客户名称 { get; set; }
public string 标准 { get; set; }
public decimal? 单价 { get; set; }
public decimal? 数量 { get; set; }
public decimal? 金额 { get; set; }
public string 币别 { get; set; }
public decimal? 汇率 { get; set; }
public string 备注 { get; set; }
public decimal? 结算金额 { get; set; }
public decimal? 开票金额 { get; set; }
public decimal? 申请金额 { get; set; }
public DateTime? 提交日期 { get; set; }
public string 审核人 { get; set; }
public DateTime? 审核日期 { get; set; }
public string 录入人 { get; set; }
public DateTime? 录入日期 { get; set; }
public string 对帐编号 { get; set; }
public bool? 是否对帐 { get; set; }
public int? 旧id { get; set; }
public string 旧状态 { get; set; }
public int? 顺序 { get; set; }
public decimal? 冲抵金额 { get; set; }
public bool? 机密 { get; set; }
public bool? 是否复核 { get; set; }
public bool? 系统费用 { get; set; }
public int? 运价编号 { get; set; }
public string 所属部门 { get; set; }
public DateTime? 应结日期 { get; set; }
public bool? 是否打印 { get; set; }
public bool? 不开发票 { get; set; }
public decimal? 税率 { get; set; }
public decimal? 税额 { get; set; }
public decimal? 不含税金额 { get; set; }
public string 方案编号 { get; set; }
public string 方案名称 { get; set; }
public string 方案费用名称 { get; set; }
public string 拆分费用名称 { get; set; }
public decimal? 拆分金额 { get; set; }
public string 拆分币别 { get; set; }
public decimal? 拆分汇率 { get; set; }
}
}

3
DSWeb.Common/DB/DS6DataContext.cs
Unescape Escape View File

@ -33,7 +33,10 @@ namespace DSWeb.Common.DB
public DbSet<t_sys_code_emp_md> t_sys_code_emp { get; set; }
public DbSet<t_code_goods_md> t_code_goods { get; set; }
public DbSet<t_ch_fee_md> t_ch_fee { get; set; }
}
}

3
DSWeb.DJYMQ/App.config
Unescape Escape View File

@ -22,7 +22,7 @@
<add key="ReceiveMQUri" value="amqp://djy_booking_new:123qwe@47.104.207.5:12567/djy_booking_new" />
-->
<add key="ReceiveMQUri" value="amqp://djy_booking_new:123qwe@60.209.125.238:12567/djy_booking_new" />
</appSettings>
<connectionStrings>
<!--本地开发
@ -31,6 +31,7 @@
-->
<!--实际地址-->
<add name="DS6DB" connectionString="Data Source=60.209.125.238,52314;Initial Catalog=HECHUAN;Persist Security Info=True;User ID=sa;Password=Ds20040201" providerName="System.Data.SqlClient" />
</connectionStrings>
<startup>

651
DSWeb.DJYMQ/DS7Service.cs
View File

File diff suppressed because one or more lines are too long

48
DSWeb/Areas/CommMng/DAL/PDFHelper.cs
Unescape Escape View File

@ -14,6 +14,7 @@ using DSWeb.MvcShipping.DAL.MsOpSeaeDAL;
using NPOI.OpenXmlFormats;
using DSWeb.MvcShipping.Models.MsOpSeae;
using NPOI.SS.Formula.Functions;
using System.Drawing;
namespace DSWeb.Areas.CommMng.DAL
{
@ -31,7 +32,7 @@ namespace DSWeb.Areas.CommMng.DAL
public DBResult MakePdf_BillCheckOut(BillCheckOut_md head,string path)
{
var result = new DBResult();
var errorindex = 0.0;
try
{
@ -110,12 +111,12 @@ namespace DSWeb.Areas.CommMng.DAL
//内容文字字体 黑色11
iTextSharp.text.Font infos = new iTextSharp.text.Font(bfComic, 11, 0, iTextSharp.text.BaseColor.BLACK);
//抬头地址字体 黑色11 下划线
iTextSharp.text.Font address = new iTextSharp.text.Font(bfComic, 14, Font.UNDERLINE, iTextSharp.text.BaseColor.BLACK);
iTextSharp.text.Font address = new iTextSharp.text.Font(bfComic, 14, iTextSharp.text.Font.UNDERLINE, iTextSharp.text.BaseColor.BLACK);
//红色内容 红色11
iTextSharp.text.Font redinfos = new iTextSharp.text.Font(bfComic, 12, 0, iTextSharp.text.BaseColor.RED);
#region 条码号
BarCodeDrawing _Code39 = new BarCodeDrawing();
@ -126,15 +127,27 @@ namespace DSWeb.Areas.CommMng.DAL
var 条码号 = head.CHECKOUTNO;
System.Drawing.Image _codeImage = _Code39.GetCodeImage(条码号, BarCodeDrawing.BarCodeDrawingModel.BarCodeDrawingNormal, true);
errorindex = 1;
System.IO.MemoryStream _Stream = new System.IO.MemoryStream();
errorindex = 1.1;
ImageConverter imgconv = new ImageConverter();
_codeImage.Save(_Stream, System.Drawing.Imaging.ImageFormat.Jpeg);
string markPath = System.Environment.CurrentDirectory + $"\\temp{条码号}.jpg";
_codeImage.Save(markPath);
iTextSharp.text.Image im = iTextSharp.text.Image.GetInstance(markPath);
byte[] bytes = (byte[])imgconv.ConvertTo(_codeImage, typeof(byte[]));
Stream stream = new MemoryStream(bytes);
errorindex = 1.2;
//string markPath = System.Environment.CurrentDirectory + $"\\temp{条码号}.jpg";
//_codeImage.Save(markPath);
//_codeImage.Dispose();
iTextSharp.text.Image im = iTextSharp.text.Image.GetInstance(stream);
errorindex = 1.3;
im.SetAbsolutePosition(width - 280, height - 60 - 80);
errorindex = 1.4;
im.ScaleAbsolute(260, 40);
errorindex = 1.5;
//document.Add(im);
#endregion
@ -168,7 +181,7 @@ namespace DSWeb.Areas.CommMng.DAL
地址.Leading = 22;
document.Add(地址);
errorindex = 2;
#endregion
@ -221,6 +234,8 @@ namespace DSWeb.Areas.CommMng.DAL
billlist.Add(rec);
}
errorindex = 3;
foreach (var item in body)
{
var MBLNO = new iTextSharp.text.Paragraph(item.MBLNO, infos);
@ -263,6 +278,8 @@ namespace DSWeb.Areas.CommMng.DAL
//document.Add(newinfo);
}
errorindex = 4;
document.Add(table);
//感谢
@ -287,7 +304,7 @@ namespace DSWeb.Areas.CommMng.DAL
document.Close();
File.Delete(markPath);
//File.Delete(markPath);
head.MAILPDFURL = SaveUrlName;
@ -295,10 +312,19 @@ namespace DSWeb.Areas.CommMng.DAL
cdc.SaveChanges();
errorindex = 5;
result.OK(filename);
}
catch (Exception ex) {
result.SetErrorInfo(ex.Message);
var innermsg = "";
if (ex.InnerException != null) {
if (ex.InnerException.Message != null) {
innermsg = ex.InnerException.Message;
}
}
result.SetErrorInfo($"PDFHelper{errorindex}:"+ex.Message+$"[{innermsg}]");
}
return result;

Write Preview
Loading…
Cancel
Save