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

'20220902-1'

Browse Source
临时发布20240103
ddlucky 2 years ago
parent dd1308e98f
commit dac4b7c3e2
20 changed files with 874 additions and 607 deletions
Show Stats Download Patch File Download Diff File

88
DSWeb.Common/DB/Comm.cs
Unescape Escape View File

@ -2581,6 +2581,94 @@ namespace DSWeb.Common.DB
[Table("op_aire_bill")]
public partial class op_aire_bill_md {
[Key]
public string AS_ID { get; set; }
public string BSNO { get; set; }
public string MBLNO { get; set; }
public string HBLNO { get; set; }
public string TEMPLATE { get; set; }
public string BILLTYPE { get; set; }
public string SHIPPERID { get; set; }
public string CONSIGNEEID { get; set; }
public string NOTIFYPARTYID { get; set; }
public string SHIPPER { get; set; }
public string CONSIGNEE { get; set; }
public string NOTIFYPARTY { get; set; }
public string AGENTID { get; set; }
public string AGENT { get; set; }
public string VESSEL { get; set; }
public DateTime? ETD { get; set; }
public DateTime? ETA { get; set; }
public string PORTLOADID { get; set; }
public string PORTLOAD { get; set; }
public string PORTDISCHARGEID { get; set; }
public string PORTDISCHARGE { get; set; }
public string AIRLINES { get; set; }
public string IATANO { get; set; }
public string ACCOUNTCODE { get; set; }
public string ACCOUNTINFO { get; set; }
public string HANDINGINFO { get; set; }
public string CURR { get; set; }
public string BLFRT { get; set; }
public string OTFRT { get; set; }
public string TRANSTATEMENT { get; set; }
public string CUSTOMSTATEMENT { get; set; }
public string INAMOUNT { get; set; }
public string CLASS { get; set; }
public decimal? FEEKGS { get; set; }
public decimal? PRICE { get; set; }
public decimal? TTLFREIGHT { get; set; }
public decimal? TOTALAMOUNT { get; set; }
public string OTFEE { get; set; }
public string MARKS { get; set; }
public string DESCRIPTION { get; set; }
public int? PKGS { get; set; }
public string KINDPKGS { get; set; }
public int? KGS { get; set; }
public int? CBM { get; set; }
public string PFREIGHT { get; set; }
public string CFREIGHT { get; set; }
public string PSTATEMENT { get; set; }
public string CSTATEMENT { get; set; }
public string PTAX { get; set; }
public string CTAX { get; set; }
public string POTFREIGHT { get; set; }
public string COTFREIGHT { get; set; }
public string PCARRIEROT { get; set; }
public string CCARRIEROT { get; set; }
public string PTOTAL { get; set; }
public string CTOTAL { get; set; }
public string GOODSNAME { get; set; }
public string ISSUEBY { get; set; }
public DateTime? ISSUEDATE { get; set; }
public string ISSUEPLACE { get; set; }
public string INPUTBY { get; set; }
public string OTFEE1 { get; set; }
public decimal? OTFEE1AMOUNT { get; set; }
public string OTFEE2 { get; set; }
public decimal? OTFEE2AMOUNT { get; set; }
public string OTFEE3 { get; set; }
public decimal? OTFEE3AMOUNT { get; set; }
public string OTFEE4 { get; set; }
public decimal? OTFEE4AMOUNT { get; set; }
public string OTFEE5 { get; set; }
public decimal? OTFEE5AMOUNT { get; set; }
public string OTFEE6 { get; set; }
public decimal? OTFEE6AMOUNT { get; set; }
public string OTFEE7 { get; set; }
public decimal? OTFEE7AMOUNT { get; set; }
public string OTFEE8 { get; set; }
public decimal? OTFEE8AMOUNT { get; set; }
public string UNIT { get; set; }
public string REMARK { get; set; }
public string CUSTVALUE { get; set; }
public string CUSTOMVALUE { get; set; }
public DateTime? INPUTTIME { get; set; }
public DateTime? MODIFYTIME { get; set; }
public string MODIFYUSER { get; set; }
}
}

2
DSWeb.Common/DB/CommonDataContext.cs
Unescape Escape View File

@ -89,8 +89,8 @@ namespace DSWeb.Common.DB
public DbSet<sys_bank_md> sys_bank { get; set; }
public DbSet<op_aire_bill_md> op_aire_bill { get; set; }
}

BIN
DSWeb.Common/bin/Release/DSWeb.Common.dll
View File

Binary file not shown.

BIN
DSWeb.Common/bin/Release/DSWeb.Common.pdb
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Release/DSWeb.Common.dll
View File

Binary file not shown.

BIN
DSWeb.Interface/bin/Release/DSWeb.Common.pdb
View File

Binary file not shown.

1035
DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs
View File

File diff suppressed because it is too large Load Diff

109
DSWeb/Areas/MvcShipping/Controllers/MsAireOrderController.cs
Unescape Escape View File

@ -1154,57 +1154,70 @@ namespace DSWeb.MvcShipping.Controllers
if (fenlist != null && fenlist.Count() > 0) {
foreach (var fen in fenlist) {
var newfen = AutoMapperHelper.MapTo<crm_aireorder_md, MsOpAire>(headData);
newfen.BSNO = fen.BSNO;
newfen.ORDERNO = fen.ORDNO;
newfen.CUSTNO = "";
newfen.ORDERTYPE = "销售订舱";
newfen.REMARK += "[分单]";
newfen.SHIPPERID = "";
newfen.SHIPPER = "";
newfen.CONSIGNEEID = "";
newfen.CONSIGNEE = "";
newfen.NOTIFYPARTYID = "";
newfen.NOTIFYPARTY = "";
newfen.OPERATOR = "";
newfen.OPERATORTEL = "";
newfen.OPERATOREMAIL = "";
newfen.SHIPPERID = fen.SHIPPERID;
var _shipper = v_info_shipper_md.GetShipper(newrec.SHIPPERID);
if (_shipper != null)
{
newfen.SHIPPER = _shipper.shipperdetail;
}
newfen.CONSIGNEEID = fen.CONSIGNEEID;
var _CONSIGNEE = v_info_shipper_md.GetShipper(newrec.CONSIGNEEID);
if (_CONSIGNEE != null)
{
newfen.CONSIGNEE = _CONSIGNEE.shipperdetail;
}
newfen.NOTIFYPARTYID = fen.NOTIFYPARTYID;
var _NOTIFYPARTY = v_info_shipper_md.GetShipper(newrec.NOTIFYPARTYID);
if (_NOTIFYPARTY != null)
{
newfen.NOTIFYPARTY = _NOTIFYPARTY.shipperdetail;
}
newfen.CUSTOMERNAME = fen.CUSTOMERNAME;
newfen.OPERATOR = fen.OPERATOR;
newfen.OPERATORTEL = fen.OPERATORTEL;
newfen.OPERATOREMAIL = fen.OPERATOREMAIL;
newfen.PKGS = fen.PKGS.ToString();
newfen.FEEKGS = fen.FEEKGS.ToString();
newfen.KGS = fen.KGS.ToString();
newfen.CBM = fen.CBM.ToString();
//20220902 改为在提单信息中增加分单信息
var newfen = AutoMapperHelper.MapTo<crm_aireorder_md,op_aire_bill_md>(headData);
newfen.BSNO = headData.BSNO;
newfen.AS_ID = Guid.NewGuid().ToString();
newfen.INPUTBY = Convert.ToString(Session["SHOWNAME"]).ToString().Trim();
newfen.INPUTTIME = DateTime.Now;
cdc.op_aire_bill.Add(newfen);
//var newfen = AutoMapperHelper.MapTo<crm_aireorder_md, MsOpAire>(headData);
//newfen.BSNO = fen.BSNO;
//newfen.ORDERNO = fen.ORDNO;
//newfen.CUSTNO = "";
//newfen.ORDERTYPE = "销售订舱";
//newfen.REMARK += "[分单]";
//newfen.SHIPPERID = "";
//newfen.SHIPPER = "";
//newfen.CONSIGNEEID = "";
//newfen.CONSIGNEE = "";
//newfen.NOTIFYPARTYID = "";
//newfen.NOTIFYPARTY = "";
//newfen.OPERATOR = "";
//newfen.OPERATORTEL = "";
//newfen.OPERATOREMAIL = "";
//newfen.SHIPPERID = fen.SHIPPERID;
//var _shipper = v_info_shipper_md.GetShipper(newrec.SHIPPERID);
//if (_shipper != null)
//{
// newfen.SHIPPER = _shipper.shipperdetail;
//}
//newfen.CONSIGNEEID = fen.CONSIGNEEID;
//var _CONSIGNEE = v_info_shipper_md.GetShipper(newrec.CONSIGNEEID);
//if (_CONSIGNEE != null)
//{
// newfen.CONSIGNEE = _CONSIGNEE.shipperdetail;
//}
//newfen.NOTIFYPARTYID = fen.NOTIFYPARTYID;
//var _NOTIFYPARTY = v_info_shipper_md.GetShipper(newrec.NOTIFYPARTYID);
//if (_NOTIFYPARTY != null)
//{
// newfen.NOTIFYPARTY = _NOTIFYPARTY.shipperdetail;
//}
//newfen.CUSTOMERNAME = fen.CUSTOMERNAME;
//newfen.OPERATOR = fen.OPERATOR;
//newfen.OPERATORTEL = fen.OPERATORTEL;
//newfen.OPERATOREMAIL = fen.OPERATOREMAIL;
//newfen.PKGS = fen.PKGS.ToString();
//newfen.FEEKGS = fen.FEEKGS.ToString();
//newfen.KGS = fen.KGS.ToString();
//newfen.CBM = fen.CBM.ToString();
//hlp.DoSave("add", newfen, Session);
hlp.DoSave("add", newfen, Session);
}
cdc.SaveChanges();
}

28
DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs
Unescape Escape View File

@ -587,21 +587,21 @@ namespace DSWeb.MvcShipping.Controllers
//headData.GID = PubSysDAL.GetBillNo("0405"); //获取合同号
headData.BLSTATUS = "录入状态";
}
else
{
headData.DbOperationType = DbOperationType.DbotUpd;
headData.ModelUIStatus = "E";
}
else
{
headData.DbOperationType = DbOperationType.DbotUpd;
headData.ModelUIStatus = "E";
}
T_ALL_DA T_ALL_DA = new T_ALL_DA();
var BLCOUNT = T_ALL_DA.GetStrSQL("BLCOUNT", "select count(*) BLCOUNT from OP_SEAE WHERE CUSTOMERNAME='"+headData.CUSTOMERNAME+"' AND DATEDIFF([day],ISNULL(OP_SEAE.STLDATE,OP_SEAE.ETD),GETDATE())>0 ");
if (BLCOUNT == "0")
{
headData.ISCHAOQI = "否";
}
else {
headData.ISCHAOQI = "是";
};
T_ALL_DA T_ALL_DA = new T_ALL_DA();
var BLCOUNT = T_ALL_DA.GetStrSQL("BLCOUNT", "select count(*) BLCOUNT from OP_SEAE WHERE CUSTOMERNAME='"+headData.CUSTOMERNAME+"' AND DATEDIFF([day],ISNULL(OP_SEAE.STLDATE,OP_SEAE.ETD),GETDATE())>0 ");
if (BLCOUNT == "0")
{
headData.ISCHAOQI = "否";
}
else {
headData.ISCHAOQI = "是";
};
var result = new DBResult();

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

@ -298,7 +298,8 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
strSql.Append(",(SELECT TOP 1 STATUS+' '+ CONVERT(varchar(100),COMPTIME, 20) FROM OP_STATUS WHERE BSNO=op_seae.BSNO AND STTYPE='2' ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS ");
strSql.Append(",(SELECT TOP 1 BLSTATUS FROM op_blissue WHERE BSNO=OP_SEAE.BSNO) BLISSUESTATUS");
strSql.Append(",ISSUETYPE");
strSql.Append(" from op_seae ");
@ -388,7 +389,7 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
data.OPSTATUS = Convert.ToString(reader["OPSTATUS"]);
data.REMARK = Convert.ToString(reader["REMARK"]);
data.BLISSUESTATUS = Convert.ToString(reader["BLISSUESTATUS"]);
data.ISSUETYPE = Convert.ToString(reader["ISSUETYPE"]);
#endregion
headList.Add(data);
}
@ -464,17 +465,20 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
#region 特殊放单申请
static public List<MsOp_BLISSUEListmb> GetSPList(int start, int limit, string strCondition, string sort, string userid="", string usercode = "", string companyid = "")
{
var rangstr = GetRangDAStr("index", userid, usercode, companyid);
if (!string.IsNullOrEmpty(rangstr))
{
if (!string.IsNullOrWhiteSpace(userid))
{
if (!string.IsNullOrEmpty(strCondition))
{
strCondition = strCondition + " and " + rangstr;
}
else
var rangstr = GetRangDAStr("index", userid, usercode, companyid);
if (!string.IsNullOrEmpty(rangstr))
{
strCondition = rangstr;
if (!string.IsNullOrEmpty(strCondition))
{
strCondition = strCondition + " and " + rangstr;
}
else
{
strCondition = rangstr;
}
}
}
@ -3069,9 +3073,11 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
{
BLINFOmb data = new BLINFOmb();
while (reader.Read())
{
{
#region Set DB data to Object
#region 结费类型
data.结费类型 = "";
if (reader["ISSP"] != DBNull.Value)
@ -3089,7 +3095,8 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
{
data.结费类型 = data.结费类型 + "客户结费类型为：" + Convert.ToString(reader["ACCTYPE"]);
}
if (Convert.ToString(reader["ACCTYPE"]) == "约定天数") {
if (Convert.ToString(reader["ACCTYPE"]) == "约定天数")
{
//data.结费类型 = data.结费类型 + Convert.ToString(reader["stldays"]) + "天 ";
//string CUSTOMERNAME, string OPLBNAME, string BUSDATE, string SALE
var CUSTOMERNAME = Convert.ToString(reader["CUSTOMERNAME"]);
@ -3109,12 +3116,13 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
data.TTLNODR = data.TTLNODR + Convert.ToDecimal(reader["TTLNODR"]);
//var RMBNODR=0M;
if (reader["RMBNODR"] != DBNull.Value)
data.RMBNODR =data.RMBNODR+ Convert.ToDecimal(reader["RMBNODR"]);
data.RMBNODR = data.RMBNODR + Convert.ToDecimal(reader["RMBNODR"]);
//var USDNODR=0M;
if (reader["USDNODR"] != DBNull.Value)
data.USDNODR = data.USDNODR+Convert.ToDecimal(reader["USDNODR"]);
data.USDNODR = data.USDNODR + Convert.ToDecimal(reader["USDNODR"]);
#endregion
#region 累计欠费
//data.TTLNODR_All = 0M;
//if (reader["TTLNODR_All"] != DBNull.Value)
@ -3163,7 +3171,6 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
data.IS累计欠费 = "no";
data.信用额度 = data.信用额度 + " 额度范围内";
}
else
{
if (data.TTLNODR_All != 0)
@ -3173,6 +3180,20 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
}
}
#endregion
#region 提单签出 未签单
//if (reader["NUMTYPPE"].ToString() == "提单签出")
//{
//}
//if (reader["NUMTYPPE"].ToString() == "未签出")
//{
//}
#endregion
#endregion
//headList.Add(data);
@ -3245,44 +3266,61 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
var BLISSUENOSHEN = MsSysParamSetDAL.GetData("PARAMNAME='BLISSUENOSHEN'");
var searchStr = new StringBuilder();
searchStr.Append(" ,SUM(RMBNODR) RMBNODR,SUM(USDNODR) USDNODR,SUM(TTLNODR) TTLNODR");
searchStr.Append(" ,SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN RMBNODR ELSE 0 END) CRMBNODR");
searchStr.Append(" ,SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN USDNODR ELSE 0 END) CUSDNODR");
searchStr.Append(" ,SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN TTLNODR ELSE 0 END) CTTLNODR ");
searchStr.Append(" ,sum(CASE WHEN BLISSUESTATUS='提单签出' then RMBNODR else 0 END) RMBNODR_YQC");
searchStr.Append(" ,sum(CASE WHEN BLISSUESTATUS='提单签出' then USDNODR else 0 END) USDNODR_YQC");
searchStr.Append(" ,sum(CASE WHEN BLISSUESTATUS='提单签出' then TTLNODR else 0 END) TTLNODR_YQC");
searchStr.Append(" ,SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN CASE WHEN BLISSUESTATUS='提单签出' then RMBNODR else 0 END ELSE 0 END) CRMBNODR_YQC");
searchStr.Append(" ,SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN CASE WHEN BLISSUESTATUS='提单签出' then USDNODR else 0 END ELSE 0 END) CUSDNODR_YQC");
searchStr.Append(" ,SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN CASE WHEN BLISSUESTATUS='提单签出' then TTLNODR else 0 END ELSE 0 END) CTTLNODR_YQC");
searchStr.Append(" ,sum(CASE WHEN BLISSUESTATUS<>'提单签出' then RMBNODR else 0 END) RMBNODR_WQC");
searchStr.Append(" ,sum(CASE WHEN BLISSUESTATUS<>'提单签出' then USDNODR else 0 END) USDNODR_WQC");
searchStr.Append(" ,sum(CASE WHEN BLISSUESTATUS<>'提单签出' then TTLNODR else 0 END) TTLNODR_WQC");
searchStr.Append(" ,SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN CASE WHEN BLISSUESTATUS<>'提单签出' then RMBNODR else 0 END ELSE 0 END) CRMBNODR_WQC");
searchStr.Append(" ,SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN CASE WHEN BLISSUESTATUS<>'提单签出' then USDNODR else 0 END ELSE 0 END) CUSDNODR_WQC");
searchStr.Append(" ,SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN CASE WHEN BLISSUESTATUS<>'提单签出' then TTLNODR else 0 END ELSE 0 END) CTTLNODR_WQC");
var strSql = new StringBuilder();
strSql.Append(" SELECT '委托单位:'+CUSTOMERNAME+'('+SALE+')' INFOTEXT, SUM(RMBNODR) RMBNODR,SUM(USDNODR) USDNODR,SUM(TTLNODR) TTLNODR");
strSql.Append(",SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN RMBNODR ELSE 0 END) CRMBNODR,");
strSql.Append("SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN USDNODR ELSE 0 END) CUSDNODR,");
strSql.Append("SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN TTLNODR ELSE 0 END) CTTLNODR");
strSql.Append(" SELECT '委托单位:'+CUSTOMERNAME+'('+SALE+')' INFOTEXT ");
strSql.Append(searchStr);
//strSql.Append(",SUM(RMBNODR) RMBNODR,SUM(USDNODR) USDNODR,SUM(TTLNODR) TTLNODR ");
//strSql.Append(",SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN RMBNODR ELSE 0 END) CRMBNODR,");
//strSql.Append("SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN USDNODR ELSE 0 END) CUSDNODR,");
//strSql.Append("SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN TTLNODR ELSE 0 END) CTTLNODR");
if (BLISSUENOSHEN.PARAMVALUE == "1")
{
strSql.Append(" from v_op_bill_gain_shen WHERE CUSTOMERNAME='" + CUSTNAME + "' and SALE='" + SALE + "'");
}
else strSql.Append(" from v_op_bill_gain WHERE CUSTOMERNAME='" + CUSTNAME + "' and SALE='" + SALE + "'");
strSql.Append(" GROUP BY CUSTOMERNAME,SALE ");
strSql.Append(" UNION");
strSql.Append(" SELECT '委托单位:'+CUSTOMERNAME INFOTEXT, SUM(RMBNODR) RMBNODR,SUM(USDNODR) USDNODR,SUM(TTLNODR) TTLNODR");
strSql.Append(",SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN RMBNODR ELSE 0 END) CRMBNODR,");
strSql.Append("SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN USDNODR ELSE 0 END) CUSDNODR,");
strSql.Append("SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN TTLNODR ELSE 0 END) CTTLNODR");
strSql.Append(" SELECT '委托单位:'+CUSTOMERNAME INFOTEXT");
strSql.Append(searchStr);
if (BLISSUENOSHEN.PARAMVALUE == "1")
{
strSql.Append(" from v_op_bill_gain_shen WHERE CUSTOMERNAME='" + CUSTNAME + "' ");
} else
strSql.Append(" from v_op_bill_gain WHERE CUSTOMERNAME='" +CUSTNAME+ "' ");
strSql.Append(" GROUP BY CUSTOMERNAME ");
strSql.Append(" UNION");
strSql.Append(" SELECT '结算单位:'+CUSTNAME+'('+SALE+')' INFOTEXT, SUM(RMBNODR) RMBNODR,SUM(USDNODR) USDNODR,SUM(TTLNODR) TTLNODR");
strSql.Append(",SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN RMBNODR ELSE 0 END) CRMBNODR,");
strSql.Append("SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN USDNODR ELSE 0 END) CUSDNODR,");
strSql.Append("SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN TTLNODR ELSE 0 END) CTTLNODR");
strSql.Append(" SELECT '结算单位:'+CUSTNAME+'('+SALE+')' INFOTEXT ");
strSql.Append(searchStr);
if (BLISSUENOSHEN.PARAMVALUE == "1")
{
strSql.Append(" from v_op_bill_cust_gain_shen WHERE CUSTNAME='" + CUSTNAME + "' and SALE='" + SALE + "'");
} else
strSql.Append(" from v_op_bill_cust_gain WHERE CUSTNAME='"+CUSTNAME+"' and SALE='"+SALE+"'");
strSql.Append(" GROUP BY CUSTNAME,SALE ");
strSql.Append(" UNION");
strSql.Append(" SELECT '结算单位:'+CUSTNAME INFOTEXT, SUM(RMBNODR) RMBNODR,SUM(USDNODR) USDNODR,SUM(TTLNODR) TTLNODR");
strSql.Append(",SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN RMBNODR ELSE 0 END) CRMBNODR,");
strSql.Append("SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN USDNODR ELSE 0 END) CUSDNODR,");
strSql.Append("SUM(CASE WHEN (DATEDIFF([day],ISNULL(STLDATE,ETD),GETDATE())>0) THEN TTLNODR ELSE 0 END) CTTLNODR");
strSql.Append(" SELECT '结算单位:'+CUSTNAME INFOTEXT");
strSql.Append(searchStr);
if (BLISSUENOSHEN.PARAMVALUE == "1")
{
strSql.Append(" from v_op_bill_cust_gain_shen WHERE CUSTNAME='" + CUSTNAME + "'");
@ -3309,6 +3347,14 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
data.USDNODR = Convert.ToString(reader["USDNODR"]) + "(" + Convert.ToString(reader["CUSDNODR"]) + ")";
data.TTLNODR = Convert.ToString(reader["TTLNODR"]) + "(" + Convert.ToString(reader["CTTLNODR"]) + ")";
data.RMBNODR_YQC = Convert.ToString(reader["RMBNODR_YQC"]) + "(" + Convert.ToString(reader["CRMBNODR_YQC"]) + ")";
data.USDNODR_YQC = Convert.ToString(reader["USDNODR_YQC"]) + "(" + Convert.ToString(reader["CUSDNODR_YQC"]) + ")";
data.TTLNODR_YQC = Convert.ToString(reader["TTLNODR_YQC"]) + "(" + Convert.ToString(reader["CTTLNODR_YQC"]) + ")";
data.RMBNODR_WQC = Convert.ToString(reader["RMBNODR_WQC"]) + "(" + Convert.ToString(reader["CRMBNODR_WQC"]) + ")";
data.USDNODR_WQC = Convert.ToString(reader["USDNODR_WQC"]) + "(" + Convert.ToString(reader["CUSDNODR_WQC"]) + ")";
data.TTLNODR_WQC = Convert.ToString(reader["TTLNODR_WQC"]) + "(" + Convert.ToString(reader["CTTLNODR_WQC"]) + ")";
#endregion
headList.Add(data);
}

12
DSWeb/Areas/MvcShipping/Models/MsOp_BLISSUE/MsOp_BLISSUE.cs
Unescape Escape View File

@ -701,6 +701,12 @@ namespace DSWeb.MvcShipping.Models.MsOp_BLISSUE
set { _TTLNODR = value; }
}
public string RMBNODR_YQC { get; set; }
public string USDNODR_YQC { get; set; }
public string TTLNODR_YQC { get; set; }
public string RMBNODR_WQC { get; set; }
public string USDNODR_WQC { get; set; }
public string TTLNODR_WQC { get; set; }
}
[JsonObject]
@ -735,6 +741,12 @@ namespace DSWeb.MvcShipping.Models.MsOp_BLISSUE
private string _IS累计欠费 = string.Empty;
private string _IS后续业务 = string.Empty;
private string _NUMTYPE = string.Empty;
public string NUMTYPE //用于表示此条数据为 total 提单签出 未签出 //total的一定有 提单签出/未签出 不是一定两条都有
{
get { return _NUMTYPE; }
set { _NUMTYPE = value; }
}
[ModelDB]
public string InfoText //用于显示业务信息文本

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

@ -148,8 +148,9 @@ Ext.define('MsChFeedoBill', {
{ name: 'CBM', type: 'string' },
{ name: 'BSCUSTOMNO', type: 'string' },
{ name: 'CUSTOMSNUM', type: 'string' },
{ name: 'BLISSUESTATUS', type: 'string' }
{ name: 'BLISSUESTATUS', type: 'string' },
{ name: 'ISSUETYPE', type: 'string' }
]
});
@ -157,10 +158,19 @@ Ext.define('BLINFOLIST', {
extend: 'Ext.data.Model',
idProperty: 'INFOTEXT',
fields: [
{ name: 'INFOTEXT', type: 'string' },
{ name: 'RMBNODR', type: 'string' },
{ name: 'USDNODR', type: 'string' },
{ name: 'TTLNODR', type: 'string' }
{ name: 'INFOTEXT', type: 'string' },
{ name: 'RMBNODR', type: 'string' },
{ name: 'USDNODR', type: 'string' },
{ name: 'TTLNODR', type: 'string' },
{ name: 'RMBNODR_YQC', type: 'string' },
{ name: 'USDNODR_YQC', type: 'string' },
{ name: 'TTLNODR_YQC', type: 'string' },
{ name: 'RMBNODR_WQC', type: 'string' },
{ name: 'USDNODR_WQC', type: 'string' },
{ name: 'TTLNODR_WQC', type: 'string' }
]
});

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

@ -1515,6 +1515,12 @@ Ext.extend(Shipping.MsOp_BLISSUESPEdit, Ext.Panel, {
dataIndex: 'CBM',
header: '尺码',
width: 60
},
{
sortable: true,
dataIndex: 'ISSUETYPE',
header: '签单方式',
width: 80
}
];
@ -1565,8 +1571,8 @@ Ext.extend(Shipping.MsOp_BLISSUESPEdit, Ext.Panel, {
});
this.girdcolumsbill = DsTruck.GetGridPanel(USERID, this.formname + 'bill', this.girdcolumsbill, 1); //使用者id，表名，中间column数组，跳过一开始的几列
this.gridBillList.reconfigure(this.storeBillList, this.girdcolumsbill);
this.gridBillList.reconfigure(this.storeBillList, this.girdcolumsbill);
this.gridBillList.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.SelectedRecord = record;
@ -1578,6 +1584,7 @@ Ext.extend(Shipping.MsOp_BLISSUESPEdit, Ext.Panel, {
window.open(openUrl, openType, openSet);
// DsOpenEditWin("/TruckMng/MsWlPc/Edit");
}, this);
this.storeBillList.on('beforeload', function (store) {
var _thisCUSTOMERNAME = Ext.getCmp("thisCUSTOMERNAME").getValue();
var sql = "CUSTOMERNAME='" + _thisCUSTOMERNAME

30
DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUESPIndex.js
Unescape Escape View File

@ -777,6 +777,36 @@ Ext.extend(Shipping.MsOp_BLISSUESPIndex, Ext.Panel, {
dataIndex: 'TTLNODR',
header: '合计应收欠费(超期)',
width: 160
}, {
sortable: true,
dataIndex: 'RMBNODR_YQC',
header: '已签出RMB应收欠费(超期)',
width: 160
}, {
sortable: true,
dataIndex: 'USDNODR_YQC',
header: '已签出USD应收欠费(超期)',
width: 160
}, {
sortable: true,
dataIndex: 'TTLNODR_YQC',
header: '已签出合计应收欠费(超期)',
width: 160
}, {
sortable: true,
dataIndex: 'RMBNODR_WQC',
header: '未签出RMB应收欠费(超期)',
width: 160
}, {
sortable: true,
dataIndex: 'USDNODR_WQC',
header: '未签出USD应收欠费(超期)',
width: 160
}, {
sortable: true,
dataIndex: 'TTLNODR_WQC',
header: '未签出合计应收欠费(超期)',
width: 160
}
]
});

28
DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape Escape View File

@ -8214,13 +8214,13 @@
<publishTime>08/26/2022 20:26:43</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEModel.js">
<publishTime>08/30/2022 12:01:26</publishTime>
<publishTime>09/02/2022 16:40:59</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUESPEdit.js">
<publishTime>09/01/2022 17:31:20</publishTime>
<publishTime>09/02/2022 16:38:27</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUESPIndex.js">
<publishTime>09/01/2022 13:56:41</publishTime>
<publishTime>09/02/2022 16:43:39</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsRptDeptArrearsDetailIndex.js">
<publishTime>08/26/2022 20:26:43</publishTime>
@ -12822,10 +12822,10 @@
<publishTime>08/26/2022 20:26:37</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>09/01/2022 17:39:42</publishTime>
<publishTime>09/02/2022 18:59:16</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>09/01/2022 17:39:42</publishTime>
<publishTime>09/02/2022 18:59:16</publishTime>
</File>
<File Include="bin/AspNetPager.dll">
<publishTime>08/26/2022 20:26:48</publishTime>
@ -12876,28 +12876,28 @@
<publishTime>08/26/2022 20:26:49</publishTime>
</File>
<File Include="bin/DSWeb.Common.dll">
<publishTime>09/01/2022 17:39:09</publishTime>
<publishTime>09/02/2022 18:58:40</publishTime>
</File>
<File Include="bin/DSWeb.Common.dll.config">
<publishTime>08/26/2022 20:26:39</publishTime>
</File>
<File Include="bin/DSWeb.Common.pdb">
<publishTime>09/01/2022 17:39:09</publishTime>
<publishTime>09/02/2022 18:58:40</publishTime>
</File>
<File Include="bin/DSWeb.dll">
<publishTime>09/01/2022 17:39:20</publishTime>
<publishTime>09/02/2022 18:58:54</publishTime>
</File>
<File Include="bin/DSWeb.Interface.dll">
<publishTime>09/01/2022 17:39:09</publishTime>
<publishTime>09/02/2022 18:58:40</publishTime>
</File>
<File Include="bin/DSWeb.Interface.pdb">
<publishTime>09/01/2022 17:39:09</publishTime>
<publishTime>09/02/2022 18:58:40</publishTime>
</File>
<File Include="bin/DSWeb.pdb">
<publishTime>09/01/2022 17:39:20</publishTime>
<publishTime>09/02/2022 18:58:54</publishTime>
</File>
<File Include="bin/DSWeb.XmlSerializers.dll">
<publishTime>09/01/2022 17:39:21</publishTime>
<publishTime>09/02/2022 18:58:55</publishTime>
</File>
<File Include="bin/DSWebComponent.dll">
<publishTime>08/28/2022 03:33:29</publishTime>
@ -17529,7 +17529,7 @@
<publishTime>08/26/2022 20:26:46</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>09/01/2022 17:39:35</publishTime>
<publishTime>09/02/2022 18:59:09</publishTime>
</File>
<File Include="PriceCarrier/CrmPriceCarrierInfo.aspx">
<publishTime>08/26/2022 20:26:46</publishTime>
@ -24078,7 +24078,7 @@
<publishTime>08/26/2022 20:26:48</publishTime>
</File>
<File Include="Web.config">
<publishTime>09/01/2022 11:15:58</publishTime>
<publishTime>09/02/2022 18:42:43</publishTime>
</File>
<File Include="WebSearchEngine/SearchEngineAdapter.aspx">
<publishTime>08/26/2022 20:26:48</publishTime>

4
DSWeb/Web.config
Unescape Escape View File

@ -90,10 +90,10 @@
<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" />
-->
<!-- 深圳彩虹捷运 正式库 LYGJX admin 123456
<!-- 深圳彩虹捷运 正式库 LYGJX admin 123456
<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 -->
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=CHCSK;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=CHCSK;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />

BIN
DSWeb/bin/DSWeb.XmlSerializers.dll
View File

Binary file not shown.

4
DSWeb/bin/DSWeb.dll.config
Unescape Escape View File

@ -90,10 +90,10 @@
<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" />
-->
<!-- 深圳彩虹捷运 正式库 LYGJX admin 123456
<!-- 深圳彩虹捷运 正式库 LYGJX admin 123456
<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 -->
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=CHCSK;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=CHCSK;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />

BIN
DSWeb/sql/update.mdb
View File

Binary file not shown.

BIN
DSWeb/sql/update.rar
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save