lu
2024-11-22 ef4f463dc38d0934c2fce5d0eded7844a3726ca4
采购到货
已修改4个文件
114 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs 91 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -451,7 +451,7 @@
                    _obj.list.Add(new MesInvItemArnDetail
                    {
                        Guid = _guid,
                        AboutGuid = Guid.Parse(row["aboutGuid"].ToString()),
                        AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
                        ItemId = int.Parse(row["itemId"].ToString()),
                        Quantity = decimal.Parse(row["quantity"].ToString())
                    });
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs
@@ -29,11 +29,11 @@
        /// </summary>
        private void InitializeComponent()
        {
            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();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            this.gvMx2itemOutId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -48,6 +48,8 @@
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -118,8 +120,6 @@
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
            this.txt_checkUserFname = new DevExpress.XtraEditors.TextEdit();
            this.lbGuid = new System.Windows.Forms.Label();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -169,7 +169,7 @@
            this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
            this.gvMx2tlQty.Tag = "query_a.tl_qty";
            this.gvMx2tlQty.Visible = true;
            this.gvMx2tlQty.VisibleIndex = 10;
            this.gvMx2tlQty.VisibleIndex = 8;
            this.gvMx2tlQty.Width = 94;
            // 
            // gvMx2pbillNo
@@ -183,7 +183,7 @@
            this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
            this.gvMx2pbillNo.Tag = "query_a.pbill_no";
            this.gvMx2pbillNo.Visible = true;
            this.gvMx2pbillNo.VisibleIndex = 3;
            this.gvMx2pbillNo.VisibleIndex = 1;
            this.gvMx2pbillNo.Width = 94;
            // 
            // gvMx2status
@@ -197,7 +197,7 @@
            this.gvMx2status.OptionsColumn.ReadOnly = true;
            this.gvMx2status.Tag = "query_a.status";
            this.gvMx2status.Visible = true;
            this.gvMx2status.VisibleIndex = 2;
            this.gvMx2status.VisibleIndex = 0;
            this.gvMx2status.Width = 94;
            // 
            // gvMx2lineK3id
@@ -211,7 +211,7 @@
            this.gvMx2lineK3id.OptionsColumn.ReadOnly = true;
            this.gvMx2lineK3id.Tag = "query_a.line_k3id";
            this.gvMx2lineK3id.Visible = true;
            this.gvMx2lineK3id.VisibleIndex = 14;
            this.gvMx2lineK3id.VisibleIndex = 12;
            this.gvMx2lineK3id.Width = 94;
            // 
            // gvMx2ebelnK3id
@@ -225,7 +225,7 @@
            this.gvMx2ebelnK3id.OptionsColumn.ReadOnly = true;
            this.gvMx2ebelnK3id.Tag = "query_a.ebeln_k3id";
            this.gvMx2ebelnK3id.Visible = true;
            this.gvMx2ebelnK3id.VisibleIndex = 13;
            this.gvMx2ebelnK3id.VisibleIndex = 11;
            this.gvMx2ebelnK3id.Width = 94;
            // 
            // gvMx2workLine
@@ -239,7 +239,7 @@
            this.gvMx2workLine.OptionsColumn.ReadOnly = true;
            this.gvMx2workLine.Tag = "query_a.work_line";
            this.gvMx2workLine.Visible = true;
            this.gvMx2workLine.VisibleIndex = 4;
            this.gvMx2workLine.VisibleIndex = 2;
            this.gvMx2workLine.Width = 94;
            // 
            // gvMx2depotCode
@@ -253,7 +253,7 @@
            this.gvMx2depotCode.OptionsColumn.ReadOnly = true;
            this.gvMx2depotCode.Tag = "query_a.depot_code";
            this.gvMx2depotCode.Visible = true;
            this.gvMx2depotCode.VisibleIndex = 11;
            this.gvMx2depotCode.VisibleIndex = 9;
            this.gvMx2depotCode.Width = 94;
            // 
            // gvMx2remark
@@ -267,7 +267,7 @@
            this.gvMx2remark.OptionsColumn.ReadOnly = true;
            this.gvMx2remark.Tag = "query_a.remark";
            this.gvMx2remark.Visible = true;
            this.gvMx2remark.VisibleIndex = 12;
            this.gvMx2remark.VisibleIndex = 10;
            this.gvMx2remark.Width = 94;
            // 
            // gvMx2quantity
@@ -284,7 +284,7 @@
            this.gvMx2quantity.Name = "gvMx2quantity";
            this.gvMx2quantity.Tag = "query_a.quantity";
            this.gvMx2quantity.Visible = true;
            this.gvMx2quantity.VisibleIndex = 9;
            this.gvMx2quantity.VisibleIndex = 7;
            this.gvMx2quantity.Width = 94;
            // 
            // gvMx2itemNo
@@ -298,7 +298,7 @@
            this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
            this.gvMx2itemNo.Tag = "query_a.item_no";
            this.gvMx2itemNo.Visible = true;
            this.gvMx2itemNo.VisibleIndex = 5;
            this.gvMx2itemNo.VisibleIndex = 3;
            this.gvMx2itemNo.Width = 94;
            // 
            // tabMxPage2
@@ -347,6 +347,24 @@
            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx2.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn12
            //
            this.gridColumn12.Caption = "guid";
            this.gridColumn12.FieldName = "guid";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.OptionsColumn.ReadOnly = true;
            this.gridColumn12.Width = 94;
            //
            // gridColumn11
            //
            this.gridColumn11.Caption = "aboutGuid";
            this.gridColumn11.FieldName = "aboutGuid";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.OptionsColumn.ReadOnly = true;
            this.gridColumn11.Width = 94;
            //
            // gridColumn5
            // 
            this.gridColumn5.Caption = "物料名称";
@@ -355,7 +373,7 @@
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 6;
            this.gridColumn5.VisibleIndex = 4;
            this.gridColumn5.Width = 94;
            // 
            // gridColumn6
@@ -366,7 +384,7 @@
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 7;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 94;
            // 
            // gridColumn7
@@ -377,7 +395,7 @@
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 8;
            this.gridColumn7.VisibleIndex = 6;
            this.gridColumn7.Width = 94;
            // 
            // gvMxDel
@@ -387,16 +405,16 @@
            this.gvMxDel.MinWidth = 25;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 15;
            this.gvMxDel.VisibleIndex = 13;
            this.gvMxDel.Width = 94;
            // 
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.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)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -716,6 +734,7 @@
            // 
            // txt_itemOutNo
            // 
            this.txt_itemOutNo.Enabled = false;
            this.txt_itemOutNo.Location = new System.Drawing.Point(94, 15);
            this.txt_itemOutNo.Name = "txt_itemOutNo";
            this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1147,7 +1166,7 @@
            // 
            // txt_suppId
            // 
            this.txt_suppId.IsReadly = false;
            this.txt_suppId.IsReadly = true;
            this.txt_suppId.KeyFile = "id";
            this.txt_suppId.Location = new System.Drawing.Point(94, 50);
            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
@@ -1157,7 +1176,7 @@
            // 
            // txt_depotId
            // 
            this.txt_depotId.IsReadly = false;
            this.txt_depotId.IsReadly = true;
            this.txt_depotId.KeyFile = "depotId";
            this.txt_depotId.Location = new System.Drawing.Point(94, 88);
            this.txt_depotId.Margin = new System.Windows.Forms.Padding(0);
@@ -1192,26 +1211,6 @@
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            //
            // gridColumn11
            //
            this.gridColumn11.Caption = "aboutGuid";
            this.gridColumn11.FieldName = "aboutGuid";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 1;
            this.gridColumn11.Width = 94;
            //
            // gridColumn12
            //
            this.gridColumn12.Caption = "guid";
            this.gridColumn12.FieldName = "guid";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 0;
            this.gridColumn12.Width = 94;
            // 
            // Frm_MesInvItemOuts
            // 
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs
@@ -175,7 +175,7 @@
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
@@ -223,7 +223,7 @@
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
@@ -303,7 +303,7 @@
                    _obj.MesInvItemOutItemsList.Add(new MesInvItemOutItems
                    {
                        Guid = _guid,
                        AboutGuid = row["aboutGuid"].ToString(),//
                        AboutGuid = UtilityHelper.ToGuid(row["aboutGuid"].ToString()),//
                        Quantity = decimal.Parse(row["quantity"].ToString())
                    });
                }
@@ -391,6 +391,7 @@
                    lbGuid.Text = strGuid;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
                    gvList.Add(gvMx2);
                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
@@ -438,20 +439,20 @@
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();
            var rowhandle = gvMx1.FocusedRowHandle;
            gvMx2.CloseEditor();
            gvMx2.UpdateCurrentRow();
            var rowhandle = gvMx2.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gvMx1.GetDataRow(rowhandle);
                var dr = gvMx2.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据,确定删除吗?"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
                {
                    gvMx1.DeleteRow(rowhandle);
                    gvMx2.DeleteRow(rowhandle);
                    return;
                }
                var strJson = "";
@@ -460,7 +461,7 @@
                try
                {
                    strJson = UtilityHelper.HttpPost("",
                        _webServiceName + "DeleteModelMx",
                        _webServiceName + "DeleteModelMx2",
                        JsonConvert.SerializeObject(lst));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs
@@ -167,6 +167,6 @@
        /// <summary>
        /// RK_LINE
        /// </summary>
        public string AboutGuid { get; set; }
        public Guid AboutGuid { get; set; }
    }
}