From 4edfc50d4e8d015081cb9ac473635d83c38c1127 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 16 二月 2021 14:53:14 +0800
Subject: [PATCH] 代码提交
---
src/BLL/Demo.BillView/Demo.BillView.csproj | 3
src/BLL/Demo.BillView/PRD/Pro_SCTLFSH.cs | 69 ++++++++
src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTask.cs | 37 +---
src/BLL/Demo.BillView/PRD/Pro_DayPlanReturnMaterial.cs | 250 +++++++++++++++++++++++++++++++
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs | 13
src/BLL/Demo.BillView/PRD/Pro_SCTLSH.cs | 69 ++++++++
src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs | 30 +++
7 files changed, 434 insertions(+), 37 deletions(-)
diff --git a/src/BLL/Demo.BillView/Demo.BillView.csproj b/src/BLL/Demo.BillView/Demo.BillView.csproj
index f3bdc44..3673d74 100644
--- a/src/BLL/Demo.BillView/Demo.BillView.csproj
+++ b/src/BLL/Demo.BillView/Demo.BillView.csproj
@@ -228,12 +228,15 @@
<Compile Include="PRD\Pro_DayPlanCheckSelectMenu.cs" />
<Compile Include="PRD\Pro_DayPlanPushSCHB.cs" />
<Compile Include="PRD\Pro_DayPlanBG.cs" />
+ <Compile Include="PRD\Pro_DayPlanReturnMaterial.cs" />
<Compile Include="PRD\Pro_PPBomSubmit.cs" />
<Compile Include="PRD\Pro_RJHYLQDBGFSH.cs" />
<Compile Include="PRD\Pro_SCHBFSH.cs" />
+ <Compile Include="PRD\Pro_SCTLFSH.cs" />
<Compile Include="PRD\Pro_SCLLFSH.cs" />
<Compile Include="PRD\Pro_SCHBSH.cs" />
<Compile Include="PRD\Pro_RJHYLQDBGSH.cs" />
+ <Compile Include="PRD\Pro_SCTLSH.cs" />
<Compile Include="PRD\Pro_SCLLSH.cs" />
<Compile Include="PRD\Pro_RjhylqdDatachange.cs" />
<Compile Include="PRD\Pro_PPBomSave.cs" />
diff --git a/src/BLL/Demo.BillView/PRD/Pro_DayPlanReturnMaterial.cs b/src/BLL/Demo.BillView/PRD/Pro_DayPlanReturnMaterial.cs
new file mode 100644
index 0000000..ad8f615
--- /dev/null
+++ b/src/BLL/Demo.BillView/PRD/Pro_DayPlanReturnMaterial.cs
@@ -0,0 +1,250 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Kingdee.BOS.Util;
+using Kingdee.BOS.Core.Metadata;
+using Kingdee.BOS.Core.Metadata.EntityElement;
+using Kingdee.BOS.Core.DynamicForm.PlugIn;
+using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
+using Kingdee.BOS.Orm.DataEntity;
+using Kingdee.BOS.Contracts;
+using Kingdee.BOS.App;
+using Kingdee.BOS.Core.Metadata.FieldElement;
+using System.ComponentModel;
+using Kingdee.BOS.ServiceHelper;
+using Kingdee.K3.SCM.App;
+
+namespace Demo.DynamicForm.PRD
+{
+ /// <summary>
+ /// 鎻掍欢绀轰緥锛氭棩璁″垝鐢ㄦ枡娓呭崟涓嬫帹鍚庯紝寤虹珛鐢熶骇棰嗘枡鍗曚笌鐢熶骇鐢ㄦ枡娓呭崟鍏宠仈鍏崇郴
+ /// </summary>
+ /// <remarks>
+ /// 瑕佹眰锛�
+ /// 1. 闇�瑕佸紩鍏ュ崟鎹綋鐨勬簮鍗曠被鍨嬨�佹簮鍗曠紪鍙峰瓧娈�
+ /// 2. 鏈彃浠舵寕鍦ㄧ敓浜ч鏂欏崟鐨勪繚瀛樻搷浣滀笂
+ /// 鐢熶骇棰嗘枡鍗曚笌鐢熶骇鐢ㄦ枡娓呭崟鍏宠仈
+ /// </remarks>
+ [Description("鏃ヨ鍒掔敤鏂欐竻鍗曚笅鎺ㄥ悗锛屽缓绔嬬敓浜ч��鏂欏崟涓庣敓浜х敤鏂欐竻鍗曞叧鑱斿叧绯�")]
+ [HotUpdate]
+ public class Pro_DayPlanReturnMaterial : AbstractOperationServicePlugIn
+ {
+ public override void OnPreparePropertys(PreparePropertysEventArgs e)
+ {
+ base.OnPreparePropertys(e);
+ e.FieldKeys.Add("FSrcBillType");
+ e.FieldKeys.Add("FSrcBillNo");
+ e.FieldKeys.Add("FID");
+ e.FieldKeys.Add("FTreeEntity_FEntryID");
+ e.FieldKeys.Add("FBillNo");
+ e.FieldKeys.Add("FBFLowId");
+ e.FieldKeys.Add("FMaterialId");
+ e.FieldKeys.Add("FBaseUnitQty");
+ 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);
+ HashSet<string> poBillNos = new HashSet<string>();
+ Entity entity = this.BusinessInfo.GetEntity("FEntity");//鑾峰彇鏄庣粏淇℃伅
+ Entity linkEntry = this.BusinessInfo.GetEntity("FEntity_Link");
+ Field fldSrcFormId = this.BusinessInfo.GetField("FSrcBillType");
+ Field fldSrcBillNo = this.BusinessInfo.GetField("FSrcBillNo");
+ // 瀵瑰崟鎹綋杩涜寰幆锛屽彇鍏宠仈鐨勬簮鍗曠紪鍙�
+ foreach (var billObj in e.SelectedRows)
+ {
+ DynamicObjectCollection entryRows = entity.DynamicProperty.GetValue(billObj.DataEntity)
+ as DynamicObjectCollection;
+ foreach (var entryRow in entryRows)
+ {
+ //鐢熶骇鐢ㄦ枡娓呭崟涓虹┖鏃�
+ if (Convert.ToString(entryRow["FDayPlanBillNo"]) == "")
+ continue;
+ string srcFormId = "";
+ string srcSrcBillNo = "";
+ string FPPBOMFENTRYID = "";
+ try
+ {
+ srcFormId = "PRD_PPBOM";
+ srcSrcBillNo = entryRow["PPBOMBILLNO"].ToString();
+ FPPBOMFENTRYID = entryRow["PPBomEntryId"].ToString();
+ }
+ catch (Exception)
+ {
+ }
+ if (string.IsNullOrWhiteSpace(srcFormId)
+ || string.IsNullOrWhiteSpace(srcSrcBillNo)
+ )
+ {// 婧愬崟涓嶆槸閲囪喘璁㈠崟锛岀暐杩�
+ continue;
+ }
+ // 婧愬崟缂栧彿宸茬粡鐧昏锛屼笉鍐嶉噸澶嶈褰曪紝鐣ヨ繃
+ if (poBillNos.Contains(srcSrcBillNo)) continue;
+ // Link宸茬粡璁板綍浜嗘簮鍗曚俊鎭紝鐣ヨ繃
+ //DynamicObjectCollection linkRows = linkEntry.DynamicProperty.GetValue(entryRow)
+ // as DynamicObjectCollection;
+ //if (linkRows.Count > 0) continue;
+ bool Ret = SourceVerification(Convert.ToString(entryRow["Id"]));
+ if (!Ret) continue;
+
+ poBillNos.Add(srcSrcBillNo);
+ }
+ }
+ if (poBillNos.Count == 0) return;
+ DynamicObject[] poObjs = this.LoadPurchaseOrder(poBillNos);
+ if (poObjs == null || poObjs.Length == 0) return;
+ Dictionary<string, Dictionary<string, DynamicObject>> dctAllBills = this.BuildDictionary(poObjs);
+ string srcTableNumber = this.GetPOEntryTableNumber();
+ List<DynamicObject> allNewLinkRows = new List<DynamicObject>();
+ // 寰幆鍗曟嵁浣擄紝涓哄崟鎹綋锛屽缓绔嬭捣婧愬崟鍏宠仈淇℃伅锛�
+ foreach (var billObj in e.SelectedRows)
+ {
+ DynamicObjectCollection entryRows = entity.DynamicProperty.GetValue(billObj.DataEntity)
+ as DynamicObjectCollection;
+ foreach (var entryRow in entryRows)
+ {
+ string srcFormId = "";
+ string srcSrcBillNo = "";
+ string FPPBOMFENTRYID = "";
+
+ srcFormId = "PRD_PPBOM";
+ srcSrcBillNo = entryRow["PPBOMBILLNO"].ToString();
+ FPPBOMFENTRYID = entryRow["PPBomEntryId"].ToString();
+
+ if (string.IsNullOrWhiteSpace(srcFormId)
+ || string.IsNullOrWhiteSpace(srcSrcBillNo)
+ )
+ {// 婧愬崟涓嶆槸閿�鍞鍗曪紝鐣ヨ繃
+ continue;
+ }
+ Dictionary<string, DynamicObject> dctOneBill = null;
+ if (dctAllBills.TryGetValue(srcSrcBillNo, out dctOneBill) == false) continue;
+ DynamicObject materialObj = entryRow["MaterialId"] as DynamicObject;
+ if (materialObj == null) continue;
+ string materialNumber = Convert.ToString(materialObj["number"]);
+ DynamicObject srcRow = null;
+ if (dctOneBill.TryGetValue(materialNumber, out srcRow) == false) continue;
+ // Link宸茬粡璁板綍浜嗘簮鍗曚俊鎭紝鐣ヨ繃
+ 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();
+ DynamicObject linkRow = new DynamicObject(linkEntry.DynamicObjectType);
+ linkRow["STableName"] = srcTableNumber;
+ this.FillLinkRow(srcRow, entryRow, linkRow);
+ linkRows.Add(linkRow);
+ allNewLinkRows.Add(linkRow);
+ }
+ }
+ // 涓烘柊寤虹殑婧愬崟鍏宠仈淇℃伅锛岃缃唴鐮�
+ IDBService dbService = Kingdee.K3.SCM.App.ServiceHelper.GetService<IDBService>();
+ dbService.AutoSetPrimaryKey(this.Context, allNewLinkRows.ToArray(), linkEntry.DynamicObjectType);
+ }
+ /// <summary>
+ /// 鍔犺浇鐩稿叧鐨勯攢鍞鍗曟暟鎹�
+ /// </summary>
+ /// <param name="poBillNos"></param>
+ /// <returns></returns>
+ private DynamicObject[] LoadPurchaseOrder(HashSet<string> poBillNos)
+ {
+ IViewService viewService = Kingdee.K3.SCM.App.ServiceHelper.GetService<IViewService>();
+ string formId = "PRD_PPBOM";
+
+ // 鎸囧畾闇�瑕佸姞杞界殑閿�鍞鍗曞瓧娈�
+ List<SelectorItemInfo> fields = new List<SelectorItemInfo>();
+ fields.Add(new SelectorItemInfo("FID")); // 鍗曟嵁涓婚敭
+ fields.Add(new SelectorItemInfo("FTreeEntity_FEntryID")); // 鍗曟嵁浣撲富閿�
+ fields.Add(new SelectorItemInfo("FBillNo")); // 鍗曟嵁缂栧彿
+ fields.Add(new SelectorItemInfo("FBFLowId")); // 涓氬姟娴佺▼
+ fields.Add(new SelectorItemInfo("FMaterialId")); // 鐗╂枡
+ fields.Add(new SelectorItemInfo("FMaterialID2")); // 鐗╂枡
+ fields.Add(new SelectorItemInfo("FBASENEEDQTY")); // 鍩烘湰鍗曚綅鏁伴噺
+ fields.Add(new SelectorItemInfo("FBASEPICKEDQTY")); // 鍩烘湰鍗曚綅鍏宠仈鏁伴噺
+ fields.Add(new SelectorItemInfo("FBFLOWID")); //
+
+ // 鎸囧畾杩囨护鏉′欢
+ string filter = string.Format(" FBillNo IN ('{0}') ", string.Join("','", poBillNos));
+ OQLFilter ofilter = OQLFilter.CreateHeadEntityFilter(filter);
+ var objs = viewService.Load(this.Context, formId, fields, ofilter);
+ return objs;
+ }
+ /// <summary>
+ /// 鎶婇攢鍞鍗曞崟鎹綋琛屾瀯寤轰负瀛楀吀锛欴ictionary(鍗曟嵁缂栧彿, Dictionary(鐗╂枡缂栫爜, 婧愬崟琛�));
+ /// </summary>
+ /// <param name="poObjs"></param>
+ /// <returns></returns>
+ private Dictionary<string, Dictionary<string, DynamicObject>> BuildDictionary(DynamicObject[] poObjs)
+ {
+ Dictionary<string, Dictionary<string, DynamicObject>> dctAllBills =
+ new Dictionary<string, Dictionary<string, DynamicObject>>();
+ foreach (var poObj in poObjs)
+ {
+ string billNo = Convert.ToString(poObj["BillNo"]);
+ Dictionary<string, DynamicObject> dctOneBill = new Dictionary<string, DynamicObject>();
+ DynamicObjectCollection entryRows = poObj["PPBomEntry"] as DynamicObjectCollection;
+ foreach (var entryRow in entryRows)
+ {
+ DynamicObject materialObj = entryRow["MaterialId"] as DynamicObject;
+ if (materialObj == null) continue;
+ string materialNumber = Convert.ToString(materialObj["number"]);
+ dctOneBill[materialNumber] = entryRow;
+ }
+ dctAllBills.Add(billNo, dctOneBill);
+ }
+ return dctAllBills;
+ }
+ /// <summary>
+ /// 鑾峰彇閿�鍞鍗曞叧鑱斾富瀹炰綋琛ㄦ牸缂栫爜
+ /// </summary>
+ /// <returns></returns>
+ private string GetPOEntryTableNumber()
+ {
+ IBusinessFlowService bfMetaService = Kingdee.K3.SCM.App.ServiceHelper.GetService<IBusinessFlowService>();
+ var tableDefine = bfMetaService.LoadTableDefine(this.Context, POFormId, "FEntity");
+ return tableDefine.TableNumber;
+ }
+ /// <summary>
+ /// 濉啓婧愬崟淇℃伅
+ /// </summary>
+ /// <param name="srcRow">婧愬崟琛�</param>
+ /// <param name="toRow">鐩爣鍗曡</param>
+ /// <param name="linkRow">鍏宠仈琛�</paramBaseActualQtyOld
+ private void FillLinkRow(DynamicObject srcRow, DynamicObject toRow, DynamicObject linkRow)
+ {
+ //鍦ㄥ埗鏉愭枡鏁伴噺
+ decimal remainQty = DBServiceHelper.ExecuteScalar<decimal>(Context, $"select FWipQty from T_PRD_PPBOMENTRY_Q where FENTRYID ={toRow["PPBomEntryId"]?.ToString()}", 0);
+ //linkRow["FlowId"] = srcRow["BFLowId_Id"];
+ linkRow["FlowId"] = "81119477-4778-4d0b-94b9-1c43a1c1f768";
+ linkRow["FlowLineId"] = 8;
+ linkRow["RuleId"] = "PRD_PPBOM2RETURNMTRL";
+ linkRow["SBillId"] = ((DynamicObject)srcRow.Parent)[0];
+ linkRow["STableId"] = ((DynamicObject)srcRow.Parent)[0];
+ linkRow["SId"] = toRow["PPBomEntryId"];
+ linkRow["BASEQTYOLD"] = remainQty;
+ linkRow["BASEQTY"] = toRow["Qty"];
+ }
+
+ /// <summary>
+ /// 楠岃瘉鏄惁鐢熸垚杩囩敓浜х敤鏂欐竻鍗曞搴旂殑婧愬崟
+ /// </summary>
+ /// <returns></returns>
+ public bool SourceVerification(string FTID)
+ {
+ string sql = $" select count(*) from T_BF_INSTANCEENTRY where FSTABLENAME= 'T_PRD_PPBOMENTRY' and FTTABLENAME = 'T_STK_STKTRANSFERINENTRY' and FTID = '{FTID}'";
+ int count = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
+ if (count == 0)
+ return true;
+ else
+ return false;
+ }
+
+ }
+}
diff --git a/src/BLL/Demo.BillView/PRD/Pro_SCTLFSH.cs b/src/BLL/Demo.BillView/PRD/Pro_SCTLFSH.cs
new file mode 100644
index 0000000..470b2f0
--- /dev/null
+++ b/src/BLL/Demo.BillView/PRD/Pro_SCTLFSH.cs
@@ -0,0 +1,69 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Kingdee.BOS.Util;
+using Kingdee.BOS.Core.Metadata;
+using Kingdee.BOS.Core.Metadata.EntityElement;
+using Kingdee.BOS.Core.DynamicForm.PlugIn;
+using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
+using Kingdee.BOS.Orm.DataEntity;
+using Kingdee.BOS.Contracts;
+using Kingdee.BOS.App;
+using Kingdee.BOS.Core.Metadata.FieldElement;
+using System.ComponentModel;
+using Kingdee.BOS.ServiceHelper;
+using Kingdee.K3.SCM.App;
+
+namespace Demo.DynamicForm.PRD
+{
+ [Description("[鐢熶骇閫�鏂欏崟-鍙嶅鏍竇鎸夐挳鍔熻兘]")]
+ [HotUpdate]
+ public class Pro_SCTLFSH : AbstractOperationServicePlugIn
+ {
+ public override void OnPreparePropertys(PreparePropertysEventArgs e)
+ {
+ base.OnPreparePropertys(e);
+ e.FieldKeys.Add("FSrcBillType");
+ e.FieldKeys.Add("FSrcBillNo");
+ e.FieldKeys.Add("FID");
+ e.FieldKeys.Add("FTreeEntity_FEntryID");
+ e.FieldKeys.Add("FBillNo");
+ e.FieldKeys.Add("FBFLowId");
+ e.FieldKeys.Add("FMaterialId");
+ e.FieldKeys.Add("FBaseUnitQty");
+ e.FieldKeys.Add("FBaseJoinQty");
+ e.FieldKeys.Add("FDayPlanBillNo");
+ e.FieldKeys.Add("FDayPlanFentryId");
+ e.FieldKeys.Add("FisFX");
+ }
+ /// <summary>
+ ///鍙嶅鏍� 鍙嶆洿鏂版棩璁″垝鐢ㄦ枡娓呭崟閫�鏂欐暟閲�
+ /// </summary>
+ /// <param name="e"></param>
+ public override void AfterExecuteOperationTransaction(AfterExecuteOperationTransaction e)
+ {
+ base.AfterExecuteOperationTransaction(e);
+ List<string> sqlList = new List<string>();
+ string sql = "";
+ //淇濆瓨鏃舵洿鏂扮敓浜х敤鏂欐竻鍗曡〃鏄庣粏璋冩嫧鏁伴噺
+ Entity entity = this.BusinessInfo.GetEntity("FEntity");//鑾峰彇鏄庣粏淇℃伅
+ foreach (var billObj in e.SelectedRows)
+ {
+ DynamicObjectCollection entryRows = entity.DynamicProperty.GetValue(billObj.DataEntity)
+ as DynamicObjectCollection;
+ foreach (var entryRow in entryRows)
+ {
+ //鐢熶骇鐢ㄦ枡娓呭崟涓虹┖鏃�
+ if (Convert.ToString(entryRow["FDayPlanBillNo"]) == "" || !Convert.ToBoolean(entryRow["FisFX"]))
+ continue;
+ string fentryId = entryRow["FDayPlanFentryId"].ToString();
+ decimal FBaseQty = Convert.ToDecimal(entryRow["BaseQty"]);
+ sql = string.Format($"/*dialect*/update Sc_DayPlanPPBomBillSub set FRetunrnQty -= {FBaseQty} where FEntryID = { fentryId} ");
+ sqlList.Add(sql);
+ sql = string.Format($"/*dialect*/update T_PRD_RETURNMTRLENTRY set FisFX = 0 where FentryId = {entryRow["Id"]}");
+ sqlList.Add(sql);
+ }
+ }
+ DBServiceHelper.ExecuteBatch(Context, sqlList);
+ }
+ }
+}
diff --git a/src/BLL/Demo.BillView/PRD/Pro_SCTLSH.cs b/src/BLL/Demo.BillView/PRD/Pro_SCTLSH.cs
new file mode 100644
index 0000000..cecd9c4
--- /dev/null
+++ b/src/BLL/Demo.BillView/PRD/Pro_SCTLSH.cs
@@ -0,0 +1,69 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Kingdee.BOS.Util;
+using Kingdee.BOS.Core.Metadata;
+using Kingdee.BOS.Core.Metadata.EntityElement;
+using Kingdee.BOS.Core.DynamicForm.PlugIn;
+using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
+using Kingdee.BOS.Orm.DataEntity;
+using Kingdee.BOS.Contracts;
+using Kingdee.BOS.App;
+using Kingdee.BOS.Core.Metadata.FieldElement;
+using System.ComponentModel;
+using Kingdee.BOS.ServiceHelper;
+using Kingdee.K3.SCM.App;
+using ZD.Cloud.Logger;
+
+namespace Demo.DynamicForm.PRD
+{
+ [Description("[鐢熶骇閫�鏂欏崟-瀹℃牳]鎸夐挳鍔熻兘]")]
+ [HotUpdate]
+ public class Pro_SCTLSH : AbstractOperationServicePlugIn
+ {
+ public override void OnPreparePropertys(PreparePropertysEventArgs e)
+ {
+ base.OnPreparePropertys(e);
+ e.FieldKeys.Add("FSrcBillType");
+ e.FieldKeys.Add("FSrcBillNo");
+ e.FieldKeys.Add("FID");
+ e.FieldKeys.Add("FTreeEntity_FEntryID");
+ e.FieldKeys.Add("FBillNo");
+ e.FieldKeys.Add("FBFLowId");
+ e.FieldKeys.Add("FMaterialId");
+ e.FieldKeys.Add("FBaseUnitQty");
+ e.FieldKeys.Add("FBaseJoinQty");
+ e.FieldKeys.Add("FDayPlanBillNo");
+ e.FieldKeys.Add("FDayPlanFentryId");
+ e.FieldKeys.Add("Qty");
+ }
+ /// <summary>
+ ///瀹℃牳鏇存柊鏃ヨ鍒掔敤鏂欐竻鍗曢鏂欐暟閲�
+ /// </summary>
+ /// <param name="e"></param>
+ public override void AfterExecuteOperationTransaction(AfterExecuteOperationTransaction e)
+ {
+ base.AfterExecuteOperationTransaction(e);
+ List<string> sqlList = new List<string>();
+ string sql = "";
+ //瀹℃牳鏃舵洿鏂扮敓浜х敤鏂欐竻鍗曡〃鏄庣粏棰嗘枡鏁伴噺
+ Entity entity = this.BusinessInfo.GetEntity("FEntity");//鑾峰彇鏄庣粏淇℃伅
+ foreach (var billObj in e.SelectedRows)
+ {
+ DynamicObjectCollection entryRows = entity.DynamicProperty.GetValue(billObj.DataEntity)
+ as DynamicObjectCollection;
+ foreach (var entryRow in entryRows)
+ {
+ string fentryId = entryRow["FDayPlanFentryId"].ToString();
+ if (fentryId == "0")
+ continue;
+ sql = string.Format($"/*dialect*/update Sc_DayPlanPPBomBillSub set FRetunrnQty = FRetunrnQty + {Convert.ToDecimal(entryRow["BaseQty"])} where FEntryID = {fentryId} ");
+ //LogHelper.Info("棰嗘枡鍗曠殑鏃ヨ鍒掔敤鏂欐竻鍗旾D:" + fentryId);
+ sqlList.Add(sql);
+ sql = string.Format($"/*dialect*/update T_PRD_RETURNMTRLENTRY set FisFX = 1 where FentryId = {entryRow["Id"]}");
+ sqlList.Add(sql);
+ }
+ }
+ DBServiceHelper.ExecuteBatch(Context, sqlList);
+ }
+ }
+}
diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 09c553b..ee2ebb2 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -399,12 +399,13 @@
//鍗曟嵁浣撲俊鎭浆鎹负鍒楄〃闆嗗悎
DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
List<string> sqlList = new List<string>();
- string sql;
- foreach (var item in entityDataObjoct)
- {
- sql = $"/*dialect*/update t1 set t1.FHLockedSub=0 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()) and t1.FID = { Convert.ToString(item["FDayPlanWorkID"])} ";
- sqlList.Add(sql);
- }
+ string sql = $"/*dialect*/update t1 set t1.FHLockedSub=0 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())";
+ DBServiceHelper.Execute(Context, sql);
+ //foreach (var item in entityDataObjoct)
+ //{
+ // sql = $"/*dialect*/update t1 set t1.FHLockedSub=0 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()) and t1.FID = { Convert.ToString(item["FDayPlanWorkID"])} ";
+ // sqlList.Add(sql);
+ //}
SearchList();
this.View.ShowMessage("鎿嶄綔鎴愬姛");
diff --git a/src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs b/src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs
index f7b8822..557ab29 100644
--- a/src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs
+++ b/src/BLL/Demo.BillView/PRD/ProductScheduleButtonClick.cs
@@ -529,9 +529,35 @@
{
var orders = group.OrderBy(x => Convert.ToDateTime(x["FPlanEndDate"]));//璁″垝瀹屽伐鏃ユ湡鎺掑簭
var seq = 1;
-
+ string fMaterialID = ""; //璁板綍寰幆鏃剁殑浜у搧 鐢ㄤ簬浜у搧鎹㈢嚎鏃跺垽鏂紙鍚屼竴涓骇绾挎椂鐨勮绠楋級
foreach (var order in orders)
{
+ List<ENG_WORKCALFULLDATA> _ENG_WORKCALFULLDATA = ENG_WORKCALFULLDATA.Where(x => x.FALLHOURS > 0 && x.FCalUserId == Convert.ToInt32(order["FSczy_Id"])).ToList();
+ //浜у搧鍙戠敓鍙樺够鏃舵墸闄ょ浉搴旂殑鎹㈢嚎鏃堕棿
+ if (fMaterialID == "")
+ {
+ fMaterialID = order["FMATERIALID_Id"].ToString();
+ }
+ decimal FChangeLine = Convert.ToDecimal(order["FChangeLine"]);//鎹㈢嚎鏃堕棿
+ if (fMaterialID != order["FMATERIALID_Id"].ToString())
+ {
+ foreach (var item in _ENG_WORKCALFULLDATA)
+ {
+ if (FChangeLine < item.FALLHOURS)
+ {
+ //鏀瑰彉list涓煇涓厓绱犲��
+ var model = ENG_WORKCALFULLDATA.Where(c => c.FENTRYID == item.FENTRYID).FirstOrDefault();
+ //model.FALLHOURS -= Math.Ceiling(fqty / FCapacity);
+ model.FALLHOURS -= FChangeLine; // 鐢熶骇鏁� / 灏忔椂浜ц兘 = 娑堣�楃殑灏忔椂 锛堟暟鍊肩被鍨嬩负decimal锛�
+ }
+ else
+ {
+ var model = ENG_WORKCALFULLDATA.Where(c => c.FENTRYID == item.FENTRYID).FirstOrDefault();
+ model.FALLHOURS = 0;
+ }
+ }
+ fMaterialID = order["FMATERIALID_Id"].ToString();
+ }
//璁＄畻浜ц兘
decimal FCapacity = Convert.ToDecimal(order["FCapacity"]);//灏忔椂浜ц兘
decimal FSCOrderCount = Convert.ToDecimal(order["FSCOrderCount"]);//鐢熶骇璁㈠崟
@@ -544,7 +570,7 @@
FSCOrderCount = FSCOrderCount - fDayPlanQuality;
List<ENG_WORKCALFULLDATA> finalyResult = new List<ENG_WORKCALFULLDATA>();
decimal dayFCapacity = 0;//褰撴棩鍓╀綑浜ч噺 = 灏忔椂浜ц兘 * 鏃ュ墿浣欏伐浣滄椂闀�
- List<ENG_WORKCALFULLDATA> _ENG_WORKCALFULLDATA = ENG_WORKCALFULLDATA.Where(x => x.FALLHOURS > 0 && x.FCalUserId == Convert.ToInt32(order["FSczy_Id"])).ToList();
+ _ENG_WORKCALFULLDATA = ENG_WORKCALFULLDATA.Where(x => x.FALLHOURS > 0 && x.FCalUserId == Convert.ToInt32(order["FSczy_Id"])).ToList();
foreach (var item in _ENG_WORKCALFULLDATA)
{
if (FSCOrderCount == 0)
diff --git a/src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTask.cs b/src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTask.cs
index b2a30a7..9287a8e 100644
--- a/src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTask.cs
+++ b/src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTask.cs
@@ -36,11 +36,8 @@
DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
if (dt.Rows.Count > 0)
{
- foreach (DataRow dr in dt.Rows)
- {
- Extraction(dr["FDAYPLANID"].ToString());
- sqlList.Add($"/*dialect*/ update sc_TLPLANZXJH set FZXDATE = getdate(), FISZX = 1 where FID={dr["FID"]}");
- }
+ Extraction();
+ sqlList.Add($"/*dialect*/ update sc_TLPLANZXJH set FZXDATE = getdate(), FISZX = 1 where FISZX = 0 ");
DBServiceHelper.ExecuteBatch(Context, sqlList);
}
LogHelper.Info("鎻愭枡璁″垝鏃堕暱锛�" + sw.Elapsed);
@@ -53,7 +50,7 @@
}
}
- public void Extraction(string FDayPlanWorkID)
+ public void Extraction()
{
LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]锛氭祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇曟祴璇�");
try
@@ -63,8 +60,8 @@
//鎻愭枡璁″垝棰勫鐞� 娓呯悊鎻愭枡璁″垝鍗曟暟鎹� 鏇存柊閲囪喘璁㈠崟鎻愭枡璁″垝鏁伴噺
string sql = string.Format(@"
/*dialect*/
- exec [鎻愭枡璁″垝棰勫鐞哴 '{0}'
- ", FDayPlanWorkID.Replace(",", "-"));
+ exec [鎻愭枡璁″垝棰勫鐞哴
+ ");
DBServiceHelper.Execute(Context, sql);
LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鎻愭枡璁″垝棰勫鐞唖ql锛�" + sql);
//閲囪喘璁㈠崟鏁版嵁
@@ -83,24 +80,6 @@
LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]鍙敤閲囪喘璁㈠崟鏁版嵁sql锛�" + sql);
sql = string.Format(@"
/*dialect*/
- SELECT T1.FID,FHMATERID,FHMASTERDATE,FHQTY,FCOMPLETECOUNT,FPRDMOMAINID,T2.FENTRYID,T1.FBILLNO, FNeedQty,(FLeadtime+FLeadTtime2)FFIXLEADTIME,t5.FMAXPOQTY,FJITBatch FMINPOQTY,FJITMATERIALGROUP,FJITMaterielDemand,FJITSafeStock,t3.FMATERIALID,t6.FNumber,FHQTY*FNeedQty NeedQty,FHPRDORGID FStockOrgId
-FROM SC_WORKBILLSORTBILLMAIN T1
-JOIN SC_WORKBILLSORTBILLSUB T2 ON T1.FID=T2.FID
-LEFT JOIN(SELECT T1.FID,max(t2.FMATERIALID)FMATERIALIDMAIN, max(t2.FMoId)FMoId,MAX(FENTRYID) FENTRYID, SUM(convert(decimal(18, 2), FBASENUMERATOR / FBASEDENOMINATOR))FNeedQty, T1.FMATERIALID from T_PRD_PPBOMENTRY T1
-JOIN T_PRD_PPBOM T2 on t1.FID = t2.FID
-group by T1.FMATERIALID, T1.FID) T3 on T1.FPRDMOMAINID = t3.FMoId and T1.FHMATERID = t3.FMATERIALIDMAIN
-JOIN T_BD_MATERIAL T6 ON T3.FMATERIALID = T6.FMATERIALID
-join t_BD_MaterialBase t4 on t3.FMATERIALID = t4.FMATERIALID
-join t_BD_MaterialPlan t5 on t3.FMATERIALID = t5.FMATERIALID
-WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0
-AND FComplete ='鏈綈濂�'
-AND FERPCLSID=1
- AND T2.FENTRYID not in (select distinct FHSOURCEENTRYID from CG_PODEMANDPLANBILLSUB where FHSOURCEINTERID IN ({0}))
-AND T1.FID in ({0})
-order by FHMASTERDATE
-", FDayPlanWorkID);
- sql = string.Format(@"
- /*dialect*/
SELECT T1.FID,FHMASTERDATE,t1.FEntryID,T1.FBILLNO, FNeedQty,(FLeadtime+FLeadTtime2)FFIXLEADTIME,t5.FMAXPOQTY,FJITBatch FMINPOQTY,FJITMATERIALGROUP,FJITMaterielDemand,FJITSafeStock,t1.FMATERIALID,t6.FNumber,NeedQty, FStockOrgId ,FErpClsID
FROM (
select FHICMOINTERID FID,FHICMOENTRYID FEntryID,FPlanDate FHMASTERDATE,FLackCount NeedQty,FHMATERID FMATERIALID,FHStockOrgID FStockOrgId,FPRDBILLNO FBillNo,FSumPlanCount FNeedQty from JIT_MOMaterReadysBill a
@@ -112,10 +91,10 @@
WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0
AND FERPCLSID in ('1','3')
AND T1.NeedQty>0
-AND T1.FENTRYID not in (select distinct FHSOURCEENTRYID from CG_PODEMANDPLANBILLSUB where FHSOURCEINTERID IN ({0}))
-AND T1.FID in ({0})
+AND T1.FENTRYID not in (select distinct FHSOURCEENTRYID from CG_PODEMANDPLANBILLSUB where FHSOURCEINTERID IN (select distinct FDAYPLANID from sc_TLPLANZXJH where FISZX = 0))
+AND T1.FID in (select distinct FDAYPLANID from sc_TLPLANZXJH where FISZX = 0)
order by FHMASTERDATE
-", FDayPlanWorkID);
+");
//LogHelper.Info("[鎻愭枡璁″垝鍑嗗闃舵]闇�瑕佹彁鏂欐暟鎹畇ql锛�" + sql);
DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
List<DayPlanPpbom> DayPlanPpbom = ds.ToModelList<DayPlanPpbom>();
--
Gitblit v1.9.1