From e383743627f94e837c18111318c8261391029c03 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 26 二月 2021 13:44:03 +0800
Subject: [PATCH] 日计划用料清单下推直接调拨单 关联关系以及反写 代码上传 测试通过
---
src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs | 65 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 15 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs b/src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs
index 96dcb69..9688acf 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs
@@ -42,6 +42,8 @@
e.FieldKeys.Add("FBaseJoinQty");
}
private const string POFormId = "PRD_PPBOM";
+ public List<string> FentryIdList = new List<string>();
+
public override void BeforeExecuteOperationTransaction(BeforeExecuteOperationTransaction e)
{
base.BeforeExecuteOperationTransaction(e);
@@ -59,12 +61,12 @@
{
string srcFormId = "";
string srcSrcBillNo = "";
+ string FPPBOMFENTRYID = "";
try
{
srcFormId = "PRD_PPBOM";
- srcSrcBillNo = fldSrcBillNo.DynamicProperty.GetValue<string>(entryRow);
- srcSrcBillNo = DBServiceHelper.ExecuteScalar<string>(Context, $" select distinct FPPBOMBILLNO from T_PRD_PICKMTRLDATA where FSRCBILLNO = '{srcSrcBillNo}' ", srcSrcBillNo);
-
+ srcSrcBillNo = entryRow["PPBOMBILLNO"].ToString();
+ FPPBOMFENTRYID = entryRow["PPBomEntryId"].ToString();
}
catch (Exception)
{
@@ -100,10 +102,13 @@
as DynamicObjectCollection;
foreach (var entryRow in entryRows)
{
- string srcSrcBillNo = fldSrcBillNo.DynamicProperty.GetValue<string>(entryRow);
- string srcFormId = "PRD_PPBOM";
- srcSrcBillNo = DBServiceHelper.ExecuteScalar<string>(Context, $" select distinct FPPBOMBILLNO from T_PRD_PICKMTRLDATA where FSRCBILLNO = '{srcSrcBillNo}' ", srcSrcBillNo);
+ string srcFormId = "";
+ string srcSrcBillNo = "";
+ string FPPBOMFENTRYID = "";
+ srcFormId = "PRD_PPBOM";
+ srcSrcBillNo = entryRow["PPBOMBILLNO"].ToString();
+ FPPBOMFENTRYID = entryRow["PPBomEntryId"].ToString();
if (string.IsNullOrWhiteSpace(srcFormId)
|| string.IsNullOrWhiteSpace(srcSrcBillNo)
@@ -122,21 +127,50 @@
bool Ret = SourceVerification(Convert.ToString(entryRow["Id"]));
if (!Ret) continue;
+ //璁板綍婧愬崟ID 鐢ㄤ簬鏇存柊
+ if (!FentryIdList.Contains(entryRow["Id"]?.ToString()))
+ FentryIdList.Add(entryRow["Id"]?.ToString());
+
DynamicObjectCollection linkRows = linkEntry.DynamicProperty.GetValue(entryRow)
as DynamicObjectCollection;
- linkRows.Clear();
+ //linkRows.Clear();
DynamicObject linkRow = new DynamicObject(linkEntry.DynamicObjectType);
linkRow["STableName"] = srcTableNumber;
this.FillLinkRow(srcRow, entryRow, linkRow);
linkRows.Add(linkRow);
allNewLinkRows.Add(linkRow);
}
- }
+ }
// 涓烘柊寤虹殑婧愬崟鍏宠仈淇℃伅锛岃缃唴鐮�
IDBService dbService = ServiceHelper.GetService<IDBService>();
dbService.AutoSetPrimaryKey(this.Context, allNewLinkRows.ToArray(), linkEntry.DynamicObjectType);
}
-
+ /// <summary>
+ /// 鏂板鎿嶄綔鍚� sql鏇存柊鏁伴噺 浠ュ強 婧愬崟淇℃伅琛�
+ /// </summary>
+ /// <param name="e"></param>
+ public override void AfterExecuteOperationTransaction(AfterExecuteOperationTransaction e)
+ {
+ base.AfterExecuteOperationTransaction(e);
+ string FentryId = string.Join(",", FentryIdList.ToArray());
+ List<string> sqlList = new List<string>();
+ string sql = string.Format(@"/*dialect*/
+ update a set FBASEACTUALQTY = b.FBASEACTUALQTY
+ from T_PRD_PICKMTRLDATA_LK a
+ join T_PRD_PICKMTRLDATA b on a.FENTRYID = b.FENTRYID
+ where a.FSTABLENAME = 'T_PRD_PPBOMENTRY' and a.FENTRYID in ({0})", FentryId);
+ sqlList.Add(sql);
+ sql = string.Format(@"/*dialect*/
+ update T_PRD_PICKMTRLDATA set
+ FSrcBillType = 'PRD_PPBOM',
+ FSRCENTRYID=FPPBomEntryId,
+ FSrcBillNo=FPPBOMBILLNO
+ where FENTRYID in ({0})
+ ", FentryId);
+ sqlList.Add(sql);
+ DBServiceHelper.ExecuteBatch(Context, sqlList);
+ //DBServiceHelper.Execute(Context, sql);
+ }
/// <summary>
/// 鍔犺浇鐩稿叧鐨勯攢鍞鍗曟暟鎹�
/// </summary>
@@ -208,16 +242,17 @@
/// <param name="linkRow">鍏宠仈琛�</param>
private void FillLinkRow(DynamicObject srcRow, DynamicObject toRow, DynamicObject linkRow)
{
+ //鍓╀綑棰嗘枡鏁伴噺
+ decimal remainQty = DBServiceHelper.ExecuteScalar<decimal>(Context, $"select FMustQty -isnull(FSelPickedQty,0) from T_PRD_PPBOMENTRY t1 left join T_PRD_PPBOMENTRY_Q t2 on t1.FENTRYID = t2.FENTRYID where t1.FENTRYID={toRow["PPBomEntryId"]?.ToString()}", 0);
linkRow["FlowId"] = srcRow["BFLowId_Id"];
linkRow["FlowLineId"] = 0;
linkRow["RuleId"] = "PRD_PPBOM2PICKMTRL_NORMAL";
linkRow["SBillId"] = ((DynamicObject)srcRow.Parent)[0];
+ linkRow["STableId"] = ((DynamicObject)srcRow.Parent)[0];
linkRow["SId"] = srcRow[0];
- // 鍘熷鎼哄甫閲�
- decimal baseUnitQty = Convert.ToDecimal(srcRow["BaseNeedQty"]);//鐢ㄦ枡娓呭崟鍗曚綅鏁伴噺
- decimal joinUnitQty = Convert.ToDecimal(srcRow["BasePickedQty"]);//鐢ㄦ枡娓呭崟鍗曚綅棰嗘枡鏁伴噺
- linkRow["BaseActualQtyOld"] = baseUnitQty - joinUnitQty;
- linkRow["BaseActualQty"] = toRow["BASEACTUALQTY"]; //鍩烘湰鍗曚綅瀹炲彂鏁伴噺
+ linkRow["BaseActualQtyOld"] = remainQty;
+ linkRow["BaseActualQty"] = toRow["ACTUALQTY"]; //鍩烘湰鍗曚綅瀹炲彂鏁伴噺
+
}
/// <summary>
@@ -226,7 +261,7 @@
/// <returns></returns>
public bool SourceVerification(string FTID)
{
- string sql = $" select count(*) from T_BF_INSTANCEENTRY where FSTABLENAME= 'T_PRD_PPBOMENTRY' and FTID = '{FTID}'";
+ string sql = $" select count(*) from T_BF_INSTANCEENTRY where FSTABLENAME= 'T_PRD_PPBOMENTRY' and FTTABLENAME = 'T_PRD_PICKMTRLDATA' and FTID = '{FTID}'";
int count = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
if (count == 0)
return true;
--
Gitblit v1.9.1