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

1

Browse Source
QDHHYT
hanxuntao 3 weeks ago
parent b6f56847b0
commit f963ddbdb0
9 changed files with 69 additions and 24 deletions
Show Stats Download Patch File Download Diff File

49
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
Unescape Escape View File

@ -5817,31 +5817,42 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
{
var result = new DBResult();
//向：做确认订舱操作的人、该业务的销售、该业务的录入人 发送邮件
var mailtitle = "舱位回收 "+headData.MBLNO;
var mailtitle = "舱位回收 ";
if (!string.IsNullOrEmpty(headData.CARRIER))
mailtitle = mailtitle + headData.CARRIER;
if (!string.IsNullOrEmpty(headData.ORDNO))
mailtitle = mailtitle + "-" + headData.ORDNO;
if (!string.IsNullOrEmpty(headData.MBLNO))
mailtitle = mailtitle + "-" + headData.MBLNO;
if (!string.IsNullOrEmpty(headData.MBLNO))
mailtitle = mailtitle + "-" + headData.MBLNO;
if (!string.IsNullOrEmpty(headData.LANE))
mailtitle = mailtitle + "-" + headData.LANE;
if (!string.IsNullOrEmpty(headData.ETD))
mailtitle = mailtitle + "-" + headData.ETD;
if (!string.IsNullOrEmpty(headData.PORTDISCHARGE))
mailtitle = mailtitle + "-" + headData.PORTDISCHARGE;
if (!string.IsNullOrEmpty(headData.COUNTRY))
mailtitle = mailtitle + "," + headData.COUNTRY;
if (!string.IsNullOrEmpty(headData.CNTRTOTAL))
mailtitle = mailtitle + "-" + headData.CNTRTOTAL;
var Body = new StringBuilder();
Body.Append("<html> <Body>");
Body.Append("<br />退仓:<br />委托编号:" + opSeae.CUSTNO);
Body.Append("<br />订舱号：" + headData.ORDERNO);
Body.Append("<br />主提单号：" + headData.MBLNO);
Body.Append("<br />提单号：" + headData.MBLNO);
Body.Append("<br />运费协议号：" + headData.CONTRACTNO);
Body.Append("<br />货物标识：" + opSeae.CARGOID);
Body.Append("<br />开船日期：" + headData.ETD);
Body.Append("<br />船名：" + headData.VESSEL);
Body.Append("<br />航次：" + headData.VOYNO);
Body.Append("<br />箱型箱量：" + headData.CNTRTOTAL);
Body.Append("<br />起运港：" + headData.PORTLOAD);
Body.Append("<br />卸货港：" + headData.PORTDISCHARGE);
Body.Append("<br />船公司：" + headData.CARRIER);
Body.Append("<br />目的港及国家：" + headData.PORTDISCHARGE+","+headData.COUNTRY);
Body.Append("<br />五字代码：" + headData.PORTDISCHARGEID);
Body.Append("<br />船名航次：" + headData.VESSEL + headData.VOYNO);
Body.Append("<br />订舱代理：" + headData.FORWARDER);
Body.Append("<br />航线：" + headData.LANE);
Body.Append("<br />箱型箱量：" + headData.CNTRTOTAL);
Body.Append("<br />HSCODE：" + headData.HSCODE);
Body.Append("<br />品名：" + headData.GOODSNAME);
Body.Append("<br />货物标识：" + opSeae.CARGOID);
Body.Append("<br />重量：" + headData.KGS);
Body.Append("<br />约号：" + headData.CONTRACTNO);
Body.Append("<br />规定卖价：" + headData.SELL);
Body.Append("<br />成本：" + headData.COST);
Body.Append("<br />备注：" + headData.REMARK);
Body.Append("<br />订舱号：" + headData.ORDERNO);
Body.Append("<br />退仓客户：" + headData.CUSTOMERNAME);
Body.Append("</Body></html> ");
var mailto = "";
void mailtoAdd(string mail)

15
DSWeb/Areas/MvcShipping/DAL/MsOpSeaePre/MsOpSeaePreDAL.cs
Unescape Escape View File

@ -16,6 +16,7 @@ using DSWeb.MvcShipping.Models.MsOpOther;
using System.Web;
using System.util.collections;
using DSWeb.MvcShipping.DAL.MsCodeOpDef;
using System.Linq;
namespace DSWeb.MvcShipping.DAL.MsOpSeaePreDAL
{
@ -42,7 +43,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaePreDAL
+ ",CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR"
+ ",(select top 1 showname from [user] where GID=op_seae_pre.CREATEUSER) as CREATEUSER,(select top 1 showname from [user] where GID=op_seae_pre.MODIFIEDUSER) as MODIFIEDUSER"
+ ",[PORTLOADID],[PORTLOAD],[PORTDISCHARGEID],[PORTDISCHARGE],[LANE],[CARRIER],[FORWARDER],[BSSTATUS],[CNTRTOTAL],[OP],[REMARK],[CREATEUSER],[CREATETIME],[MODIFIEDUSER],[MODIFIEDTIME] "
+ ",ORDERNO,CUSTSERVICE,HSCODE,GOODSNAME,SALEDEPT,ISUP,ISORDER,ORDNO,TEU,KGS,COST,SELL FROM op_seae_pre";
+ ",CASE WHEN len(PORTDISCHARGEID)<>5 THEN '' ELSE (select top 1 c_country_name from t_sys_country_code where c_country_code=LEFT(PORTDISCHARGEID,2)) END as COUNTRY "
+ ",ORDERNO,CUSTSERVICE,HSCODE,GOODSNAME,SALEDEPT,ISUP,ISORDER,ORDNO,TEU,KGS,COST,SELL FROM op_seae_pre";
if (!string.IsNullOrEmpty(strCondition))
{
strSql += " where " + strCondition;
@ -79,6 +81,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaePreDAL
+ ",CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR"
+ ",(select top 1 showname from [user] where GID=op_seae_pre.CREATEUSER) as CREATEUSER,(select top 1 showname from [user] where GID=op_seae_pre.MODIFIEDUSER) as MODIFIEDUSER"
+ ",[PORTLOADID],[PORTLOAD],[PORTDISCHARGEID],[PORTDISCHARGE],[LANE],[CARRIER],[FORWARDER],[BSSTATUS],[CNTRTOTAL],[OP],[REMARK],[CREATEUSER],[CREATETIME],[MODIFIEDUSER],[MODIFIEDTIME] "
+ ",CASE WHEN len(PORTDISCHARGEID)<>5 THEN '' ELSE (select top 1 c_country_name from t_sys_country_code where c_country_code=LEFT(PORTDISCHARGEID,2)) END as COUNTRY "
+ ",ORDERNO,CUSTSERVICE,HSCODE,GOODSNAME,SALEDEPT,ISUP,ISORDER,ORDNO,TEU,KGS,COST,SELL FROM op_seae_pre";
;
@ -104,6 +108,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaePreDAL
+ ",CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR"
+ ",(select top 1 showname from [user] where GID=op_seae_pre.CREATEUSER) as CREATEUSER,(select top 1 showname from [user] where GID=op_seae_pre.MODIFIEDUSER) as MODIFIEDUSER"
+ ",[PORTLOADID],[PORTLOAD],[PORTDISCHARGEID],[PORTDISCHARGE],[LANE],[CARRIER],[FORWARDER],[BSSTATUS],[CNTRTOTAL],[OP],[REMARK],[CREATEUSER],[CREATETIME],[MODIFIEDUSER],[MODIFIEDTIME] "
+ ",CASE WHEN len(PORTDISCHARGEID)<>5 THEN '' ELSE (select top 1 c_country_name from t_sys_country_code where c_country_code=LEFT(PORTDISCHARGEID,2)) END as COUNTRY "
+ ",ORDERNO,CUSTSERVICE,HSCODE,GOODSNAME,SALEDEPT,ISUP,ISORDER,ORDNO,TEU,KGS,COST,SELL FROM op_seae_pre";
if (!string.IsNullOrEmpty(condition))
{
@ -136,7 +142,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaePreDAL
//
String strSql = "SELECT [BSNO],[MASTERNO],[CUSTOMERNAME],[MBLNO],[CONTRACTNO],[VESSEL],[VOYNO],[ETD],[CLOSINGDATE],[CLOSEDOCDATE],[ETA]"
+ ",CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR"
+ ",(select top 1 showname from [user] where GID=op_seae_pre_his.CREATEUSER) as CREATEUSER,(select top 1 showname from [user] where GID=op_seae_pre_his.MODIFIEDUSER) as MODIFIEDUSER"
+ ",(select top 1 showname from [user] where GID=op_seae_pre_his.CREATEUSER) as CREATEUSER,(select top 1 showname from [user] where GID=op_seae_pre_his.MODIFIEDUSER) as MODIFIEDUSER,COUNTRY"
+ ",[PORTLOADID],[PORTLOAD],[PORTDISCHARGEID],[PORTDISCHARGE],[LANE],[CARRIER],[FORWARDER],[BSSTATUS],[CNTRTOTAL],[OP],[REMARK],[CREATEUSER],[CREATETIME],[MODIFIEDUSER],[MODIFIEDTIME],0 BSLOCK FROM op_seae_pre_his ";
if (!string.IsNullOrEmpty(strCondition))
{
@ -171,7 +177,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaePreDAL
}
//
String strSql = "SELECT [BSNO],[MASTERNO],[CUSTOMERNAME],[MBLNO],[CONTRACTNO],[VESSEL],[VOYNO],[ETD],[CLOSINGDATE],[CLOSEDOCDATE],[ETA]"
+ ",CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR"
+ ",CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR,COUNTRY"
+ ",[PORTLOADID],[PORTLOAD],[PORTDISCHARGEID],[PORTDISCHARGE],[LANE],[CARRIER],[FORWARDER],[BSSTATUS],[CNTRTOTAL],[OP],[REMARK],[CREATEUSER],[CREATETIME],[MODIFIEDUSER],[MODIFIEDTIME],0 BSLOCK FROM op_seae_pre_his ";
if (!string.IsNullOrEmpty(strCondition))
@ -193,7 +199,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaePreDAL
static public MsOpSeaePre GetHisData(string condition)
{
String strSql = "SELECT [BSNO],[MASTERNO],[CUSTOMERNAME],[MBLNO],[CONTRACTNO],[VESSEL],[VOYNO],[ETD],[CLOSINGDATE],[CLOSEDOCDATE],[ETA]"
+ ",CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR"
+ ",CNTR1,CNTR2,CNTR3,CNTR4,CNTR5,CNTR6,CNTR7,CNTR8,CNTR9,CNTR10,OTCNTR,COUNTRY"
+ ",[PORTLOADID],[PORTLOAD],[PORTDISCHARGEID],[PORTDISCHARGE],[LANE],[CARRIER],[FORWARDER],[BSSTATUS],[CNTRTOTAL],[OP],[REMARK],[CREATEUSER],[CREATETIME],[MODIFIEDUSER],[MODIFIEDTIME],0 BSLOCK FROM op_seae_pre_his ";
if (!string.IsNullOrEmpty(condition))
@ -238,6 +244,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaePreDAL
data.FORWARDER = Convert.ToString(reader["FORWARDER"]);
data.BSSTATUS = Convert.ToString(reader["BSSTATUS"]);
data.CNTRTOTAL = Convert.ToString(reader["CNTRTOTAL"]);
data.COUNTRY = Convert.ToString(reader["COUNTRY"]);
data.OP = Convert.ToString(reader["OP"]);
data.REMARK = Convert.ToString(reader["REMARK"]);
data.CREATEUSER = Convert.ToString(reader["CREATEUSER"]);

2
DSWeb/Areas/MvcShipping/Models/MsOpSeaePre/MsOpSeaePre.cs
Unescape Escape View File

@ -454,6 +454,8 @@ namespace DSWeb.MvcShipping.Models.MsOpSeaePre
public bool BSLOCK { get; set; }
public string COUNTRY { get; set; }
#endregion
public MsOpSeaePre()

2
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaePre/MsOpSeaePreIndex.js
Unescape Escape View File

@ -1785,7 +1785,7 @@ Ext.extend(Shipping.MsOpSeaePreIndex, Ext.Panel, {
var sql = '';
if (crmsale == 1) {
sql = ' ISUP=1 and isnull(ISORDER,0)<>1 '
sql = " ISUP=1 and NOT EXISTS (select 1 from crm_seaeorder WHERE op_seae_pre.ORDNO=crm_seaeorder.ORDNO AND ORSTATUS in ('8','0')) "
}
var MBLNO = form.findField('MBLNO').getValue();

BIN
JobAutoCreateFee/bin/Debug/JobAutoCreateFee.dll
View File

Binary file not shown.

BIN
JobAutoCreateFee/bin/Debug/JobAutoCreateFee.pdb
View File

Binary file not shown.

25
JobAutoCreateFee/obj/Debug/JobAutoCreateFee.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -48,3 +48,28 @@ H:\DS7发布版2019\JobAutoCreateFee\obj\Debug\JobAutoCreateFee.csproj.CopyCompl
H:\DS7发布版2019\JobAutoCreateFee\obj\Debug\JobAutoCreateFee.dll
H:\DS7发布版2019\JobAutoCreateFee\obj\Debug\JobAutoCreateFee.pdb
H:\DS7发布版2019\JobAutoCreateFee\obj\Debug\JobAutoCreateFee.csproj.AssemblyReference.cache
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\quartz_jobs.xml
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\JobAutoCreateFee.dll
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\JobAutoCreateFee.pdb
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Common.Logging.Core.dll
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Common.Logging.dll
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\log4net.dll
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Microsoft.Practices.EnterpriseLibrary.Data.dll
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Newtonsoft.Json.dll
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Quartz.dll
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Microsoft.Practices.EnterpriseLibrary.Common.dll
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Microsoft.Practices.ObjectBuilder2.dll
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Microsoft.Practices.Unity.dll
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Common.Logging.pdb
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Common.Logging.xml
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Common.Logging.Core.pdb
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Common.Logging.Core.xml
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\log4net.xml
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Newtonsoft.Json.xml
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Quartz.pdb
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\bin\Debug\Quartz.xml
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\obj\Debug\JobAutoCreateFee.csproj.AssemblyReference.cache
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\obj\Debug\JobAutoCreateFee.csproj.CoreCompileInputs.cache
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\obj\Debug\JobAutoC.26A5C266.Up2Date
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\obj\Debug\JobAutoCreateFee.dll
D:\DONGSHENG7\DS7HHYT\JobAutoCreateFee\obj\Debug\JobAutoCreateFee.pdb

BIN
JobAutoCreateFee/obj/Debug/JobAutoCreateFee.dll
View File

Binary file not shown.

BIN
JobAutoCreateFee/obj/Debug/JobAutoCreateFee.pdb
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save