From 8a2f4c5977834d55b889bef3d01e1e02442b735c Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 19 一月 2022 22:00:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WarM/报表分析/Kf_BarCodeOutInReport.cs |  289 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 151 insertions(+), 138 deletions(-)

diff --git "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs" "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs"
index 8fb2595..e2effff 100644
--- "a/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs"
+++ "b/WarM/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_BarCodeOutInReport.cs"
@@ -24,33 +24,38 @@
 
         Pub_Class.ClsGridListSum oSumGrid = new Pub_Class.ClsGridListSum();
 
-        #region 鍥哄畾浠g爜 
+        #region  鍥哄畾浠g爜
 
-        private void initGrid()
+        private void Kf_BarCodeOutInReport_Load(object sender, EventArgs e)
         {
-            DBUtility.Xt_BaseBillFun.initGridRpt(grdMain, this.Name);
-        }
-       
-        //寰楀埌瀵瑰簲鍒�
-        private Int32 Fun_GetCol(string sCol)
-        {
-            return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+            SetFormCaption();
+            oSumGrid.ogrdMain = grdMain;  //鍒濆鍖� new
+            //oSumGrid.oGridsum = grdSum;
+            dtpHBDate.Value = DateTime.Today;
+            dtpHEDate.Value = DateTime.Today;
+            //鍔犺浇鍗曟嵁绫诲瀷淇℃伅
+            Sub_AddBillTypeList();
         }
 
-        private void tc_Click(object sender, EventArgs e)
+        //鍔犺浇鍗曟嵁绫诲瀷淇℃伅
+        private void Sub_AddBillTypeList()
         {
-            this.Close();
+            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+            DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeReport_BillType ", "h_p_WMS_BarCodeReport_BillType");
+            if (ds == null || ds.Tables[0].Rows.Count == 0)
+            {
+                MessageBox.Show("鑾峰彇鍗曟嵁绫诲瀷澶辫触");
+                return;
+            }
+            cmbBillType.Items.Clear();
+            cmbBillType.Items.Add("鍏ㄩ儴");
+            for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+            {
+                cmbBillType.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBillTypeName"]));
+            }
+            cmbBillType.Text = "鍏ㄩ儴";
         }
 
-        //Kf_BarCodeOutInReportDlg oDlg = new Kf_BarCodeOutInReportDlg();
-        private void cx_Click(object sender, EventArgs e)
-        {
-            //oDlg.ShowDialog();
-            //if (oDlg.IsOk == 1)
-            //{
-                timer1.Enabled = true;
-            //}
-        }
         //璁剧疆鎶ヨ〃鍚嶇О
         private void SetFormCaption()
         {
@@ -61,16 +66,16 @@
             cmbBillType.SelectedIndex = 0;
         }
 
-
-        private void Frm_EasyReport_Load(object sender, EventArgs e)
+        private void initGrid()
         {
-            SetFormCaption();
-            oSumGrid.ogrdMain = grdMain;  //鍒濆鍖� new
-            //oSumGrid.oGridsum = grdSum;
-            dtpHBDate.Value = DateTime.Today;
-            dtpHEDate.Value = DateTime.Today;
+            DBUtility.Xt_BaseBillFun.initGridRpt(grdMain, this.Name);
         }
 
+        //鍒濆鍖栬〃澶存樉绀�
+        private void initHeadCaption()
+        {
+
+        }
 
         private void timer1_Tick(object sender, EventArgs e)
         {
@@ -88,45 +93,10 @@
             }
         }
 
-        private void Xs_SellOutPriceReport_KeyUp(object sender, KeyEventArgs e)
+        private void timer2_Tick(object sender, EventArgs e)
         {
-            if (e.KeyValue == 13)
-                timer1.Enabled = true;
-        }
-
-        private void mrlk_Click(object sender, EventArgs e)
-        {
-
-            DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
-        }
-
-        private void bclk_Click(object sender, EventArgs e)
-        {
-            //淇濆瓨鍒楀
-            DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
-        }
-
-        
-        //鎵撳嵃
-        private void dy_Click(object sender, EventArgs e)
-        {
-            Sub_SetReport();
-            Report.Print(true);
-        }
-        //棰勮
-        private void view_Click(object sender, EventArgs e)
-        {
-            Sub_SetReport();
-            Report.PrintPreview(true);
-        }
-       
-        #endregion
-
-        #region 鐣岄潰澶勭悊
-        //鍒濆鍖栬〃澶存樉绀�
-        private void initHeadCaption()
-        {
-             
+            timer2.Enabled = false;
+            timer1.Enabled = true;
         }
 
         private bool Fun_AllowQuery()//瀹℃牳鏌ヨ鏉′欢
@@ -139,43 +109,87 @@
             return true;
         }
 
+        private void grdMain_Paint(object sender, PaintEventArgs e)
+        {
+            DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+        }
+
+        private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
+        {
+            Total();
+        }
+
+        private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+        {
+            Total();
+        }
+
+        private void Total()
+        {
+            if (grdMain.Rows.Count > 0 && grdMain.ColumnCount > 0)
+            {
+                oSumGrid.SetGridsum();
+                oSumGrid.Total();
+            }
+        }
+
+        //寰楀埌瀵瑰簲鍒�
+        private Int32 Fun_GetCol(string sCol)
+        {
+            return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+        }
+
+        private void Xs_SellOutPriceReport_KeyUp(object sender, KeyEventArgs e)
+        {
+            if (e.KeyValue == 13)
+                timer1.Enabled = true;
+        }
+
+        //淇濆瓨鍒楀
+        private void bclk_Click(object sender, EventArgs e)
+        {
+            DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+        }
+
+        //榛樿鍒楀
+        private void mrlk_Click(object sender, EventArgs e)
+        {
+            DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+        }
+
+        #endregion
+
+        #region  鏌ヨ鍔熻兘
+
+        private void cx_Click(object sender, EventArgs e)
+        {
+            timer1.Enabled = true;
+        }
+
         private void Display()
         {
             ClsCN SubCn = new ClsCN();
             DataSet DSet = new DataSet();
-            //鏄剧ず鎶ヨ〃澶� 鏍囬
-            
-            //鏄剧ず杩囨护鏉′欢
-
 
             //杩囨护鏉′欢Dlg
             string sDlgWhere = "";
             sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
             sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
-            sDlgWhere = sDlgWhere + ",'" + txtHMater.Text + "'";
-            sDlgWhere = sDlgWhere + ",'" + txtHWHName.Text + "'";
-            sDlgWhere = sDlgWhere + ",'" + txtHSPName.Text + "'";
-            sDlgWhere = sDlgWhere + ",'" + txtHBatchNo.Text + "'";
-            sDlgWhere = sDlgWhere + ",'" + txtHBarCode.Text + "'";
             sDlgWhere = sDlgWhere + ",'" + cmbBillType.Text + "'";
             sDlgWhere = sDlgWhere + ",'" + txtHBillNo.Text + "'";
-            //sDlgWhere = sDlgWhere + ",'" + oDlg.cmbHSumType.Text.Trim() + "'";
+            sDlgWhere = sDlgWhere + ",'" + txtHBarCode.Text + "'";
+            sDlgWhere = sDlgWhere + ",'" + txtHMater.Text + "'";
+            sDlgWhere = sDlgWhere + ",'" + txtHBatchNo.Text + "'";
+            sDlgWhere = sDlgWhere + ",'" + txtHWHName.Text + "'";
+            sDlgWhere = sDlgWhere + ",'" + txtHSPName.Text + "'";
+            sDlgWhere = sDlgWhere + ",'" + txtHSourceBillNo.Text + "'";
+            sDlgWhere = sDlgWhere + ",'" + txtHMaker.Text + "'";
             if (sDlgWhere.Trim().Length > 0)
             {
                 sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
             }
-            //杩囨护鏉′欢
-            //string sWhere = "";
-            //sWhere = sWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
-            //sWhere = sWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
-            //sWhere = sWhere + "," + ClsPub.isLong(txtHCusID.Tag) + "";
-            //sWhere = sWhere + ",3";
-            //if (sWhere.Trim().Length > 0)
-            //{
-            //    sWhere = sWhere.Substring(1, sWhere.Length - 1);
-            //}
-            //
-            DSet = SubCn.RunProcReturn("exec h_p_Kf_BarCodeOutInReport " + sDlgWhere, "h_p_Kf_BarCodeOutInReport");
+
+            DSet = SubCn.RunProcReturn("exec h_p_Kf_BarCodeOutInReport_New " + sDlgWhere, "h_p_Kf_BarCodeOutInReport_New");
             //鐢熸垚棣栬鏍囬
             if (DSet == null)
             {
@@ -199,36 +213,9 @@
 
         #endregion
 
-        #region 鎵撳嵃璁剧疆
+        #region  瀵煎嚭鍔熻兘
 
-        //鎵撳嵃璁剧疆
-        GridppReport Report;
-        //璁剧疆鎵撳嵃妯$増璺緞
-        private void Sub_SetReport()
-        {
-            Report = new GridppReport();
-            Report.LoadFromFile(ClsPub.AppPath + @"\Report\搴旀敹娆炬槑缁嗚〃.grf");  //here .
-            Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
-            Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
-        }
-        //濉叆鍗曟嵁琛ㄥご淇℃伅
-        private void ReportBeforePostRecord()//your report?kao
-        {
-            //Report.FieldByName("HDateItemID").AsString = lblHDateItemID.Text;
-            //Report.FieldByName("CusNumber").AsString = lblHCusNumber.Text;
-            //Report.FieldByName("CusName").AsString = lblHCusName.Text;
-            //Report.FieldByName("BeginBalance").AsString = lblHBeginBalance.Text;
-        }
-        //濉叆鍗曟嵁鏄庣粏淇℃伅
-        private void ReportFetchRecordByDataTable()
-        {
-            //BLL.Utility.FillRecordToReport(Report, grdMain, false);
-        }
-        #endregion
-
-        #region 鏁版嵁瀵煎嚭
-
-        
+        //寮曞嚭
         private void yc_Click(object sender, EventArgs e)
         {
             //BLL.ClsPub_BLL.DataGridViewToExcel2(grdMain, this.Text);
@@ -321,46 +308,72 @@
             }
         }
 
+        //瀵煎嚭
+        private void dc_Click(object sender, EventArgs e)
+        {
+            DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+        }
 
         #endregion
 
-         
+        #region  閫�鍑哄姛鑳�
 
-        private void timer2_Tick(object sender, EventArgs e)
+        private void tc_Click(object sender, EventArgs e)
         {
-            timer2.Enabled = false;
-            //oDlg.ShowDialog();
-            //if (oDlg.IsOk == 1)
-            //{
-                timer1.Enabled = true;
-            //}
+            this.Close();
         }
 
-        private void Total()
+        #endregion
+
+        #region  鎵撳嵃鍔熻兘
+
+        //鎵撳嵃璁剧疆
+        GridppReport Report;
+
+        //棰勮
+        private void view_Click(object sender, EventArgs e)
         {
-            if (grdMain.Rows.Count > 0 && grdMain.ColumnCount > 0)
-            {
-                oSumGrid.SetGridsum();
-                oSumGrid.Total();
-            }
+            Sub_SetReport();
+            Report.PrintPreview(true);
         }
 
-        private void grdMain_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)
+        //鎵撳嵃
+        private void dy_Click(object sender, EventArgs e)
         {
-            Total();
+            Sub_SetReport();
+            Report.Print(true);
         }
 
-        private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+        //璁剧疆鎵撳嵃妯$増璺緞
+        private void Sub_SetReport()
         {
-            Total();
-
+            Report = new GridppReport();
+            Report.LoadFromFile(ClsPub.AppPath + @"\Report\搴旀敹娆炬槑缁嗚〃.grf");  //here .
+            Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+            Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
         }
 
-        private void grdMain_Paint(object sender, PaintEventArgs e)
+        //濉叆鍗曟嵁琛ㄥご淇℃伅
+        private void ReportBeforePostRecord()//your report?kao
         {
-            DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
+            //Report.FieldByName("HDateItemID").AsString = lblHDateItemID.Text;
+            //Report.FieldByName("CusNumber").AsString = lblHCusNumber.Text;
+            //Report.FieldByName("CusName").AsString = lblHCusName.Text;
+            //Report.FieldByName("BeginBalance").AsString = lblHBeginBalance.Text;
         }
 
-        
+        //濉叆鍗曟嵁鏄庣粏淇℃伅
+        private void ReportFetchRecordByDataTable()
+        {
+            //BLL.Utility.FillRecordToReport(Report, grdMain, false);
+        }
+
+        #endregion
+
+
+
+
+
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1