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/PRD/Pro_WorkBillPlatform.cs | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
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
--
Gitblit v1.9.1