From 527469d17b75d42349bf17234ef3e34cc36e8920 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 13 九月 2021 17:30:55 +0800
Subject: [PATCH] nothing
---
src/BLL/Demo.BillView/Demo.BillView.csproj | 2
src/BLL/Demo.Report/PRD/prd_TimelinessRateReport.cs | 46 +++++++++-----
src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTaskByPurchase.cs | 4
src/BLL/Demo.Report/PRD/prd_CompleteSetRateReport.cs | 38 +++++++-----
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 34 +++++------
5 files changed, 71 insertions(+), 53 deletions(-)
diff --git a/src/BLL/Demo.BillView/Demo.BillView.csproj b/src/BLL/Demo.BillView/Demo.BillView.csproj
index fe8ee99..f2527f0 100644
--- a/src/BLL/Demo.BillView/Demo.BillView.csproj
+++ b/src/BLL/Demo.BillView/Demo.BillView.csproj
@@ -229,6 +229,8 @@
<Compile Include="PRD\Pro_DayPlanCheckSelectMenu.cs" />
<Compile Include="PRD\Pro_DayPlanPushSCHB.cs" />
<Compile Include="PRD\Pro_DayPlanBG.cs" />
+ <Compile Include="PRD\Pur_ReceiveDelete.cs" />
+ <Compile Include="PRD\Pur_Receive.cs" />
<Compile Include="PRD\Pro_DayPlanReturnMaterial.cs" />
<Compile Include="PRD\Pro_PPBomSubmit.cs" />
<Compile Include="PRD\Pro_RJHYLQDBGFSH.cs" />
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 4111a5b..ddb2b1d 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -507,9 +507,9 @@
}
else
{
- //楠岃瘉鏃ヨ鍒掑伐鍗曟槸鍚﹀瓨鍦ㄦ暟鎹� 鐢熶骇璁㈠崟鍙峰姞鏄庣粏琛屽彿 宸茬敓鎴愯繃鏃ヨ鍒掔殑涓嶇敓鎴�
+ //楠岃瘉鏃ヨ鍒掑伐鍗曟槸鍚﹀瓨鍦ㄦ暟鎹� 鐢熶骇璁㈠崟鍙峰姞鏄庣粏琛屽彿 宸茬敓鎴愯繃鏃ヨ鍒掔殑涓嶇敓鎴� (鍏抽棴鍚庣殑)
string moSql = string.Format(@"/*dialect*/ select FID from SC_WORKBILLSORTBILLMAIN
- where FSCORDERNO ='{0}' and FSRCBILLENTRYSEQ = '{1}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
+ where FDOCUMENTSTATUS NOT IN ('E') AND FSCORDERNO ='{0}' and FSRCBILLENTRYSEQ = '{1}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
int fDayPlanFID = DBServiceHelper.ExecuteScalar<int>(Context, moSql, 0);
if (fDayPlanFID > 0)
continue;
@@ -1076,7 +1076,7 @@
--(FHEntryCloseDate is null and DATEDIFF(D,GETDATE(),FHMASTERDATE)<0)or
DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0
and a.FDOCUMENTSTATUS not in ('E')
---and b.FHQTY>0
+and b.FHQTY>0
ORDER BY b.FHMASTERDATE,a.FHOrderLev
";
ds = DBServiceHelper.ExecuteDataSet(Context, sql);
@@ -1091,6 +1091,7 @@
LogHelper.Info("榻愬鍒嗘瀽鍑嗗鏁版嵁瀹屾垚锛�" + sw.Elapsed);
foreach (var item in DatePlanList)
{
+ //LogHelper.Info("榻愬鍒嗘瀽绗竴涓惊鐜� 锛� 宸ュ崟鍙� 锛�" + item.FPRDMOENTYID.ToString() + item.FHMASTERDATE.ToString("yyyy-MM-dd"));
//绛涢�夊嚭褰撴棩璁″垝鏁版嵁
var _BomList = BomList.Where(x => x.FHMASTERDATE == item.FHMASTERDATE && x.FPRDMOENTYID == item.FPRDMOENTYID).ToList();
foreach (var _item in _BomList)
@@ -1347,7 +1348,7 @@
";
ds = DBServiceHelper.ExecuteDataSet(Context, sql);
List<PRD_PPBOM> BomList = ds.ToModelList<PRD_PPBOM>();
- //鏃ヨ鍒�+鐢熶骇璁㈠崟瀛愯〃缂栫爜ID
+ //鏃ヨ鍒掓棩鏈�+鐢熶骇璁㈠崟瀛愯〃缂栫爜ID
var DatePlanList = BomList.GroupBy(p => new { p.FHMASTERDATE, p.FPRDMOENTYID }).Select(x => new PRD_PPBOM { FHMASTERDATE = x.Key.FHMASTERDATE, FPRDMOENTYID = x.Key.FPRDMOENTYID }).ToList();
//CompleteAnalysisTempModel 鐢ㄤ簬瀛樺偍涓存椂闇�瑕佹彃鍏ユ暟鎹�
List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>();
@@ -2995,20 +2996,12 @@
//鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
int Fseq = entityDataObjoct.Count();
- //if (Fseq == 0)
- //{
- // this.View.ShowErrMessage("璇峰厛鍔犺浇鏁版嵁");
- // return;
- //}
- //var isexists = entityDataObjoct.Where(x => x["FSRCBILLENTRYSEQ"].ToString() == "1");
- //var isexists1 = entityDataObjoct.ToList().FindAll(x => x["FSRCBILLENTRYSEQ"].ToString() == "1");
string pageId = Guid.NewGuid().ToString();
ListShowParameter showParameter = new ListShowParameter();
showParameter.FormId = "PRD_MO";
showParameter.PageId = pageId;
showParameter.UseOrgId = this.Context.CurrentOrganizationInfo.ID;
showParameter.IsLookUp = true;
- this.View.ShowForm(showParameter);
this.View.ShowForm(showParameter, delegate (FormResult result)
{
object returnData = result.ReturnData;
@@ -3018,20 +3011,22 @@
LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟 琛屾暟" + listSelectedRowCollection.Count().ToString());
if (listSelectedRowCollection != null)
{
+ var ret = "";
foreach (var listSelectedRow in listSelectedRowCollection)
{
if (entityDataObjoct.Where(x => x["FSRCBILLENTRYSEQ"].ToString() == listSelectedRow.DataRow["t1_FSeq"].ToString() && x["FSCOrderNo"].ToString() == listSelectedRow.DataRow["FBillNo"].ToString()).Count() > 0)
{
- LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟:"+listSelectedRow.DataRow["FBillNo"].ToString()+ ", 琛屽彿," +listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸查��");
+ LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟:" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿," + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸查��");
+ ret += "鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿," + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",宸查��" + "\n";
continue;
}
//浠婂ぉ浠ュ墠鐨勬暟鎹槸鏄剧ず涓嶅嚭鏉ョ殑
string sql = $"select DATEDIFF(d,getdate(),FPlanStartDate)days from T_PRD_MOENTRY where FENTRYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
int day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
if (day < 0)
- {
- LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟:鏃ユ湡澶潬鍚庯紝" + listSelectedRow.DataRow["FBillNo"].ToString()+ ", 琛屽彿, "+listSelectedRow.DataRow["t1_FSeq"].ToString() + ", day= "+ day.ToString());
- //LogHelper.Info(sql);
+ {
+ LogHelper.Info("鐢熶骇璁″垝骞冲彴閫夊崟:鏃ユ湡澶潬鍚庯紝" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿, " + listSelectedRow.DataRow["t1_FSeq"].ToString() + ", day= " + day.ToString());
+ ret += "璁″垝寮�宸ユ棩鏈熷湪浠婂ぉ涔嬪墠,鐢熶骇璁㈠崟鍙凤細" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 琛屽彿," + listSelectedRow.DataRow["t1_FSeq"].ToString() + "\n";
continue;
}
this.Model.CreateNewEntryRow("FEntity");
@@ -3047,6 +3042,10 @@
this.View.Model.SetValue("FT" + day.ToString(), listSelectedRow.DataRow["FQty"].ToString(), Fseq);
Fseq++;
}
+ if (ret != "")
+ {
+ this.View.ShowMessage(ret);
+ }
}
}
});
@@ -3058,6 +3057,3 @@
}
}
}
-
-
-//tbReleaseReserve
\ No newline at end of file
diff --git a/src/BLL/Demo.Report/PRD/prd_CompleteSetRateReport.cs b/src/BLL/Demo.Report/PRD/prd_CompleteSetRateReport.cs
index eaa7b5f..56fef0b 100644
--- a/src/BLL/Demo.Report/PRD/prd_CompleteSetRateReport.cs
+++ b/src/BLL/Demo.Report/PRD/prd_CompleteSetRateReport.cs
@@ -29,13 +29,6 @@
public override void Initialize()
{
- //base.Initialize();
- //this.ReportProperty.ReportType = ReportType.REPORTTYPE_NORMAL;
- //this.ReportProperty.ReportName = new LocaleValue("渚涘簲鍟嗛�佹枡璁″垝鍒楄〃璁㈠崟", base.Context.UserLocale.LCID);
- //this.ReportProperty.IsUIDesignerColumns = true;
- //this.ReportProperty.IsGroupSummary = true;
- //this.ReportProperty.SimpleAllCols = false;
-
base.Initialize();
// 绠�鍗曡处琛ㄧ被鍨嬶細鏅�氥�佹爲褰€�佸垎椤�
this.ReportProperty.ReportType = ReportType.REPORTTYPE_NORMAL;
@@ -44,15 +37,11 @@
this.ReportProperty.IsUIDesignerColumns = false;
//鏄惁鍒嗙粍姹囨��
this.ReportProperty.IsGroupSummary = true;
-
-
-
}
public override ReportHeader GetReportHeaders(IRptParams filter)
{
ReportHeader header = new ReportHeader();
-
header.AddChild("FIDENTITYID", new LocaleValue("搴忓彿"), SqlStorageType.SqlInt).ColIndex = 1;
header.AddChild("FHDATE", new LocaleValue("鎻愭枡璁″垝鏃ユ湡", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 1;
header.AddChild("FHSOURCEBILLNO", new LocaleValue("鐢熶骇璁㈠崟缂栧彿", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 2;
@@ -73,7 +62,6 @@
header.AddChild("FISQT", new LocaleValue("鏄惁榻愬", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 12;
header.AddChild("FTYPE", new LocaleValue("绫诲瀷", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 12;
header.AddChild("FJSRATE", new LocaleValue("榻愬鐜�", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal).ColIndex = 12;
-
return header;
}
@@ -86,11 +74,9 @@
string FProductLine = ""; //鐢熶骇绾�
string FMoBillNo = ""; //鐢熶骇璁㈠崟鍙�
string FSupplyID = ""; //渚涘簲鍟�
-
FBeginDATE = customFil["FBeginDATE"]?.ToString();
FEndDATE = customFil["FEndDATE"]?.ToString();
FMoBillNo = customFil["FMoBillNo"]?.ToString();
-
if (((DynamicObject)customFil["FProductLine"]) != null)
{
FProductLine = ((DynamicObject)customFil["FProductLine"])["Id"].ToString();
@@ -103,8 +89,30 @@
LogHelper.Info(sql);
DBUtils.Execute(this.Context, sql);
}
- public override void CloseReport()
+ public override ReportTitles GetReportTitles(IRptParams filter)
{
+ var result = base.GetReportTitles(filter);
+ DynamicObject dyFilter = filter.FilterParameter.CustomFilter;
+ if (dyFilter != null)
+ {
+ if (result == null)
+ {
+ result = new ReportTitles();
+ }
+ }
+ var begindate = dyFilter["FBeginDATE"]?.ToString() ?? "1990-01-01 00:00:00";
+ var enddate = dyFilter["FEndDATE"]?.ToString() ?? "9999 - 01 - 01 00:00:00";
+ var FMoBillNo = dyFilter["FMoBillNo"]?.ToString() ?? "";
+ var FProductLine = (dyFilter["FProductLine"] as DynamicObject)?["Name"].ToString() ?? "";
+ var FSupplyID = (dyFilter["FSupplyID"] as DynamicObject)?["Name"].ToString() ?? "";
+ //var FMaterialID = (dyFilter["FMaterialID"] as DynamicObject)?["Id"].ToString() ?? "";
+ result.AddTitle("FBeginDATE", begindate);
+ result.AddTitle("FEndDATE", enddate);
+ result.AddTitle("FMoBillNo", FMoBillNo);
+ result.AddTitle("FProductLine", FProductLine);
+ result.AddTitle("FSupplyID", FSupplyID);
+ //result.AddTitle("FMaterialID", FMaterialID);
+ return result;
}
}
diff --git a/src/BLL/Demo.Report/PRD/prd_TimelinessRateReport.cs b/src/BLL/Demo.Report/PRD/prd_TimelinessRateReport.cs
index 6615b18..342501f 100644
--- a/src/BLL/Demo.Report/PRD/prd_TimelinessRateReport.cs
+++ b/src/BLL/Demo.Report/PRD/prd_TimelinessRateReport.cs
@@ -29,13 +29,6 @@
public override void Initialize()
{
- //base.Initialize();
- //this.ReportProperty.ReportType = ReportType.REPORTTYPE_NORMAL;
- //this.ReportProperty.ReportName = new LocaleValue("渚涘簲鍟嗛�佹枡璁″垝鍒楄〃璁㈠崟", base.Context.UserLocale.LCID);
- //this.ReportProperty.IsUIDesignerColumns = true;
- //this.ReportProperty.IsGroupSummary = true;
- //this.ReportProperty.SimpleAllCols = false;
-
base.Initialize();
// 绠�鍗曡处琛ㄧ被鍨嬶細鏅�氥�佹爲褰€�佸垎椤�
this.ReportProperty.ReportType = ReportType.REPORTTYPE_NORMAL;
@@ -45,13 +38,11 @@
//鏄惁鍒嗙粍姹囨��
this.ReportProperty.IsGroupSummary = true;
this.ReportProperty.PrimaryKeyFieldName = "FIDENTITYID";
-
}
public override ReportHeader GetReportHeaders(IRptParams filter)
{
ReportHeader header = new ReportHeader();
-
header.AddChild("FIDENTITYID", new LocaleValue("搴忓彿"), SqlStorageType.SqlInt).ColIndex = 1;
header.AddChild("FHDATE", new LocaleValue("鎻愭枡璁″垝鏃ユ湡", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 1;
header.AddChild("FHSOURCEBILLNO", new LocaleValue("鐢熶骇璁㈠崟缂栧彿", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 2;
@@ -64,12 +55,12 @@
header.AddChild("FMATERIALNUMBER", new LocaleValue("鍘熸潗鏂欑紪鐮�", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 9;
header.AddChild("FMATERIALNAME", new LocaleValue("鍘熸潗鏂欏悕绉�", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 10;
header.AddChild("FSPECIFICATION", new LocaleValue("鍘熸潗鏂欒鏍�", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 11;
- header.AddChild("FHQTY", new LocaleValue("璁㈠崟鏁伴噺", this.Context.UserLocale.LCID),SqlStorageType.SqlDecimal).ColIndex = 11;
+ header.AddChild("FHQTY", new LocaleValue("璁㈠崟鏁伴噺", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal).ColIndex = 11;
header.AddChild("FREALQTY", new LocaleValue("瀹為檯鍒拌揣鏁伴噺", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal).ColIndex = 11;
header.AddChild("FRKDATE", new LocaleValue("瀹為檯鍒拌揣鏃堕棿", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 12;
header.AddChild("FTYPE", new LocaleValue("绫诲瀷", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 12;
header.AddChild("FJSRATE", new LocaleValue("鍒拌揣鍙婃椂鐜�", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal).ColIndex = 12;
-
+ header.AddChild("FTQCOUNT", new LocaleValue("鎷栨湡鏁伴噺", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal).ColIndex = 13;
return header;
}
@@ -77,14 +68,13 @@
{
base.BuilderReportSqlAndTempTable(filter, tableName);
DynamicObject customFil = filter.FilterParameter.CustomFilter;
- string FDATE = ""; //鎻愭枡鏃ユ湡
string FProductLine = ""; //鐢熶骇绾�
- string FMoBillNo = ""; //鐢熶骇璁㈠崟鍙�
string FMaterialID = ""; //鐗╂枡
string FSupplyID = ""; //渚涘簲鍟�
- FDATE = customFil["FDATE"]?.ToString();
- FMoBillNo = customFil["FMoBillNo"]?.ToString();
+ string FBeginDATE = customFil["FBeginDATE"]?.ToString();
+ string FEndDATE = customFil["FEndDATE"]?.ToString();
+ string FMoBillNo = customFil["FMoBillNo"]?.ToString();
if (((DynamicObject)customFil["FMaterialID"]) != null)
{
@@ -98,12 +88,34 @@
{
FSupplyID = ((DynamicObject)customFil["FSupplyID"])["Id"].ToString();
}
- string sql = string.Format($"/*dialect*/ EXEC pr_TimelinessRateReport '{tableName}','{FDATE}','{FMoBillNo}','{FProductLine}','{FSupplyID}','{FMaterialID}'");
+ string sql = string.Format($"/*dialect*/ EXEC pr_TimelinessRateReport '{tableName}','{FBeginDATE}','{FEndDATE}','{FMoBillNo}','{FProductLine}','{FSupplyID}','{FMaterialID}'");
LogHelper.Info(sql);
DBUtils.Execute(this.Context, sql);
}
- public override void CloseReport()
+ public override ReportTitles GetReportTitles(IRptParams filter)
{
+ var result = base.GetReportTitles(filter);
+ DynamicObject dyFilter = filter.FilterParameter.CustomFilter;
+ if (dyFilter != null)
+ {
+ if (result == null)
+ {
+ result = new ReportTitles();
+ }
+ }
+ var begindate = dyFilter["FBeginDATE"]?.ToString() ?? "1990-01-01 00:00:00";
+ var enddate = dyFilter["FEndDATE"]?.ToString() ?? "9999 - 01 - 01 00:00:00";
+ var FMoBillNo = dyFilter["FMoBillNo"]?.ToString() ?? "";
+ var FProductLine = (dyFilter["FProductLine"] as DynamicObject)?["Name"].ToString() ?? "";
+ var FSupplyID = (dyFilter["FSupplyID"] as DynamicObject)?["Name"].ToString() ?? "";
+ var FMaterialID = (dyFilter["FMaterialID"] as DynamicObject)?["Name"].ToString() ?? "";
+ result.AddTitle("FBeginDATE", begindate);
+ result.AddTitle("FEndDATE", enddate);
+ result.AddTitle("FMoBillNo", FMoBillNo);
+ result.AddTitle("FProductLine", FProductLine);
+ result.AddTitle("FSupplyID", FSupplyID);
+ result.AddTitle("FMaterialID", FMaterialID);
+ return result;
}
}
diff --git a/src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTaskByPurchase.cs b/src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTaskByPurchase.cs
index f1c7c58..8ebd378 100644
--- a/src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTaskByPurchase.cs
+++ b/src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTaskByPurchase.cs
@@ -37,7 +37,7 @@
(
select FBILLTYPEID from T_BAS_BILLTYPE
where FBILLFORMID = 'PUR_PurchaseOrder'
-and FNUMBER in('CGDD09_SYS', 'CGDD10_SYS')
+and FNUMBER in('CGDD09_SYS','CGDD10_SYS','CGDD06,'CGDD08')
)
and FDOCUMENTSTATUS = 'C'
and FENTRYID not in (select distinct FHPOOrderEntryID from Cg_PODemandPlanBillSub)";
@@ -71,7 +71,7 @@
(
select FBILLTYPEID from T_BAS_BILLTYPE
where FBILLFORMID = 'PUR_PurchaseOrder'
-and FNUMBER in('CGDD09_SYS','CGDD10_SYS')
+and FNUMBER in('CGDD09_SYS','CGDD10_SYS','CGDD06,'CGDD08')
)
and a.FDOCUMENTSTATUS = 'C'
)A
--
Gitblit v1.9.1