From a0e7ad65f78935d8b4818f063f6974db567d199d Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 26 十一月 2020 16:40:11 +0800
Subject: [PATCH] 测试问题项更改
---
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 72 insertions(+), 5 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index d4ac0a7..85e5725 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -262,9 +262,21 @@
else
sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'";
- string sql = $"/*dialect*/update t1 set t1.FHLockedSub=1 from Sc_WorkBillSortBillSub t1 join Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE between DATEADD(day,-1,getdate()) and DATEADD(day,{day - 1},getdate()) " + sqlwhere;
+ //鑾峰彇鍗曟嵁浣撲俊鎭�
+ Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
+ //鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
+ DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
+ List<string> sqlList = new List<string>();
+ string sql;
+ foreach (var item in entityDataObjoct)
+ {
- int result = DBUtils.Execute(Context, sql);
+ sql = $"/*dialect*/update Sc_WorkBillSortBillSub set FHLockedSub=1 where FEntryID in (select TOP({day}) FEntryID from Sc_WorkBillSortBillSub where FHLOCKEDSUB = 0 AND FID = { Convert.ToString(item["FDayPlanWorkID"])} AND DATEDIFF(DAY, GETDATE(), FHMASTERDATE) >= 0 ORDER BY FEntryID) ";
+ sqlList.Add(sql);
+
+ }
+
+ int result = DBServiceHelper.ExecuteBatch(Context, sqlList);
if (result > 0)
{
SearchList222();
@@ -272,7 +284,6 @@
}
else
this.View.ShowMessage("鎿嶄綔澶辫触锛岃仈绯荤鐞嗗憳锛�");
-
}
/// <summary>
/// 淇濆瓨鍔熻兘
@@ -287,11 +298,17 @@
//鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
DateTime date = DateTime.Now;
-
foreach (DynamicObject current in entityDataObjoct)
{
+ DateTime FBzDate = Convert.ToDateTime(Convert.ToDateTime(current["FBzDate"]));
+ DateTime end = Convert.ToDateTime(Convert.ToDateTime(current["FBzDate"]).AddDays(60).ToShortDateString());//鏈�澶ф棩鏈�
for (int i = 0; i <= 60; i++)
{
+ DateTime start = Convert.ToDateTime(date.AddDays(i).ToShortDateString());
+ TimeSpan getDay = end.Subtract(start);
+ //缂栧埗鏃ユ湡+61澶�>date.AddDays(i).ToShortDateString() continue
+ if (getDay.Days < 0)
+ break;
sql = $"/*dialect*/update t1 set FHQTY='{Convert.ToString(current["FT" + "" + i + ""])}' from Sc_WorkBillSortBillSub t1 join " +
$" Sc_WorkBillSortBillMain t2 on t1.FID = t2.FID where FHMASTERDATE='{date.AddDays(i).ToShortDateString()}' and t2.FID='{Convert.ToString(current["FDayPlanWorkID"])}'";
sqlList.Add(sql);
@@ -571,6 +588,16 @@
else
sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'";
+
+ //鐢熶骇璁㈠崟鍙�
+ string FScOrderMainNo = Convert.ToString((this.Model.GetValue("FScOrderMainNo")));
+ if (string.IsNullOrEmpty(FScOrderMainNo))
+ {
+
+ }
+ else
+ sqlwhere += $" and FSCORDERNO='{FScOrderMainNo}'";
+
//鐗╂枡
if ((this.Model.GetValue("FMatralId") as DynamicObject) != null)
{
@@ -612,6 +639,10 @@
this.Model.SetValue("FHMainSourceInterID", dt.Rows[i]["FPRDMOMAINID"].ToString(), i);//婧愬崟涓诲唴鐮丗HMainSourceInterID
this.Model.SetValue("FHMainSourceEntryID", dt.Rows[i]["FPRDMOENTYID"].ToString(), i);//婧愬崟瀛愬唴鐮丗HMainSourceEntryID
this.Model.SetValue("FDayPlanWorkID", dt.Rows[i]["FID"].ToString(), i);//鏃ヨ鍒掑伐鍗旻ID
+
+ this.Model.SetValue("FProductWorkShopId", dt.Rows[i]["FHSourceID"].ToString(), i);//鐢熶骇杞﹂棿
+ this.Model.SetValue("FResourcesId", dt.Rows[i]["FHWorkShopID"].ToString(), i);//鐢熶骇璧勬簮
+
sql = @"/*dialect*/SELECT * FROM Sc_WorkBillSortBillSub WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0 and FID=" + dt.Rows[i]["FID"].ToString();
DataTable _dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
@@ -870,6 +901,41 @@
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
List<DayPlanPpbom> DayPlanPpbom = ds.ToModelList<DayPlanPpbom>();
+
+ sql = @"select T1.FID,FPLANCOUNT,FCOMPLETECOUNT,t2.FHQTY from SC_WORKBILLSORTBILLMAIN T1
+JOIN SC_WORKBILLSORTBILLSUB T2 ON T1.FID=T2.FID WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0 AND FPLANCOUNT>FCOMPLETECOUNT AND T1.FID in (" + FDayPlanWorkID + ")";
+ DataSet Complete = DBServiceHelper.ExecuteDataSet(Context, sql);
+ List<DayPlanPpbom> CompleteList = ds.ToModelList<DayPlanPpbom>();
+ //FID闆嗗悎
+ var FIDList = CompleteList.Select(x => x.FID).Distinct().ToList();
+ foreach (var item in FIDList)
+ {
+ var _CompleteList = CompleteList.Where(p => p.FID == item).ToList();
+ decimal FComplete = _CompleteList.FirstOrDefault().FCOMPLETECOUNT;
+ if (FComplete == 0)
+ continue;
+ foreach (var _item in _CompleteList)
+ {
+ FComplete = FComplete - _item.FHQTY;
+ if (FComplete >= 0)
+ {
+ DayPlanPpbom.RemoveAll(p => p.FENTRYID == _item.FENTRYID);
+
+ }
+ else
+ {
+ DayPlanPpbom.FindAll(p => p.FENTRYID == _item.FENTRYID).ForEach(x =>
+ {
+ x.NeedQty = -(x.FNeedQty * FComplete);
+ });
+ break;
+ }
+
+
+ }
+
+ }
+
//鐗╂枡闆嗗悎 鐢辩墿鏂欏幓鍒嗙粍
List<string> MaterialIDList = DayPlanPpbom.Select(x => x.FMATERIALID).Distinct().ToList();
//鎻愭枡璁″垝鏁版嵁闆嗕复鏃跺瓨鍌ㄩ泦鍚�
@@ -1023,6 +1089,7 @@
{
if (Purchase.FQTY >= NeedQty)
{
+
List<int> mmm = new List<int>();
foreach (int id in FEntryIdList)
{
@@ -1117,7 +1184,7 @@
{
FEntryIdList.Remove(mm);
}
-
+
}
}
NeedQty = 0;
--
Gitblit v1.9.1