代码提交

王 垚

2021-02-16 4edfc50d4e8d015081cb9ac473635d83c38c1127

代码提交

 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" />

 src/BLL/Demo.BillView/PRD/Pro_DayPlanReturnMaterial.cs

New file
@@ -0,0 +1,250 @@
using 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>
        /// 把销售订单单据体行构建为字典：Dictionary(单据编号, 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;
        }

    }
}

 src/BLL/Demo.BillView/PRD/Pro_SCTLFSH.cs

New file
@@ -0,0 +1,69 @@
using 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);
        }
    }
}

 src/BLL/Demo.BillView/PRD/Pro_SCTLSH.cs

New file
@@ -0,0 +1,69 @@
using 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("领料单的日计划用料清单ID:" + 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);
        }
    }
}

 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("操作成功");


 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)

 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("[提料计划准备阶段]提料计划预处理sql：" + 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("[提料计划准备阶段]需要提料数据sql：" + sql);
                DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
                List<DayPlanPpbom> DayPlanPpbom = ds.ToModelList<DayPlanPpbom>();