nothing

王 垚

2021-02-28 eef39f21410d0eb02018bda05d3da369604b1562

nothing

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

@@ -224,6 +224,7 @@
    <Compile Include="PRD\ProCompleteAnalysisMateriel.cs" />
    <Compile Include="PRD\ProCompleteAnalysisDetails.cs" />
    <Compile Include="PRD\Prd_Pickmtrl.cs" />
    <Compile Include="PRD\Pro_DayPlanList.cs" />
    <Compile Include="PRD\Pro_DayPlan.cs" />
    <Compile Include="PRD\Pro_DayPlanCheckSelectMenu.cs" />
    <Compile Include="PRD\Pro_DayPlanPushSCHB.cs" />

 src/BLL/Demo.Report/Demo.Report.csproj

@@ -121,6 +121,9 @@
    <Reference Include="Kingdee.K3.SCM.ServiceHelper, Version=7.5.1507.2, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\ZD.Cloud.Common.7.5.1.2\lib\net452\Kingdee.K3.SCM.ServiceHelper.dll</HintPath>
    </Reference>
    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\log4net.1.2.10\lib\2.0\log4net.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\ZD.Newtonsoft.Json.1.0.0\lib\Newtonsoft.Json.dll</HintPath>
    </Reference>
@@ -132,6 +135,9 @@
    <Reference Include="System.Data" />
    <Reference Include="System.Net.Http" />
    <Reference Include="System.Xml" />
    <Reference Include="ZD.Cloud.Logger, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\ZD.Cloud.Logger.1.1.0\lib\net40\ZD.Cloud.Logger.dll</HintPath>
    </Reference>
    <Reference Include="ZD.Cloud.WebApi, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\ZD.Cloud.WebApi.7.6.1\lib\net452\ZD.Cloud.WebApi.dll</HintPath>
    </Reference>
@@ -140,6 +146,8 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="PRD\prd_TimelinessRateReport.cs" />
    <Compile Include="PRD\prd_CompleteSetRateReport.cs" />
    <Compile Include="PRD\prd_ExtractionPlanDetail.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>

 src/BLL/Demo.Report/packages.config

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
  <package id="log4net" version="1.2.10" targetFramework="net472" />
  <package id="ZD.Cloud.Common" version="7.5.1.2" targetFramework="net472" />
  <package id="ZD.Cloud.Logger" version="1.1.0" targetFramework="net472" />
  <package id="ZD.Cloud.WebApi" version="7.6.1" targetFramework="net472" />
  <package id="ZD.Newtonsoft.Json" version="1.0.0" targetFramework="net472" />
  <package id="ZD.Share" version="1.0.3" targetFramework="net472" />

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

@@ -59,9 +59,11 @@
        {
            try
            {
                //提料计划预处理 清理提料计划单数据 更新采购订单提料计划数量
                string sql = @"select a.FID,b.FENTRYID,B.FSEQ,a.FBILLNO,A.FSUPPLIERID,d.FNUMBER as FSUPPLIERNAME,a.FDATE,b.FMATERIALID,c.FNUMBER as FMATERIALNAME,b.FQTY from t_PUR_POOrder a
                //需要生成提料计划所有数据
                string sql = @"/*dialect*/ SELECT * FROM (
select a.FID,b.FENTRYID,B.FSEQ,a.FBILLNO,A.FSUPPLIERID,d.FNUMBER as FSUPPLIERNAME,CONVERT(NVARCHAR(50),T.FDELIVERYDATE,23)FDELIVERYDATE,b.FMATERIALID,c.FNUMBER as FMATERIALNAME,b.FQTY from t_PUR_POOrder a
join t_PUR_POOrderEntry b on a.FID = b.FID
join T_PUR_POORDERENTRY_D T on B.FENTRYID = T.FENTRYID
join T_BD_MATERIAL c on b.FMATERIALID = c.FMATERIALID
join T_BD_SUPPLIER d on a.FSUPPLIERID=d.FSUPPLIERID
left join Cg_PODemandPlanBillSub e on b.FENTRYID =e.FHPOOrderEntryID
@@ -72,34 +74,33 @@
and FNUMBER in('CGDD09_SYS','CGDD10_SYS')
)
and a.FDOCUMENTSTATUS = 'C'
)A
";

                //交期和供应商进行分组 
                DataTable purDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
                sql = @"select distinct a.FID from t_PUR_POOrder a
                sql = @"/*dialect*/ select DISTINCT A.FSUPPLIERID,CONVERT(NVARCHAR(50),T.FDELIVERYDATE,23)FDELIVERYDATE from t_PUR_POOrder a
join t_PUR_POOrderEntry b on a.FID = b.FID
join T_BD_MATERIAL c on b.FMATERIALID = c.FMATERIALID
join T_BD_SUPPLIER d on a.FSUPPLIERID = d.FSUPPLIERID
left join Cg_PODemandPlanBillSub e on b.FENTRYID = e.FHPOOrderEntryID
join T_PUR_POORDERENTRY_D T on B.FENTRYID = T.FENTRYID
left join Cg_PODemandPlanBillSub e on b.FENTRYID =e.FHPOOrderEntryID
where a.FBILLTYPEID in 
(
select FBILLTYPEID from T_BAS_BILLTYPE
select FBILLTYPEID  from T_BAS_BILLTYPE
where FBILLFORMID = 'PUR_PurchaseOrder'
and FNUMBER in('CGDD09_SYS', 'CGDD10_SYS')
and FNUMBER in('CGDD09_SYS','CGDD10_SYS')
)
and a.FDOCUMENTSTATUS = 'C'
";
                DataTable _purDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];

                JArray FinalyResult = new JArray();
                int tlmmm = 1;
                if (_purDt.Rows.Count > 0)
                {
                    foreach (DataRow _dr in _purDt.Rows)
                    {
                        DataRow[] purDtRows = purDt.Select($"FID = '{_dr[0]}'");
                        DataRow[] purDtRows = purDt.Select($"FSUPPLIERID = '{_dr[0].ToString()}' AND FDELIVERYDATE = '{_dr[1].ToString()}'");
                        LogHelper.Info(purDtRows.ToString());
                        JObject model = new JObject();
                        model.Add("FHDate", purDtRows[0]["FDATE"].ToString());
                        model.Add("FHDate", purDtRows[0]["FDELIVERYDATE"].ToString());
                        model.Add("FSettleCurrId", new JObject() { ["Fnumber"] = "PRE001" });
                        model.Add("FSupplierID", new JObject() { ["Fnumber"] = purDtRows[0]["FSUPPLIERNAME"].ToString() });
                        JArray Fentity = new JArray();