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

20240909

Browse Source
ShenZhenCHJY
dengyu 3 months ago
parent 8adf6603e2
commit 8eee76a19f
15 changed files with 109 additions and 16 deletions
Show Stats Download Patch File Download Diff File

24
DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs
Unescape Escape View File

@ -3942,6 +3942,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
var CUSTBANK = "";
var ACCOUNT = "";
var CUSTNAME = "";
var 购方地址 = "";
var 购方电话 = "";
if (isapp)
{
var head2 = ChinvoiceapplicationDAL.GetData("BILLNO='" + billno + "'");
@ -3950,6 +3953,8 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
CUSTNAME = head2.ACTUALCUSTOMERNAME;
else
CUSTNAME = head2.CUSTOMERNAME;
购方地址 = head2.CUSTADDRTEL;
}
else
{
@ -3960,7 +3965,23 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
CUSTNAME = head.ACTUALCUSTOMERNAME;
else
CUSTNAME = head.CUSTOMERNAME;
购方地址 = head.CUSTADDRTEL;
}
try {
var _condition = "BILLNO='" + billno + "'";
var 直开head = DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin.ChinvoiceDAL.GetData(_condition);
if (!string.IsNullOrWhiteSpace(直开head.CUSTADDR)) {
购方地址=直开head.CUSTADDR;
购方电话=直开head.CUSTTEL;
}
} catch {
}
decimal rmbttl = 0;
decimal usdttl = 0;
decimal Allrmbttl = 0;
@ -3993,6 +4014,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
}
}
using (var conn = db.CreateConnection())
{
conn.Open();
@ -4100,6 +4122,8 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
templatestr = templatestr.Replace("《明细数据》", strl);
templatestr = templatestr.Replace("[购方银行]", custbank);
templatestr = templatestr.Replace("[购方账号]", custaccount);
templatestr = templatestr.Replace("[购方地址]", 购方地址);
templatestr = templatestr.Replace("[购方电话]", 购方电话);
templatestr = templatestr.Replace("[销方银行]", ACCOUNT);
templatestr = templatestr.Replace("[外币金额(总计)]", Allusdttl.ToString("#0.00"));
templatestr = templatestr.Replace("[人民币金额(总计)]", Allrmbttl.ToString("#0.00"));

3
DSWeb/Areas/Account/Models/MsOpBill/MsOpBill.cs
Unescape Escape View File

@ -253,7 +253,8 @@ namespace DSWeb.Areas.Account.Models.MsOpBill
public string BLISSUESTATUS { get; set; }
public int? CannotKoudan { get; set; }
#endregion
public MsOpBill()

2
DSWeb/Areas/Account/Viewsjs/Chfee_invoice_HangXin/ChInvoiceAppEdit.js
Unescape Escape View File

@ -5904,6 +5904,8 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
StoreFieldName.add({ "OPLBNAME": "购方银行" });
StoreFieldName.add({ "OPLBNAME": "购方账号" });
StoreFieldName.add({ "OPLBNAME": "销方银行" });
StoreFieldName.add({ "OPLBNAME": "购方地址" });
StoreFieldName.add({ "OPLBNAME": "购方电话" });
StoreFieldName.add({ "OPLBNAME": "购方USD银行" });
StoreFieldName.add({ "OPLBNAME": "购方USD账号" });
StoreFieldName.add({ "OPLBNAME": "购方RMB银行" });

9
DSWeb/Areas/MvcShipping/DAL/DisportsD/DisportsDal.cs
Unescape Escape View File

@ -16,7 +16,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.Disports
//查询disport语句
static public List<DisportModel> GetDisportList(string ename, string cname)
{
StringBuilder sb = new StringBuilder("select cd.PORTID,cd.PORT,cd.CHAU,cd.PORTTYPE,cd.EDICODE,cd.cname,cd.country,cl.LANE,cd.LANEGID from code_disport as cd left join code_lanes as cl on(cd.lanegid=cl.gid) ");
StringBuilder sb = new StringBuilder("select cd.PORTID,cd.PORT,cd.CHAU,cd.PORTTYPE,cd.EDICODE,cd.cname,cd.country,cl.LANE,cd.LANEGID,cd.CannotKoudan from code_disport as cd left join code_lanes as cl on(cd.lanegid=cl.gid) ");
if (!string.IsNullOrEmpty(ename) && !string.IsNullOrEmpty(cname))
{
sb.Append(" where port like('%" + ename + "%') and cname like('%" + cname + "%')");
@ -35,7 +35,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.Disports
#region 根据ID进行查询
static public List<DisportModel> GetDisportListByID(string headData)
{
string sql = "select cd.PORTID,cd.PORT,cd.CHAU,cd.PORTTYPE,cd.EDICODE,cd.cname,cd.country,cl.LANE,cd.lanegid,cd.explain,cd.LANEGID from code_disport as cd left join code_lanes as cl on(cd.lanegid=cl.gid) where portid=('" + headData + "')";
string sql = "select cd.PORTID,cd.PORT,cd.CHAU,cd.PORTTYPE,cd.EDICODE,cd.cname,cd.country,cl.LANE,cd.lanegid,cd.explain,cd.LANEGID,cd.CannotKoudan from code_disport as cd left join code_lanes as cl on(cd.lanegid=cl.gid) where portid=('" + headData + "')";
return SetDataByID(sql);
}
#endregion
@ -58,6 +58,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.Disports
data.country = Convert.ToString(reader["country"]);
data.LANE = Convert.ToString(reader["LANE"]);
data.LANEGID = Convert.ToString(reader["LANEGID"]);
data.CannotKoudan= Convert.ToInt32(reader["CannotKoudan"]);
#endregion
headList.Add(data);
}
@ -86,7 +87,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.Disports
data.LANE = Convert.ToString(reader["LANE"]);
data.DESCRIP = Convert.ToString(reader["explain"]);
data.LANEGID = Convert.ToString(reader["LANEGID"]);
data.CannotKoudan = Convert.ToInt32(reader["CannotKoudan"]);
#endregion
headList.Add(data);
}
@ -248,7 +249,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.Disports
{
var cmdDelete = db.GetSqlStringCommand("delete from code_disport where portid='" + headData.PORTID + "'");
db.ExecuteNonQuery(cmdDelete, tran);
string sql = string.Format("insert into code_disport(Portid,port,cname,CHAU,EXPLAIN,PORTTYPE,EDICODE,country,LANEGID) values('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}')", headData.PORTID, headData.PORT.Replace("'", "''"), headData.cname, headData.CHAU, headData.DESCRIP, headData.PORTTYPE, headData.EDICODE, headData.country, headData.LANEGID);
string sql = string.Format("insert into code_disport(Portid,port,cname,CHAU,EXPLAIN,PORTTYPE,EDICODE,country,LANEGID,CannotKoudan) values('{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}')", headData.PORTID, headData.PORT.Replace("'", "''"), headData.cname, headData.CHAU, headData.DESCRIP, headData.PORTTYPE, headData.EDICODE, headData.country, headData.LANEGID,headData.CannotKoudan);
var cmd = db.GetSqlStringCommand(sql);
db.ExecuteNonQuery(cmd, tran);
tran.Commit();

8
DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs
Unescape Escape View File

@ -316,9 +316,10 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
strSql.Append(",(SELECT TOP 1 BLSTATUS FROM op_blissue WHERE BSNO=OP_SEAE.BSNO) BLISSUESTATUS");
strSql.Append(",ISSUETYPE");
strSql.Append(" from op_seae where ISSUETYPE<>'SWB' ");//20230302 固化逻辑 不显示issuetype=SWB的业务 因为实际上扣不了
strSql.Append(",isnull((select top 1 CannotKoudan from code_disport where port=portdischarge),-1) CannotKoudan ");
strSql.Append(" from op_seae where ISSUETYPE<>'SWB' ");//20230302 固化逻辑 不显示issuetype=SWB的业务 因为实际上扣不了
if (!string.IsNullOrEmpty(strCondition))
{
@ -407,6 +408,9 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
data.REMARK = Convert.ToString(reader["REMARK"]);
data.BLISSUESTATUS = Convert.ToString(reader["BLISSUESTATUS"]);
data.ISSUETYPE = Convert.ToString(reader["ISSUETYPE"]);
data.CannotKoudan = Convert.ToInt32(reader["CannotKoudan"]);
#endregion
headList.Add(data);
}

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

@ -96,5 +96,9 @@ namespace DSWeb.Areas.MvcShipping.Models.Disport
get { return _LANEGID; }
set { _LANEGID = value; }
}
[ModelDB]
//不能扣单
public int? CannotKoudan { get; set; } = 0;
}
}

33
DSWeb/Areas/MvcShipping/Viewsjs/MsCodeDisportSet/MsCodeDisportSetEdit.js
Unescape Escape View File

@ -105,6 +105,23 @@ Ext.extend(Shipping.MsCodeGoodsEdit, Ext.Panel, {
displayField: 'EnumValueName'
});
this.StoreCannotKoudan = Ext.create('Ext.data.Store', {
fields: ['value', 'text']
});
this.StoreCannotKoudan.add({ 'value':1, 'text': '是' });
this.StoreCannotKoudan.add({ 'value':0, 'text': '否' });
this.comboxCannotKoudan = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '不能扣单', //'默认FRT',
store: this.StoreCannotKoudan,
valueField: 'value',
displayField: 'text',
forceSelection: true,
name: 'CannotKoudan'
});
//表参照相关(编辑form)
//编辑form
@ -169,7 +186,21 @@ Ext.extend(Shipping.MsCodeGoodsEdit, Ext.Panel, {
name: 'DESCRIP'
}]
}
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [this.comboxCannotKoudan
, {
xtype:'hiddenfield'
}
]
}
]//end items(fieldset 1)
}//end fieldset 1
]//end root items

10
DSWeb/Areas/MvcShipping/Viewsjs/MsCodeDisportSet/MsCodeDisportSetIndex.js
Unescape Escape View File

@ -76,6 +76,16 @@ Ext.extend(Shipping.MsCodeGoodsIndex, Ext.Panel, {
dataIndex: 'EDICODE',
header: 'EDI编码',
width: 140
}, {
sortable: true,
dataIndex: 'CannotKoudan',
header: '不能扣单',
width: 80,
renderer: function (value, p, record) {
if (value == '1')
return '<SPAN style="COLOR: red">是</SPAN>';
return '否';
}
}, {
sortable: true,
dataIndex: 'GID',

3
DSWeb/Areas/MvcShipping/Viewsjs/MsCodeDisportSet/MsCodeDisportSetModel.js
Unescape Escape View File

@ -10,7 +10,8 @@
{ name: 'cname', type: 'string' },
{ name: 'country', type: 'string' },
{ name: 'LANE', type: 'string' },
{ name: 'LANEGID', type: 'string' }
{ name: 'LANEGID', type: 'string' },
{ name: 'CannotKoudan', type: 'string' }
]
});

3
DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEModel.js
Unescape Escape View File

@ -156,7 +156,8 @@ Ext.define('MsChFeedoBill', {
{ name: 'BSCUSTOMNO', type: 'string' },
{ name: 'CUSTOMSNUM', type: 'string' },
{ name: 'BLISSUESTATUS', type: 'string' },
{ name: 'ISSUETYPE', type: 'string' }
{ name: 'ISSUETYPE', type: 'string' },
{ name: 'CannotKoudan', type: 'number' }
]
});

9
DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUESPEdit.js
Unescape Escape View File

@ -1607,7 +1607,14 @@ Ext.extend(Shipping.MsOp_BLISSUESPEdit, Ext.Panel, {
sortable: true,
dataIndex: 'PORTDISCHARGE',
header: '目的港',
width: 120
width: 120,
renderer: function (value, p, record) {
if (record.data.CannotKoudan==-1)
return '<SPAN style="COLOR: red">' + value + '[不规范的港口名]</SPAN>';
if (record.data.CannotKoudan == 1)
return '<SPAN style="COLOR: red">' + value + '[不能扣单]</SPAN>';
return value;
}
}, {
sortable: true,
dataIndex: 'VESSEL',

7
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js
Unescape Escape View File

@ -174,6 +174,13 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
header: Zi.LAN.ORDERETD,
width: 80
},
{
sortable: true,
dataIndex: 'ETD2',
header: Zi.LAN.ETD2,
width: 80
},
{
sortable: true,
dataIndex: 'BLTYPE',

2
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/Zi_zh-cn.js
Unescape Escape View File

@ -13,7 +13,7 @@ Zi.LAN.TEU = "TEU";
Zi.LAN.ORDERETD = "大船ETD";
Zi.LAN.ETD2 = "驳船ETD";
Zi.LAN.BSSOURCE = "合约类型";//业务来源
Zi.LAN.ISSUETYPE = "签单方式";
Zi.LAN.CONTRACTNO = "合约号";

8
DSWeb/Web.config
Unescape Escape View File

@ -131,14 +131,14 @@
<add name="DongShengDB" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 正式库 rainbow admin admin -->
<!-- 深圳彩虹捷运 正式库 rainbow admin admin
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456
-->
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456 -->
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=1107;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=1107;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳泛亚捷运 正式库 SZFYJY admin 123456
<add name="DongShengDB" connectionString="Server=39.108.7.69,62356;Database=ShippingWeb_SZFYJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />

BIN
DSWeb/sql/update.mdb
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save