From eef39f21410d0eb02018bda05d3da369604b1562 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期日, 28 二月 2021 14:18:12 +0800
Subject: [PATCH] nothing

---
 src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTaskByPurchase.cs |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTaskByPurchase.cs b/src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTaskByPurchase.cs
index 357534e..f1c7c58 100644
--- a/src/BLL/Demo.TimedTaskPlugIn/PRD/TLPlanTimeTaskByPurchase.cs
+++ b/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();

--
Gitblit v1.9.1