From 529179f84e3fd76c359d604815788414a540deba Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 24 十一月 2020 13:43:11 +0800
Subject: [PATCH] 2020.11.24 测试更改上传

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

diff --git a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
index b02119b..6ae34c7 100644
--- a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
+++ b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
@@ -22,6 +22,7 @@
     public class ProCompleteAnalysisMateriel : AbstractDynamicFormPlugIn
     {
         bool did = false;
+        string FMatrailId = "";
 
         public override void OnLoad(EventArgs e)
         {
@@ -36,10 +37,15 @@
                 if (did)
                     return;
                 string FHMainICMOInterIDr = this.View.OpenParameter.GetCustomParameter("FHMainICMOInterIDr").ToString();//涓荤敓浜ц鍗曚富鍐呯爜
-                                                                                                                        //string FBillNo = this.View.OpenParameter.GetCustomParameter("FBillNo").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}' ", FHMainICMOInterIDr);
+                                        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     FIDENTIFICAT=2 and FHMATERID ='{0}'", FMatrailId);
                 DataTable dt = DBServiceHelper.ExecuteDataSet(this.Context, sql).Tables[0];
                 if (dt.Rows.Count > 0)
                 {
@@ -59,8 +65,12 @@
                         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", FCompleteCount, i);//     
+                        this.Model.SetValue("FOccupyCount", dt.Rows[i]["FHUseQty"], 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("FOwnerId", dt.Rows[i]["FOwnerId"], i);//璐т富  
                     }
                 }
 
@@ -76,15 +86,18 @@
         /// </summary>
         public void SearchList()
         {
-            string sqlwhere = " where 1=1";
+            string sqlwhere = " 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
+                                        left join T_PRD_MO b on a.FHMainICMOInterIDr=b.FID where FIDENTIFICAT=2
                                          ");
 
             //鐢熶骇璁㈠崟鍙�
             string PRDBillNo = Convert.ToString(this.Model.GetValue("FScOrderNo"));
             if (!string.IsNullOrEmpty(PRDBillNo))
                 sqlwhere += $" and FPRDBillNo='{PRDBillNo}'";
+
+            if (FMatrailId != "")
+                sqlwhere += $" and FHMATERID='{FMatrailId}'";
 
             sql += sqlwhere;
             DataTable dt = DBServiceHelper.ExecuteDataSet(this.Context, sql).Tables[0];
@@ -107,8 +120,16 @@
                     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", FCompleteCount, i);//     
+                    this.Model.SetValue("FOccupyCount", dt.Rows[i]["FHUseQty"], 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);//璐т富  
+
                 }
             }
             this.View.UpdateView();

--
Gitblit v1.9.1