From ddc23c8a38e7df3c294ca3227793ef717beb6580 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 14 十二月 2020 14:21:39 +0800
Subject: [PATCH] JIT分析更改后代码上传

---
 src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs |   51 ++++++++-------------------------------------------
 1 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
index 6ae34c7..dd6efae 100644
--- a/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
+++ b/src/BLL/Demo.BillView/PRD/ProCompleteAnalysisMateriel.cs
@@ -23,11 +23,9 @@
     {
         bool did = false;
         string FMatrailId = "";
-
         public override void OnLoad(EventArgs e)
         {
             base.OnLoad(e);
-
             if (this.View.OpenParameter.GetCustomParameter("FHMainICMOInterIDr") == null)
             {
                 SearchList();
@@ -38,47 +36,32 @@
                     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     FIDENTIFICAT=2 and FHMATERID ='{0}'", FMatrailId);
+                                        where   FHMATERID ='{0}'", FMatrailId);
                 DataTable dt = DBServiceHelper.ExecuteDataSet(this.Context, sql).Tables[0];
                 if (dt.Rows.Count > 0)
                 {
                     for (int i = 0; i < dt.Rows.Count; i++)
                     {
-                        /*
-                        璁″垝鍙戞枡鏁伴噺 = 璁″垝鎬绘暟閲� * 鍗曚綅鐢ㄦ枡
-                        榻愬鏁伴噺 = 榻愬鏁� * 鍗曚綅鐢ㄦ枡锛堣�冭檻鍒嗗眰绾�* 鐖剁骇锛�
-                        缂烘枡鏁伴噺 = 1 - 2
-                        鏄惁榻愬 = 缂烘枡 < 0 ?
-                        */
-                        decimal FPlanIssueCount = Convert.ToDecimal(dt.Rows[i]["FSumPlanCount"]) * Convert.ToDecimal(dt.Rows[i]["FUNITDOSAGE"]);//璁″垝鍙戞枡鏁伴噺
-                        decimal FCompleteCount = Convert.ToDecimal(dt.Rows[i]["FCompleteCount"]) * Convert.ToDecimal(dt.Rows[i]["FUNITDOSAGE"]);//榻愬鏁伴噺
-
-                        decimal FLackCount = FPlanIssueCount - FCompleteCount;//缂烘枡鏁伴噺
                         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]["FHUseQty"], i);//     
+                        this.Model.SetValue("FScOrderNoDetail", dt.Rows[i]["FBILLNOs"], i);//鐢熶骇璁㈠崟鍙�        
+                        this.Model.SetValue("FOccupyCount", dt.Rows[i]["FCompleteCount"], 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);//璐т富  
+                        this.Model.SetValue("FPlanDate", dt.Rows[i]["FPlanDate"].ToString(), i);//鏃ヨ鍒掓棩鏈�   
                     }
                 }
-
                 did = true;
-
             }
-
-
         }
 
         /// <summary>
@@ -86,19 +69,16 @@
         /// </summary>
         public void SearchList()
         {
-            string sqlwhere = " and 1=1";
+            string sqlwhere = " where 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 where FIDENTIFICAT=2
+                                        left join T_PRD_MO b on a.FHMainICMOInterIDr=b.FID   
                                          ");
-
             //鐢熶骇璁㈠崟鍙�
             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];
             this.Model.DeleteEntryData("FEntity");
@@ -106,38 +86,23 @@
             {
                 for (int i = 0; i < dt.Rows.Count; i++)
                 {
-                    /*
-                        璁″垝鍙戞枡鏁伴噺 = 璁″垝鎬绘暟閲� * 鍗曚綅鐢ㄦ枡
-                        榻愬鏁伴噺 = 榻愬鏁� * 鍗曚綅鐢ㄦ枡锛堣�冭檻鍒嗗眰绾�* 鐖剁骇锛�
-                        缂烘枡鏁伴噺 = 1 - 2
-                        鏄惁榻愬 = 缂烘枡 < 0 ?
-                        */
-                    decimal FPlanIssueCount = Convert.ToDecimal(dt.Rows[i]["FSumPlanCount"]) * Convert.ToDecimal(dt.Rows[i]["FUNITDOSAGE"]);//璁″垝鍙戞枡鏁伴噺
-                    decimal FCompleteCount = Convert.ToDecimal(dt.Rows[i]["FCompleteCount"]) * Convert.ToDecimal(dt.Rows[i]["FUNITDOSAGE"]);//榻愬鏁伴噺
-
-                    decimal FLackCount = FPlanIssueCount - FCompleteCount;//缂烘枡鏁伴噺
                     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]["FHUseQty"], i);//     
-
+                    this.Model.SetValue("FOccupyCount", dt.Rows[i]["FCompleteCount"], 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.Model.SetValue("FPlanDate", dt.Rows[i]["FPlanDate"].ToString(), i);//鏃ヨ鍒掓棩鏈�   
                 }
             }
             this.View.UpdateView();
-
             did = true;
         }
-
-
         public override void BarItemClick(BarItemClickEventArgs e)
         {
             base.BarItemClick(e);

--
Gitblit v1.9.1