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

20240604

Browse Source
ShenZhenCHJY
dengyu 7 months ago
parent d75e993f5c
commit 0230c79781
7 changed files with 79 additions and 29 deletions
Show Stats Download Patch File Download Diff File

50
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
Unescape Escape View File

@ -3163,7 +3163,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
if (str == "UASC") return "UASC"; if (str == "UASC") return "UASC";
if (str == "COSU") return "COSCO"; if (str == "COSU") return "COSCO";
if (str == "OOLU") return "OOCL"; if (str == "OOLU") return "OOCL";
if (str == "PIL") return "Pacific International Lines"; if (str == "PIL"|| str == "PABV") return "Pacific International Lines";
else return ""; else return "";
} }
public static string GetBillNum(string str) public static string GetBillNum(string str)
@ -7443,14 +7443,15 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
else else
r.WriteLine("NAD+FW+++" + formatEdiStr("txt", billams.FORWARD) + "'"); r.WriteLine("NAD+FW+++" + formatEdiStr("txt", billams.FORWARD) + "'");
} icount++;
}
else else
{ {
if (IsNADFW == 1) if (IsNADFW == 1)
{ {
r.WriteLine("NAD+FW+" + tbNADFWID + ":160:86++" + tbNADFW + "'"); r.WriteLine("NAD+FW+" + tbNADFWID + ":160:86++" + tbNADFW + "'");
icount++;
} }
else else
{ {
@ -7459,9 +7460,28 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
else else
r.WriteLine("NAD+FW+" + ftpset.SENDCODE + ":160:86++" + ftpset.SENDNAME + "'"); r.WriteLine("NAD+FW+" + ftpset.SENDCODE + ":160:86++" + ftpset.SENDNAME + "'");
} }
} icount++;
}
var alsendcode = ftpset.ALIASSENDCODE; if (dsUserOp != null)
{
if (dsUserOp.Tables[0].Rows.Count > 0)
{
r.WriteLine("CTA+IC+:" + dsUserOp.Tables[0].Rows[0]["USERNAME"].ToString().Trim() + "'");
r.WriteLine("COM+" + dsUserOp.Tables[0].Rows[0]["OFFICEPHONE"].ToString().Trim() + ":TE'");
r.WriteLine("COM+" + dsUserOp.Tables[0].Rows[0]["EMAIL1"].ToString().Trim() + ":EM'");
r.WriteLine("NAD+MR+++" + ftpset.SENDNAME + "'");
//r.WriteLine("CTA+NT+:" +billams.ATTN+ "'");
//r.WriteLine("COM+" + billams.ATTNEMAIL + ":EM'");
r.WriteLine("CTA+NT+:" + dsUserOp.Tables[0].Rows[0]["USERNAME"].ToString().Trim() + "'");
r.WriteLine("COM+" + dsUserOp.Tables[0].Rows[0]["EMAIL1"].ToString().Trim() + ":EM'");
icount = icount + 6;
}
}
var alsendcode = ftpset.ALIASSENDCODE;
if (alsendcode == "") if (alsendcode == "")
{ {
alsendcode = ftpset.SENDCODE; alsendcode = ftpset.SENDCODE;
@ -7479,26 +7499,12 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
r.WriteLine("NAD+HI+" + alsendcode + ":160:86++" + alsendcode + "'"); r.WriteLine("NAD+HI+" + alsendcode + ":160:86++" + alsendcode + "'");
} }
icount = icount + 1;
//r.WriteLine("CTA+IC+:" +billams.ATTN+ "'"); //r.WriteLine("CTA+IC+:" +billams.ATTN+ "'");
//r.WriteLine("COM+" +billams.ATTNTEL+ ":TE'"); //r.WriteLine("COM+" +billams.ATTNTEL+ ":TE'");
//r.WriteLine("COM+" + billams.ATTNEMAIL + ":EM'"); //r.WriteLine("COM+" + billams.ATTNEMAIL + ":EM'");
if (dsUserOp != null)
{
if (dsUserOp.Tables[0].Rows.Count > 0)
{
r.WriteLine("CTA+IC+:" + dsUserOp.Tables[0].Rows[0]["USERNAME"].ToString().Trim() + "'");
r.WriteLine("COM+" + dsUserOp.Tables[0].Rows[0]["OFFICEPHONE"].ToString().Trim() + ":TE'");
r.WriteLine("COM+" + dsUserOp.Tables[0].Rows[0]["EMAIL1"].ToString().Trim() + ":EM'");
r.WriteLine("NAD+MR+++" + ftpset.SENDNAME + "'");
//r.WriteLine("CTA+NT+:" +billams.ATTN+ "'");
//r.WriteLine("COM+" + billams.ATTNEMAIL + ":EM'");
r.WriteLine("CTA+NT+:" + dsUserOp.Tables[0].Rows[0]["USERNAME"].ToString().Trim() + "'");
r.WriteLine("COM+" + dsUserOp.Tables[0].Rows[0]["EMAIL1"].ToString().Trim() + ":EM'");
}
}
if (isbill != 1) if (isbill != 1)
{ {
r.WriteLine("GID+1+" + bill.PKGS.ToString() + ":" + GetPackageEDICode(bill.KINDPKGS, "INTTR").Trim() + "::6:" + bill.KINDPKGS + "'"); r.WriteLine("GID+1+" + bill.PKGS.ToString() + ":" + GetPackageEDICode(bill.KINDPKGS, "INTTR").Trim() + "::6:" + bill.KINDPKGS + "'");
@ -7507,7 +7513,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
{ {
r.WriteLine("GID+1+" + OpBill.PKGS.ToString() + ":" + GetPackageEDICode(OpBill.KINDPKGS, "INTTR").Trim() + "::6:" + OpBill.KINDPKGS + "'"); r.WriteLine("GID+1+" + OpBill.PKGS.ToString() + ":" + GetPackageEDICode(OpBill.KINDPKGS, "INTTR").Trim() + "::6:" + OpBill.KINDPKGS + "'");
} }
icount = icount + 8; icount = icount + 1;
if (bill.HSCODE != "") if (bill.HSCODE != "")
{ {

15
DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs
Unescape Escape View File

@ -125,7 +125,9 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
strSql.Append(",(select DESCRIPTION from info_client where shortname=B.customername) CUSTOMERFULLNAME "); strSql.Append(",(select DESCRIPTION from info_client where shortname=B.customername) CUSTOMERFULLNAME ");
strSql.Append(",(select top 1 CUSTOMERNAME from crm_seaeorder_fen where MASTERNO = b.BSNO order by ordno) FEN_CUSTOMERNAME"); strSql.Append(",(select top 1 CUSTOMERNAME from crm_seaeorder_fen where MASTERNO = b.BSNO order by ordno) FEN_CUSTOMERNAME");
strSql.Append(",B.ISEI,B.TEU,cd.COUNTRY,cd.CHAU"); strSql.Append(",B.ISEI,B.TEU,cd.COUNTRY,cd.CHAU,B.ORDER_CUSTCODE,B.ORDER_CUSTNAME");
strSql.Append(" from crm_seaeorder B WITH (NOLOCK)"); strSql.Append(" from crm_seaeorder B WITH (NOLOCK)");
//strSql.Append(" left join (select t3.* from (select *,row_number() over (partition by EDICODE order by portid asc) as rownum from code_disport) t3 where t3.rownum = 1 ) cd on B.DESTINATIONID = cd.EDICODE "); //strSql.Append(" left join (select t3.* from (select *,row_number() over (partition by EDICODE order by portid asc) as rownum from code_disport) t3 where t3.rownum = 1 ) cd on B.DESTINATIONID = cd.EDICODE ");
@ -242,7 +244,7 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
strSql.Append(",B.AUDITOPERATOR2,B.ETD2,B.ISSUETYPE2,B.STLNAME2,B.TIDANLEIXING,B.SUBMITDATE,TRADETERM,DIANSHANGORDERNO,BCNO "); strSql.Append(",B.AUDITOPERATOR2,B.ETD2,B.ISSUETYPE2,B.STLNAME2,B.TIDANLEIXING,B.SUBMITDATE,TRADETERM,DIANSHANGORDERNO,BCNO ");
strSql.Append(",(select DESCRIPTION from info_client where shortname=B.customername) CUSTOMERFULLNAME "); strSql.Append(",(select DESCRIPTION from info_client where shortname=B.customername) CUSTOMERFULLNAME ");
strSql.Append(",(select top 1 CUSTOMERNAME from crm_seaeorder_fen where MASTERNO = b.BSNO order by ordno) FEN_CUSTOMERNAME"); strSql.Append(",(select top 1 CUSTOMERNAME from crm_seaeorder_fen where MASTERNO = b.BSNO order by ordno) FEN_CUSTOMERNAME");
strSql.Append(",B.ISEI,B.TEU,cd.COUNTRY,cd.CHAU"); strSql.Append(",B.ISEI,B.TEU,cd.COUNTRY,cd.CHAU,B.ORDER_CUSTCODE,B.ORDER_CUSTNAME");
strSql.Append(" from crm_seaeorder B"); strSql.Append(" from crm_seaeorder B");
//strSql.Append(" left join (select t3.* from (select *,row_number() over (partition by EDICODE order by portid asc) as rownum from code_disport) t3 where t3.rownum = 1 ) cd on B.DESTINATIONID = cd.EDICODE "); //strSql.Append(" left join (select t3.* from (select *,row_number() over (partition by EDICODE order by portid asc) as rownum from code_disport) t3 where t3.rownum = 1 ) cd on B.DESTINATIONID = cd.EDICODE ");
strSql.Append(" left join (select * from( select *,row_number() over (partition by EDICODE order by CHAU desc) as rownum from (select EDICODE,COUNTRY,CHAU from code_disport union all select PORTENAME EDICODE,COUNTRY,'' CHAU from code_air_port)t4) t3 where t3.rownum = 1) cd on B.DESTINATIONID = cd.EDICODE "); strSql.Append(" left join (select * from( select *,row_number() over (partition by EDICODE order by CHAU desc) as rownum from (select EDICODE,COUNTRY,CHAU from code_disport union all select PORTENAME EDICODE,COUNTRY,'' CHAU from code_air_port)t4) t3 where t3.rownum = 1) cd on B.DESTINATIONID = cd.EDICODE ");
@ -533,6 +535,13 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
if (reader["CHAU"] != DBNull.Value) if (reader["CHAU"] != DBNull.Value)
data.CHAU = Convert.ToString(reader["CHAU"]); data.CHAU = Convert.ToString(reader["CHAU"]);
if (reader["ORDER_CUSTCODE"] != DBNull.Value)
data.ORDER_CUSTCODE = Convert.ToString(reader["ORDER_CUSTCODE"]);//
if (reader["ORDER_CUSTNAME"] != DBNull.Value)
data.ORDER_CUSTNAME = Convert.ToString(reader["ORDER_CUSTNAME"]);//
#endregion #endregion
headList.Add(data); headList.Add(data);
} }
@ -946,7 +955,7 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
strSql.Append(",B.AUDITOPERATOR2,B.ETD2,B.ISSUETYPE2,B.STLNAME2,B.TIDANLEIXING,B.SUBMITDATE ,TRADETERM,DIANSHANGORDERNO,BCNO "); strSql.Append(",B.AUDITOPERATOR2,B.ETD2,B.ISSUETYPE2,B.STLNAME2,B.TIDANLEIXING,B.SUBMITDATE ,TRADETERM,DIANSHANGORDERNO,BCNO ");
strSql.Append(",(select DESCRIPTION from info_client where shortname=B.customername) CUSTOMERFULLNAME "); strSql.Append(",(select DESCRIPTION from info_client where shortname=B.customername) CUSTOMERFULLNAME ");
strSql.Append(",(select top 1 CUSTOMERNAME from crm_seaeorder_fen where MASTERNO = b.BSNO order by ordno) FEN_CUSTOMERNAME"); strSql.Append(",(select top 1 CUSTOMERNAME from crm_seaeorder_fen where MASTERNO = b.BSNO order by ordno) FEN_CUSTOMERNAME");
strSql.Append(",B.ISEI,B.TEU,cd.COUNTRY,cd.CHAU"); strSql.Append(",B.ISEI,B.TEU,cd.COUNTRY,cd.CHAU,B.ORDER_CUSTCODE,B.ORDER_CUSTNAME");
strSql.Append(" from crm_seaeorder B"); strSql.Append(" from crm_seaeorder B");
//strSql.Append(" left join (select t3.* from (select *,row_number() over (partition by EDICODE order by portid asc) as rownum from code_disport) t3 where t3.rownum = 1 ) cd on B.DESTINATIONID = cd.EDICODE "); //strSql.Append(" left join (select t3.* from (select *,row_number() over (partition by EDICODE order by portid asc) as rownum from code_disport) t3 where t3.rownum = 1 ) cd on B.DESTINATIONID = cd.EDICODE ");
strSql.Append(" left join (select * from( select *,row_number() over (partition by EDICODE order by CHAU desc) as rownum from (select EDICODE,COUNTRY,CHAU from code_disport union all select PORTENAME EDICODE,COUNTRY,'' CHAU from code_air_port)t4) t3 where t3.rownum = 1) cd on B.DESTINATIONID = cd.EDICODE "); strSql.Append(" left join (select * from( select *,row_number() over (partition by EDICODE order by CHAU desc) as rownum from (select EDICODE,COUNTRY,CHAU from code_disport union all select PORTENAME EDICODE,COUNTRY,'' CHAU from code_air_port)t4) t3 where t3.rownum = 1) cd on B.DESTINATIONID = cd.EDICODE ");

9
DSWeb/Areas/MvcShipping/Models/MsSeaeOrder/MsSeaeOrder.cs
Unescape Escape View File

@ -1495,6 +1495,15 @@ namespace DSWeb.MvcShipping.Models.MsSeaeOrder
set { _ISEI = value; } set { _ISEI = value; }
} }
//20240604 合约方代码 合约方
[ModelDB]
public string ORDER_CUSTCODE { get; set; }
[ModelDB]
public string ORDER_CUSTNAME { get; set; }
#endregion #endregion

15
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js
Unescape Escape View File

@ -1220,7 +1220,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
fieldLabel: '运输条款', fieldLabel: '运输条款',
store: this.storeSERVICE, store: this.storeSERVICE,
forceSelection: true, forceSelection: true,
flex: 2, flex: 1,
name: 'SERVICE', name: 'SERVICE',
valueField: 'SERVICE', valueField: 'SERVICE',
displayField: 'SERVICE' displayField: 'SERVICE'
@ -2212,6 +2212,12 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
//// flex: 0.7, //// flex: 0.7,
// name: 'MAXWEIGHT' // name: 'MAXWEIGHT'
// } // }
, {
fieldLabel: Zi.LAN.ORDER_CUSTCODE,
labelWidth: 100,
// flex: 0.8,
name: "ORDER_CUSTCODE"
}
] ]
}, { }, {
xtype: 'container', xtype: 'container',
@ -2232,7 +2238,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
items: [{ items: [{
xtype: 'textareafield', xtype: 'textareafield',
grow: true, grow: true,
flex: 3, flex: 2,
fieldLabel: '订舱备注', fieldLabel: '订舱备注',
height: 40, height: 40,
name: 'REMARK', name: 'REMARK',
@ -2245,6 +2251,11 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
height: 40, height: 40,
name: 'ORREASON', name: 'ORREASON',
anchor: '100%' anchor: '100%'
}, {
fieldLabel: Zi.LAN.ORDER_CUSTNAME,
labelWidth: 100,
// flex: 0.8,
name: "ORDER_CUSTNAME"
}] }]
} }
] ]

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

@ -473,6 +473,16 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
dataIndex: 'ISSUETYPE', dataIndex: 'ISSUETYPE',
header: Zi.LAN.ISSUETYPE, header: Zi.LAN.ISSUETYPE,
width: 80 width: 80
}, {
sortable: true,
dataIndex: 'ORDER_CUSTCODE',
header: Zi.LAN.ORDER_CUSTCODE,
width: 80
}, {
sortable: true,
dataIndex: 'ORDER_CUSTNAME',
header: Zi.LAN.ORDER_CUSTNAME,
width: 80
} }

4
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderModel.js
Unescape Escape View File

@ -143,7 +143,9 @@
{ name: 'TEU', type: 'string' }, { name: 'TEU', type: 'string' },
{ name: 'FEEKGS', type: 'string' }, { name: 'FEEKGS', type: 'string' },
{ name: 'COUNTRY', type: 'string' }, { name: 'COUNTRY', type: 'string' },
{ name: 'CHAU', type: 'string' } { name: 'CHAU', type: 'string' },
{ name: 'ORDER_CUSTCODE', type: 'string' },
{ name: 'ORDER_CUSTNAME', type: 'string' }
] ]
}); });

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

@ -16,4 +16,7 @@ Zi.LAN.ORDERETD = "大船ETD";
Zi.LAN.BSSOURCE = "合约类型";//业务来源 Zi.LAN.BSSOURCE = "合约类型";//业务来源
Zi.LAN.ISSUETYPE = "签单方式"; Zi.LAN.ISSUETYPE = "签单方式";
Zi.LAN.CONTRACTNO = "合约号"; Zi.LAN.CONTRACTNO = "合约号";
Zi.LAN.ORDER_CUSTCODE = "合约方代码";
Zi.LAN.ORDER_CUSTNAME = "合约方";

Write Preview
Loading…
Cancel
Save