bug

lu

2025-06-20 98e93a53c3407b9785eba27faec13fe7afc1255b

bug

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
namespace Gs.DevApp.DevFrm.RkQC
{
    partial class Frm_Cqfa
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Text = "Frm_Cqfa";
        }

        #endregion
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using DevExpress.XtraEditors;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm.RkQC
{
    public partial class Frm_Cqfa : DevExpress.XtraEditors.XtraForm
    {
        public Frm_Cqfa()
        {
            InitializeComponent();
        }
    }
}

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs

@@ -52,11 +52,6 @@
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -176,8 +171,6 @@
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -268,7 +261,6 @@
            this.xtraTabPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
            // 
@@ -964,6 +956,7 @@
            // 
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.allClickKey = null;
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
@@ -974,7 +967,7 @@
            // 
            // radOut
            // 
            this.radOut.Location = new System.Drawing.Point(1033, 10);
            this.radOut.Location = new System.Drawing.Point(1030, 10);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -982,7 +975,8 @@
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "全打"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "只打整张"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动打")});
            this.radOut.Size = new System.Drawing.Size(227, 28);
            this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
            this.radOut.Size = new System.Drawing.Size(340, 32);
            this.radOut.StyleController = this.layout99;
            this.radOut.TabIndex = 476;
            // 
@@ -1285,13 +1279,10 @@
            // 
            this.layoutControlItem24.Control = this.radOut;
            this.layoutControlItem24.Location = new System.Drawing.Point(1020, 0);
            this.layoutControlItem24.MaxSize = new System.Drawing.Size(230, 28);
            this.layoutControlItem24.MinSize = new System.Drawing.Size(230, 28);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem24.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
            this.layoutControlItem24.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlItem24.Size = new System.Drawing.Size(340, 32);
            this.layoutControlItem24.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem24.Text = "计算方式";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem24.TextVisible = false;
@@ -1608,8 +1599,6 @@
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.rptChongDa});
            this.gcMx2.Size = new System.Drawing.Size(1165, 422);
            this.gcMx2.TabIndex = 2;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1626,8 +1615,7 @@
            this.gvMx1quantity,
            this.gridColumn6,
            this.gvMx1createBy,
            this.gvMx1lotDate,
            this.gvBtnAlawys});
            this.gvMx1lotDate});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1731,27 +1719,6 @@
            this.gvMx1lotDate.Visible = true;
            this.gvMx1lotDate.VisibleIndex = 7;
            this.gvMx1lotDate.Width = 94;
            // 
            // gvBtnAlawys
            // 
            this.gvBtnAlawys.Caption = "重打";
            this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
            this.gvBtnAlawys.MinWidth = 25;
            this.gvBtnAlawys.Name = "gvBtnAlawys";
            this.gvBtnAlawys.Visible = true;
            this.gvBtnAlawys.VisibleIndex = 8;
            this.gvBtnAlawys.Width = 94;
            // 
            // rptChongDa
            // 
            this.rptChongDa.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "重打", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.rptChongDa.Name = "rptChongDa";
            this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
            // 
            // picCheckBox
            // 
@@ -1862,7 +1829,6 @@
            this.xtraTabPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);

@@ -1947,8 +1913,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa;
        private DevExpress.XtraEditors.TextEdit txt_createBy;
        private DevExpress.XtraEditors.TextEdit txt_createDate;
        private UserControl.UcLookCustomer txt_fCustId;

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs

@@ -1,4 +1,5 @@
using DevExpress.XtraEditors;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -104,6 +105,45 @@
                       + "," + txt_iCount_1.Text.Trim()
                       + "," + txt_psnQty_1.Text.Trim()
                       + "}";
            };
            this.ucBtnPrint1.btnAllClick += (s, e) =>
            {
                string rowGuid = lbMxGuid.Text.Trim();
                if (rowGuid.Length < 10)
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印的行！");
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "受托入库");
                string strCodeList = "";
                frm.UpdateParent += (ss, ee) =>
                {
                    strCodeList = ee.StringSingle;
                };
                frm.ShowDialog();
                if (string.IsNullOrEmpty(strCodeList))
                    return;
                try
                {
                    string rptParameter = "rpt_Strk{"
                    + "100"
                    + "," + ""
                    + "," + ""
                    + "," + ""
                    + "," + ""
                    + "," + strCodeList
                    + "}";
                    using (Form rpt = new RptPreview(rowGuid, rptParameter))
                    {
                        rpt.ShowDialog();
                    }
                    frm.Close();
                }
                catch (Exception ex)
                {
                    MsgHelper.ShowError(ex.Message);
                }
            };
            //自动计算打印量
            txt_psnQty_1.TextChanged += (s, e) =>
@@ -657,47 +697,6 @@
                txt_kQty.Text = "";
                txt_psnQty_1.Text = "";
                txt_iCount_1.Text = "";
            }
        }
        /// <summary>
        /// é‡æ‰“条码
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            MsgHelper.ShowInformation("功能开发中！");
            return;
            var rowhandle = gvMx2.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gvMx2.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
                    return;
                var _obj = new
                {
                    mxGuid = mxGuid,
                    inType = "dhtm"
                };
                try
                {
                    var strJson = UtilityHelper.HttpPost("",
                           "VArrivalBarcodeManager/DeleteBarcode",
                        JsonConvert.SerializeObject(_obj));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                    }
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                }
            }
        }
    }

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -572,6 +572,12 @@
    <Compile Include="DevFrm\RkQC\Frm_CqDetect01.Designer.cs">
      <DependentUpon>Frm_CqDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_Cqfa.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_Cqfa.Designer.cs">
      <DependentUpon>Frm_Cqfa.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_Cqsq.cs">
      <SubType>Form</SubType>
    </Compile>