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

解决3月23日问题1-7；1、舱单的这30块钱可以付船代吗？2、应付费用里也想加上分单号，3、收付分单号的取值如果没有分单号放主单号，4、舱单的这部分信息想隐藏，是不是就得单独页面，（暂时不用修改，我先问问）5、业务来源可以根据委托单位的信息带过来吗？6、大简云上订舱编号录入可以之录海运部，或者,mkt1吧，系统会解析的吧7、单价的取值现在是根据实际客户来提取的，如果实际客户没有维护单价可以取委托单位的吗？

Browse Source
DS7_JingHan
ddlucky 2 years ago
parent 045798da93
commit 06fea483cf
2 changed files with 57 additions and 24 deletions
Show Stats Download Patch File Download Diff File

44
DSWeb.Service.Output.DS7/DS7Service.cs
Unescape Escape View File

@ -612,6 +612,7 @@ namespace DSWeb.Service.Output.DS7
var SOURCEOP = ""; var SOURCEOP = "";
var 费用标准结算对象 = ""; var 费用标准结算对象 = "";
var 船代 = "";
var custEdi = dS7Data.CodeCustEdi.AsNoTracking().FirstOrDefault(x => x.EDINAME == "DJY_OUTPUT" && x.EDICODE == WeiTuoFaSongFang); var custEdi = dS7Data.CodeCustEdi.AsNoTracking().FirstOrDefault(x => x.EDINAME == "DJY_OUTPUT" && x.EDICODE == WeiTuoFaSongFang);
if (custEdi != null) if (custEdi != null)
@ -619,7 +620,10 @@ namespace DSWeb.Service.Output.DS7
费用标准结算对象 = custEdi.CUST; 费用标准结算对象 = custEdi.CUST;
} }
var 船代Edi= dS7Data.CodeCustEdi.AsNoTracking().FirstOrDefault(x => x.EDINAME == "DJY_OUTPUT" && x.EDICODE == _edi.FORWARDER);
if (船代Edi != null) {
船代 = 船代Edi.CUST;
}
//如果大简云业务中的【订舱编号】空着，则用大简云舱单界面的【委托发送方】 ，寻找EDI代码设置中的EDICODE =【委托发送方】 EDINAME = 大简云的客户 填入【委托单位】字段的内容 //如果大简云业务中的【订舱编号】空着，则用大简云舱单界面的【委托发送方】 ，寻找EDI代码设置中的EDICODE =【委托发送方】 EDINAME = 大简云的客户 填入【委托单位】字段的内容
@ -666,6 +670,8 @@ namespace DSWeb.Service.Output.DS7
SOURCEOP = orderinfo[1]; SOURCEOP = orderinfo[1];
} }
var 委托单位 = dS7Data.InfoClient.FirstOrDefault(x => x.SHORTNAME == CUSTOMERNAME);
if (op_other == null || op_other.BSNO == null || op_other.BSNO == "") if (op_other == null || op_other.BSNO == null || op_other.BSNO == "")
{ {
@ -699,12 +705,12 @@ namespace DSWeb.Service.Output.DS7
FEESTATUS = false, FEESTATUS = false,
MBLNO = MBLNO, MBLNO = MBLNO,
HBLNO = "", HBLNO = "",
CUSTOMERNAME = CUSTOMERNAME, CUSTOMERNAME = 委托单位.SHORTNAME,
CUSTOMERNAME2=WeiTuoFaSongFang,//20230313-大简云舱单界面的【委托发送方】录入东胜系统的实际客户， CUSTOMERNAME2 = WeiTuoFaSongFang,//20230313-大简云舱单界面的【委托发送方】录入东胜系统的实际客户，
//CARRIER //CARRIER
BSDATE = DateTime.Today, BSDATE = DateTime.Today,
ACCDATE = DateTime.Now.ToString("yyyy-MM"), ACCDATE = DateTime.Now.ToString("yyyy-MM"),
BSSOURCE = "", BSSOURCE = 委托单位.BSSOURCE,
OP = opUser.SHOWNAME, OP = opUser.SHOWNAME,
CUSTSERVICE = opUser.SHOWNAME, CUSTSERVICE = opUser.SHOWNAME,
SALE = opUser.SHOWNAME, SALE = opUser.SHOWNAME,
@ -713,11 +719,12 @@ namespace DSWeb.Service.Output.DS7
//SR2023011000005 //SR2023011000005
PORTLOAD = _edi.PORTLOAD,//装货港 PORTLOAD = _edi.PORTLOAD,//装货港
PORTDISCHARGE = _edi.PORTDISCHARGE,//卸货港 PORTDISCHARGE = _edi.PORTDISCHARGE,//卸货港
PKGS= PKGS, PKGS = PKGS,
KGS= KGS, KGS = KGS,
NETWEIGHT=0, NETWEIGHT = 0,
CBM= CBM, CBM = CBM,
SOURCEOP= SOURCEOP SOURCEOP = SOURCEOP,
SHIPAGENT = 船代
}; };
//,DUIYUEHAO = 对账约号 //,DUIYUEHAO = 对账约号
//20230317 对账约号存于opLogic //20230317 对账约号存于opLogic
@ -877,6 +884,10 @@ namespace DSWeb.Service.Output.DS7
//查询配置，生成应收 //查询配置，生成应收
var fee = dS7Data.CustFeeTemplateDetail.AsNoTracking().FirstOrDefault(x => x.CUSTOMERNAME == 费用标准结算对象 && x.FEENAME == FeeShouName); var fee = dS7Data.CustFeeTemplateDetail.AsNoTracking().FirstOrDefault(x => x.CUSTOMERNAME == 费用标准结算对象 && x.FEENAME == FeeShouName);
if (fee == null) {
fee = dS7Data.CustFeeTemplateDetail.AsNoTracking().FirstOrDefault(x => x.CUSTOMERNAME == 委托单位.SHORTNAME && x.FEENAME == FeeShouName);
}
if (fee != null ) if (fee != null )
{ {
var feeShou = new ChFee(); var feeShou = new ChFee();
@ -943,6 +954,17 @@ namespace DSWeb.Service.Output.DS7
} }
} }
if (FeePayCustomerType == "船代") {
//20230327 改为：
//如应付对象类型为船代 则结算对象改为该业务的船代公司
FeePayCustomer = 船代;
}
var 分单号 = HBLNO;
if (string.IsNullOrWhiteSpace(HBLNO)) {
分单号 = MBLNO;
}
//应付 //应付
if (string.IsNullOrEmpty(HBLNO) && FeePayPrice>0) //主单才插入船代费用 if (string.IsNullOrEmpty(HBLNO) && FeePayPrice>0) //主单才插入船代费用
{ {
@ -994,7 +1016,7 @@ namespace DSWeb.Service.Output.DS7
feeFu.ISACC = false; feeFu.ISACC = false;
feeFu.CUSTDUI = false; feeFu.CUSTDUI = false;
feeFu.BXGID = HBLNO; feeFu.BXGID = 分单号;
dS7Data.ChFee.Add(feeFu); dS7Data.ChFee.Add(feeFu);
dS7Data.SaveChanges(); dS7Data.SaveChanges();
@ -1050,7 +1072,7 @@ namespace DSWeb.Service.Output.DS7
feeFuDJY.ISACC = false; feeFuDJY.ISACC = false;
feeFuDJY.CUSTDUI = false; feeFuDJY.CUSTDUI = false;
feeFuDJY.BXGID = HBLNO; feeFuDJY.BXGID = 分单号;
dS7Data.ChFee.Add(feeFuDJY); dS7Data.ChFee.Add(feeFuDJY);

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

@ -630,7 +630,8 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
fieldLabel: '源操作', fieldLabel: '源操作',
name: 'SOURCEOP' name: 'SOURCEOP'
} }
, { xtype: 'hiddenfield', flex: 2 } ,this.comboxBSSOURCE
, { xtype: 'hiddenfield', flex: 1 }
] ]
} }
@ -723,21 +724,26 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
defaults: { defaults: {
anchor: '100%' anchor: '100%'
}, },
items: [{ items: [
xtype: 'container', {
layout: 'hbox', xtype: 'container',
defaultType: 'textfield', layout: 'hbox',
items: [this.comboxBSSOURCE, this.comboxBSSOURCEDETAIL, { defaultType: 'textfield',
hidden: true,
items: [this.comboxBSSOURCEDETAIL//this.comboxBSSOURCE,
, {
fieldLabel: '装货港', fieldLabel: '装货港',
name: 'PORTLOAD' name: 'PORTLOAD'
}, { }, {
fieldLabel: '卸货港', fieldLabel: '卸货港',
name: 'PORTDISCHARGE' name: 'PORTDISCHARGE'
}, this.comboxTRANSTYPE, this.comboxTRADETYPE] }, this.comboxTRANSTYPE, this.comboxTRADETYPE]
}, { },
{
xtype: 'container', xtype: 'container',
layout: 'hbox', layout: 'hbox',
defaultType: 'textfield', defaultType: 'textfield',
hidden: true,
items: [{ items: [{
fieldLabel: '业务日期', fieldLabel: '业务日期',
format: 'Y-m-d', format: 'Y-m-d',
@ -780,10 +786,12 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
} }
} }
}, this.comboxGOODSNAME] }, this.comboxGOODSNAME]
}, { },
{
xtype: 'container', xtype: 'container',
layout: 'hbox', layout: 'hbox',
defaultType: 'textfield', defaultType: 'textfield',
hidden: true,
items: [ { items: [ {
fieldLabel: '毛重', fieldLabel: '毛重',
name: 'KGS', name: 'KGS',
@ -824,10 +832,12 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
regex: /^\d+(\.\d{1,4})?$/, regex: /^\d+(\.\d{1,4})?$/,
regexText: '请输入正确的数值类型！' regexText: '请输入正确的数值类型！'
}, this.comboxCustWmsCode] }, this.comboxCustWmsCode]
}, { },
{
xtype: 'container', xtype: 'container',
layout: 'hbox', layout: 'hbox',
defaultType: 'textfield', defaultType: 'textfield',
hidden: true,
items: [{ items: [{
fieldLabel: '订舱编号', fieldLabel: '订舱编号',
name: 'ORDERNO' name: 'ORDERNO'
@ -843,7 +853,8 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
fieldLabel: '手册号', fieldLabel: '手册号',
name: 'BOOKNO' name: 'BOOKNO'
}, this.comboxCUSTOMSER, this.comboxCountry] }, this.comboxCUSTOMSER, this.comboxCountry]
}, { },
{
xtype: 'container', xtype: 'container',
layout: 'hbox', layout: 'hbox',
defaultType: 'textfield', defaultType: 'textfield',

Write Preview
Loading…
Cancel
Save