From f26b3129adde088d5ff4a633cecfeabb72834e96 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 10 九月 2021 17:24:35 +0800
Subject: [PATCH] 选单功能

---
 src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
index 775fdd2..7af0539 100644
--- a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
+++ b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
@@ -1,5 +1,4 @@
-锘縰sing Kingdee.BOS.App.Data;
-using Kingdee.BOS.Core.DynamicForm;
+锘縰sing Kingdee.BOS.Core.DynamicForm;
 using Kingdee.BOS.Core.DynamicForm.PlugIn;
 using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
 
@@ -36,13 +35,15 @@
                     return;
                 string FHMainICMOInterIDr = this.View.OpenParameter.GetCustomParameter("FHMainICMOInterIDr").ToString();//涓荤敓浜ц鍗曚富鍐呯爜
                 FMatrailId = this.View.OpenParameter.GetCustomParameter("FMatrailId").ToString();//鐗╂枡
-                //string FBillNo = this.View.OpenParameter.GetCustomParameter("FBillNo").ToString();
-                string sql = string.Format(@"/*dialect*/select a.*,b.FBILLNO FBILLNOs from JIT_MOMaterReadysBill a  
-                                        left join T_PRD_MO b on a.FHMainICMOInterIDr=b.FID
-                                        where FHMainICMOInterIDr ='{0}' and FIDENTIFICAT=2 and FHMATERID ='{1}'", FHMainICMOInterIDr, FMatrailId);
-                sql = string.Format(@"/*dialect*/select a.*,b.FBILLNO FBILLNOs from JIT_MOMaterReadysBill a  
-                                        left join T_PRD_MO b on a.FHMainICMOInterIDr=b.FID
-                                        where  FCompleteCount>0 and    FHMATERID ='{0}'", FMatrailId);
+               string sql = string.Format(@"/*dialect*/
+SELECT A.*,B.FBILLNO FBILLNOS FROM JIT_MOMATERREADYSBILL A  
+LEFT JOIN T_PRD_MO B ON A.FHMAINICMOINTERIDR=B.FID
+WHERE FHICMOINTERID 
+NOT IN (SELECT FID FROM   SC_WORKBILLSORTBILLMAIN WHERE FDOCUMENTSTATUS IN ('E'))
+AND FCOMPLETECOUNT1>0 
+AND FHMATERID ='{0}'
+ORDER BY FPLANDATE ASC,FHSTOCKQTY DESC
+", FMatrailId);
                 DataTable dt = DBServiceHelper.ExecuteDataSet(this.Context, sql).Tables[0];
                 if (dt.Rows.Count > 0)
                 {
@@ -52,7 +53,7 @@
                         this.Model.SetValue("FSEQ", i + 1, i);//搴忓彿
                         this.Model.SetValue("FMateralDetailId", dt.Rows[i]["FHMATERID"], i);
                         this.Model.SetValue("FScOrderNoDetail", dt.Rows[i]["FBILLNOs"], i);//鐢熶骇璁㈠崟鍙�        
-                        this.Model.SetValue("FOccupyCount", dt.Rows[i]["FCompleteCount"], i);//     
+                        this.Model.SetValue("FOccupyCount", dt.Rows[i]["FCompleteCount1"], i);//     
                         this.Model.SetValue("FCurrentCount", dt.Rows[i]["FHStockQty"], i);//褰撳墠搴撳瓨鎯呭喌  
                         this.Model.SetValue("FOrgId", dt.Rows[i]["FHStockOrgID"], i);//搴撳瓨缁勭粐  
                         this.Model.SetValue("FOwnerTypeId", dt.Rows[i]["FOwnerTypeId"], i);//璐т富绫诲瀷  
@@ -69,7 +70,7 @@
         /// </summary>
         public void SearchList()
         {
-            string sqlwhere = " where FCompleteCount>0 and  1=1";
+            string sqlwhere = " where FCompleteCount1>0 and  1=1";
             string sql = string.Format(@"/*dialect*/select a.*,b.FBILLNO FBILLNOs from JIT_MOMaterReadysBill a  
                                         left join T_PRD_MO b on a.FHMainICMOInterIDr=b.FID   
                                          ");
@@ -89,11 +90,9 @@
                     this.Model.CreateNewEntryRow("FEntity");
                     this.Model.SetValue("FSEQ", i + 1, i);//搴忓彿
                     this.Model.SetValue("FMateralDetailId", dt.Rows[i]["FHMATERID"], i);
-                    this.Model.SetValue("FScOrderNoDetail", dt.Rows[i]["FBILLNOs"], i);//鐢熶骇璁㈠崟鍙�
-                    this.Model.SetValue("FOccupyCount", dt.Rows[i]["FCompleteCount"], i);//     
+                    this.Model.SetValue("FScOrderNoDetail", dt.Rows[i]["FBILLNOs"], i);//鐢熶骇璁㈠崟鍙�        
+                    this.Model.SetValue("FOccupyCount", dt.Rows[i]["FCompleteCount1"], i);//     
                     this.Model.SetValue("FCurrentCount", dt.Rows[i]["FHStockQty"], i);//褰撳墠搴撳瓨鎯呭喌  
-                    this.Model.SetValue("FOrgId", dt.Rows[i]["FHStockOrgID"], i);//搴撳瓨缁勭粐  
-                    this.Model.SetValue("FOwnerTypeId", dt.Rows[i]["FOwnerTypeId"], i);//搴撳瓨缁勭粐  
                     this.Model.SetValue("FOrgId", dt.Rows[i]["FHStockOrgID"], i);//搴撳瓨缁勭粐  
                     this.Model.SetValue("FOwnerTypeId", dt.Rows[i]["FOwnerTypeId"], i);//璐т富绫诲瀷  
                     this.Model.SetValue("FOwnerId", dt.Rows[i]["FOwnerId"], i);//璐т富  

--
Gitblit v1.9.1