From 7163324f5b4a21747a74fefecf1dd686480436d4 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期日, 28 二月 2021 10:14:13 +0800
Subject: [PATCH] 生产计划平台不显示关闭单据 齐套分析 关闭单据不参与计算

---
 src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
index 98ade66..d7bc10c 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -1280,6 +1280,7 @@
 --鏉′欢涓轰粖澶╁線鍚庣殑鏃ヨ鍒� + 浠婂ぉ涔嬪墠鏈叧闂殑鏃ヨ鍒�
 where (FHEntryCloseDate is null and DATEDIFF(D,GETDATE(),FHMASTERDATE)<0)or DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0
 and b.FHQTY>0
+and a.FDOCUMENTSTATUS not in ('E')
 ORDER BY b.FHMASTERDATE,a.FHOrderLev 
 ";
                 ds = DBServiceHelper.ExecuteDataSet(Context, sql);
@@ -1763,6 +1764,7 @@
 --鏉′欢涓轰粖澶╁線鍚庣殑鏃ヨ鍒� + 浠婂ぉ涔嬪墠鏈叧闂殑鏃ヨ鍒�
 where (FHEntryCloseDate is null and DATEDIFF(D,GETDATE(),FHMASTERDATE)<0)or DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0
 and b.FHQTY>0
+and a.FDOCUMENTSTATUS not in ('E')
 ORDER BY b.FHMASTERDATE,a.FHOrderLev 
 ";
                 ds = DBServiceHelper.ExecuteDataSet(Context, sql);
@@ -2222,6 +2224,7 @@
                 string sql = @"/*dialect*/ select t1.*,isnull((select SUM(isnull(FNotProductNum,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FNotProductNum ,isnull((select SUM(isnull(FHQTY,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FQTYLS 
  from  Sc_WorkBillSortBillMain t1
  left join T_BD_MATERIAL t3 on t1.FHMaterID=t3.FMATERIALID
+ where t1.FDOCUMENTSTATUS not in ('E')
 " + sqlwhere;
                 DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
                 DateTime DateNow = DateTime.Now;//鑾峰彇褰撳墠鏃ユ湡
@@ -2347,6 +2350,7 @@
                 string sql = @"/*dialect*/  select t1.*,isnull((select SUM(isnull(FNotProductNum,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FNotProductNum ,isnull((select SUM(isnull(FHQTY,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FQTYLS 
  from  Sc_WorkBillSortBillMain t1
  left join T_BD_MATERIAL t3 on t1.FHMaterID=t3.FMATERIALID
+ where t1.FDOCUMENTSTATUS not in ('E')
 " + sqlwhere;
                 DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
                 DateTime DateNow = DateTime.Now;//鑾峰彇褰撳墠鏃ユ湡
@@ -3393,7 +3397,8 @@
                     {
                         foreach (var listSelectedRow in listSelectedRowCollection)
                         {
-                            string sql = $"select DATEDIFF(d,FPlanStartDate,getdate())days from T_PRD_MOENTRY where FENTRYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
+                            //浠婂ぉ浠ュ墠鐨勬暟鎹槸鏄剧ず涓嶅嚭鏉ョ殑
+                            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);
                             this.Model.CreateNewEntryRow("FEntity");
                             this.View.Model.SetItemValueByNumber("FORGID", "100", Fseq);

--
Gitblit v1.9.1