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

从大简云向下同步舱单业务

Browse Source
DS7_JingHan
ddlucky 2 years ago
parent d15e945641
commit a48fad885f
8 changed files with 1131 additions and 232 deletions
Show Stats Download Patch File Download Diff File

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

@ -685,6 +685,26 @@ namespace DSWeb.Common.DB
/// 用于向大简云发送开票请求后 记录费用与链接的关系 /// 用于向大简云发送开票请求后 记录费用与链接的关系
/// </summary> /// </summary>
public string INVLINKGID { get; set; } public string INVLINKGID { get; set; }
/// <summary>
/// 当这条业务没有进入任何下游业务时
/// </summary>
/// <returns></returns>
public bool chfeeCanChange()
{
if (
SETTLEMENT == 0 &&
ORDERAMOUNT == 0 &&
ORDERINVOICE == 0 &&
ORDERINVSETTLEMENT == 0 &&
ORDERSETTLEMENT == 0 &&
INVOICE == 0 &&
!(ISDEBIT == null ? false : (bool)ISDEBIT)
) return true;
return false;
}
} }
public partial class ch_fee_md public partial class ch_fee_md

7
DSWeb.Service.Output.DS7/App.config
Unescape Escape View File

@ -11,7 +11,7 @@
<add key="ServiceDisplayName" value="大简云舱单导出东胜7服务(经汉综合业务版)" /> <add key="ServiceDisplayName" value="大简云舱单导出东胜7服务(经汉综合业务版)" />
<!-- 大简云公司ID --> <!-- 大简云公司ID -->
<add key="CompanyId" value="9f3b3526-4dd4-4997-b974-1f2adb2793c7" /> <add key="CompanyId" value="7b3e51c4-cec3-4034-b246-431918b98836" />
<!-- Corpid --> <!-- Corpid -->
<add key="Corpid" value="Comcab2d43f60454327af30a131fc1d3abd" /> <add key="Corpid" value="Comcab2d43f60454327af30a131fc1d3abd" />
@ -19,9 +19,6 @@
<!-- rabbitmq地址 --> <!-- rabbitmq地址 -->
<add key="ReceiveMQUri" value="amqp://djy_output:123qwe@47.104.207.5:12567/djy.output.test" /> <add key="ReceiveMQUri" value="amqp://djy_output:123qwe@47.104.207.5:12567/djy.output.test" />
<!-- DS7地址 -->
<add key="DS7URL" value="http://127.0.0.1:10201" />
<!-- 导入费用录入人ID --> <!-- 导入费用录入人ID -->
<add key="FeeInputUserId" value="1BEC90E1-9780-472F-90C2-0C6390C044A4" /> <add key="FeeInputUserId" value="1BEC90E1-9780-472F-90C2-0C6390C044A4" />
@ -42,7 +39,7 @@
</appSettings> </appSettings>
<connectionStrings> <connectionStrings>
<!--本地开发 --> <!--本地开发 -->
<add name="DongShengDB" connectionString="Data Source=192.168.0.80;Initial Catalog=qdqj;Persist Security Info=True;User ID=sa;Password=sa123" providerName="System.Data.SqlClient" /> <add name="DongShengDB" connectionString="Data Source=60.209.125.238,26600;Initial Catalog=ShippingWeb_JHCSK;Persist Security Info=True;User ID=sa;Password=Ds20040201" providerName="System.Data.SqlClient" />
</connectionStrings> </connectionStrings>
<startup> <startup>

355
DSWeb.Service.Output.DS7/DS7DataContext.cs
Unescape Escape View File

@ -34,6 +34,11 @@ namespace DSWeb.Service.Output.DS7
public DbSet<SysBillNoSet> SysBillNoSet { get; set; } public DbSet<SysBillNoSet> SysBillNoSet { get; set; }
public DbSet<User> User { get; set; } public DbSet<User> User { get; set; }
public DbSet<op_other_md> op_other { get; set; }
public DbSet<op_seae_edi_md> op_seae_edi { get; set; }
public DbSet<op_seae_edi_ctn_md> op_seae_edi_ctn { get; set; }
} }
[Table("op_seae")] [Table("op_seae")]
@ -915,4 +920,354 @@ namespace DSWeb.Service.Output.DS7
} }
[Table("op_other")]
public class op_other_md
{
[Key]
public string BSNO { get; set; }
public string OPLB { get; set; }
public string OPLBNAME { get; set; }
public bool? BSSTATUS { get; set; }
public bool? FEESTATUS { get; set; }
public string CUSTNO { get; set; }
public string MBLNO { get; set; }
public string HBLNO { get; set; }
public string CONTRACTNO { get; set; }
public string CUSTOMERNAME { get; set; }
public DateTime? BSDATE { get; set; }
public string ACCDATE { get; set; }
public string BSSOURCE { get; set; }
public string BSSOURCEDETAIL { get; set; }
public string OP { get; set; }
public string CUSTSERVICE { get; set; }
public string SALE { get; set; }
public string CORPID { get; set; }
public string TRANSTYPE { get; set; }
public string VESSEL { get; set; }
public string VOYNO { get; set; }
public DateTime? ETD { get; set; }
public string PORTLOAD { get; set; }
public string PORTDISCHARGE { get; set; }
public string TRADETYPE { get; set; }
public string GOODSNAME { get; set; }
public decimal? KGS { get; set; }
public decimal? NETWEIGHT { get; set; }
public int? PKGS { get; set; }
public string KINDPKGS { get; set; }
public decimal? CBM { get; set; }
public bool? ISVOU { get; set; }
public string VOUNO { get; set; }
public string REMARK { get; set; }
public string CREATEUSER { get; set; }
public DateTime? CREATETIME { get; set; }
public string MODIFIEDUSER { get; set; }
public DateTime? MODIFIEDTIME { get; set; }
public string orderno { get; set; }
public string STLNAME { get; set; }
public DateTime? STLDATE { get; set; }
public string CTNALL { get; set; }
public int? CTNNUM { get; set; }
public string IsService1 { get; set; }
public string IsService2 { get; set; }
public string IsService3 { get; set; }
public string IsService4 { get; set; }
public string IsService5 { get; set; }
public string IsService6 { get; set; }
public string IsService7 { get; set; }
public string IsService8 { get; set; }
public string IsService9 { get; set; }
public string IsService10 { get; set; }
public string IsServiceFee1 { get; set; }
public string IsServiceFee2 { get; set; }
public string IsServiceFee3 { get; set; }
public string IsServiceFee4 { get; set; }
public string IsServiceFee5 { get; set; }
public string IsServiceFee6 { get; set; }
public string IsServiceFee7 { get; set; }
public string IsServiceFee8 { get; set; }
public string IsServiceFee9 { get; set; }
public string IsServiceFee10 { get; set; }
public string IsService11 { get; set; }
public string IsService12 { get; set; }
public string IsServiceFee11 { get; set; }
public string IsServiceFee12 { get; set; }
public string ENTERP { get; set; }
public string IsService13 { get; set; }
public string IsService14 { get; set; }
public string IsService15 { get; set; }
public string IsService16 { get; set; }
public string IsServiceFee13 { get; set; }
public string IsServiceFee14 { get; set; }
public string IsServiceFee15 { get; set; }
public string IsServiceFee16 { get; set; }
public string BOOKNO { get; set; }
public string ISPRINTPR { get; set; }
public int BillFeeStatus { get; set; }
public string OPERATOR { get; set; }
public string CUSTOMERNAME2 { get; set; }
public string SALECORPID { get; set; }
public string FRCUSTSERVICE { get; set; }
public DateTime? CLOSINGDATE { get; set; }
public DateTime? CLOSEDOCDATE { get; set; }
public string SALEDEPT { get; set; }
public string CUSTOMSER { get; set; }
public string WAREHOUSE { get; set; }
public string COUNTRYOFORIGIN { get; set; }
public DateTime? BILLFEESTATUSTIME { get; set; }
public byte? STLMODE { get; set; }
public string TRUCKNO { get; set; }
}
[Table("op_seae_edi")]
public partial class op_seae_edi_md
{
[Key]
public string MFNO { get; set; }
public string BSNO { get; set; }
public string MASTERNO { get; set; }
public string EDITYPE { get; set; }
public string EDISTATUS { get; set; }
public string INPUTBY { get; set; }
public string INPUTDATE { get; set; }
public string CUSTNO { get; set; }
public string MBLNO { get; set; }
public string HBLNO { get; set; }
public string SHIPPERNAME { get; set; }
public string SHIPPERADDR1 { get; set; }
public string SHIPPERADDR2 { get; set; }
public string SHIPPERADDR3 { get; set; }
public string SHIPPERCITY { get; set; }
public string SHIPPERPROVINCE { get; set; }
public string SHIPPERPOSTCODE { get; set; }
public string SHIPPERCOUNTRY { get; set; }
public string SHIPPERATTN { get; set; }
public string SHIPPERTEL { get; set; }
public string CONSIGNEENAME { get; set; }
public string CONSIGNEEADDR1 { get; set; }
public string CONSIGNEEADDR2 { get; set; }
public string CONSIGNEEADDR3 { get; set; }
public string CONSIGNEECITY { get; set; }
public string CONSIGNEEPROVINCE { get; set; }
public string CONSIGNEEPOSTCODE { get; set; }
public string CONSIGNEECOUNTRY { get; set; }
public string CONSIGNEEATTN { get; set; }
public string CONSIGNEETEL { get; set; }
public string NOTIFYPARTYNAME { get; set; }
public string NOTIFYPARTYADDR1 { get; set; }
public string NOTIFYPARTYADDR2 { get; set; }
public string NOTIFYPARTYADDR3 { get; set; }
public string NOTIFYPARTYCITY { get; set; }
public string NOTIFYPARTYPROVINCE { get; set; }
public string NOTIFYPARTYPOSTCODE { get; set; }
public string NOTIFYPARTYCOUNTRY { get; set; }
public string NOTIFYPARTYATTN { get; set; }
public string NOTIFYPARTYTEL { get; set; }
public string NOTIFYPARTY2NAME { get; set; }
public string NOTIFYPARTY2ADDR1 { get; set; }
public string NOTIFYPARTY2ADDR2 { get; set; }
public string NOTIFYPARTY2ADDR3 { get; set; }
public string NOTIFYPARTY2CITY { get; set; }
public string NOTIFYPARTY2PROVINCE { get; set; }
public string NOTIFYPARTY2POSTCODE { get; set; }
public string NOTIFYPARTY2COUNTRY { get; set; }
public string NOTIFYPARTY2ATTN { get; set; }
public string NOTIFYPARTY2TEL { get; set; }
public string SHIPPER { get; set; }
public string CONSIGNEE { get; set; }
public string NOTIFYPARTY { get; set; }
public string VESSEL { get; set; }
public string VOYNO { get; set; }
public DateTime? ETD { get; set; }
public string PORTLOADID { get; set; }
public string PORTLOAD { get; set; }
public string PORTDISCHARGEID { get; set; }
public string PORTDISCHARGE { get; set; }
public string PLACEDELIVERYID { get; set; }
public string PLACEDELIVERY { get; set; }
public string DESTINATIONID { get; set; }
public string DESTINATION { get; set; }
public string SERVICE { get; set; }
public string MARKS { get; set; }
public string DESCRIPTION { get; set; }
public decimal? PKGS { get; set; } = 0;
public string KINDPKGS { get; set; }
public decimal? KGS { get; set; } = 0M;
public decimal? CBM { get; set; } = 0M;
public string CARGOID { get; set; }
public string DCLASS { get; set; }
public string DUNNO { get; set; }
public string REEFERF { get; set; }
public string TEMPID { get; set; }
public string TEMPSET { get; set; }
public string TEMPMAX { get; set; }
public string TEMPMIN { get; set; }
public string FREIGHTAGMNO { get; set; }
public string HUMIDITY { get; set; }
public string SHIPIMO { get; set; }
public string CARRIERID { get; set; }
public string ORDERNO { get; set; }
public string FILEROLE { get; set; }
public string PACKINGTYPE { get; set; }
public string SHIPSERVICENO { get; set; }
public string TRANSTYPE { get; set; }
public string FILETYPE { get; set; }
public bool? ISLASTHBL { get; set; } = false;
public DateTime? ETA { get; set; }
public string BLFRT { get; set; }
public string ISSUEPLACE { get; set; }
public string ETDTIME { get; set; }
public string AGENTID { get; set; }
public string CNTRSEALNO { get; set; }
public DateTime? SENDTIME { get; set; }
public string STATUS { get; set; }
public string YARD { get; set; }
public string CHANGERESON { get; set; }
public string FORWARD { get; set; }
public string CARRIER { get; set; }
public string REMARKS { get; set; }
public string CNTRNO { get; set; }
public string CORPID { get; set; }
public int? CTNNUM { get; set; } = 0;
public string DPAGE { get; set; }
public string DLABEL { get; set; }
public string LINKMAN { get; set; }
public bool? ISSAMECONSIGNEE { get; set; } = false;
public string FORWARDER { get; set; }
public string DCARRIER { get; set; }
public string ARVESSEL { get; set; }
public string ARVOYNO { get; set; }
public string ARSHIPIMO { get; set; }
public string ARSHIPSERVICENO { get; set; }
public string FIRSTPORTOFCALLID { get; set; }
public string FIRSTPORTOFCALLDATE { get; set; }
public string LASTPORTOFCALLID { get; set; }
public string LASTPORTOFCALLDATE { get; set; }
public string MANIFESTSTATUS { get; set; }
public string PLACERECEIPTID { get; set; }
public string PLACERECEIPT { get; set; }
public string SHIPPERCODE { get; set; }
public string SHIPPEREMAIL { get; set; }
public string CONSIGNEECODE { get; set; }
public string CONSIGNEEEMAIL { get; set; }
public string NOTIFYPARTYCODE { get; set; }
public string NOTIFYPARTYEMAIL { get; set; }
public string ISFIMPORTER_CODE_TYPE { get; set; }
public string ISFIMPORTER_CODE { get; set; }
public string IMPORTER_CODE_TYPE { get; set; }
public string IMPORTER_CODE { get; set; }
public string CONSIGNEE_CODE_TYPE { get; set; }
public string CONSIGNEE_CODE { get; set; }
public string CARGOTYPE { get; set; }
public string BONDTYPE { get; set; }
public string BONDHOLDER_CODE_TYPE { get; set; }
public string BONDHOLDER_CODE { get; set; }
public string SELLREFCODE { get; set; }
public string MANUFACTURERREFCODE { get; set; }
public string SELLERNAME { get; set; }
public string SELLERADDR1 { get; set; }
public string SELLERCOUNTRY { get; set; }
public string BUYERNAME { get; set; }
public string BUYERADDR1 { get; set; }
public string BUYERCOUNTRY { get; set; }
public string MANUFACTURERNAME { get; set; }
public string MANUFACTURERADDR1 { get; set; }
public string MANUFACTURERCOUNTRY { get; set; }
public string SHIPTOPARTYNAME { get; set; }
public string SHIPTOPARTYADDR1 { get; set; }
public string SHIPTOPARTYCOUNTRY { get; set; }
//public string CONTAINERLOCATIONYNAME { get; set; }
public string CONTAINERLOCATIONADDR1 { get; set; }
public string CONTAINERLOCATIONCOUNTRY { get; set; }
public string CONSOLIDATORNAME { get; set; }
public string CONSOLIDATORADDR1 { get; set; }
public string CONSOLIDATORCOUNTRY { get; set; }
public string CONTAINERLOCATIONNAME { get; set; }
public string IMPORTERNAME { get; set; }
public string IMPORTERADDR1 { get; set; }
public string IMPORTERCOUNTRY { get; set; }
public string BOOKINGPARTYNAME { get; set; }
public string BOOKINGPARTYADDR1 { get; set; }
public string BOOKINGPARTYCOUNTRY { get; set; }
public string SELLERCITY { get; set; }
public string SELLERPROVINCE { get; set; }
public string BUYERCITY { get; set; }
public string BUYERPROVINCE { get; set; }
public string MANUFACTURERCITY { get; set; }
public string MANUFACTURERPROVINCE { get; set; }
public string SHIPTOPARTYCITY { get; set; }
public string SHIPTOPARTYPROVINCE { get; set; }
public string CONTAINERLOCATIONCITY { get; set; }
public string CONTAINERLOCATIONPROVINCE { get; set; }
public string CONSOLIDATORCITY { get; set; }
public string CONSOLIDATORPROVINCE { get; set; }
public string IMPORTERCITY { get; set; }
public string IMPORTERPROVINCE { get; set; }
public string BOOKINGPARTYCITY { get; set; }
public string BOOKINGPARTYPROVINCE { get; set; }
public string SELLERADDR2 { get; set; }
public string SELLEREMAIL { get; set; }
public string BUYERADDR2 { get; set; }
public string BUYEREMAIL { get; set; }
public string MANUFACTURERADDR2 { get; set; }
public string MANUFACTUREREMAIL { get; set; }
public string SHIPTOPARTYADDR2 { get; set; }
public string SHIPTOPARTYEMAIL { get; set; }
public string CONTAINERLOCATIONADDR2 { get; set; }
public string CONTAINERLOCATIONEMAIL { get; set; }
public string CONSOLIDATORADDR2 { get; set; }
public string CONSOLIDATOREMAIL { get; set; }
public string IMPORTERADDR2 { get; set; }
public string IMPORTEREMAIL { get; set; }
public string BOOKINGPARTYADDR2 { get; set; }
public string BOOKINGPARTYEMAIL { get; set; }
public string AMSSCACCODE { get; set; }
public string BONDACTIVECODE { get; set; }
public string HBLTYPE { get; set; }
public string MASTERHBLNUMBER { get; set; }
public string PORTTERMINALCODETYPE { get; set; }
public string PORTTERMINALCODE { get; set; }
public string MASTERHBLPREFIX { get; set; }
public string CONTACTNAME { get; set; }
public string CONTACTPHONE { get; set; }
public string COMMENTS { get; set; }
public string DELIVERYPORTTERMINALCODETYPE { get; set; }
public string DELIVERYPORTTERMINALCODE { get; set; }
//public string status_detai { get; set; }
}
[Table("op_seae_edi_ctn")]
public partial class op_seae_edi_ctn_md
{
[Key]
public string ctn_id { get; set; }
public string MFNO { get; set; }
public string CTNCODE { get; set; }
public string SIZE { get; set; }
public string CTN { get; set; }
public int? CTNNUM { get; set; } = 0;
public int? TEU { get; set; } = 0;
public string CTNALL { get; set; }
public string CNTRNO { get; set; }
public string SEALNO { get; set; }
public decimal? PKGS { get; set; } = 0;
public decimal? KGS { get; set; } = 0M;
public decimal? CBM { get; set; } = 0M;
public string KINDPKGS { get; set; }
public string DESCRIPTION { get; set; }
public string MARKS { get; set; }
public string PO { get; set; }
public string SKU { get; set; }
public string SKUDESCRIP { get; set; }
public string DUNNO { get; set; }
public string HTS { get; set; }
public string CTOFORIGIN { get; set; }
public decimal? GOODVALUE { get; set; } = 0M;
public string CTNOWNER { get; set; }
}
} }

967
DSWeb.Service.Output.DS7/DS7Service.cs
View File

File diff suppressed because it is too large Load Diff

9
DSWeb/Areas/CommMng/DAL/PublicAPIDAL.cs
Unescape Escape View File

@ -208,6 +208,15 @@ namespace DSWeb.Areas.CommMng.DAL
foreach (var item in FeeHead.COSTS) { foreach (var item in FeeHead.COSTS) {
//20230103 导入费用时先删除所有能删的费用
var 当前现存费用 = cdc.ch_fee.Where(x => x.BSNO == BSNO && x.chfeeCanChange()).ToList();
if(当前现存费用 != null && 当前现存费用.Count > 0) {
var delgids = 当前现存费用.Select(s => s.GID).ToArray();
var delgidstr = "'" + string.Join("','", delgids) + "'";
BasicDataRefDAL.ExecSql($"delete from ch_fee where gid in({delgidstr})");
}
var customername= cdc.code_cust_edi.FirstOrDefault(x => x.EDINAME == "关贸云" && x.EDICODE == item.COAGENT_ID); var customername= cdc.code_cust_edi.FirstOrDefault(x => x.EDINAME == "关贸云" && x.EDICODE == item.COAGENT_ID);
CUSTOMER = cdc.info_client.FirstOrDefault(x => x.SHORTNAME == customername.CUST); CUSTOMER = cdc.info_client.FirstOrDefault(x => x.SHORTNAME == customername.CUST);

1
DSWeb/Areas/MvcShipping/Models/MsChFee/MsChFee.cs
Unescape Escape View File

@ -488,6 +488,7 @@ namespace DSWeb.MvcShipping.Models.MsChFee
{ {
return "BsNo"; return "BsNo";
} }
} }

3
DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_CangDanEdit.js
Unescape Escape View File

@ -159,11 +159,12 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
model: 'DsShipping.ux.CustomRefModel', model: 'DsShipping.ux.CustomRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' } proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
}); });
this.storeCustCode.load({ params: { condition: "ISCONTROLLER='1'"} }); this.storeCustCode.load({ params: { condition: "ISCONTROLLER='1'" } });
this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', { this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '委托单位', fieldLabel: '委托单位',
store: this.storeCustCode, store: this.storeCustCode,
forceSelection: true, forceSelection: true,
matchFieldWidth: false,
name: 'CUSTOMERNAME', name: 'CUSTOMERNAME',
valueField: 'CustName', valueField: 'CustName',
displayField: 'CodeAndName', displayField: 'CodeAndName',

1
DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_KuaiDiEdit.js
Unescape Escape View File

@ -167,6 +167,7 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
name: 'CUSTOMERNAME', name: 'CUSTOMERNAME',
valueField: 'CustName', valueField: 'CustName',
displayField: 'CodeAndName', displayField: 'CodeAndName',
matchFieldWidth: false,
listeners: { listeners: {
scope: this, scope: this,
'select': function (combo, records, eOpts) { 'select': function (combo, records, eOpts) {

Write Preview
Loading…
Cancel
Save