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_MaterialRequisitionAuditDayPlan.cs | 88 ++++++++++++++++++++++++++++++++-----------
1 files changed, 65 insertions(+), 23 deletions(-)
diff --git a/src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs b/src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs
index 96dcb69..c0bc9db 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_MaterialRequisitionAuditDayPlan.cs
@@ -16,13 +16,13 @@
namespace Demo.DynamicForm.PRD
{
/// <summary>
- /// 鎻掍欢绀轰緥锛氬紩鍏ラ攢鍞嚭搴撳崟锛屽缓绔嬩笌閿�鍞鍗曠殑鍏宠仈
+ /// 鎻掍欢绀轰緥锛氭棩璁″垝鐢ㄦ枡娓呭崟涓嬫帹鍚庯紝寤虹珛鐢熶骇棰嗘枡鍗曚笌鐢熶骇鐢ㄦ枡娓呭崟鍏宠仈鍏崇郴
/// </summary>
/// <remarks>
/// 瑕佹眰锛�
/// 1. 闇�瑕佸紩鍏ュ崟鎹綋鐨勬簮鍗曠被鍨嬨�佹簮鍗曠紪鍙峰瓧娈�
- /// 2. 鏈彃浠舵寕鍦ㄩ攢鍞嚭搴撳崟鐨勪繚瀛樻搷浣滀笂
- /// 鍑哄簱鍏宠仈閿�鍞鍗�
+ /// 2. 鏈彃浠舵寕鍦ㄧ敓浜ч鏂欏崟鐨勪繚瀛樻搷浣滀笂
+ /// 鐢熶骇棰嗘枡鍗曚笌鐢熶骇鐢ㄦ枡娓呭崟鍏宠仈
/// </remarks>
[Description("鏃ヨ鍒掔敤鏂欐竻鍗曚笅鎺ㄥ悗锛屽缓绔嬬敓浜ч鏂欏崟涓庣敓浜х敤鏂欐竻鍗曞叧鑱斿叧绯�")]
[HotUpdate]
@@ -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);
@@ -57,14 +59,17 @@
as DynamicObjectCollection;
foreach (var entryRow in entryRows)
{
+ //鐢熶骇鐢ㄦ枡娓呭崟涓虹┖鏃�
+ if (Convert.ToString(entryRow["FDayPlanBillNo"]) == "")
+ continue;
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 +105,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 +130,54 @@
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>();
+ IDBService dbService = Kingdee.K3.SCM.App.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);
+ if (FentryIdList.Count == 0)
+ return;
+ string FentryId = string.Join(",", FentryIdList.ToArray());
+ List<string> sqlList = new List<string>();
+ string sql = string.Format(@"/*dialect*/
+ update a set FSTOCKAPPQTY = FAPPQTY,FSTOCKACTUALQTY=FACTUALQTY
+ from T_PRD_PICKMTRLDATA a
+ where a.FENTRYID in ({0})", FentryId);
+ sqlList.Add(sql);
+ sql = string.Format(@"/*dialect*/
+update a set
+FSrcBillType='PRD_PPBOM',
+FSrcBillNo = b.FPPBOMBILLNO,
+FSRCINTERID =FHPPBomInterID,
+FSRCENTRYID = FHPPBomEntryID,
+FSRCENTRYSEQ =FPPBOMFSEQINT
+from T_PRD_PICKMTRLDATA a
+join Sc_DayPlanPPBomBillSub b on a.FDAYPLANFENTRYID = b.FEntryID
+where a.FEntryID in ({0})
+ ", FentryId);
+ sqlList.Add(sql);
+ DBServiceHelper.ExecuteBatch(Context, sqlList);
+ }
/// <summary>
/// 鍔犺浇鐩稿叧鐨勯攢鍞鍗曟暟鎹�
/// </summary>
@@ -144,7 +185,7 @@
/// <returns></returns>
private DynamicObject[] LoadPurchaseOrder(HashSet<string> poBillNos)
{
- IViewService viewService = ServiceHelper.GetService<IViewService>();
+ IViewService viewService = Kingdee.K3.SCM.App.ServiceHelper.GetService<IViewService>();
string formId = "PRD_PPBOM";
// 鎸囧畾闇�瑕佸姞杞界殑閿�鍞鍗曞瓧娈�
@@ -196,7 +237,7 @@
/// <returns></returns>
private string GetPOEntryTableNumber()
{
- IBusinessFlowService bfMetaService = ServiceHelper.GetService<IBusinessFlowService>();
+ IBusinessFlowService bfMetaService = Kingdee.K3.SCM.App.ServiceHelper.GetService<IBusinessFlowService>();
var tableDefine = bfMetaService.LoadTableDefine(this.Context, POFormId, "FEntity");
return tableDefine.TableNumber;
}
@@ -208,16 +249,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["FlowLineId"] = 5;
linkRow["RuleId"] = "PRD_PPBOM2PICKMTRL_NORMAL";
linkRow["SBillId"] = ((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["STableId"] = ((DynamicObject)srcRow.Parent)[0];
+ linkRow["SId"] = toRow["PPBomEntryId"];
+ linkRow["BaseActualQtyOld"] = remainQty;
+ linkRow["BaseActualQty"] = toRow["ACTUALQTY"]; //鍩烘湰鍗曚綅瀹炲彂鏁伴噺
+
}
/// <summary>
@@ -226,7 +268,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