bug

lu

4 天以前 8f01d83e693ee01e8013ac77874ecd3fa385be16

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs

@@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Threading.Tasks;
using System.Windows.Forms;

@@ -20,6 +21,7 @@
        string _ucBm = "";//领料部门
        string _ucHzlx = "";//货主类型
        string _ucHz = "";//货主
        string _ucGys = "";//供应商
        public Frm_MesItemQt()
        {
            InitializeComponent();
@@ -73,6 +75,8 @@
                    var rtn = UtilityHelper.ReturnToTablePage(strReturn);
                    var dt = rtn.rtnData.list;
                    this.repositoryItemSearchLookUpEdit1.DataSource = dt;
                    // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
                    //repositoryItemSearchLookUpEdit1.PopupFormSize = new System.Drawing.Size(500, 300);
                }
                catch (Exception ex)
                {
@@ -87,6 +91,7 @@
                    return;
                txt_qt013.getSuppler(_orgId, _ucKh);
                txt_qt009.getSuppler(_orgId, _ucBm);
                txt_wwgys.getSuppler(_orgId, _ucGys);
            };
            //选择来源单号
            txt_qt035.ButtonClick += (s, e) =>
@@ -102,6 +107,80 @@
                };
                frm.ShowDialog();
            };

            #region 2025-08-27 复制beg
            btnCopyXls.Click += (s, e) =>
            {
                string kcZz = txt_qt023.GetId();
                if (string.IsNullOrEmpty(kcZz))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择库存组织后才能使用复制功能！");
                    txt_qt023.Focus();
                    return;
                }
                string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
                if (File.Exists(filePath))
                {
                    var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.其它出库.ToString());
                    frm.UpdateParent += (ss, ee) =>
                    {
                        try
                        {
                            var lst = ee.DynamicList;
                            DataTable _Table = (DataTable)gcMx1.DataSource;
                            foreach (dynamic dym in lst)
                            {
                                DataRow _row = _Table.NewRow();
                                _row["qd002"] = dym.itemNo;
                                _row["qd003"] = dym.itemName;
                                _row["qd004"] = dym.itemModel;
                                _row["qd009dw"] = dym.dwName;
                                _row["itemId"] = dym.itemId;
                                _row["qd007"] = dym.sl;
                                _row["qd010"] = dym.bz;
                                //默认仓库和仓库数量
                                _row["depotName"] = dym.depotName;
                                _row["depotId"] = dym.depotId;
                                _row["kcQty"] = dym.kcQty;
                                _Table.Rows.Add(_row);
                            }
                            gcMx1.BindingContext = new BindingContext();
                            gcMx1.DataSource = _Table;
                            gcMx1.ForceInitialize();
                            gvMx1.CloseEditor();
                            gvMx1.PostEditor();
                            gvMx1.UpdateCurrentRow();
                            gvMx1.BestFitColumns();
                        }
                        catch (Exception ex)
                        {
                            Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
                        }
                    };
                    frm.ShowDialog();
                }
                else
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("找不到xlsCopy.xls文件，请联系管理员！");
                }
            };
            #endregion

            #region 2025-08-27 增加委外供应商
            txt_qtlx.SelectedIndexChanged += (s, e) =>
            {
                int idx = txt_qtlx.SelectedIndex;
                if (idx == 7)
                {
                    layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
                }
                else
                {
                    layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                    txt_wwgys.SetIdOrCode("");
                }
            };
            #endregion
        }

        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -300,6 +379,8 @@
            string inLyCus = txt_qt013.GetId();//领用客户
            string inLyDepart = txt_qt009.GetId();//领用部门
            string inKcfx = txt_qt020.Text.Trim();//库存方向
            string qtlx = txt_qtlx.Text.Trim();//后来增加的类型
            string wwgys = txt_wwgys.GetId();
            if (string.IsNullOrEmpty(inOrgId))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择库存组织！");
@@ -316,29 +397,46 @@
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择货主！");
                return;
            }
            //if (txt_qt019.SelectedIndex <= 0)
            //{
            //    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择单据类型！");
            //    txt_qt019.Focus();
            //    return;
            //}
            if (string.IsNullOrEmpty(inLyOrg))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择领用组织！");
                txt_qt024.Focus();
                return;
            }
            if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
            if (txt_qtlx.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("客户或部门必选一个！");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择出库类型！");
                txt_qtlx.Focus();
                return;
            }
            //if (txt_qt020.SelectedIndex <= 0)
            //{
            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择库存方向！");
            //    txt_qt020.Focus();
            //    return;
            //}
            //这是非委外的防呆
            if (txt_qtlx.SelectedIndex != 7)
            {
                if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("客户或部门必选一个！");
                    return;
                }
                if (!string.IsNullOrEmpty(wwgys))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("出库类型不为【7:无源单委外退料】,请不要选择委外供应商！");
                    return;
                }
            }
            //这是委外的防呆
            if (txt_qtlx.SelectedIndex == 7)
            {
                if (string.IsNullOrEmpty(wwgys))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("出库类型为【7:无源单委外退料】,请选择委外供应商！");
                    return;
                }
                if (!string.IsNullOrEmpty(inLyCus))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("出库类型为【7:无源单委外退料】,不用选择客户！");
                    return;
                }
            }
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
@@ -352,6 +450,8 @@
                inLyDepart = inLyDepart,//领用部门
                inKcfx = inKcfx,//库存方向
                inSource = txt_qt035.EditValue,//工单号
                qtlx = qtlx,
                wwgys = wwgys,
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();
@@ -394,7 +494,6 @@
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);

                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
@@ -444,7 +543,8 @@
                    {
                        gcMain1.DataSource = dt;
                        gcMain1.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                        gridView1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -494,6 +594,7 @@
                    _ucBm = dy.qt009;
                    _ucHzlx = dy.qt025;
                    _ucHz = dy.qt018;
                    _ucGys = dy.wwgys;//委外供应商
                    lbGuid.Text = strGuid;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
@@ -502,6 +603,7 @@
                    _ucBm = "";
                    _ucHzlx = "";
                    _ucHz = "";
                    _ucGys = "";
                    ucLookHuoZhu1.Enabled = isEdit;
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
@@ -689,7 +791,7 @@
                        int rowHandle = gridView1.LocateByValue("guid", rowGuid);
                        gridView1.FocusedRowHandle = rowHandle;
                    }
                   

                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
@@ -706,12 +808,18 @@
            gvMx1.SetFocusedRowCellValue("qd002", SelectedDataRow["itemNo"]);
            gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]);
            gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
            gvMx1.SetFocusedRowCellValue("qd009", SelectedDataRow["dwName"]);
            gvMx1.SetFocusedRowCellValue("qd009dw", SelectedDataRow["dwName"]);
            gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]);

            gvMx1.SetFocusedRowCellValue("depotName", SelectedDataRow["depotName"]);
            gvMx1.SetFocusedRowCellValue("depotId", SelectedDataRow["depotId"]);
            gvMx1.SetFocusedRowCellValue("kcQty", SelectedDataRow["kcQty"]);

            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();

            gvMx1.BestFitColumns();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
        }
        /// <summary>
        /// 删除明细
@@ -769,20 +877,29 @@
            var rowhandle = gvMx1.FocusedRowHandle;
            if (rowhandle < 0)
                return;

            var dr = gvMx1.GetDataRow(rowhandle);
            var strItemId = dr["itemId"].ToString();
            if (string.IsNullOrEmpty(strItemId))
            {
                MsgHelper.ShowError("提示：请先选择物料！");
                return;
            }
            var strOrgGuid = txt_qt023.GetId();
            if (string.IsNullOrEmpty(strOrgGuid))
            {
                MsgHelper.ShowError("提示：请先选择库存组织！");
                return;
            }
            ;
            SelectCk frm = new SelectCk(strOrgGuid);
            SelectCk frm = new SelectCk(strOrgGuid, strItemId);
            frm.UpdateParent += (ss, ee) =>
            {
                var lst = new List<dynamic>();
                lst = ee.DynamicList;
                gvMx1.SetFocusedRowCellValue("depotName", lst[0].name);
                gvMx1.SetFocusedRowCellValue("depotId", lst[0].guid);
                gvMx1.SetFocusedRowCellValue("kcQty", lst[0].kcQty);
                gvMx1.BestFitColumns();
            };
            frm.ShowDialog();
        }