Skip to content

C
CZXT
提交 ec481330 authored 作者: 谭富强's avatar 谭富强
浏览文件
操作

1

上级 dcde4485
隐藏空白字符变更
内嵌 并排
正在显示 包含 38 行增加 和 28 行删除
Code/LQKJ.K3.CZXT.Pluglus/LQKJ_Warehouserentexpenses_PLTJ.cs
浏览文件 @ ec481330
...@@ -47,19 +47,19 @@ namespace LQKJ.K3.CZXT.Pluglus ...@@ -47,19 +47,19 @@ namespace LQKJ.K3.CZXT.Pluglus
if (selectedDate > currentDate) if (selectedDate > currentDate)
{ {
// 如果选择的日期超过当前日期，则不允许 // 如果选择的日期超过当前日期，则不允许
this.View.ShowMessage($"{currentMonth}月之前的数据"); this.View.ShowMessage($"只能录入{currentMonth}月之前的数据");
} }
else if (selectedDate.Year == currentDate.Year) // 如果选择的日期是当前年份 else if (selectedDate.Year == currentDate.Year) // 如果选择的日期是当前年份
{ {
if (selectedDate.Month > currentDate.Month) if (selectedDate.Month > currentDate.Month)
{ {
// 如果选择的日期月份超过当前月份，则不允许 // 如果选择的日期月份超过当前月份，则不允许
this.View.ShowMessage($"{currentMonth}月之前的数据"); this.View.ShowMessage($"只能录入{currentMonth}月之前的数据");
} }
else if (selectedDate.Month == currentDate.Month) else if (selectedDate.Month == currentDate.Month)
{ {
// 如果选择的日期是当前月份，则不允许 // 如果选择的日期是当前月份，则不允许
this.View.ShowMessage($"{currentMonth}月之前的数据"); this.View.ShowMessage($"只能录入{currentMonth}月之前的数据");
} }
else if (selectedDate.Month == currentDate.Month - 1) else if (selectedDate.Month == currentDate.Month - 1)
{ {
...@@ -75,7 +75,7 @@ namespace LQKJ.K3.CZXT.Pluglus ...@@ -75,7 +75,7 @@ namespace LQKJ.K3.CZXT.Pluglus
else else
{ {
// 其他情况（例如选择的日期年份超过当前年份），则不允许 // 其他情况（例如选择的日期年份超过当前年份），则不允许
this.View.ShowMessage($"{currentMonth}月之前的数据"); this.View.ShowMessage($"只能录入{currentMonth}月之前的数据");
} }
DynamicObject entityCollection = rowData["F_LQKJ_OrgId"] as DynamicObject; DynamicObject entityCollection = rowData["F_LQKJ_OrgId"] as DynamicObject;
......
Code/LQKJ.K3.CZXT.Pluglus/WarehouseRentReport.cs
浏览文件 @ ec481330
This source diff could not be displayed because it is too large. You can view the blob instead.
Code/LQKJ.K3.CZXT.Pluglus/Warehouserent_MXBB.cs
浏览文件 @ ec481330
...@@ -134,10 +134,28 @@ namespace LQKJ.K3.CZXT.Pluglus ...@@ -134,10 +134,28 @@ namespace LQKJ.K3.CZXT.Pluglus
} }
F_LQKJ_OrgId += string.Join(",", errorMessagest); F_LQKJ_OrgId += string.Join(",", errorMessagest);
} }
if (customFilter["F_LQKJ_StartDate"] != null && customFilter["F_LQKJ_EndDate"] != null) //if (customFilter["F_LQKJ_StartDate"] != null && customFilter["F_LQKJ_EndDate"] != null)
//{
// F_LQKJ_StartDate = (customFilter["F_LQKJ_StartDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_StartDate"]).ToString("yyyy-MM-dd");//起始日期
// F_LQKJ_EndDate = (customFilter["F_LQKJ_EndDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_EndDate"]).ToString("yyyy-MM-dd");//截止日期
//}
if (customFilter["F_LQKJ_StartDate"] != null || customFilter["F_LQKJ_EndDate"] != null)
{ {
F_LQKJ_StartDate = (customFilter["F_LQKJ_StartDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_StartDate"]).ToString("yyyy-MM-dd");//起始日期 if (customFilter["F_LQKJ_StartDate"] != null && customFilter["F_LQKJ_EndDate"] != null)
F_LQKJ_EndDate = (customFilter["F_LQKJ_EndDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_EndDate"]).ToString("yyyy-MM-dd");//截止日期 {
F_LQKJ_StartDate = (customFilter["F_LQKJ_StartDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_StartDate"]).ToString("yyyy-MM-dd");//起始日期
F_LQKJ_EndDate = (customFilter["F_LQKJ_EndDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_EndDate"]).ToString("yyyy-MM-dd");//截止日期
}
else if (customFilter["F_LQKJ_StartDate"] != null && customFilter["F_LQKJ_EndDate"] == null)
{
F_LQKJ_StartDate = (customFilter["F_LQKJ_StartDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_StartDate"]).ToString("yyyy-MM-dd");//起始日期
F_LQKJ_EndDate = (customFilter["F_LQKJ_StartDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_StartDate"]).ToString("yyyy-MM-dd");//起始日期
}
else if (customFilter["F_LQKJ_StartDate"] == null && customFilter["F_LQKJ_EndDate"] != null)
{
F_LQKJ_StartDate = (customFilter["F_LQKJ_EndDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_EndDate"]).ToString("yyyy-MM-dd");//截止日期
F_LQKJ_EndDate = (customFilter["F_LQKJ_EndDate"] == null) ? string.Empty : Convert.ToDateTime(customFilter["F_LQKJ_EndDate"]).ToString("yyyy-MM-dd");//截止日期
}
} }
var OpenParameter = filter.CustomParams["OpenParameter"] as Dictionary<string, Object>; var OpenParameter = filter.CustomParams["OpenParameter"] as Dictionary<string, Object>;
if (OpenParameter.ContainsKey("orgId")) if (OpenParameter.ContainsKey("orgId"))
...@@ -620,24 +638,6 @@ namespace LQKJ.K3.CZXT.Pluglus ...@@ -620,24 +638,6 @@ namespace LQKJ.K3.CZXT.Pluglus
receBillTable.EndInit(); receBillTable.EndInit();
// 保存到数据库或进一步处理 // 保存到数据库或进一步处理
Kingdee.BOS.App.Data.DBUtils.BulkInserts(this.Context, receBillTable); Kingdee.BOS.App.Data.DBUtils.BulkInserts(this.Context, receBillTable);
//string sqlLINS = ($@"/*dialect*/SELECT * FROM {receBillTable} ORDER by FDate");
//DBUtils.Execute(this.Context, sqlLINS);
//string gllxSQL = ($@"/*dialect*/WITH NumberedTMP AS (
// SELECT *, ROW_NUMBER() OVER (ORDER BY (SELECT NULL)) AS RowNum
// FROM {receBillTable}
// )MERGE INTO NumberedTMP t1
// USING (
// SELECT F_LQKJ_FDATE,ZZ.FORGID,F_LQKJ_Scanfee,F_LQKJ_JDchannelfee,F_LQKJ_Breturnfees,F_LQKJ_Specialloading,F_LQKJ_Inspectionfee,F_LQKJ_Wdbczce
// FROM T_LQKJ_CZexpenses t1
// LEFT JOIN T_ORG_ORGANIZATIONS_L ZZ ON T1.F_LQKJ_ORGID = ZZ.FNAME AND ZZ.FLOCALEID = 2052
// ) t2
// ON (-- 只匹配序号最大的记录
// t1.RowNum = (SELECT MAX(RowNum) FROM NumberedTMP) AND FORMAT(t1.FDate, 'yyyy/MM') = FORMAT(t2.F_LQKJ_FDATE, 'yyyy/MM') AND t1.FSTOCKORGID = t2.FORGID)
// WHEN MATCHED THEN
// UPDATE SET
// t1.F_LQKJ_Scanfee = t2.F_LQKJ_Scanfee,t1.F_LQKJ_JDchannelfee = t2.F_LQKJ_JDchannelfee,t1.F_LQKJ_Breturnfees = t2.F_LQKJ_Breturnfees,
// t1.F_LQKJ_Specialloading = t2.F_LQKJ_Specialloading,t1.F_LQKJ_Inspectionfee = t2.F_LQKJ_Inspectionfee,t1.F_LQKJ_Wdbczce = t2.F_LQKJ_Wdbczce;");
//DBUtils.Execute(this.Context, gllxSQL);
// 定义报表字段名的列表 zds 列表将用于记录需要选择的字段及其相关信息（如类型、长度、名称等） // 定义报表字段名的列表 zds 列表将用于记录需要选择的字段及其相关信息（如类型、长度、名称等）
zds = new List<CreateTmpTableZD>(); zds = new List<CreateTmpTableZD>();
...@@ -730,9 +730,13 @@ namespace LQKJ.K3.CZXT.Pluglus ...@@ -730,9 +730,13 @@ namespace LQKJ.K3.CZXT.Pluglus
,ISNULL(FORMAT((T1.F_LQKJ_Specialloading), '0.####'), '0') AS F_LQKJ_Specialloading--特殊装货 ,ISNULL(FORMAT((T1.F_LQKJ_Specialloading), '0.####'), '0') AS F_LQKJ_Specialloading--特殊装货
,ISNULL(FORMAT((T1.F_LQKJ_Inspectionfee), '0.####'), '0') AS F_LQKJ_Inspectionfee--检查及包装费 ,ISNULL(FORMAT((T1.F_LQKJ_Inspectionfee), '0.####'), '0') AS F_LQKJ_Inspectionfee--检查及包装费
,ISNULL(FORMAT((T1.F_LQKJ_Wdbczce), '0.####'), '0') AS F_LQKJ_Wdbczce--未达标仓租差额 ,ISNULL(FORMAT((T1.F_LQKJ_Wdbczce), '0.####'), '0') AS F_LQKJ_Wdbczce--未达标仓租差额
,ISNULL(FORMAT((W.F_ORA_DECIMAL_QTR * ((T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY) * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END)) + (W.F_ORA_DECIMAL_QTR1 * ((T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY) * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END)) ,ISNULL(FORMAT(ISNULL(CONVERT(FLOAT, W.F_ORA_DECIMAL_QTR), 0) * ((T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY) * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END)
+ (W.F_ORA_DECIMAL_83G * (T1.FSTOCKOUTQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END)) + (CS.F_LQKJ_Sortingfees * ((T1.FSTOCKQCQTY + T1.FSTOCKINQTY - T1.FSTOCKOUTQTY) * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END)) + ISNULL(CONVERT(FLOAT, T1.F_ORA_DECIMAL_QTR1), 0)
+ T1.F_LQKJ_Scanfee + T1.F_LQKJ_JDchannelfee + T1.F_LQKJ_Breturnfees + T1.F_LQKJ_Specialloading + T1.F_LQKJ_Inspectionfee + T1.F_LQKJ_Wdbczce, '0.####'), '0') AS F_LQKJ_Totalcosts--费用合计 + ISNULL(CONVERT(FLOAT, T1.F_ORA_DECIMAL_83G), 0)
+ (T1.FSTOCKOUTQTY * CASE WHEN JB.FVOLUME = 0 THEN 1 ELSE JB.FVOLUME END * ISNULL(CONVERT(FLOAT, CS.F_LQKJ_Sortingfees), 0))
+ ISNULL(CONVERT(FLOAT, T1.F_LQKJ_Scanfee), 0) + ISNULL(CONVERT(FLOAT, T1.F_LQKJ_JDchannelfee), 0) + ISNULL(CONVERT(FLOAT, T1.F_LQKJ_Breturnfees), 0)
+ ISNULL(CONVERT(FLOAT, T1.F_LQKJ_Specialloading), 0) + ISNULL(CONVERT(FLOAT, T1.F_LQKJ_Inspectionfee), 0)
+ ISNULL(CONVERT(FLOAT, T1.F_LQKJ_Wdbczce), 0), '0.####'), '0') AS F_LQKJ_Totalcosts--费用合计
FROM {0} T1 FROM {0} T1
LEFT JOIN LQKJ_SettupParameters CS ON 1=1 --设置参数表 LEFT JOIN LQKJ_SettupParameters CS ON 1=1 --设置参数表
LEFT JOIN T_ORG_ORGANIZATIONS_L ZZ ON T1.FSTOCKORGID=ZZ.FORGID AND ZZ.FLOCALEID=2052--组织多语言表 LEFT JOIN T_ORG_ORGANIZATIONS_L ZZ ON T1.FSTOCKORGID=ZZ.FORGID AND ZZ.FLOCALEID=2052--组织多语言表
...@@ -843,6 +847,12 @@ UPDATE SET ...@@ -843,6 +847,12 @@ UPDATE SET
// 调用基类的 GetSummaryColumnInfo 方法获取基本的汇总列信息 // 调用基类的 GetSummaryColumnInfo 方法获取基本的汇总列信息
var result = base.GetSummaryColumnInfo(filter); var result = base.GetSummaryColumnInfo(filter);
// 以下是一些被注释掉的代码，表示如果需要，可以添加更多的汇总字段 // 以下是一些被注释掉的代码，表示如果需要，可以添加更多的汇总字段
result.Add(new SummaryField("F_LQKJ_Unitvolume", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//单位体积
result.Add(new SummaryField("F_LQKJ_Warehouserent", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//仓租单价
result.Add(new SummaryField("F_LQKJ_Unloadingfee", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//卸车费单价
result.Add(new SummaryField("F_LQKJ_Loadingfee", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//装车费单价
result.Add(new SummaryField("F_LQKJ_Sortingfees", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//分拣费单价
result.Add(new SummaryField("F_LQKJ_Totalcosts", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//费用合计
result.Add(new SummaryField("FSTOCKQCQTY", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//期初&数量(库存) result.Add(new SummaryField("FSTOCKQCQTY", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//期初&数量(库存)
result.Add(new SummaryField("FSTOCKINQTY", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//入库数 result.Add(new SummaryField("FSTOCKINQTY", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//入库数
result.Add(new SummaryField("FSTOCKOUTQTY", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//出库数 result.Add(new SummaryField("FSTOCKOUTQTY", Kingdee.BOS.Core.Enums.BOSEnums.Enu_SummaryType.SUM));//出库数
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论