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 b4d420d7c2 8cbe254d67
commit 33e3d47ddf
5 changed files with 1481 additions and 26 deletions
Show Stats Download Patch File Download Diff File

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

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Web; using System.Web;
@ -876,4 +877,109 @@ namespace DSWeb.Common.DB
public decimal? 拆分汇率 { get; set; } public decimal? 拆分汇率 { get; set; }
} }
/// <summary>
/// 业务函电
/// </summary>
[Table("t_op_letter")]
public partial class t_op_letter_md
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int LE_ID { get; set; } = 0;
public string 编号 { get; set; }
public string 函电名称 { get; set; }
public string HEAD_TO { get; set; }
public string HEAD_ATTN { get; set; }
public string 签发人 { get; set; }
public DateTime? 签发日期 { get; set; }
public int? LF { get; set; }
public long? DJYBOOKINGID { get; set; }
public long? DJYLETTERID { get; set; }
}
public class OpLetterBase {
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.None)]
public int LE_ID { get; set; } = 0;
public long DJYLETTERID { get; set; }
public long DJYBOOKINGID { get; set; }
public void getCopy(OpLetterBase newrec, Type lettertype)
{
PropertyInfo[] properties = lettertype.GetProperties();
// 遍历属性打印到控制台。
foreach (PropertyInfo prop in properties)
{
if (prop.Name == "LE_ID" || prop.Name == "DJYID" || prop.Name == "DJYBOOKINGID")
continue;
//Console.WriteLine(prop.Name);
prop.SetValue(this, prop.GetValue(newrec), null);
}
}
}
/// <summary>
/// 业务函电 派车
/// </summary>
[Table("t_op_letter_pc")]
public partial class t_op_letter_pc_md: OpLetterBase
{
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 string 厂家联系电话 { 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; }
}
/// <summary>
///
/// </summary>
[Table("t_op_letter_rh")]
public partial class t_op_letter_rh_md : OpLetterBase
{
public string 入货场站 { get; set; }
public string 入货截至时间 { get; set; }
public string 场站联系人 { get; set; }
public string 场站联系电话 { get; set; }
public string 备注 { get; set; }
public t_op_letter_rh_md() { }
//public void getCopy(t_op_letter_rh_md updrec) {
// 入货场站 = updrec.入货场站;
// 入货截至时间 = updrec.入货截至时间;
// 场站联系人 = updrec.场站联系人;
// 场站联系电话 = updrec.场站联系电话;
// 场站电话 = updrec.场站电话;
// 备注 = updrec.备注;
// DJYID = updrec.DJYID;
//}
}
} }

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

@ -35,6 +35,11 @@ namespace DSWeb.Common.DB
public DbSet<t_code_goods_md> t_code_goods { 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_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; }
} }

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

@ -12,16 +12,17 @@
<!-- 大简云公司ID --> <!-- 大简云公司ID -->
<add key="CompanyId" value="349708986646597" /> <add key="CompanyId" value="349708986646597" />
<!--
<add key="UserNameStr" value="单证007,用户名B" /> <add key="UserNameStr" value="单证007,用户名B" /> -->
<!-- Corpid <!-- Corpid
<add key="Corpid" value="Comcab2d43f60454327af30a131fc1d3abd" /> <add key="Corpid" value="Comcab2d43f60454327af30a131fc1d3abd" />
--> -->
<!-- rabbitmq地址 <!-- rabbitmq地址
<add key="ReceiveMQUri" value="amqp://djy_output:123qwe@47.104.207.5:12567/djy.output" /> <add key="ReceiveMQUri" value="amqp://djy_output:123qwe@47.104.207.5:12567/djy.output" />
<add key="ReceiveMQUri" value="amqp://djy_booking_new:123qwe@47.104.207.5:12567/djy_booking_new" /> <add key="ReceiveMQUri" value="amqp://hechuan_booking:hechuan_booking123@47.104.207.5:12567/hechuan_booking" />
<add key="ReceiveMQUri" value="amqp://djy_booking_new:123qwe@60.209.125.238:12567/djy_booking_new" />
--> -->
<add key="ReceiveMQUri" value="amqp://djy_booking_new:123qwe@60.209.125.238:12567/djy_booking_new" /> <add key="ReceiveMQUri" value="amqp://hechuan_booking:hechuan_booking123@47.104.207.5:12567/hechuan_booking" />
</appSettings> </appSettings>
<connectionStrings> <connectionStrings>

799
DSWeb.DJYMQ/DS7Service.cs
View File

File diff suppressed because one or more lines are too long

584
JobReqWebData/quartz_jobs_Backup.xml
Unescape Escape View File

@ -0,0 +1,584 @@
<?xml version="1.0" encoding="utf-8" ?>
<job-scheduling-data xmlns="http://quartznet.sourceforge.net/JobSchedulingData">
<processing-directives>
<overwrite-existing-data>true</overwrite-existing-data>
</processing-directives>
<schedule>
<!--发送请求数据任务-->
<job>
<name>JobSendRequest</name>
<group>SendRequest</group>
<description>发送数据请求</description>
<job-type>JobReqWebData.JobSendRequest,JobReqWebData</job-type>
<durable>true</durable>
<recover>false</recover>
<job-data-map>
<!--连接字符串-->
<entry>
<key>ConnectString</key>
<value>Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201</value>
</entry>
<!--查询SQL-->
<entry>
<key>QuerySql</key>
<value>
select MBLNO,C.YARDCODE as YARDNAME,'' as WEBUSERNAME,'' as WEBUSERPASS FROM OP_SEAE b
left join code_yarddata_set c on (c.YARD=b.YARD) WHERE MBLNO!='' AND ETD&gt;=GETDATE()-30 AND ETD&lt;=GETDATE()+10 AND ISNULL(C.YARDCODE,'')!=''
and not exists (SELECT 1 FROM op_status s where s.bsno=b.bsno and s.STATUS='重箱返场')
UNION
select MBLNO,'YGT' as YARDNAME,'15163472790' as WEBUSERNAME,'19861115qq' as WEBUSERPASS FROM OP_SEAE b
WHERE MBLNO!='' AND ETD&gt;=GETDATE()-10 AND ETD&lt;=GETDATE()+10 AND
exists (SELECT 1 FROM op_status s where s.bsno=b.bsno and s.STATUS='空箱出场' )
and not EXISTS (SELECT 1 FROM op_status s where s.bsno=b.bsno and s.STATUS='装船出运')
</value>
</entry>
<!--请求url-->
<entry>
<key>ReqUrl</key>
<value>http://47.104.90.170:5000/save</value>
</entry>
<!--客户名-->
<entry>
<key>Customer</key>
<value>SDBT</value>
</entry>
<!--密码-->
<entry>
<key>Password</key>
<value>abc123</value>
</entry>
<!--请求超时（单位：秒）-->
<entry>
<key>RequestTimeout</key>
<value>30</value>
</entry>
</job-data-map>
</job>
<!-- 发送请求数据任务触发器-->
<trigger>
<cron>
<name>TriggerSendRequest</name>
<group>SendRequest</group>
<description>发送数据请求触发器</description>
<job-name>JobSendRequest</job-name>
<job-group>SendRequest</job-group>
<cron-expression>0 0/10 * * * ? *</cron-expression>
</cron>
</trigger>
<!--获取数据任务-->
<job>
<name>JobGetData</name>
<group>GetData</group>
<description>获取数据</description>
<job-type>JobReqWebData.JobGetData,JobReqWebData</job-type>
<durable>true</durable>
<recover>false</recover>
<job-data-map>
<!--请求url-->
<entry>
<key>ReqUrl</key>
<value>http://47.104.90.170:5000/extract</value>
</entry>
<!--连接字符串-->
<entry>
<key>ConnectString</key>
<value>Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201</value>
</entry>
<!--客户名-->
<entry>
<key>Customer</key>
<value>SDBT</value>
</entry>
<!--密码-->
<entry>
<key>Password</key>
<value>abc123</value>
</entry>
<!--请求超时（单位：秒）-->
<entry>
<key>RequestTimeout</key>
<value>60</value>
</entry>
</job-data-map>
</job>
<!-- 获取数据任务触发器-->
<trigger>
<cron>
<name>TriggerGetData</name>
<group>GetData</group>
<description>获取数据触发器</description>
<job-name>JobGetData</job-name>
<job-group>GetData</job-group>
<cron-expression>0 0/3 * * * ? *</cron-expression>
</cron>
</trigger>
<!--发送账号任务-->
<job>
<name>JobSendAccount</name>
<group>SendAccount</group>
<description>获取数据</description>
<job-type>JobReqWebData.JobSendAccount,JobReqWebData</job-type>
<durable>true</durable>
<recover>false</recover>
<job-data-map>
<!--请求url-->
<entry>
<key>ReqUrl</key>
<value>http://47.104.90.170:5000/account/password</value>
</entry>
<!--客户名-->
<entry>
<key>Customer</key>
<value>SDBT</value>
</entry>
<!--密码-->
<entry>
<key>Password</key>
<value>abc123</value>
</entry>
<!--请求超时（单位：秒）-->
<entry>
<key>RequestTimeout</key>
<value>30</value>
</entry>
<!--账号密码json-->
<entry>
<key>AccountJson</key>
<value>
[{
"WEBUSERNAME": "18560748070",
"WEBPASSWORD": "SDbt8888",
"YARDNAME": "YGT"
},{
"WEBUSERNAME": "18678203935",
"WEBPASSWORD": "Qd123456",
"YARDNAME": "YGT"
},{
"WEBUSERNAME": "13805337465",
"WEBPASSWORD": "QingDao123",
"YARDNAME": "YGT"
}]
</value>
</entry>
</job-data-map>
</job>
<!-- 发送账号任务触发器-->
<trigger>
<simple>
<name>TriggerSendAccount</name>
<group>SendAccount</group>
<description>发送账号任务触发器</description>
<job-name>JobSendAccount</job-name>
<job-group>SendAccount</job-group>
<repeat-count>0</repeat-count>
<repeat-interval>0</repeat-interval>
</simple>
</trigger>
<!--<4.1>浩宏需求 箱满仓的外运费用 发送请求数据任务-->
<job>
<name>JobXmcSend</name>
<group>JobXmcSend</group>
<description>发送数据请求</description>
<job-type>JobReqWebData.JobXmcSend,JobReqWebData</job-type>
<durable>true</durable>
<recover>false</recover>
<job-data-map>
<!--连接字符串-->
<entry>
<key>ConnectString</key>
<value>Data Source=qdhaohong.dongshengsoft.net;Initial Catalog=ShippingWeb_QDHH;Persist Security Info=True;User ID=sa;Password=Ds20040201</value>
</entry>
<!--查询SQL-->
<entry>
<key>QuerySql</key>
<value>
select MBLNO,'XMC' as YARDNAME FROM OP_SEAE b left join code_yarddata_set c on (c.YARD=b.YARD) WHERE MBLNO&lt;&gt;'' AND ETD&gt;=CONVERT(DATETIME,CONVERT(VARCHAR(10),dateadd(day,-90,GETDATE()),21)) AND ETD&lt;CONVERT(DATETIME,CONVERT(VARCHAR(10),dateadd(day,-60,GETDATE()),21)) AND FORWARDER = '山东外运'
</value>
</entry>
<!--请求url-->
<entry>
<key>ReqUrl</key>
<value>
http://47.104.90.170:6000/xmc/savedata
</value>
</entry>
<entry>
<key>custname</key>
<value>
QDHH
</value>
</entry>
<entry>
<key>custpsw</key>
<value>
QDHH123
</value>
</entry>
<!--请求超时（单位：秒）-->
<entry>
<key>RequestTimeout</key>
<value>60</value>
</entry>
</job-data-map>
</job>
<!--
<cron>
<name>TriggerJobXmcSend</name>
<group>JobXmcSend</group>
<description>发送数据请求触发器</description>
<job-name>JobXmcSend</job-name>
<job-group>JobXmcSend</job-group>
<cron-expression>0 0/1 0 * * ? *</cron-expression>
</cron>
</trigger>
-->
<!--
<trigger>
<simple>
<name>TriggerJobXmcSend</name>
<group>JobXmcSend</group>
<description>发送数据请求触发器</description>
<job-name>JobXmcSend</job-name>
<job-group>JobXmcSend</job-group>
<repeat-count>0</repeat-count>
<repeat-interval>0</repeat-interval>
</simple>
</trigger>
-->
<trigger>
<cron>
<name>TriggerJobXmcSend</name>
<group>JobXmcSend</group>
<description>发送数据请求触发器</description>
<job-name>JobXmcSend</job-name>
<job-group>JobXmcSend</job-group>
<cron-expression>0 45 17 1/1 * ? *</cron-expression>
</cron>
</trigger>
<!-- <4.2>浩宏需求 从 箱满仓 获取应付费用 并与本地相同提单号业务对比
读取信息
-->
<job>
<name>JobXmcGet</name>
<group>JobXmcGet</group>
<description>箱满仓按提单号取费用_获取</description>
<job-type>JobReqWebData.JobXmcGet,JobReqWebData</job-type>
<durable>true</durable>
<recover>false</recover>
<job-data-map>
<!--连接字符串-->
<entry>
<key>ConnectString</key>
<value>Data Source=qdhaohong.dongshengsoft.net;Initial Catalog=ShippingWeb_QDHH;Persist Security Info=True;User ID=sa;Password=Ds20040201</value>
</entry>
<!--请求url-->
<entry>
<key>ReqUrl</key>
<value>
http://47.104.90.170:6000/xmc/extract
</value>
</entry>
<entry>
<key>custname</key>
<value>
QDHH
</value>
</entry>
<entry>
<key>custpsw</key>
<value>
QDHH123
</value>
</entry>
<!--请求超时（单位：秒）-->
<entry>
<key>RequestTimeout</key>
<value>60</value>
</entry>
</job-data-map>
</job>
<!-- <4.2>浩宏需求 读取信息 触发器-->
<trigger>
<cron>
<name>TriggerXmcGet</name>
<group>JobXmcGet</group>
<description>箱满仓按提单号取费用_读取信息触发器</description>
<job-name>JobXmcGet</job-name>
<job-group>JobXmcGet</job-group>
<cron-expression>0 0/2 * * * ? *</cron-expression>
</cron>
</trigger>
<!--发送ATD请求数据任务-->
<job>
<name>JobSendATDRequest</name>
<group>SendATDRequest</group>
<description>发送数据请求</description>
<job-type>JobReqWebData.JobSendATDRequest,JobReqWebData</job-type>
<durable>true</durable>
<recover>false</recover>
<job-data-map>
<!--连接字符串-->
<entry>
<key>ConnectString</key>
<value>Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201</value>
</entry>
<!--查询SQL-->
<entry>
<key>QuerySql</key>
<value>
select distinct VESSEL ship_name,VOYNO as voyage_number,'' as web_name,'' as web_psw FROM OP_SEAE b
WHERE MBLNO!='' AND ETD&gt;=GETDATE()-30 AND ETD&lt;=GETDATE()+10
</value>
</entry>
<!--请求url-->
<entry>
<key>ReqUrl</key>
<value>http://118.190.106.151:5500/ygt/cbjh/new/extract</value>
</entry>
<!--客户名-->
<entry>
<key>Customer</key>
<value>SDBT</value>
</entry>
<!--密码-->
<entry>
<key>Password</key>
<value>abc123</value>
</entry>
<!--请求超时（单位：秒）-->
<entry>
<key>RequestTimeout</key>
<value>30</value>
</entry>
</job-data-map>
</job>
<!-- 发送ATD请求数据任务触发器-->
<trigger>
<cron>
<name>TriggerSendRequest</name>
<group>SendATDRequest</group>
<description>发送数据请求触发器</description>
<job-name>JobSendATDRequest</job-name>
<job-group>SendATDRequest</job-group>
<cron-expression>0 0/10 * * * ? *</cron-expression>
</cron>
</trigger>
<!--获取ATD数据-->
<job>
<name>JobGetATDData</name>
<group>GetATDData</group>
<description>获取数据</description>
<job-type>JobReqWebData.JobGetATDData,JobReqWebData</job-type>
<durable>true</durable>
<recover>false</recover>
<job-data-map>
<!--连接字符串-->
<entry>
<key>ConnectString</key>
<value>Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201</value>
</entry>
<!--请求url-->
<entry>
<key>ReqUrl</key>
<value>http://118.190.106.151:5500/ygt/cbjh/new/save</value>
</entry>
<!--客户名-->
<entry>
<key>Customer</key>
<value>SDBT</value>
</entry>
<!--密码-->
<entry>
<key>Password</key>
<value>abc123</value>
</entry>
<!--请求超时（单位：秒）-->
<entry>
<key>RequestTimeout</key>
<value>30</value>
</entry>
</job-data-map>
</job>
<!-- 获取ATD任务触发器-->
<trigger>
<cron>
<name>TriggerSendRequest</name>
<group>GetATDData</group>
<description>发送数据请求触发器</description>
<job-name>JobGetATDData</job-name>
<job-group>GetATDData</job-group>
<cron-expression>0 0/10 * * * ? *</cron-expression>
</cron>
</trigger>
<!--发送进口单一数据任务-->
<job>
<name>JobGetImpData</name>
<group>GetImpData</group>
<description>发送数据请求</description>
<job-type>JobReqWebData.JobGetImpData,JobReqWebData</job-type>
<durable>true</durable>
<recover>false</recover>
<job-data-map>
<!--连接字符串-->
<entry>
<key>ConnectString</key>
<value>Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201</value>
</entry>
<!--查询SQL-->
<entry>
<key>QuerySql</key>
<value>
select MBLNO FROM OP_SEAI b
WHERE MBLNO!='' AND ETD&gt;=GETDATE()-10 AND ETD&lt;=GETDATE()+10
and not EXISTS (SELECT 1 FROM op_status s where s.bsno=b.bsno and s.STATUS='海关放行')
</value>
</entry>
<!--请求url-->
<entry>
<key>ReqUrl</key>
<value>http://47.104.90.170:5000/query</value>
</entry>
<!--客户名-->
<entry>
<key>Customer</key>
<value>SDBT</value>
</entry>
<!--密码-->
<entry>
<key>Password</key>
<value>abc123</value>
</entry>
<!--YGT客户名-->
<entry>
<key>YGTUser</key>
<value>SDBT</value>
</entry>
<!--YGT密码-->
<entry>
<key>YGTPsw</key>
<value>abc123</value>
</entry>
<!--YGT代码-->
<entry>
<key>Yardid</key>
<value>YGT_ZHCW</value>
</entry>
<!--请求超时（单位：秒）-->
<entry>
<key>RequestTimeout</key>
<value>30</value>
</entry>
<!--每票间隔时间（单位：秒）-->
<entry>
<key>SleepTime</key>
<value>70</value>
</entry>
</job-data-map>
</job>
<!-- 发送请求数据任务触发器-->
<trigger>
<cron>
<name>TriggerSendRequest</name>
<group>SendRequest</group>
<description>发送数据请求触发器</description>
<job-name>JobSendRequest</job-name>
<job-group>SendRequest</job-group>
<cron-expression>0 0/10 * * * ? *</cron-expression>
</cron>
</trigger>
<!--定时插入WEB数据库数据任务-->
<job>
<name>JobDs7ToWeb</name>
<group>SendDs7DataRequest</group>
<description>发送数据请求</description>
<job-type>JobReqWebData.JobDs7ToWeb,JobReqWebData</job-type>
<durable>true</durable>
<recover>false</recover>
<job-data-map>
<!--DS7连接字符串-->
<entry>
<key>ConnectString</key>
<value>Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201</value>
</entry>
<!--DS7查询SQL-->
<entry>
<key>QuerySql</key>
<value>
select bl.AS_ID,bl.BSNO,b.CUSTNO,b.CONTRACTNO PONO,bl.MBLNO,bl.HBLNO,b.CUSTOMERNAME,bl.SHIPPER,bl.CONSIGNEE,bl.PORTLOAD,bl.DESTINATION
,CASE WHEN len(b.DESTINATIONID)!=5 THEN '' ELSE (select top 1 c_country_name from t_sys_country_code where c_country_code=LEFT(b.DESTINATIONID,2)) END as COUNTRY
,b.VESSEL,b.VOYNO,bl.CNTRTOTAL,b.BLTYPE,b.[SERVICE],b.ETD,b.ATD,b.CARRIER,bl.NOPKGS,bl.DESCRIPTION,bl.GROSSWEIGHT,bl.MEASUREMENT,b.HSCODE,b.FINANCIALSTAFFFAX INSURANCEOP
,(SELECT TOP 1 COMPTIME FROM op_status WHERE [STATUS]='Approached' AND BSNO=B.BSNO) LINKCUSTTIME
,(SELECT TOP 1 OpTime FROM op_SeaCover WHERE coverTitle='接单' AND BSNO=B.BSNO) CREATETIME
,(SELECT TOP 1 OpTime FROM op_SeaCover WHERE coverTitle='出号' AND BSNO=B.BSNO) MBLNOTIME
,bl.MODIFYTIME BSDATE
FROM op_seae_billmanage bl
LEFT JOIN op_seae b on (b.bsno=bl.BSNO)
WHERE
bl.MODIFYTIME&gt;=DATEADD(HOUR,-12 ,getdate())
</value>
</entry>
<!--WEB连接字符串-->
<entry>
<key>WebConnectString</key>
<value>Data Source=47.105.157.231;Initial Catalog=Shippingweb;Persist Security Info=True;User ID=sa;Password=Ds20040201</value>
</entry>
<!--请求超时（单位：秒）-->
<entry>
<key>RequestTimeout</key>
<value>30</value>
</entry>
</job-data-map>
</job>
<!-- 定时插入WEB数据库数据任务触发器-->
<trigger>
<cron>
<name>TriggerSendRequest</name>
<group>SendDs7DataRequest</group>
<description>发送数据请求触发器</description>
<job-name>JobDs7ToWeb</job-name>
<job-group>SendDs7DataRequest</job-group>
<cron-expression>* 0/1 * * * ? </cron-expression>
</cron>
</trigger>
</schedule>
</job-scheduling-data>
Write Preview
Loading…
Cancel
Save