~kyy/LB_MesClient.git

cnf

2025-11-18 c1473d3b538592e691e3836df88c259fe488e0f3

委外各种打印增加

已修改5个文件

	DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs	67 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs	66 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs

@@ -24,6 +24,7 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -97,6 +98,31 @@
                lbGuid, txt_itemOutNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }

        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                this.toolBarMenu1.rptParameter = "return false";
                MsgHelper.Warning("请先选择你要打印的单据！");
                return;
            }
            string rptParameter = "rpt_wwlld{"
            + rowGuid  // @inOrderGuid - 单据guid
            + "," + "100"  // @isDesign - 重打都是传100
            + "," + ""  // @in1 - 入库时间（扩展用）
            + "," + ""  // @in2 - 特采（扩展用）
            + "," + ""  // @in3 - 供应商id（扩展用）
            + "," + ""  // @in4 - 张数（扩展用）
            + "," + ""  // @in5 - 数量（扩展用）
            + "," + ""  // @in6 - 扩展用
            + "}";
            this.toolBarMenu1.rptParameter = rptParameter;
            this.toolBarMenu1.guidKey = rowGuid;
        }

        /// <summary>
        ///     审核事件
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs

@@ -30,6 +30,7 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -227,6 +228,30 @@
            getPageList(1);
        }

        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                this.toolBarMenu1.rptParameter = "return false";
                MsgHelper.Warning("请先选择你要打印的单据！");
                return;
            }
            string rptParameter = "rpt_wwtlsqd{"
            + rowGuid  // @inOrderGuid - 单据guid
            + "," + "100"  // @isDesign - 重打都是传100
            + "," + ""  // @in1 - 入库时间（扩展用）
            + "," + ""  // @in2 - 特采（扩展用）
            + "," + ""  // @in3 - 供应商id（扩展用）
            + "," + ""  // @in4 - 张数（扩展用）
            + "," + ""  // @in5 - 数量（扩展用）
            + "," + ""  // @in6 - 扩展用
            + "}";
            this.toolBarMenu1.rptParameter = rptParameter;
            this.toolBarMenu1.guidKey = rowGuid;
        }

        /// <summary>
        ///     审核事件
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs

@@ -24,6 +24,7 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -95,6 +96,31 @@
            _filterList = e.FilterList;
            getPageList(1);
        }

        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                this.toolBarMenu1.rptParameter = "return false";
                MsgHelper.Warning("请先选择你要打印的单据！");
                return;
            }
            string rptParameter = "rpt_wwtld{"
            + rowGuid  // @inOrderGuid - 单据guid
            + "," + "100"  // @isDesign - 重打都是传100
            + "," + ""  // @in1 - 入库时间（扩展用）
            + "," + ""  // @in2 - 特采（扩展用）
            + "," + ""  // @in3 - 供应商id（扩展用）
            + "," + ""  // @in4 - 张数（扩展用）
            + "," + ""  // @in5 - 数量（扩展用）
            + "," + ""  // @in6 - 扩展用
            + "}";
            this.toolBarMenu1.rptParameter = rptParameter;
            this.toolBarMenu1.guidKey = rowGuid;
        }

        /// <summary>
        ///     审核事件
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs

@@ -40,6 +40,7 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
            this.toolBarMenu1.getXmlConfig();
            Form parentForm = this.FindForm();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
@@ -154,6 +155,72 @@
            getPageList(1);
        }

        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_blNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                this.toolBarMenu1.rptParameter = "return false";
                MsgHelper.Warning("请先选择你要打印的单据！");
                return;
            }

            var dr = gridView1.GetFocusedDataRow();
            string ordertype = txt_bl017.Text.Trim();

            // 判断哪个不为空就赋值给 ordertype
            if (!string.IsNullOrEmpty(txt_bl017.Text.Trim()))
            {
                ordertype = txt_bl017.Text.Trim();
            }
            else if (!string.IsNullOrEmpty(dr["bl009"].ToString()))
            {
                ordertype = dr["bl009"].ToString();
            }

            // 如果两个都为空，则提示错误
            if (string.IsNullOrEmpty(ordertype))
            {
                this.toolBarMenu1.rptParameter = "return false";
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择单据类型！");
                txt_bl017.Focus();
                return;
            }
 
            if (ordertype == "委外补料")
            {
                string rptParameter = "rpt_wwblsqd{"
              + rowGuid  // @inOrderGuid - 单据guid
              + "," + "100"  // @isDesign - 重打都是传100
              + "," + ""  // @in1 - 入库时间（扩展用）
              + "," + ""  // @in2 - 特采（扩展用）
              + "," + ""  // @in3 - 供应商id（扩展用）
              + "," + ""  // @in4 - 张数（扩展用）
              + "," + ""  // @in5 - 数量（扩展用）
              + "," + ""  // @in6 - 扩展用
              + "}";
                this.toolBarMenu1.rptParameter = rptParameter;
                this.toolBarMenu1.guidKey = rowGuid;
            }
            else
            {
                string rptParameter = "rpt_wwclsqd{"
              + rowGuid  // @inOrderGuid - 单据guid
              + "," + "100"  // @isDesign - 重打都是传100
              + "," + ""  // @in1 - 入库时间（扩展用）
              + "," + ""  // @in2 - 特采（扩展用）
              + "," + ""  // @in3 - 供应商id（扩展用）
              + "," + ""  // @in4 - 张数（扩展用）
              + "," + ""  // @in5 - 数量（扩展用）
              + "," + ""  // @in6 - 扩展用
              + "}";
                this.toolBarMenu1.rptParameter = rptParameter;
                this.toolBarMenu1.guidKey = rowGuid;
            }
           
        }

        /// <summary>
        /// 取消事件
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs

@@ -34,6 +34,7 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
            this.toolBarMenu1.getXmlConfig();
            Form parentForm = this.FindForm();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
@@ -112,6 +113,71 @@
            _filterList = e.FilterList;
            getPageList(1);
        }

        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                this.toolBarMenu1.rptParameter = "return false";
                MsgHelper.Warning("请先选择你要打印的单据！");
                return;
            }
            var dr = gridView1.GetFocusedDataRow();
            string ordertype = txt_itemOutNo.Text.Trim();

            // 判断哪个不为空就赋值给 ordertype
            if (!string.IsNullOrEmpty(txt_outType.Text.Trim()))
            {
                ordertype = txt_outType.Text.Trim();
            }
            else if (!string.IsNullOrEmpty(dr["outType"].ToString()))
            {
                ordertype = dr["outType"].ToString();
            }

            // 如果两个都为空，则提示错误
            if (string.IsNullOrEmpty(ordertype))
            {
                this.toolBarMenu1.rptParameter = "return false";
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择单据类型！");
                txt_outType.Focus();
                return;
            }

            if (ordertype == "委外补料")
            {
                string rptParameter = "rpt_wwbld{"
              + rowGuid  // @inOrderGuid - 单据guid
              + "," + "100"  // @isDesign - 重打都是传100
              + "," + ""  // @in1 - 入库时间（扩展用）
              + "," + ""  // @in2 - 特采（扩展用）
              + "," + ""  // @in3 - 供应商id（扩展用）
              + "," + ""  // @in4 - 张数（扩展用）
              + "," + ""  // @in5 - 数量（扩展用）
              + "," + ""  // @in6 - 扩展用
              + "}";
                this.toolBarMenu1.rptParameter = rptParameter;
                this.toolBarMenu1.guidKey = rowGuid;
            }
            else
            {
                string rptParameter = "rpt_wwcld{"
              + rowGuid  // @inOrderGuid - 单据guid
              + "," + "100"  // @isDesign - 重打都是传100
              + "," + ""  // @in1 - 入库时间（扩展用）
              + "," + ""  // @in2 - 特采（扩展用）
              + "," + ""  // @in3 - 供应商id（扩展用）
              + "," + ""  // @in4 - 张数（扩展用）
              + "," + ""  // @in5 - 数量（扩展用）
              + "," + ""  // @in6 - 扩展用
              + "}";
                this.toolBarMenu1.rptParameter = rptParameter;
                this.toolBarMenu1.guidKey = rowGuid;
            }
        }

        /// <summary>
        ///     审核事件
        /// </summary>

			@@ -24,6 +24,7 @@
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			this.toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			@@ -97,6 +98,31 @@
			lbGuid, txt_itemOutNo, gridView1);
			toolBarMenu1.guidKey = rowGuid;
			}

			private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
			{
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1);
			if (string.IsNullOrEmpty(rowGuid))
			{
			this.toolBarMenu1.rptParameter = "return false";
			MsgHelper.Warning("请先选择你要打印的单据！");
			return;
			}
			string rptParameter = "rpt_wwlld{"
			+ rowGuid // @inOrderGuid - 单据guid
			+ "," + "100" // @isDesign - 重打都是传100
			+ "," + "" // @in1 - 入库时间（扩展用）
			+ "," + "" // @in2 - 特采（扩展用）
			+ "," + "" // @in3 - 供应商id（扩展用）
			+ "," + "" // @in4 - 张数（扩展用）
			+ "," + "" // @in5 - 数量（扩展用）
			+ "," + "" // @in6 - 扩展用
			+ "}";
			this.toolBarMenu1.rptParameter = rptParameter;
			this.toolBarMenu1.guidKey = rowGuid;
			}

			/// <summary>
			/// 审核事件
			/// </summary>

			@@ -30,6 +30,7 @@
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			this.toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			@@ -227,6 +228,30 @@
			getPageList(1);
			}

			private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
			{
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
			if (string.IsNullOrEmpty(rowGuid))
			{
			this.toolBarMenu1.rptParameter = "return false";
			MsgHelper.Warning("请先选择你要打印的单据！");
			return;
			}
			string rptParameter = "rpt_wwtlsqd{"
			+ rowGuid // @inOrderGuid - 单据guid
			+ "," + "100" // @isDesign - 重打都是传100
			+ "," + "" // @in1 - 入库时间（扩展用）
			+ "," + "" // @in2 - 特采（扩展用）
			+ "," + "" // @in3 - 供应商id（扩展用）
			+ "," + "" // @in4 - 张数（扩展用）
			+ "," + "" // @in5 - 数量（扩展用）
			+ "," + "" // @in6 - 扩展用
			+ "}";
			this.toolBarMenu1.rptParameter = rptParameter;
			this.toolBarMenu1.guidKey = rowGuid;
			}

			/// <summary>
			/// 审核事件
			/// </summary>

			@@ -40,6 +40,7 @@
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			this.toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
			this.toolBarMenu1.getXmlConfig();
			Form parentForm = this.FindForm();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			@@ -154,6 +155,72 @@
			getPageList(1);
			}

			private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
			{
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_blNo, gridView1);
			if (string.IsNullOrEmpty(rowGuid))
			{
			this.toolBarMenu1.rptParameter = "return false";
			MsgHelper.Warning("请先选择你要打印的单据！");
			return;
			}

			var dr = gridView1.GetFocusedDataRow();
			string ordertype = txt_bl017.Text.Trim();

			// 判断哪个不为空就赋值给 ordertype
			if (!string.IsNullOrEmpty(txt_bl017.Text.Trim()))
			{
			ordertype = txt_bl017.Text.Trim();
			}
			else if (!string.IsNullOrEmpty(dr["bl009"].ToString()))
			{
			ordertype = dr["bl009"].ToString();
			}

			// 如果两个都为空，则提示错误
			if (string.IsNullOrEmpty(ordertype))
			{
			this.toolBarMenu1.rptParameter = "return false";
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择单据类型！");
			txt_bl017.Focus();
			return;
			}

			if (ordertype == "委外补料")
			{
			string rptParameter = "rpt_wwblsqd{"
			+ rowGuid // @inOrderGuid - 单据guid
			+ "," + "100" // @isDesign - 重打都是传100
			+ "," + "" // @in1 - 入库时间（扩展用）
			+ "," + "" // @in2 - 特采（扩展用）
			+ "," + "" // @in3 - 供应商id（扩展用）
			+ "," + "" // @in4 - 张数（扩展用）
			+ "," + "" // @in5 - 数量（扩展用）
			+ "," + "" // @in6 - 扩展用
			+ "}";
			this.toolBarMenu1.rptParameter = rptParameter;
			this.toolBarMenu1.guidKey = rowGuid;
			}
			else
			{
			string rptParameter = "rpt_wwclsqd{"
			+ rowGuid // @inOrderGuid - 单据guid
			+ "," + "100" // @isDesign - 重打都是传100
			+ "," + "" // @in1 - 入库时间（扩展用）
			+ "," + "" // @in2 - 特采（扩展用）
			+ "," + "" // @in3 - 供应商id（扩展用）
			+ "," + "" // @in4 - 张数（扩展用）
			+ "," + "" // @in5 - 数量（扩展用）
			+ "," + "" // @in6 - 扩展用
			+ "}";
			this.toolBarMenu1.rptParameter = rptParameter;
			this.toolBarMenu1.guidKey = rowGuid;
			}

			}

			/// <summary>
			/// 取消事件
			/// </summary>

			@@ -34,6 +34,7 @@
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
			this.toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
			this.toolBarMenu1.getXmlConfig();
			Form parentForm = this.FindForm();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			@@ -112,6 +113,71 @@
			_filterList = e.FilterList;
			getPageList(1);
			}

			private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
			{
			string rowGuid, rowName;
			(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1);
			if (string.IsNullOrEmpty(rowGuid))
			{
			this.toolBarMenu1.rptParameter = "return false";
			MsgHelper.Warning("请先选择你要打印的单据！");
			return;
			}
			var dr = gridView1.GetFocusedDataRow();
			string ordertype = txt_itemOutNo.Text.Trim();

			// 判断哪个不为空就赋值给 ordertype
			if (!string.IsNullOrEmpty(txt_outType.Text.Trim()))
			{
			ordertype = txt_outType.Text.Trim();
			}
			else if (!string.IsNullOrEmpty(dr["outType"].ToString()))
			{
			ordertype = dr["outType"].ToString();
			}

			// 如果两个都为空，则提示错误
			if (string.IsNullOrEmpty(ordertype))
			{
			this.toolBarMenu1.rptParameter = "return false";
			Gs.DevApp.ToolBox.MsgHelper.Warning("请选择单据类型！");
			txt_outType.Focus();
			return;
			}

			if (ordertype == "委外补料")
			{
			string rptParameter = "rpt_wwbld{"
			+ rowGuid // @inOrderGuid - 单据guid
			+ "," + "100" // @isDesign - 重打都是传100
			+ "," + "" // @in1 - 入库时间（扩展用）
			+ "," + "" // @in2 - 特采（扩展用）
			+ "," + "" // @in3 - 供应商id（扩展用）
			+ "," + "" // @in4 - 张数（扩展用）
			+ "," + "" // @in5 - 数量（扩展用）
			+ "," + "" // @in6 - 扩展用
			+ "}";
			this.toolBarMenu1.rptParameter = rptParameter;
			this.toolBarMenu1.guidKey = rowGuid;
			}
			else
			{
			string rptParameter = "rpt_wwcld{"
			+ rowGuid // @inOrderGuid - 单据guid
			+ "," + "100" // @isDesign - 重打都是传100
			+ "," + "" // @in1 - 入库时间（扩展用）
			+ "," + "" // @in2 - 特采（扩展用）
			+ "," + "" // @in3 - 供应商id（扩展用）
			+ "," + "" // @in4 - 张数（扩展用）
			+ "," + "" // @in5 - 数量（扩展用）
			+ "," + "" // @in6 - 扩展用
			+ "}";
			this.toolBarMenu1.rptParameter = rptParameter;
			this.toolBarMenu1.guidKey = rowGuid;
			}
			}

			/// <summary>
			/// 审核事件
			/// </summary>