Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

lu

45 分钟以前 592fbe143bda7d096d5722a88477ad1078a22742

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs

@@ -13,10 +13,10 @@
{
    public partial class Frm_MesShouTui : DevExpress.XtraEditors.XtraForm
    {
        string _webServiceName = "MesCgthSqManager/";
        string _webServiceName = "MesShouTuiManager/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        string _ucCk = "";//发料仓库
        string _ucGys = "";//供应商
        string _ucKh = "";//客户
        public Frm_MesShouTui()
        {
            InitializeComponent();
@@ -32,63 +32,82 @@
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isCheck", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            });
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
            });
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            //选择库存组织（仓库和供应商）
            txt_thOrgId.EditChanged += (s, e) =>
            txt_fStockOrgId.EditChanged += (s, e) =>
            {
                var orgId = txt_thOrgId.GetId();
                var orgId = txt_fStockOrgId.GetId();
                if (string.IsNullOrEmpty(orgId))
                    return;
                txt_suppId.getSuppler(orgId, _ucGys);
                txt_depotId.getSuppler(orgId, _ucCk);
                txt_fCustId.getSuppler(orgId, _ucKh);
                //2025-08-11加上只能是代管仓
                txt_fStockId.getSuppler(orgId, _ucCk, " and a.depot_id in(select [仓库Id] from [dbo].[仓库属性] where [是否代管良品仓]=1 )");
            };
            //选择需要的明细
            btnSelect.Click += (s, e) =>
            {
                if (string.IsNullOrEmpty(this.txt_suppId.GetId()))
                if (string.IsNullOrEmpty(this.txt_fStockOrgId.GetId()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择供应商！");
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择组织！");
                    this.txt_fStockOrgId.Focus();
                    return;
                }
                var frm = new SelectMesCgthSq(this.txt_suppId.GetId(), this.txt_thOrgId.GetId(), (txt_isOut.Checked == true ? 1 : 0).ToString());
                if (string.IsNullOrEmpty(this.txt_fCustId.GetId()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择客户！");
                    this.txt_fCustId.Focus();
                    return;
                }
                if (string.IsNullOrEmpty(this.txt_fStockId.GetId()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择仓库！");
                    this.txt_fStockId.Focus();
                    return;
                }
                var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fStockId.GetId(), txt_fHasLinkRad.SelectedIndex.ToString());
                //赋值给明细表
                frm.UpdateParent += (ss, ee) =>
                {
                    try
                    {
                        var lst = new List<string>();
                        lst = ee.StringList;
                        var _obj = lst;
                        var strReturn = UtilityHelper.HttpPost("",
                            _webServiceName + "SelectFormTo",
                            JsonConvert.SerializeObject(_obj));
                        var dt = UtilityHelper.ReturnToList(strReturn);
                        DataTable _newTable = dt.rtnData;
                        DataTable _oldTable = (DataTable)gcMx1.DataSource;
                        DataRow[] sourceRows = _newTable.Select();
                        for (int i = 0; i < sourceRows.Length; i++)
                        var lst = ee.DynamicList;
                        DataTable _Table = (DataTable)gcMx1.DataSource;
                        foreach (dynamic dym in lst)
                        {
                            _oldTable.ImportRow(sourceRows[i]);
                            DataRow _row = _Table.NewRow();
                            _row["aboutGuid"] = dym.rkmxGuid;
                            _row["rkNo"] = dym.invBillNo;
                            _row["wlbm"] = dym.itemNo;
                            _row["wlmc"] = dym.itemName;
                            _row["wlgg"] = dym.itemModel;
                            _row["dwName"] = dym.dwName;
                            _row["fQty"] = dym.kt;
                            _row["sQty"] = 0;
                            _row["itemId"] = dym.itemId;
                            _Table.Rows.Add(_row);
                        }
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = _oldTable;
                        gcMx1.DataSource = _Table;
                        gcMx1.ForceInitialize();
                        gvMx1.CloseEditor();
                        gvMx1.PostEditor();
                        gvMx1.UpdateCurrentRow();
                    }
                    catch (Exception ex)
                    {
                        MessageBox.Show(ex.Message);
                        Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
                    }
                };
                frm.ShowDialog();
@@ -132,7 +151,7 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1.Columns, _filterList);
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -188,7 +207,7 @@
                lbGuid, txt_billNo, gridView1, "billNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
@@ -206,20 +225,20 @@
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    { }
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                }

                MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                else
                MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }

        }

        /// <summary>
@@ -257,7 +276,7 @@
                lbGuid, txt_billNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -271,6 +290,10 @@
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
            //2025/07/12加上修改状态下不能修改
            txt_fStockOrgId.IsReadly = true;
            txt_fCustId.IsReadly = true;
            txt_fHasLinkRad.ReadOnly = true;
        }
        /// <summary>
        /// 新增事件
@@ -285,6 +308,9 @@
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_fStockOrgId);

        }
        /// <summary>
        /// 保存事件
@@ -294,50 +320,45 @@
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            toolBarMenu1.isSetBtn = false;
            var _ckId = txt_depotId.GetId(); //仓库编号 depots_code
            var _gysId = txt_suppId.GetId(); //供应商编号
            string _orgId = txt_thOrgId.GetId();
            var _ckId = txt_fStockId.GetId();
            var _khId = txt_fCustId.GetId();
            string _orgId = txt_fStockOrgId.GetId();
            if (string.IsNullOrEmpty(_orgId))
            {
                MsgHelper.Warning("请选择组织！");
                txt_thOrgId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_gysId))
            {
                MsgHelper.Warning("请选择供应商！");
                txt_suppId.Focus();
                MsgHelper.ShowError("请选择组织！");
                txt_fStockOrgId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_ckId))
            {
                MsgHelper.Warning("请选择仓库！");
                txt_depotId.Focus();
                MsgHelper.ShowError("请选择仓库！");
                txt_fStockId.Focus();
                return;
            }
            if (txt_returnMethod.SelectedIndex <= 0)
            if (string.IsNullOrEmpty(_khId))
            {
                MsgHelper.Warning("请选择退料方式！");
                txt_returnMethod.Focus();
                MsgHelper.ShowError("请选择客户！");
                txt_fCustId.Focus();
                return;
            }
            if (txt_returnType.SelectedIndex <= 0)
            if (txt_fReturnStyle.SelectedIndex <= 0)
            {
                MsgHelper.Warning("请选择退料原因！");
                txt_returnType.Focus();
                MsgHelper.ShowError("请选择退料方式！");
                txt_fReturnStyle.Focus();
                return;
            }
            var _obj = new
            {
                Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //到货单主键
                KcZz = _orgId,
                Remark = txt_remark.Text.Trim(), //备注
                SuppId = int.Parse(_gysId), //供应商
                DepotId = int.Parse(_ckId),//仓库
                FType = txt_isOut.Checked == true ? 1 : 0,  //0=采购，1=委外
                Fmrmode = txt_returnMethod.Text,//退料方式
                Reason = txt_returnType.Text,//退料原因
                CusId = int.Parse(_khId),
                DepotId = int.Parse(_ckId),
                FIsLink = txt_fHasLinkRad.SelectedIndex,//有无源单
                FReturnStyle = txt_fReturnStyle.Text,//退料方式
                list = new List<dynamic>(),
            };
            gvMx1.PostEditor();
            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();
            if (gvMx1.DataRowCount <= 0)
@@ -350,19 +371,26 @@
                var row = gvMx1.GetDataRow(i);
                if (row != null)
                {
                    Guid _guid = UtilityHelper.ToGuid(row["id"].ToString());
                    string _msl = row["sqNum"].ToString();
                    Guid _guid = UtilityHelper.ToGuid(row["guid"].ToString());
                    string _msl = row["fQty"].ToString();
                    if (string.IsNullOrEmpty(_msl))
                    {
                        MsgHelper.ShowError("申请数量不能为空！");
                        return;
                    }
                    if (string.IsNullOrEmpty(row["fStockStatusId"].ToString()) || row["fStockStatusId"].ToString() == "请选择")
                    {
                        MsgHelper.ShowError("请选择库存状态！");
                        return;
                    }
                    _obj.list.Add(new
                    {
                        Guid = _guid,
                        AboutGuid = UtilityHelper.ToGuid(row["rkmxGuid"].ToString()),
                        Quantity = decimal.Parse(row["sqNum"].ToString()),
                        AboutGuid = UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
                        Quantity = decimal.Parse(row["fQty"].ToString()),
                        Bz = row["remark"].ToString(),
                        ItemId = row["itemId"].ToString(),
                        FStockStatusId = row["fStockStatusId"].ToString(),
                    });
                }
            }
@@ -372,9 +400,9 @@
                    _webServiceName + "EditModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    lbGuid.Text = _rtn.rtnData.outGuid;
                    txt_billNo.Text = _rtn.rtnData.outNo;
                    toolBarMenu1.isSetBtn = true;
@@ -382,11 +410,14 @@
                    gvList.Add(gvMx1);
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                }
                else
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -397,7 +428,7 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -413,7 +444,7 @@
                    {
                        gcMain1.DataSource = dt;
                        gcMain1.ForceInitialize();
                        gridView1.BestFitColumns();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -439,7 +470,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            var _obj = new
@@ -453,13 +484,13 @@
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
                    _ucGys = dy.suppId;
                    _ucCk = dy.depotId;
                    _ucKh = dy.fCustId;
                    _ucCk = dy.fStockId;
                    lbGuid.Text = strGuid;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
                    _ucGys = "";
                    _ucKh = "";
                    _ucCk = "";
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
@@ -481,11 +512,11 @@
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        /// <summary>
@@ -509,7 +540,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
@@ -525,26 +556,30 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
              
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "status", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
                    UtilityHelper.SetCheckIco(gridView1, "isCheck", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();
            var rowhandle = gvMx1.FocusedRowHandle;
            if (rowhandle < 0)
@@ -552,7 +587,7 @@
            if (e.Button.Index == 0)
            {
                var dr = gvMx1.GetDataRow(rowhandle);
                var mxGuid = dr["id"].ToString();
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
@@ -573,13 +608,15 @@
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                        MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                        getModel(lbGuid.Text);
                    }
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    else
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            }
        }