nothing

王 垚

2021-09-13 527469d17b75d42349bf17234ef3e34cc36e8920

nothing

 src/BLL/Demo.BillView/Demo.BillView.csproj

@@ -229,6 +229,8 @@
    <Compile Include="PRD\Pro_DayPlanCheckSelectMenu.cs" />
    <Compile Include="PRD\Pro_DayPlanPushSCHB.cs" />
    <Compile Include="PRD\Pro_DayPlanBG.cs" />
    <Compile Include="PRD\Pur_ReceiveDelete.cs" />
    <Compile Include="PRD\Pur_Receive.cs" />
    <Compile Include="PRD\Pro_DayPlanReturnMaterial.cs" />
    <Compile Include="PRD\Pro_PPBomSubmit.cs" />
    <Compile Include="PRD\Pro_RJHYLQDBGFSH.cs" />

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

@@ -507,9 +507,9 @@
                }
                else
                {
                    //验证日计划工单是否存在数据 生产订单号加明细行号 已生成过日计划的不生成
                    //验证日计划工单是否存在数据 生产订单号加明细行号 已生成过日计划的不生成 (关闭后的)
                    string moSql = string.Format(@"/*dialect*/  select FID from SC_WORKBILLSORTBILLMAIN 
 where FSCORDERNO ='{0}' and FSRCBILLENTRYSEQ = '{1}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
 where  FDOCUMENTSTATUS NOT IN ('E') AND  FSCORDERNO ='{0}' and FSRCBILLENTRYSEQ = '{1}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));
                    int fDayPlanFID = DBServiceHelper.ExecuteScalar<int>(Context, moSql, 0);
                    if (fDayPlanFID > 0)
                        continue;
@@ -1076,7 +1076,7 @@
--(FHEntryCloseDate is null and DATEDIFF(D,GETDATE(),FHMASTERDATE)<0)or 
DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0
and a.FDOCUMENTSTATUS not in ('E')
--and b.FHQTY>0
and b.FHQTY>0
ORDER BY b.FHMASTERDATE,a.FHOrderLev 
";
                ds = DBServiceHelper.ExecuteDataSet(Context, sql);
@@ -1091,6 +1091,7 @@
                LogHelper.Info("齐套分析准备数据完成：" + sw.Elapsed);
                foreach (var item in DatePlanList)
                {
                    //LogHelper.Info("齐套分析第一个循环 ： 工单号 ：" + item.FPRDMOENTYID.ToString() + item.FHMASTERDATE.ToString("yyyy-MM-dd"));
                    //筛选出当日计划数据
                    var _BomList = BomList.Where(x => x.FHMASTERDATE == item.FHMASTERDATE && x.FPRDMOENTYID == item.FPRDMOENTYID).ToList();
                    foreach (var _item in _BomList)
@@ -1347,7 +1348,7 @@
";
                ds = DBServiceHelper.ExecuteDataSet(Context, sql);
                List<PRD_PPBOM> BomList = ds.ToModelList<PRD_PPBOM>();
                //日计划+生产订单子表编码ID
                //日计划日期+生产订单子表编码ID
                var DatePlanList = BomList.GroupBy(p => new { p.FHMASTERDATE, p.FPRDMOENTYID }).Select(x => new PRD_PPBOM { FHMASTERDATE = x.Key.FHMASTERDATE, FPRDMOENTYID = x.Key.FPRDMOENTYID }).ToList();
                //CompleteAnalysisTempModel 用于存储临时需要插入数据
                List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>();
@@ -2995,20 +2996,12 @@
                //单据体信息转换为列表集合
                DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
                int Fseq = entityDataObjoct.Count();
                //if (Fseq == 0)
                //{
                //    this.View.ShowErrMessage("请先加载数据");
                //    return;
                //}
                //var isexists = entityDataObjoct.Where(x => x["FSRCBILLENTRYSEQ"].ToString() == "1");
                //var isexists1 = entityDataObjoct.ToList().FindAll(x => x["FSRCBILLENTRYSEQ"].ToString() == "1");
                string pageId = Guid.NewGuid().ToString();
                ListShowParameter showParameter = new ListShowParameter();
                showParameter.FormId = "PRD_MO";
                showParameter.PageId = pageId;
                showParameter.UseOrgId = this.Context.CurrentOrganizationInfo.ID;
                showParameter.IsLookUp = true;
                this.View.ShowForm(showParameter);
                this.View.ShowForm(showParameter, delegate (FormResult result)
                {
                    object returnData = result.ReturnData;
@@ -3018,20 +3011,22 @@
                        LogHelper.Info("生产计划平台选单 行数" + listSelectedRowCollection.Count().ToString());
                        if (listSelectedRowCollection != null)
                        {
                            var ret = "";
                            foreach (var listSelectedRow in listSelectedRowCollection)
                            {
                                if (entityDataObjoct.Where(x => x["FSRCBILLENTRYSEQ"].ToString() == listSelectedRow.DataRow["t1_FSeq"].ToString() && x["FSCOrderNo"].ToString() == listSelectedRow.DataRow["FBillNo"].ToString()).Count() > 0)
                                {
                                    LogHelper.Info("生产计划平台选单:"+listSelectedRow.DataRow["FBillNo"].ToString()+ ", 行号," +listSelectedRow.DataRow["t1_FSeq"].ToString() + ",已选");
                                    LogHelper.Info("生产计划平台选单:" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 行号," + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",已选");
                                    ret += "生产订单号：" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 行号," + listSelectedRow.DataRow["t1_FSeq"].ToString() + ",已选" + "\n";
                                    continue;
                                }
                                //今天以前的数据是显示不出来的
                                string sql = $"select DATEDIFF(d,getdate(),FPlanStartDate)days from T_PRD_MOENTRY where FENTRYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
                                int day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
                                if (day < 0)
                                { 
                                    LogHelper.Info("生产计划平台选单:日期太靠后，" + listSelectedRow.DataRow["FBillNo"].ToString()+ ", 行号, "+listSelectedRow.DataRow["t1_FSeq"].ToString() + ", day= "+ day.ToString());
                                    //LogHelper.Info(sql);
                                {
                                    LogHelper.Info("生产计划平台选单:日期太靠后，" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 行号, " + listSelectedRow.DataRow["t1_FSeq"].ToString() + ", day= " + day.ToString());
                                    ret += "计划开工日期在今天之前,生产订单号：" + listSelectedRow.DataRow["FBillNo"].ToString() + ", 行号," + listSelectedRow.DataRow["t1_FSeq"].ToString() + "\n";
                                    continue;
                                }
                                this.Model.CreateNewEntryRow("FEntity");
@@ -3047,6 +3042,10 @@
                                this.View.Model.SetValue("FT" + day.ToString(), listSelectedRow.DataRow["FQty"].ToString(), Fseq);
                                Fseq++;
                            }
                            if (ret != "")
                            {
                                this.View.ShowMessage(ret);
                            }
                        }
                    }
                });
@@ -3058,6 +3057,3 @@
        }
    }
}


//tbReleaseReserve

 src/BLL/Demo.Report/PRD/prd_CompleteSetRateReport.cs

@@ -29,13 +29,6 @@

        public override void Initialize()
        {
            //base.Initialize();
            //this.ReportProperty.ReportType = ReportType.REPORTTYPE_NORMAL;
            //this.ReportProperty.ReportName = new LocaleValue("供应商送料计划列表订单", base.Context.UserLocale.LCID);
            //this.ReportProperty.IsUIDesignerColumns = true;
            //this.ReportProperty.IsGroupSummary = true;
            //this.ReportProperty.SimpleAllCols = false;

            base.Initialize();
            // 简单账表类型：普通、树形、分页
            this.ReportProperty.ReportType = ReportType.REPORTTYPE_NORMAL;
@@ -44,15 +37,11 @@
            this.ReportProperty.IsUIDesignerColumns = false;
            //是否分组汇总
            this.ReportProperty.IsGroupSummary = true;



        }

        public override ReportHeader GetReportHeaders(IRptParams filter)
        {
            ReportHeader header = new ReportHeader();

            header.AddChild("FIDENTITYID", new LocaleValue("序号"), SqlStorageType.SqlInt).ColIndex = 1;
            header.AddChild("FHDATE", new LocaleValue("提料计划日期", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 1;
            header.AddChild("FHSOURCEBILLNO", new LocaleValue("生产订单编号", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 2;
@@ -73,7 +62,6 @@
            header.AddChild("FISQT", new LocaleValue("是否齐套", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 12;
            header.AddChild("FTYPE", new LocaleValue("类型", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 12;
            header.AddChild("FJSRATE", new LocaleValue("齐套率", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal).ColIndex = 12;

            return header;
        }

@@ -86,11 +74,9 @@
            string FProductLine = ""; //生产线
            string FMoBillNo = ""; //生产订单号
            string FSupplyID = ""; //供应商

            FBeginDATE = customFil["FBeginDATE"]?.ToString();
            FEndDATE = customFil["FEndDATE"]?.ToString();
            FMoBillNo = customFil["FMoBillNo"]?.ToString();
            
            if (((DynamicObject)customFil["FProductLine"]) != null)
            {
                FProductLine = ((DynamicObject)customFil["FProductLine"])["Id"].ToString();
@@ -103,8 +89,30 @@
            LogHelper.Info(sql);
            DBUtils.Execute(this.Context, sql);
        }
        public override void CloseReport()
        public override ReportTitles GetReportTitles(IRptParams filter)
        {
            var result = base.GetReportTitles(filter);
            DynamicObject dyFilter = filter.FilterParameter.CustomFilter;
            if (dyFilter != null)
            {
                if (result == null)
                {
                    result = new ReportTitles();
                }
            }
            var begindate = dyFilter["FBeginDATE"]?.ToString() ?? "1990-01-01 00:00:00";
            var enddate = dyFilter["FEndDATE"]?.ToString() ?? "9999 - 01 - 01 00:00:00";
            var FMoBillNo = dyFilter["FMoBillNo"]?.ToString() ?? "";
            var FProductLine = (dyFilter["FProductLine"] as DynamicObject)?["Name"].ToString() ?? "";
            var FSupplyID = (dyFilter["FSupplyID"] as DynamicObject)?["Name"].ToString() ?? "";
            //var FMaterialID = (dyFilter["FMaterialID"] as DynamicObject)?["Id"].ToString() ?? "";
            result.AddTitle("FBeginDATE", begindate);
            result.AddTitle("FEndDATE", enddate);
            result.AddTitle("FMoBillNo", FMoBillNo);
            result.AddTitle("FProductLine", FProductLine);
            result.AddTitle("FSupplyID", FSupplyID);
            //result.AddTitle("FMaterialID", FMaterialID);
            return result;

        }
    }

 src/BLL/Demo.Report/PRD/prd_TimelinessRateReport.cs

@@ -29,13 +29,6 @@

        public override void Initialize()
        {
            //base.Initialize();
            //this.ReportProperty.ReportType = ReportType.REPORTTYPE_NORMAL;
            //this.ReportProperty.ReportName = new LocaleValue("供应商送料计划列表订单", base.Context.UserLocale.LCID);
            //this.ReportProperty.IsUIDesignerColumns = true;
            //this.ReportProperty.IsGroupSummary = true;
            //this.ReportProperty.SimpleAllCols = false;

            base.Initialize();
            // 简单账表类型：普通、树形、分页
            this.ReportProperty.ReportType = ReportType.REPORTTYPE_NORMAL;
@@ -45,13 +38,11 @@
            //是否分组汇总
            this.ReportProperty.IsGroupSummary = true;
            this.ReportProperty.PrimaryKeyFieldName = "FIDENTITYID";

        }

        public override ReportHeader GetReportHeaders(IRptParams filter)
        {
            ReportHeader header = new ReportHeader();

            header.AddChild("FIDENTITYID", new LocaleValue("序号"), SqlStorageType.SqlInt).ColIndex = 1;
            header.AddChild("FHDATE", new LocaleValue("提料计划日期", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 1;
            header.AddChild("FHSOURCEBILLNO", new LocaleValue("生产订单编号", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 2;
@@ -64,12 +55,12 @@
            header.AddChild("FMATERIALNUMBER", new LocaleValue("原材料编码", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 9;
            header.AddChild("FMATERIALNAME", new LocaleValue("原材料名称", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 10;
            header.AddChild("FSPECIFICATION", new LocaleValue("原材料规格", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 11;
            header.AddChild("FHQTY", new LocaleValue("订单数量", this.Context.UserLocale.LCID),SqlStorageType.SqlDecimal).ColIndex = 11;
            header.AddChild("FHQTY", new LocaleValue("订单数量", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal).ColIndex = 11;
            header.AddChild("FREALQTY", new LocaleValue("实际到货数量", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal).ColIndex = 11;
            header.AddChild("FRKDATE", new LocaleValue("实际到货时间", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 12;
            header.AddChild("FTYPE", new LocaleValue("类型", this.Context.UserLocale.LCID), SqlStorageType.Sqlvarchar).ColIndex = 12;
            header.AddChild("FJSRATE", new LocaleValue("到货及时率", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal).ColIndex = 12;

            header.AddChild("FTQCOUNT", new LocaleValue("拖期数量", this.Context.UserLocale.LCID), SqlStorageType.SqlDecimal).ColIndex = 13;
            return header;
        }

@@ -77,14 +68,13 @@
        {
            base.BuilderReportSqlAndTempTable(filter, tableName);
            DynamicObject customFil = filter.FilterParameter.CustomFilter;
            string FDATE = ""; //提料日期
            string FProductLine = ""; //生产线
            string FMoBillNo = ""; //生产订单号
            string FMaterialID = ""; //物料
            string FSupplyID = ""; //供应商

            FDATE = customFil["FDATE"]?.ToString();
            FMoBillNo = customFil["FMoBillNo"]?.ToString();
            string FBeginDATE = customFil["FBeginDATE"]?.ToString();
            string FEndDATE = customFil["FEndDATE"]?.ToString();
            string FMoBillNo = customFil["FMoBillNo"]?.ToString();

            if (((DynamicObject)customFil["FMaterialID"]) != null)
            {
@@ -98,12 +88,34 @@
            {
                FSupplyID = ((DynamicObject)customFil["FSupplyID"])["Id"].ToString();
            }
            string sql = string.Format($"/*dialect*/ EXEC pr_TimelinessRateReport '{tableName}','{FDATE}','{FMoBillNo}','{FProductLine}','{FSupplyID}','{FMaterialID}'");
            string sql = string.Format($"/*dialect*/ EXEC pr_TimelinessRateReport '{tableName}','{FBeginDATE}','{FEndDATE}','{FMoBillNo}','{FProductLine}','{FSupplyID}','{FMaterialID}'");
            LogHelper.Info(sql);
            DBUtils.Execute(this.Context, sql);
        }
        public override void CloseReport()
        public override ReportTitles GetReportTitles(IRptParams filter)
        {
            var result = base.GetReportTitles(filter);
            DynamicObject dyFilter = filter.FilterParameter.CustomFilter;
            if (dyFilter != null)
            {
                if (result == null)
                {
                    result = new ReportTitles();
                }
            }
            var begindate = dyFilter["FBeginDATE"]?.ToString() ?? "1990-01-01 00:00:00";
            var enddate = dyFilter["FEndDATE"]?.ToString() ?? "9999 - 01 - 01 00:00:00";
            var FMoBillNo = dyFilter["FMoBillNo"]?.ToString() ?? "";
            var FProductLine = (dyFilter["FProductLine"] as DynamicObject)?["Name"].ToString() ?? "";
            var FSupplyID = (dyFilter["FSupplyID"] as DynamicObject)?["Name"].ToString() ?? "";
            var FMaterialID = (dyFilter["FMaterialID"] as DynamicObject)?["Name"].ToString() ?? "";
            result.AddTitle("FBeginDATE", begindate);
            result.AddTitle("FEndDATE", enddate);
            result.AddTitle("FMoBillNo", FMoBillNo);
            result.AddTitle("FProductLine", FProductLine);
            result.AddTitle("FSupplyID", FSupplyID);
            result.AddTitle("FMaterialID", FMaterialID);
            return result;

        }
    }

 src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTaskByPurchase.cs

@@ -37,7 +37,7 @@
(
select FBILLTYPEID from T_BAS_BILLTYPE
where FBILLFORMID = 'PUR_PurchaseOrder'
and FNUMBER in('CGDD09_SYS', 'CGDD10_SYS')
and FNUMBER in('CGDD09_SYS','CGDD10_SYS','CGDD06,'CGDD08')
)
and FDOCUMENTSTATUS = 'C'
and FENTRYID not in  (select distinct FHPOOrderEntryID from Cg_PODemandPlanBillSub)";
@@ -71,7 +71,7 @@
(
select FBILLTYPEID  from T_BAS_BILLTYPE
where FBILLFORMID = 'PUR_PurchaseOrder'
and FNUMBER in('CGDD09_SYS','CGDD10_SYS')
and FNUMBER in('CGDD09_SYS','CGDD10_SYS','CGDD06,'CGDD08')
)
and a.FDOCUMENTSTATUS = 'C'
)A