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

20240314

Browse Source
ShenZhenCHJY
ddlucky 8 months ago
parent 1304b69474
commit 190c1b18a4
24 changed files with 24513 additions and 116 deletions
Show Stats Download Patch File Download Diff File

43
DSWeb.Common/DB/Comm.cs
Unescape Escape View File

@ -2030,6 +2030,36 @@ namespace DSWeb.Common.DB
#endregion
}
[Table("code_goods")]
public partial class code_goods_md
{
[Key]
public string GID { get; set; }
public string GOODCODE { get; set; }
public string GOODNAME { get; set; }
public string DESCRIP { get; set; }
public decimal? ARRATE { get; set; }
public decimal? APRATE { get; set; }
public decimal? AROUTRATE { get; set; }
public decimal? APOUTRATE { get; set; }
public bool? ISSTOP { get; set; }
public string GoodsTypeGID { get; set; }
public string GOODNO { get; set; }
public string CREATEUSER { get; set; }
public DateTime? CREATETIME { get; set; }
public string CORPID { get; set; }
public string GOODSFEETYPE { get; set; }
public string RULEUNIT { get; set; }
public string RULEUNIT2 { get; set; }
public string RULEUNIT1 { get; set; }
public string ENAME { get; set; }
public string HSCODE { get; set; }
#region 外键 => 导航属性，ManyToMany
#endregion
}
/// <summary>
///2E5E6066-1C5D-4B04-BF8C-56637C20FC8C 是否允许使用本系统
///31AC11C1-D005-46EC-A0EE-05BC211AE1B7 是否操作
@ -3436,4 +3466,17 @@ namespace DSWeb.Common.DB
public string MNGBLSTATUS { get; set; }
public string ISCHAOQI { get; set; }
}
[Table("code_cust_edi")]
public class CodeCustEdi
{
[Key]
public string GID { get; set; }
public string CUST { get; set; }
public string EDICODE { get; set; }
public string EDINAME { get; set; }
public string REMARK { get; set; }
public string CREATEUSER { get; set; }
public DateTime? CREATETIME { get; set; }
}
}

4
DSWeb.Common/DB/CommonDataContext.cs
Unescape Escape View File

@ -51,7 +51,7 @@ namespace DSWeb.Common.DB
public DbSet<ch_fee_invoiceapplication_md> ch_fee_invoiceapplication { get; set; }
public DbSet<code_goods_inv_md> code_goods_inv { get; set; }
public DbSet<code_goods_md> code_goods { get; set; }
public DbSet<ch_fee_do_md> ch_fee_do { get; set; }
public DbSet<company_md> company { get; set; }
@ -119,6 +119,8 @@ namespace DSWeb.Common.DB
public DbSet<op_blissuelist_Detail_md> op_blissuelist_Detail { get; set; }
public DbSet<op_blissuelist_md> op_blissuelist { get; set; }
public DbSet<v_op_blissuelist_Detail_md> v_op_blissuelist_Detail { get; set; }
public DbSet<CodeCustEdi> CodeCustEdi { get; set; }
}

1022
DSWeb.Common/DB/DS6Comm.cs
View File

File diff suppressed because it is too large Load Diff

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

@ -0,0 +1,47 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Data.Entity;
using System.Linq;
using System.Web;
namespace DSWeb.Common.DB
{
public class DS6DataContext : DbContext
{
public DS6DataContext() : base("DS6DB")
{
}
public DS6DataContext(string conn) : base(conn)
{
}
public DbSet<t_crm_client_md> t_crm_client { get; set; }
public DbSet<t_sys_employee_md> t_sys_employee { get; set; }
public DbSet<t_op_seae_md> t_op_seae { get; set; }
public DbSet<t_op_seae_assistant_md> t_op_seae_assistant { get; set; }
public DbSet<t_op_state_md> t_op_state { get; set; }
public DbSet<t_op_ctn_md> t_op_ctn { get; set; }
public DbSet<t_op_ams_md> t_op_ams { get; set; }
public DbSet<t_code_ctn_md> t_code_ctn { get; set; }
public DbSet<t_code_ctn_de_md> t_code_ctn_de { get; set; }
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; }
public DbSet<t_op_letter_md> t_op_letter { get; set; }
public DbSet<t_op_letter_rh_md> t_op_letter_rh { get; set; }
public DbSet<t_op_letter_pc_md> t_op_letter_pc { get; set; }
public DbSet<t_op_letter_pc_ctn_md> t_op_letter_pc_ctn { get; set; }
}
}

2
DSWeb.Common/DSWeb.Common.csproj
Unescape Escape View File

@ -64,6 +64,8 @@
<ItemGroup>
<Compile Include="DB\CommonDataContext.cs" />
<Compile Include="DB\Comm.cs" />
<Compile Include="DB\DS6Comm.cs" />
<Compile Include="DB\DS6DataContext.cs" />
<Compile Include="DB\Op_INTERNALTRADE.cs" />
<Compile Include="DB\MailSend.cs" />
<Compile Include="DB\EDIFTPInfo.cs" />

9
DSWeb/Areas/CommMng/Controllers/BasicDataRefController.cs
Unescape Escape View File

@ -2387,6 +2387,13 @@ namespace DSWeb.Areas.CommMng.Controllers
/// <returns></returns>
public JsonResult SendOpseaeEmailToDjy(string BSNO, string str, string FileGidList = "")//
{
var canlogin = BasicDataRefDAL.CheckLogin(Session);
if (!canlogin.Success)
{
return Json(canlogin.Data);
}
var USERID = Session["USERID"].ToString();
//string str = "\"{\\\"VGM\\\":true}\"";
@ -2404,7 +2411,7 @@ namespace DSWeb.Areas.CommMng.Controllers
//20240312 用formdata方式发送post请求
result = hp.SendFormdataPost();
result = hp.SendFormdataPost(USERID);
if (result.Success) {
result = hp.SendEmail_Opseae(USERID, BSNO, FileGidList);

96
DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
Unescape Escape View File

@ -67,6 +67,8 @@ using DSWeb.MvcShipping.Models.FtpSet;
using com.sun.org.glassfish.gmbal;
using DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL;
using DSWeb.Areas.Account.Models.Chfee_Invoice_HangXin;
using ICSharpCode.SharpZipLib.BZip2;
using System.Configuration;
namespace DSWeb.Areas.CommMng.DAL
{
@ -6700,7 +6702,20 @@ namespace DSWeb.Areas.CommMng.DAL
#endregion
#region 判断appsetting当中该字段值为什么
public static string getConfigAppSetting(string FieldName) {
var FieldValue = ConfigurationManager.AppSettings[FieldName];
if (FieldValue != null && FieldValue.ToString() != "")
{
return FieldValue;
}
else {
return "";
}
}
#endregion
public static JsonResponse IsLogin(HttpSessionStateBase Session)
{
@ -6964,6 +6979,50 @@ namespace DSWeb.Areas.CommMng.DAL
}
/// <summary>
/// 压缩
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public static string Compress(string input)
{
string result = string.Empty;
byte[] buffer = Encoding.UTF8.GetBytes(input);
using (MemoryStream outputStream = new MemoryStream())
{
using (BZip2OutputStream zipStream = new BZip2OutputStream(outputStream))
{
zipStream.Write(buffer, 0, buffer.Length);
zipStream.Close();
}
return Convert.ToBase64String(outputStream.ToArray());
}
}
/// <summary>
/// 解压缩
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public static string Decompress(string input)
{
string result = string.Empty;
byte[] buffer = Convert.FromBase64String(input);
using (Stream inputStream = new MemoryStream(buffer))
{
BZip2InputStream zipStream = new BZip2InputStream(inputStream);
using (StreamReader reader = new StreamReader(zipStream, Encoding.UTF8))
{
//输出
result = reader.ReadToEnd();
}
}
return result;
}
/// <summary>
/// 海运现结买单的结算日期
/// </summary>
@ -7364,6 +7423,9 @@ namespace DSWeb.Areas.CommMng.DAL
{
result.第三方账号 = result.ParamObject["THIRDACCOUNT"].ToString();
}
else {
result.第三方账号 = "";
}
var 大简云服务项目List = BasicDataRefDAL.GetTSysEnumValueListByTypeid("81010").OrderBy(o => o.DispIndex).ToList();
result.服务项目 = "";
@ -7403,7 +7465,7 @@ namespace DSWeb.Areas.CommMng.DAL
private List<Receipt_Doc_md> DocList { get; set; }
private string 第三方账号 { get; set; }
private string 第三方账号 { get; set; } = "";
private string 服务项目 { get; set; }
private string 订舱要求 { get; set; }
@ -7442,7 +7504,7 @@ namespace DSWeb.Areas.CommMng.DAL
{ "KGS", OpseaeHead.KGS },
{ "CBM", OpseaeHead.CBM },
{ "TOTALNO", OpseaeHead.TOTALNO },
//{ "CARRIERID", OpseaeHead.CARRIERID },
{ "CARRIERID", OpseaeHead.CARRIER },
{ "CARRIER", OpseaeHead.CARRIER },
{ "CARGOID", OpseaeHead.CARGOID },
{ "DCLASS", OpseaeHead.DCLASS },
@ -7666,10 +7728,7 @@ namespace DSWeb.Areas.CommMng.DAL
var result = new DBResult(true, "");
try
{
var cansend = CanSend(USERID);
if (!cansend.Success) {
return cansend;
}
SetHead_Opseae();
@ -7741,17 +7800,32 @@ namespace DSWeb.Areas.CommMng.DAL
return result;
}
public DBResult SendFormdataPost() {
public DBResult SendFormdataPost(string USERID) {
var result = new DBResult();
var cdc = new Common.DB.CommonDataContext();
Dictionary<string, string> headers = BasicDataRefDAL.GetLogicInfo(OpseaeHead.CORPID, "大简云接口密钥_上传客户订舱需求");
var cansend = CanSend(USERID);
if (!cansend.Success)
{
return cansend;
}
var userkeyinfo = MsSysThirdPartyAccountDAL.GetData($"USERID='{USERID}' and THIRDPARTY='大简云用户userkey' ");
if (headers == null || headers.Count == 0) {
Dictionary<string, string> headers = new Dictionary<string, string>();
if (userkeyinfo == null || string.IsNullOrWhiteSpace(userkeyinfo.ACCOUNT))
{
result.SetErrorInfo("需要在第三方账号设置中设置：该账户的， 大简云用户userkey 的 账号和密钥 ");
return result;
}
else {
headers.Add("USER_KEY", userkeyinfo.ACCOUNT);
headers.Add("USER_SECRET", userkeyinfo.ACCOUNTPSW);
}
var url = cdc.sys_param_set.FirstOrDefault(x => x.PARAMNAME == "DJYCANGDANURL2").PARAMVALUE;
//var url = "http://60.209.125.238:30813/BookingCustomerOrder/ReceiveCustomerOrder";
@ -7799,7 +7873,7 @@ namespace DSWeb.Areas.CommMng.DAL
}
var rtn= PostMultipartFormData(url, headers, values, files);
BasicDataRefDAL.SaveLog(rtn,"","大简云订舱需求发送","返回值");
var _r = Newtonsoft.Json.JsonConvert.DeserializeObject<DJYPostResult>(rtn);
result = _r.getDBResult();
@ -7821,7 +7895,7 @@ namespace DSWeb.Areas.CommMng.DAL
result.SetErrorInfo($"船公司{carrier}没有配置第三方账号");
}
else {
//第三方账号 = thirdaccount.ACCOUNT;
第三方账号 = thirdaccount.ACCOUNT;
result.OK();
}

2816
DSWeb/Areas/CommMng/DAL/PubSysDAL.cs
View File

File diff suppressed because it is too large Load Diff

4
DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeae.cs
Unescape Escape View File

@ -2199,6 +2199,10 @@ namespace DSWeb.MvcShipping.Models.MsOpSeae
/// </summary>
public string TF_BLSTATUS{ get; set; }
[ModelDB(MDBType = ModelDBOprationType.Insert)]
public long? DJYID { get; set; }
#endregion
public MsOpSeae()

4
DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeaeDetail.cs
Unescape Escape View File

@ -522,6 +522,10 @@ namespace DSWeb.MvcShipping.Models.MsOpSeae
set { _CTNFEE = value; }
}
[ModelDB(MDBType = ModelDBOprationType.Insert)]
public long? DJYCTNID { get; set; }
#endregion

299
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
Unescape Escape View File

@ -1498,17 +1498,11 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
layout: 'hbox',
defaultType: 'textfield',
items: [{
//labelWidth: 100,
fieldLabel: Zi.LAN.DJYMAILINFO,//'订舱时间',
flex: 1,
readOnly:true,
name: 'DJYMAILINFO'
}, {
items: [ {
//labelWidth: 100,
fieldLabel: Zi.LAN.DjyService,
format: 'Y-m-d',
flex: 2,
flex: 3,
readOnly: true,
//xtype: 'datefield',
//labelWidth: 55,
@ -1516,17 +1510,69 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
},
{
//labelWidth: 100,
fieldLabel: Zi.LAN.DjyDCYQ,//'订舱时间',
flex: 2,
fieldLabel: Zi.LAN.DjyDCYQ,//'订舱要求',
flex: 3,
readOnly: true,
name: 'DCYQ'
},
}
//,
//{ xtype: "hiddenfield" },
//{ xtype: "hiddenfield" },
{ xtype: "hiddenfield" }
//{ xtype: "hiddenfield" }
]
}
, {
xtype: 'container',
layout: 'hbox',
flex: 1,
defaultType: 'textfield',
items: [
{
//labelWidth: 100,
fieldLabel: Zi.LAN.DJYMAILINFO,//'订舱时间',
flex: 1,
readOnly: true,
name: 'DJYMAILINFO'
},
{
xtype: 'textfield',
//grow: true,
flex: 5,
readOnly: true,
fieldLabel: Zi.LAN.DjyDCSPJG, //'订舱审批结果',
//height: 60,
name: 'DjyDCSPJG',
anchor: '100%'
}//, { xtype: "hiddenfield",flex: 2 }
]
}
, {
xtype: 'container',
layout: 'hbox',
flex: 1,
defaultType: 'textfield',
items: [
{
xtype: 'textareafield',
grow: true,
flex: 2,
fieldLabel: Zi.LAN.REMARK, //'备注',
height: 60,
name: 'REMARK',
anchor: '100%'
}, {
xtype: 'textareafield',
grow: true,
fieldLabel: Zi.LAN.OTREMARK, //'备注',
height: 60,
name: 'OPERATORFAX',
anchor: '100%'
}
]
}
]//end items(fieldset 1)
}); //end this.formEdit
@ -4262,30 +4308,32 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
name: 'ISGAIQIAN'
}
]
}, {
xtype: 'container',
layout: 'hbox',
flex: 1,
defaultType: 'textfield',
items: [
{
xtype: 'textareafield',
grow: true,
flex: 2,
fieldLabel: Zi.LAN.REMARK, //'备注',
height: 60,
name: 'REMARK',
anchor: '100%'
}, {
xtype: 'textareafield',
grow: true,
fieldLabel: Zi.LAN.OTREMARK, //'备注',
height: 60,
name: 'OPERATORFAX',
anchor: '100%'
}
]
}
//, {
// xtype: 'container',
// layout: 'hbox',
// flex: 1,
// defaultType: 'textfield',
// items: [
// {
// xtype: 'textareafield',
// grow: true,
// flex: 2,
// fieldLabel: Zi.LAN.REMARK, //'备注',
// height: 60,
// name: 'REMARK',
// anchor: '100%'
// }, {
// xtype: 'textareafield',
// grow: true,
// fieldLabel: Zi.LAN.OTREMARK, //'备注',
// height: 60,
// name: 'OPERATORFAX',
// anchor: '100%'
// }
// ]
//}
]
}
]
@ -11987,77 +12035,19 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
text: Zi.LAN.QueDingFaSong, //"确定发送",
minWidth: 70,
handler: function () {
var BSNO = me.editRecord.get('BSNO');
var _form = Ext.getCmp("formDjyOrder");
var data = _form.getForm().getValues(false, false, false);
var str = Ext.JSON.encode(data);
var feeGidSql = '';
var selectedRecords = [];
selectedRecords = me.DocCM.selected.items;
if (selectedRecords.length > 0) {
for (var i = 0; i < selectedRecords.length; i++) {
var rec = selectedRecords[i];
if (rec.data.GID == "*") //如果是新增但没有保存的数据，没有必要提交到后台
{
me.storeDocList.remove(selectedRecords[i]);
} else {
var feeGId = "" + rec.data.GID + "";
if (feeGidSql == '') {
feeGidSql = feeGId;
} else {
feeGidSql = feeGidSql + "," + feeGId;
}
}
}
}
me.DoSendDjyOrder();
}
}
//Ext.Msg.show({ title: '提示', msg: str, icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK });
Ext.Ajax.request({
url: '/CommMng/BasicDataRef/SendOpseaeEmailToDjy',
cors: true,
params: {
BSNO: BSNO,
str: str,
FileGidList: feeGidSql
},
//, {
//text: Zi.LAN.btndelete, //"删除",
//minWidth: 70,
//handler: function () {
//method: 'post',
success: function (response) {
var resultData = eval('(' + response.responseText + ')');//JSON字符串=>JSON对象
if (!resultData.Success) {
//失败
Ext.Msg.show({
title: '提示',
msg: resultData.Message,
icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK
});
return;
}
else {
//Ext.Msg.show({
// title: '提示',
// msg: resultData.Message,
// icon: Ext.MessageBox.OK,
// buttons: Ext.Msg.OK
//});
MsgTip("提示", resultData.Message);
me.GetLogic();
me.winDjyOrderShow.close();
}
}
});
}
}, {
text: Zi.LAN.btndelete, //"删除",
minWidth: 70,
handler: function () {
//}
//}
}
}, {
, {
text: Zi.LAN.GuanBi, //"关闭",
minWidth: 70,
handler: function () {
@ -22000,6 +21990,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
buttons: Ext.Msg.OK
});
} else {
var BSNO = this.Editdata.BSNO;
//此时加载一次该船公司的第三方账号
this.storeThirdAccount.load({
@ -22441,5 +22432,107 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
}
});
}
, DoSendDjyOrder: function ()
{
var BSNO = me.editRecord.get('BSNO');
var _form = Ext.getCmp("formDjyOrder");
var data = _form.getForm().getValues(false, false, false);
var str = Ext.JSON.encode(data);
if (!data.THIRDACCOUNT)
{
Ext.Msg.show({
title: '提示',
msg: "必须选择船公司账号。如果没有，需要在第三方账号当中进行维护",
icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK
});
return;
}
var feeGidSql = '';
var selectedRecords = [];
selectedRecords = me.DocCM.selected.items;
if (selectedRecords.length > 0) {
for (var i = 0; i < selectedRecords.length; i++) {
var rec = selectedRecords[i];
if (rec.data.GID == "*") //如果是新增但没有保存的数据，没有必要提交到后台
{
me.storeDocList.remove(selectedRecords[i]);
} else {
var feeGId = "" + rec.data.GID + "";
if (feeGidSql == '') {
feeGidSql = feeGId;
} else {
feeGidSql = feeGidSql + "," + feeGId;
}
}
}
}
Ext.Msg.wait(Zi.LAN.ZhengZaiCaoZuoShuJu);
//Ext.Msg.show({ title: '提示', msg: str, icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK });
Ext.Ajax.request({
//waitMsg: '正在发送请求',
url: '/CommMng/BasicDataRef/SendOpseaeEmailToDjy',
cors: true,
params: {
BSNO: BSNO,
str: str,
FileGidList: feeGidSql
},
//method: 'post',
success: function (response) {
Ext.MessageBox.hide();
var resultData = eval('(' + response.responseText + ')');//JSON字符串=>JSON对象
if (!resultData.Success) {
//失败
this.Ext.Msg.show({
title: '提示',
msg: resultData.Message,
icon: Ext.MessageBox.ERROR,
buttons: Ext.Msg.OK
});
me.GetLogic();
//return;
me.winDjyOrderShow.close();
}
else {
//Ext.Msg.show({
// title: '提示',
// msg: resultData.Message,
// icon: Ext.MessageBox.OK,
// buttons: Ext.Msg.OK
//});
//MsgTip("提示", resultData.Message,1500);
me.GetLogic();
Ext.Msg.show({
title: "提示",
msg: resultData.Message,
modal: false,
buttons: Ext.MessageBox.OK,
icon: Ext.MessageBox.INFO
});
setTimeout(function () {
Ext.MessageBox.hide();
Ext.Msg.hide();
me.winDjyOrderShow.close();
}, 1500);
}
}
});
}
});

1
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js
Unescape Escape View File

@ -358,6 +358,7 @@ Zi.LAN.winDjyOrderShow = "大简云订舱";
Zi.LAN.DJYMAILINFO = "订舱时间";
Zi.LAN.DjyService = "订舱选项";
Zi.LAN.DjyDCYQ = "订舱要求";
Zi.LAN.DjyDCSPJG = "订舱审批";
Zi.LAN.YARD = "场站";

3
DSWeb/DSWeb.csproj
Unescape Escape View File

@ -327,6 +327,9 @@
<Reference Include="Quartz, Version=2.6.2.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<HintPath>..\packages\Quartz.2.6.2\lib\net40\Quartz.dll</HintPath>
</Reference>
<Reference Include="RabbitMQ.Client, Version=3.6.9.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
<HintPath>..\packages\RabbitMQ.Client.3.6.9\lib\net45\RabbitMQ.Client.dll</HintPath>
</Reference>
<Reference Include="Renci.SshNet">
<HintPath>DLL\Renci.SshNet.dll</HintPath>
</Reference>

173
DSWeb/Global.asax.cs
Unescape Escape View File

@ -20,6 +20,10 @@ using DSWeb.Areas.MvcShipping.Models.MsOpRule;
using DSWeb.Areas.MvcShipping.Models.MsOpSeaeRunBill;
using DSWeb.Areas.MvcShipping.Comm;
using BookingWeb.DB.Model;
using RabbitMQ.Client;
using RabbitMQ.Client.Events;
using System.Text;
using DSWeb.Areas.CommMng.DAL;
namespace DSWeb
{
@ -110,6 +114,21 @@ namespace DSWeb
myTimer.AutoReset = true;
}
var ReceiveDjydc = BasicDataRefDAL. getConfigAppSetting("ReceiveDjydc");
if (ReceiveDjydc == "true")
{
//SaveLog("", "", "接收大简云订舱", "启动接收");
DoReceiveDjydc();
}
var ReceiveMQUri_CustOrderStatus= BasicDataRefDAL.getConfigAppSetting("ReceiveMQUri_CustOrderStatus");
if (!string.IsNullOrWhiteSpace( ReceiveMQUri_CustOrderStatus))
{
//接收推送的返回审批结果
DoReceiveDjyCustOrderStatus();
}
InitMapper();
JobScheduler.Start();
@ -283,5 +302,159 @@ namespace DSWeb
});
}
private IConnection mqConn;
private const string ExchangeName = "output";
#region 接收大简云订舱业务
private void DoReceiveDjydc()
{
var RecMqUri = ConfigurationManager.AppSettings["ReceiveMQUri"];
var 消费队列数据 = true;
ConnectionFactory factory = new ConnectionFactory();
factory.Uri = RecMqUri;
mqConn = factory.CreateConnection();
IModel modelDingCang = mqConn.CreateModel();
if (!string.IsNullOrWhiteSpace(ExchangeName))
modelDingCang.ExchangeDeclare(ExchangeName, ExchangeType.Direct);
var QueuePrefix_DingCang = ConfigurationManager.AppSettings["QueuePrefix_DingCang"];
var DjydcCompanyid = ConfigurationManager.AppSettings["DjydcCompanyid"];
modelDingCang.QueueDeclare($"{QueuePrefix_DingCang}{DjydcCompanyid}", false, false, false, null);
var consumerDingCang = new EventingBasicConsumer(modelDingCang);
consumerDingCang.Received += (ch, ea) =>
{
var body = ea.Body;
try
{
////不压缩
//var strBody = Encoding.UTF8.GetString(body.ToArray());
////压缩
var strBodyZip = Encoding.UTF8.GetString(body.ToArray());
//logger.Debug($"收到大简云订舱输出压缩数据：{strBodyZip}");
//LoggerHelper loggerHelper = new LoggerHelper("接收大简云订舱");
//SaveLog(strBodyZip, "", "接收大简云订舱", "压缩内容");
var strBody = Areas.CommMng.DAL.BasicDataRefDAL.Decompress(strBodyZip);
BasicDataRefDAL.SaveLog(strBody, "", "接收大简云订舱", "解压内容");
//测试数据不需解压缩
//var strBody = strBodyZip;
//logger.Debug($"收到大简云订舱输出数据：{strBody}");
//导出到东胜6
//if(strBody.Contains("TAHT30633700"))
DSWeb.Areas.CommMng.DAL.MqWorkDAL.DingCangToDS7(strBody);
}
catch (Exception ex)
{
var excep = ex;
while (excep != null)
{
//logger.Error(excep.Message);
//logger.Error(excep.StackTrace);
excep = excep.InnerException;
}
}
};
//第二个参数控制【是否消费掉队列里的数据】
modelDingCang.BasicConsume($"{QueuePrefix_DingCang}{DjydcCompanyid}", 消费队列数据, consumerDingCang);
}
#endregion
#region 接收大简云订舱审核状态回推
/// <summary>
/// 接收大简云订舱审核状态回推
/// 下半部分 审核通过与驳回
/// http://60.209.125.238:32222/single/file/3N4oTLdFSBl1IyN55BeAZKVPC3CBeg3VjrGhIxDaHw9BaGdDy5lj8HETUtMNxVIP
/// </summary>
private void DoReceiveDjyCustOrderStatus()
{
var RecMqUri = ConfigurationManager.AppSettings["ReceiveMQUri_CustOrderStatus"];
var 消费队列数据 = true;
ConnectionFactory factory = new ConnectionFactory();
factory.Uri = RecMqUri;
mqConn = factory.CreateConnection();
IModel modelDingCang = mqConn.CreateModel();
if (!string.IsNullOrWhiteSpace(ExchangeName))
modelDingCang.ExchangeDeclare(ExchangeName, ExchangeType.Direct);
var QueuePrefix = ConfigurationManager.AppSettings["QueuePrefix_CustOrderStatus"];
var DjydcCompanyid = ConfigurationManager.AppSettings["DjydcCompanyid"];
modelDingCang.QueueDeclare($"{QueuePrefix}{DjydcCompanyid}", false, false, false, null);
var consumerDingCang = new EventingBasicConsumer(modelDingCang);
consumerDingCang.Received += (ch, ea) =>
{
var body = ea.Body;
try
{
////不压缩
//var strBody = Encoding.UTF8.GetString(body.ToArray());
////压缩
var strBodyZip = Encoding.UTF8.GetString(body.ToArray());
//logger.Debug($"收到大简云订舱输出压缩数据：{strBodyZip}");
//LoggerHelper loggerHelper = new LoggerHelper("接收大简云订舱");
//SaveLog(strBodyZip, "", "接收大简云订舱", "压缩内容");
var strBody = Areas.CommMng.DAL.BasicDataRefDAL.Decompress(strBodyZip);
Areas.CommMng.DAL.BasicDataRefDAL.SaveLog(strBody, "", "接收大简云订舱", "解压内容");
//测试数据不需解压缩
//var strBody = strBodyZip;
//logger.Debug($"收到大简云订舱输出数据：{strBody}");
//导出到东胜6
//if(strBody.Contains("TAHT30633700"))
DSWeb.Areas.CommMng.DAL.MqWorkDAL.CustOrderStatusToDS7(strBody);
}
catch (Exception ex)
{
var excep = ex;
while (excep != null)
{
//logger.Error(excep.Message);
//logger.Error(excep.StackTrace);
excep = excep.InnerException;
}
}
};
//第二个参数控制【是否消费掉队列里的数据】
modelDingCang.BasicConsume($"{QueuePrefix}{DjydcCompanyid}", 消费队列数据, consumerDingCang);
}
#endregion
}
}

22
DSWeb/Web.config
Unescape Escape View File

@ -75,6 +75,28 @@
<!-- 裕龙小程序上传图片时 裕龙DSWMS系统的文件夹位置 -->
<add key="DSWMSPICPATH" value="H:\DSWMS\Vue.Net\VOL.WebApi\wwwroot\" />
<add key="DSWMSURL" value="http://localhost:9991/api/" />
<!-- 是否启用：接收大简云订舱信息消息队列 true为接收 空白不接收 -->
<add key="ReceiveDjydc" value="true" />
<!--康乾 505377247965253-->
<add key="DjydcCompanyid" value="505377247965253" />
<!-- 测试地址 业务保存的回推 -->
<add key="ReceiveMQUri" value="amqp://djy_booking_new:123qwe@60.209.125.238:40101/djy_booking_new" />
<!-- 正式地址
<add key="ReceiveMQUri" value="amqp://hechuan_booking:hechuan_booking123@47.104.207.5:12567/hechuan_booking" />
-->
<add key="QueuePrefix_DingCang" value="djy.output.dingcang.ds6." />
<!-- 测试地址 回推客户订舱审核状态 -->
<add key="ReceiveMQUri_CustOrderStatus" value="amqp://audit_booking_user:djy^2024@60.209.125.238:40101/audit_booking" />
<!-- 正式地址
<add key="ReceiveMQUri" value="amqp://hechuan_booking:hechuan_booking123@47.104.207.5:12567/hechuan_booking" />
-->
<add key="QueuePrefix_CustOrderStatus" value="auditbooking.output.ds." />
</appSettings>
<connectionStrings>
<!-- 原登陆验证服务器 -->

BIN
DSWeb/bin/RabbitMQ.Client.dll
View File

Binary file not shown.

6743
DSWeb/bin/RabbitMQ.Client.xml
View File

File diff suppressed because it is too large Load Diff

1
DSWeb/packages.config
Unescape Escape View File

@ -30,6 +30,7 @@
<package id="pdfboxNet" version="1.8.9.0" targetFramework="net45" />
<package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net45" />
<package id="Quartz" version="2.6.2" targetFramework="net40" />
<package id="RabbitMQ.Client" version="3.6.9" targetFramework="net45" />
<package id="SharpZipLib" version="1.2.0" targetFramework="net45" />
<package id="Spire.PDF" version="8.7.2" targetFramework="net45" />
</packages>

BIN
packages/RabbitMQ.Client.3.6.9/.signature.p7s vendored
View File

Binary file not shown.

BIN
packages/RabbitMQ.Client.3.6.9/RabbitMQ.Client.3.6.9.nupkg vendored
View File

Binary file not shown.

BIN
packages/RabbitMQ.Client.3.6.9/lib/net45/RabbitMQ.Client.dll vendored
View File

Binary file not shown.

6743
packages/RabbitMQ.Client.3.6.9/lib/net45/RabbitMQ.Client.xml vendored
View File

File diff suppressed because it is too large Load Diff

BIN
packages/RabbitMQ.Client.3.6.9/lib/netcore45/RabbitMQ.Client.dll vendored
View File

Binary file not shown.

6597
packages/RabbitMQ.Client.3.6.9/lib/netcore45/RabbitMQ.Client.xml vendored
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save