lu
2025-05-26 9f9f3248b65a78d3d15dbbf0f57dd93e01f64396
工单
已修改2个文件
62 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs 61 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -27,7 +27,7 @@
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            this.toolBarMenu1.btnZhongTaiClick += ToolBarMenu1_btnZhongTaiClick;
            this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
           // this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
            // this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
            this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
@@ -61,7 +61,7 @@
            };
            txt_psnQty_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut,txt_yuliang_1);
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
            };
            radOut.SelectedIndexChanged += (s, e) =>
            {
@@ -84,6 +84,35 @@
            this.ucBtnPrint100.btnReportClick += (s, e) =>
            {
                _print100();
            };
            //导入模板
            this.btnIn.Click += (s, e) =>
            {
                //这是一个随机值,将会被当作父亲guid存到file表中,服务端根据这个guid读取相应的文件
                string upGuid = Guid.NewGuid().ToString();
                string strService = "XlsInDaaHgm";
                Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(upGuid);
                frm.UpdateParent += (ss, ee) =>
                {
                    var _obj = new
                    {
                        tmpGuid = upGuid,
                        strType = "",
                    };
                    try
                    {
                        string strJson = UtilityHelper.HttpPost("",
                              "XlsInOut/" + strService,
                              JsonConvert.SerializeObject(_obj));
                        var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                        MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    }
                    catch (Exception ex)
                    {
                        MsgHelper.Warning("提示:" + ex.Message);
                    }
                };
                frm.ShowDialog();
            };
        }
@@ -222,7 +251,7 @@
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        private void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
        {
            _toolCk(7);
@@ -442,6 +471,11 @@
                    txt_zQty98.Text = dy.daa008;
                    txt_yQty98.Text = dy.yQty98;
                    txt_kQty98.Text = dy.kQty98;
                    //后盖码
                    txt_zQty100.Text = dy.daa008;
                    txt_yQty100.Text = dy.yQty100;
                    txt_kQty100.Text = dy.kQty100;
                    lbGuid.Text = strGuid;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
@@ -520,7 +554,7 @@
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx4, gvMx4);
                    }
                    txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text="";
                    txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
@@ -648,7 +682,7 @@
            this.ucBtnPrint1.rptParameter = "rpt_daa{"
                  + txt_printRemark.Text.Trim()
                   + "," + ""
                   + "," +  Gs.DevApp.ToolBox.UtilityHelper.ToDecimal( txt_yuliang_1.Text.Trim())
                   + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
                   + "," + txt_iCount_1.Text.Trim()
                   + "," + txt_psnQty_1.Text.Trim()
                   + "}";
@@ -686,7 +720,7 @@
        }
        /// <summary>
        /// 这是后盖码,仅仅打印,
        /// 这是后盖码
        /// </summary>
        private void _print100()
        {
@@ -700,12 +734,19 @@
                this.ucBtnPrint100.rptParameter = "return false";
                return;
            }
            this.ucBtnPrint100.rptParameter = "rpt_hgm{"
                  + "100"
            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_100.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请输入正确的条码数量!");
                txt_iCount_100.Focus();
                this.ucBtnPrint100.rptParameter = "return false";
                return;
            }
            this.ucBtnPrint100.rptParameter = "rpt_trace{"
                   + ""
                   + "," + ""
                   + "," + ""
                   + "," + ""
                   + "," + ""
                   + "," + txt_iCount_100.Text.Trim()
                   + "," + 1
                   + "}";
        }
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1981,6 +1981,7 @@
    <None Include="Resources\media_16x16.png" />
    <None Include="Resources\chartselectdata_16x16.png" />
    <None Include="Resources\copy_16x16.png" />
    <None Include="Resources\exporttoxls_16x16.png" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />