diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs index 5de994d8..387cc1ff 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs @@ -3163,7 +3163,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL if (str == "UASC") return "UASC"; if (str == "COSU") return "COSCO"; if (str == "OOLU") return "OOCL"; - if (str == "PIL") return "Pacific International Lines"; + if (str == "PIL"|| str == "PABV") return "Pacific International Lines"; else return ""; } public static string GetBillNum(string str) @@ -7443,14 +7443,15 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL else r.WriteLine("NAD+FW+++" + formatEdiStr("txt", billams.FORWARD) + "'"); - } + icount++; + } else { if (IsNADFW == 1) { r.WriteLine("NAD+FW+" + tbNADFWID + ":160:86++" + tbNADFW + "'"); - icount++; + } else { @@ -7459,9 +7460,28 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL else 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 == "") { alsendcode = ftpset.SENDCODE; @@ -7479,26 +7499,12 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL r.WriteLine("NAD+HI+" + alsendcode + ":160:86++" + alsendcode + "'"); } - + icount = icount + 1; //r.WriteLine("CTA+IC+:" +billams.ATTN+ "'"); //r.WriteLine("COM+" +billams.ATTNTEL+ ":TE'"); //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) { 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 + "'"); } - icount = icount + 8; + icount = icount + 1; if (bill.HSCODE != "") { diff --git a/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs index c54b1180..d3eaf81a 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs @@ -125,7 +125,9 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL 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(",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(" 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(",(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(",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(" 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 "); @@ -533,6 +535,13 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL if (reader["CHAU"] != DBNull.Value) 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 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(",(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(",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(" 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 "); diff --git a/DSWeb/Areas/MvcShipping/Models/MsSeaeOrder/MsSeaeOrder.cs b/DSWeb/Areas/MvcShipping/Models/MsSeaeOrder/MsSeaeOrder.cs index 1aba0b38..47c70374 100644 --- a/DSWeb/Areas/MvcShipping/Models/MsSeaeOrder/MsSeaeOrder.cs +++ b/DSWeb/Areas/MvcShipping/Models/MsSeaeOrder/MsSeaeOrder.cs @@ -1495,6 +1495,15 @@ namespace DSWeb.MvcShipping.Models.MsSeaeOrder set { _ISEI = value; } } + //20240604 合约方代码 合约方 + + [ModelDB] + public string ORDER_CUSTCODE { get; set; } + + [ModelDB] + public string ORDER_CUSTNAME { get; set; } + + #endregion diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js index cc6fada1..1b064d83 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderEdit.js @@ -1220,7 +1220,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, { fieldLabel: '运输条款', store: this.storeSERVICE, forceSelection: true, - flex: 2, + flex: 1, name: 'SERVICE', valueField: 'SERVICE', displayField: 'SERVICE' @@ -2212,6 +2212,12 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, { //// flex: 0.7, // name: 'MAXWEIGHT' // } + , { + fieldLabel: Zi.LAN.ORDER_CUSTCODE, + labelWidth: 100, + // flex: 0.8, + name: "ORDER_CUSTCODE" + } ] }, { xtype: 'container', @@ -2232,7 +2238,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, { items: [{ xtype: 'textareafield', grow: true, - flex: 3, + flex: 2, fieldLabel: '订舱备注', height: 40, name: 'REMARK', @@ -2245,6 +2251,11 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, { height: 40, name: 'ORREASON', anchor: '100%' + }, { + fieldLabel: Zi.LAN.ORDER_CUSTNAME, + labelWidth: 100, + // flex: 0.8, + name: "ORDER_CUSTNAME" }] } ] diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js index 6f2c5e14..e3eb2a11 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js @@ -473,6 +473,16 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, { dataIndex: 'ISSUETYPE', header: Zi.LAN.ISSUETYPE, 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 } diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderModel.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderModel.js index c3608d75..c8275883 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderModel.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderModel.js @@ -143,7 +143,9 @@ { name: 'TEU', type: 'string' }, { name: 'FEEKGS', type: 'string' }, { name: 'COUNTRY', type: 'string' }, - { name: 'CHAU', type: 'string' } + { name: 'CHAU', type: 'string' }, + { name: 'ORDER_CUSTCODE', type: 'string' }, + { name: 'ORDER_CUSTNAME', type: 'string' } ] }); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/Zi_zh-cn.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/Zi_zh-cn.js index 6994372c..10a95917 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/Zi_zh-cn.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/Zi_zh-cn.js @@ -16,4 +16,7 @@ Zi.LAN.ORDERETD = "大船ETD"; Zi.LAN.BSSOURCE = "合约类型";//业务来源 Zi.LAN.ISSUETYPE = "签单方式"; -Zi.LAN.CONTRACTNO = "合约号"; \ No newline at end of file +Zi.LAN.CONTRACTNO = "合约号"; + +Zi.LAN.ORDER_CUSTCODE = "合约方代码"; +Zi.LAN.ORDER_CUSTNAME = "合约方";