DS7_HYRD
hanxuntao 9 months ago
parent 5f00f02557
commit ea84db15c7

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

@ -410,10 +410,11 @@ namespace DSWeb.MvcShipping.Controllers
public ContentResult GetData(string handle, string condition)
{
string LAN = Convert.ToString(Session["LANGUAGES"]);
MsOpSeae head = null;
if (handle == "edit" || handle == "copyadd")
{
head = MsOpSeaeDAL.GetData(condition, CookieConfig.GetCookie_UserId(Request));
head = MsOpSeaeDAL.GetData(condition, CookieConfig.GetCookie_UserId(Request), LAN);
}
if (head == null)
{

@ -600,7 +600,7 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(",case B.OPDATE when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.OPDATE,23) end as OPDATE,B.ENTERP");
strSql.Append(",case B.CUSTOMDATE when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.CUSTOMDATE,23) end as CUSTOMDATE");
strSql.Append(",B.CUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID");
strSql.Append(",B.TRADETYPE,B.GOODSNAME,B.YARD,B.BLISSUESTATUS,B.ORDERNO");
strSql.Append(",B.TRADETYPE,B.GOODSNAME,B.YARD,B.BLISSUESTATUS,B.ORDERNO,B.INVNO");
strSql.Append(",F.GID,F.FEETYPE,F.FEENAME,F.FEEDESCRIPTION,F.CUSTOMERNAME AS CUSTNAME,F.UNIT,F.UNITPRICE,F.QUANTITY,F.AMOUNT,F.CURRENCY,F.EXCHANGERATE,F.DEBITNO");
strSql.Append(",F.TAXRATE,F.NOTAXAMOUNT,F.ACCTAXRATE,F.REMARK,F.SETTLEMENT,F.INVOICE,F.ORDERAMOUNT,F.ORDERINVOICE,F.ENTEROPERATOR,F.FEESTATUS,F.AMOUNT-F.SETTLEMENT NOSTLAMOUNT,F.INPUTMODE");
if (LAN =="en-us") {

@ -318,7 +318,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
return cnt;
}
static public List<MsOpSeae> GetSaleDataList(string strCondition, string username, string sort = null, string load = null, string userid = "", string companyid = "")
static public List<MsOpSeae> GetSaleDataList(string strCondition, string username, string sort = null, string load = null, string userid = "", string companyid = "",string LAN="")
{
var rangstr = GetSaleRangDAStr("index", userid, username, companyid);
if (!string.IsNullOrEmpty(rangstr))
@ -838,7 +838,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
return result;
}
static public MsOpSeae GetData(string condition, string userid = "")
static public MsOpSeae GetData(string condition, string userid = "",string LAN="")
{
var strSql = new StringBuilder();
strSql.Append("SELECT BSNO,MASTERNO,ORDERTYPE,ORDTYPE,ORDERNO,BSSTATUS,FEESTATUS,BSDATE,ACCDATE,MBLNO,HBLNO,CUSTNO,APPLYNO,TRANSNO,CUSTOMERNAME,BLTYPE,SHIPPERID,");
@ -867,7 +867,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append(",isnull(BLISSUESTATUS,'') BLISSUESTATUS,B.BillFeeStatus,SALECORPID,MDESCRIPTION ");
strSql.Append(",(select [NAME] from [company] where GID=B.SALECORPID) as SALECORP");
strSql.Append(",0 CUSTOMSSTATUS,0 PORTSTATUS,0 EXPSTATUS,0 TRUCKCTNSTATUS,0 CTNRETURNSTATUS,0 HGYDSTATUS,TRUCKSTATUS,0 ATASTATUS,0 STCSSTATUS,0 RCVESTATUS ");
strSql.Append(",CASE WHEN len(DESTINATIONID)<>5 THEN '' ELSE (select top 1 c_country_name from t_sys_country_code where c_country_code=LEFT(DESTINATIONID,2)) END as COUNTRY ");
if (LAN == "en-us") {
strSql.Append(",CASE WHEN len(DESTINATIONID)<>5 THEN '' ELSE (select top 1 c_country_ename from t_sys_country_code where c_country_code=LEFT(DESTINATIONID,2)) END as COUNTRY ");
}
else
strSql.Append(",CASE WHEN len(DESTINATIONID)<>5 THEN '' ELSE (select top 1 c_country_name from t_sys_country_code where c_country_code=LEFT(DESTINATIONID,2)) END as COUNTRY ");
strSql.Append(" from OP_SEAE B");

@ -102,7 +102,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsRptNoTotalDAL
strSql.Append(",case A.CUSTOMDATE when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), A.CUSTOMDATE,23) end as CUSTOMDATE,A.SERVICECONTRACTNO");
strSql.Append(",A.CUSTSERVICE, A.PORTLOAD, A.PORTDISCHARGE,B.DESTINATION, A.CUSTOMNO, A.ACCDATE,A.CARRIER, A.BSSOURCE,A.BSSOURCEDETAIL,A.LANE, A.FORWARDER,A.NETWEIGHT,A.KGS,A.TEU,A.CNTRTOTAL,A.CORPID");
strSql.Append(",A.CNTR1,A.CNTR2,A.CNTR3,A.CNTR4,A.CNTR5,A.CNTR6,A.CNTR7,A.CNTR8,A.CNTR9,A.CNTR10,A.OTCNTR,A.TRADETYPE,A.GOODSNAME,A.FEESTATUS,A.PKGS,A.CBM,A.ORDERNO,A.SALECORPID,(select [NAME] from [company] where GID=A.SALECORPID) as SALECORP");
strSql.Append(",(CASE A.FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,A.AGENTID,A.REMARK ");
strSql.Append(",(CASE A.FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,A.AGENTID,A.REMARK,A.INVNO ");
strSql.Append(",F.CUSTOMERNAME AS CUSTNAME ");
strSql.Append(",C.[DESCRIPTION] AS CUSTFULLNAME ");
strSql.Append(",isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS RMBDR,");
@ -192,7 +192,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsRptNoTotalDAL
strSql.Append(" ,A.CUSTSERVICE, A.PORTLOAD, A.PORTDISCHARGE,B.DESTINATION, A.CUSTOMNO, A.ACCDATE,A.CARRIER, A.BSSOURCE,A.BSSOURCEDETAIL, A.LANE, A.FORWARDER,A.NETWEIGHT,A.KGS,A.TEU,A.CNTRTOTAL,A.CORPID");
strSql.Append(" ,A.CNTR1,A.CNTR2,A.CNTR3,A.CNTR4,A.CNTR5,A.CNTR6,A.CNTR7,A.CNTR8,A.CNTR9,A.CNTR10,A.OTCNTR,A.TRADETYPE,A.GOODSNAME,A.FEESTATUS,A.PKGS,A.CBM,A.ORDERNO,A.SALECORPID, A.STLDATE,F.CUSTOMERNAME,C.[DESCRIPTION] ");
strSql.Append(",A.STLNAME, S.SETTLETIME,B.SALE,B.OPDATE,A.AGENTID,A.REMARK");
strSql.Append(",A.STLNAME, S.SETTLETIME,B.SALE,B.OPDATE,A.AGENTID,A.REMARK,A.INVNO");
}
@ -215,7 +215,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsRptNoTotalDAL
strSql.Append(",case B.CUSTOMDATE when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.CUSTOMDATE,23) end as CUSTOMDATE,B.SERVICECONTRACTNO");
strSql.Append(",B.CUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE,B.DESTINATION, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE,B.BSSOURCEDETAIL, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID");
strSql.Append(",B.CNTR1,B.CNTR2,B.CNTR3,B.CNTR4,B.CNTR5,B.CNTR6,B.CNTR7,B.CNTR8,B.CNTR9,B.CNTR10,B.OTCNTR,B.TRADETYPE,B.GOODSNAME,B.FEESTATUS,B.PKGS,B.CBM,B.ORDERNO,B.SALECORPID,(select [NAME] from [company] where GID=B.SALECORPID) as SALECORP");
strSql.Append(",(CASE B.FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,B.AGENTID,B.REMARK ");
strSql.Append(",(CASE B.FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,B.AGENTID,B.REMARK,B.INVNO ");
strSql.Append(",F.CUSTOMERNAME AS CUSTNAME ");
strSql.Append(",C.[DESCRIPTION] AS CUSTFULLNAME ");
strSql.Append(",isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS RMBDR,");
@ -323,7 +323,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsRptNoTotalDAL
strSql.Append(" ,B.CUSTOMDATE,B.SERVICECONTRACTNO");
strSql.Append(" ,B.CUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE,B.DESTINATION, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE,B.BSSOURCEDETAIL, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID");
strSql.Append(" ,B.CNTR1,B.CNTR2,B.CNTR3,B.CNTR4,B.CNTR5,B.CNTR6,B.CNTR7,B.CNTR8,B.CNTR9,B.CNTR10,B.OTCNTR,B.TRADETYPE,B.GOODSNAME,B.FEESTATUS,B.PKGS,B.CBM,B.ORDERNO,B.SALECORPID,B.STLDATE,F.CUSTOMERNAME,C.[DESCRIPTION] ");
strSql.Append(",B.STLNAME,B.AGENTID,B.REMARK");
strSql.Append(",B.STLNAME,B.AGENTID,B.REMARK,B.INVNO");
strSql.Append(" , S.SETTLETIME");

@ -429,6 +429,8 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
metadata.style = "background-color:" + record.data.COLOR;
if (value == '接受委托') {
value = Zi.LAN.JIESHOUWEITUO;
} if (value == '生成进口') {
value = Zi.LAN.SHENGCHENGJINKOU;
}
return value;
},

@ -799,4 +799,5 @@ Zi.LAN.QueshiYaoShanChu1 = "确实要删除选中的【";
Zi.LAN.QueshiYaoShanChu2 = "】票业务吗?";
Zi.LAN.DeleteSuccess = "删除成功";
Zi.LAN.DeleteErro = "删除错误";
Zi.LAN.FEETYPE = "复制费用范围";
Zi.LAN.FEETYPE = "复制费用范围";
Zi.LAN.SHENGCHENGJINKOU = "生成进口";

@ -828,6 +828,7 @@ Zi.LAN.QueshiYaoShanChu2 = "】票业务吗?";
Zi.LAN.DeleteSuccess = "删除成功";
Zi.LAN.DeleteErro = "删除错误";
Zi.LAN.FEETYPE = "复制费用范围";
Zi.LAN.SHENGCHENGJINKOU = "生成进口";
//Zi.LAN. = "";

@ -1185,7 +1185,7 @@ Ext.extend(Shipping.MsOpSeaiEdit, Ext.Panel, {
fieldLabel: Zi.LAN.APPLYNO, //'申请放箱号',
name: 'APPLYNO'
}, {
fieldLabel: '发仓储状态', //'MBLFRT',
fieldLabel: Zi.LAN.WMSSTATUS, //'MBLFRT',
name: 'WMSSTATUS',
readOnly: true,
}]

@ -381,7 +381,18 @@ Ext.extend(Shipping.MsOpSeaiIndex, Ext.Panel, {
sortable: true,
dataIndex: 'ORDERTYPE',
header: Zi.LAN.ORDERTYPE2, //'委托方式',
width: 80
width: 80,
renderer: function (value, cellmeta) {
if (value == '操作录入') {
return Zi.LAN.CAOZUOLUR;
} else if (value == '销售订舱') {
return Zi.LAN.XIAOSHOUDINGCANG;
} else if (value == '集团订舱') {
return Zi.LAN.JITUANDINGCANG;
} else if (value == '出口转入') {
return Zi.LAN.CHUKOUZHUANRU;
}
}
},
{
sortable: true,

@ -435,6 +435,7 @@ Zi.LAN.YYRXT = "已引入系统,确认要覆盖以前业务吗?";
Zi.LAN.WMSSTATUS = "发仓储状态";
Zi.LAN.FEEXINXI = "费用信息";
Zi.LAN.GENGGAIDANXINXI = "更改单信息";
Zi.LAN.CHUKOUZHUANRU = "出口转入";
//#endregion
//Zi.LAN. = "";

@ -436,6 +436,7 @@ Zi.LAN.YYRXT = "已引入系统,确认要覆盖以前业务吗?";
Zi.LAN.WMSSTATUS = "发仓储状态";
Zi.LAN.FEEXINXI = "费用信息";
Zi.LAN.GENGGAIDANXINXI = "更改单信息";
Zi.LAN.CHUKOUZHUANRU = "出口转入";
//#endregion
//Zi.LAN. = "";

@ -133,6 +133,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
{ name: 'CUSTNAME', type: 'string' },
{ name: 'CUSTFULLNAME', type: 'string' },
{ name: 'INVOICENO', type: 'string' },
{ name: 'INVNO', type: 'string' },
{ name: 'SALECORP', type: 'string' },
{ name: 'RMBDR', type: 'number' },
{ name: 'RMBCR', type: 'number' },
@ -644,6 +645,11 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
dataIndex: 'INVOICENO',
header: Zi.LAN.INVOICENO,
width: 80
}, {
sortable: true,
dataIndex: 'INVNO',
header: Zi.LAN.INVNO,
width: 80
}, {
sortable: true,
dataIndex: 'CUSTOMNO',
@ -1203,6 +1209,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
{ name: 'INPUTMODE', type: 'string' },
{ name: 'REMARK', type: 'string' },
{ name: 'INVOICENUM', type: 'string' },
{ name: 'INVNO', type: 'string' },
{ name: 'DEBITNO', type: 'string' },
{ name: 'UNITPRICE', type: 'number' },
{ name: 'QUANTITY', type: 'number' },
@ -1395,6 +1402,11 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
dataIndex: 'BSSOURCE',
header: Zi.LAN.BSSOURCE,
width: 120
}, {
sortable: true,
dataIndex: 'INVNO',
header: Zi.LAN.INVNO,
width: 80
}, {
sortable: true,
dataIndex: 'TEU',
@ -1854,6 +1866,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
{ name: 'CUSTNAME', type: 'string' },
{ name: 'CUSTFULLNAME', type: 'string' },
{ name: 'INVOICENO', type: 'string' },
{ name: 'INVNO', type: 'string' },
{ name: 'RMBDR', type: 'number' },
{ name: 'RMBCR', type: 'number' },
{ name: 'STLRMBDR', type: 'number' },
@ -2220,6 +2233,11 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
dataIndex: 'DELIVERYDATE',
header: Zi.LAN.DELIVERYDATE,
width: 80
}, {
sortable: true,
dataIndex: 'INVNO',
header: Zi.LAN.INVNO,
width: 80
}, {
sortable: true,
dataIndex: 'CNTRTOTAL',
@ -2888,6 +2906,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
{ name: 'DEBITNO', type: 'string' },
{ name: 'REMARK', type: 'string' },
{ name: 'INVOICENUM', type: 'string' },
{ name: 'INVNO', type: 'string' },
{ name: 'UNITPRICE', type: 'number' },
{ name: 'QUANTITY', type: 'number' },
{ name: 'AMOUNT', type: 'number' },
@ -3095,6 +3114,11 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
dataIndex: 'FEENAME',
header: Zi.LAN.FEENAME,
width: 60
}, {
sortable: true,
dataIndex: 'INVNO',
header: Zi.LAN.INVNO,
width: 80
}, {
sortable: true,
dataIndex: 'UNITPRICE',

@ -252,6 +252,7 @@ Zi.LAN.ISADVANCEDPAYNO = "仅未垫付";
Zi.LAN.ISVOUALLNO = "是否凭证";
Zi.LAN.INVOICEUSDDR = "已开票USD金额";
Zi.LAN.INVOICERMBDR = "已开票RMB金额";
Zi.LAN.INVNO = "业务发票号";
//Zi.LAN. = "";

@ -252,6 +252,7 @@ Zi.LAN.ISADVANCEDPAYNO = "仅未垫付";
Zi.LAN.ISVOUALLNO = "是否凭证";
Zi.LAN.INVOICEUSDDR = "已开票USD金额";
Zi.LAN.INVOICERMBDR = "已开票RMB金额";
Zi.LAN.INVNO = "业务发票号";
//Zi.LAN. = "";

@ -4,7 +4,7 @@
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

Loading…
Cancel
Save