From ff3f7a81758be6c7df5be8d1b2e10a645c7d4ebd Mon Sep 17 00:00:00 2001
From: huawei <huawei@2214094776>
Date: 星期四, 04 十二月 2025 18:54:59 +0800
Subject: [PATCH] 优化：选择单据的同时 申请类型变动

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs |  319 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 207 insertions(+), 112 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index c020bd1..f3c38c3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -1,4 +1,5 @@
 using DevExpress.XtraEditors;
+using DevExpress.XtraPrinting.Native;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
@@ -32,6 +33,8 @@
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
             toolBarMenu1.btnShouHouChkClick += ToolBarMenu1_btnShouHouChkClick;
             toolBarMenu1.btnShouHouFchkClick += ToolBarMenu1_btnShouHouFchkClick;
+            toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
+
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
@@ -47,7 +50,7 @@
             }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            //璁剧疆鐢宠缁勭粐
+            //设置申请组织
             this.txt_fapporgid.EditChanged += (s, e) =>
             {
                 string _sqGuid = txt_fapporgid.GetId();
@@ -68,7 +71,7 @@
                 }
                 catch (Exception ex)
                 {
-                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                    MsgHelper.ShowError("提示：" + ex.Message);
                 }
             };
 
@@ -87,20 +90,20 @@
                 gvMx1.SetFocusedRowCellValue("dcHzGuid", _orgId);
             };
 
-            #region 2025-08-27 澶嶅埗beg
+            #region 2025-08-27 复制beg
             btnCopyXls.Click += (s, e) =>
             {
                 string kcZz = txt_fapporgid.GetId();
                 if (string.IsNullOrEmpty(kcZz))
                 {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨鐢宠缁勭粐鍚庢墠鑳戒娇鐢ㄥ鍒跺姛鑳斤紒");
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能使用复制功能！");
                     txt_fapporgid.Focus();
                     return;
                 }
                 string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
                 if (File.Exists(filePath))
                 {
-                    var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.鐗╂枡璋冩嫧.ToString());
+                    var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.物料调拨.ToString());
                     frm.UpdateParent += (ss, ee) =>
                     {
                         try
@@ -149,36 +152,89 @@
                 }
                 else
                 {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("鎵句笉鍒皒lsCopy.xls鏂囦欢锛岃鑱旂郴绠＄悊鍛橈紒");
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("找不到xlsCopy.xls文件，请联系管理员！");
                 }
             };
             #endregion
 
-            #region 2025-10-17 閫夋嫨鐢熶骇/濮斿璁㈠崟
+            #region 2025-10-17 选择生产/委外订单
             btnSelect.Click += (s, e) =>
             {
                 string kcZz = txt_fapporgid.GetId();
                 if (string.IsNullOrEmpty(kcZz))
                 {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨鐢宠缁勭粐鍚庢墠鑳介�夋嫨鐢熶骇璁㈠崟锛�");
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能选择生产订单！");
                     txt_fapporgid.Focus();
                     return;
                 }
-                var frm = new SelectSqmx();
-                //璧嬪�肩粰鏄庣粏琛�
+
+                // 根据当前申请类型判断应该打开哪个类型的弹窗
+                string selectedValue = txt_fBillTypeID.EditValue?.ToString();
+                string defaultType = "1"; // 默认生产
+                if (!string.IsNullOrEmpty(selectedValue) && selectedValue.Contains("委外"))
+                {
+                    defaultType = "2"; // 委外
+                }
+                SetComboBoxValue(txt_fBillTypeID, "生产调拨申请单(DBSQD03_SC)");
+                var frm = new SelectSqmx(defaultType); 
+                 //var frm = new SelectSqmx();
+
+                // 监听选择类型变化事件，同步更新申请类型
+                frm.SelectionTypeChanged += (ss, ee) =>
+                {
+                    string workId = ee.Data; // 1是生产，2是委外
+                                             // 生产订单，设置对应的申请类型
+                    if (workId == "1")
+                    {
+                        SetComboBoxValue(txt_fBillTypeID, "生产调拨申请单(DBSQD03_SC)");
+                    }
+                    else if (workId == "2")
+                    {
+                        // 委外订单，设置对应的申请类型
+                        SetComboBoxValue(txt_fBillTypeID, "委外调拨申请单(DBSQD02_WW)");
+                    }
+                };
+                
+                //赋值给明细表
                 frm.UpdateParent += (ss, ee) =>
                 {
                     try
                     {
                         var lst = new List<string>();
+                        var lst_gd = new List<dynamic>();
                         lst = ee.StringList;
+                        lst_gd = ee.DynamicList;
                         var _obj = new
                         {
                             lst = ee.StringList,
                             workId = ee.Data,
+                            ftype = txt_fBusinessType.Text
+                        };
+                        txt_FSourceOrder.Text = "";
+                        for (int i=0;i< lst_gd.Count; i++)
+                        {
+                            if (i+1 < lst_gd.Count)
+                            {
+                                txt_FSourceOrder.Text = txt_FSourceOrder.Text + lst_gd[i].ToString()+",";
+                            }
+                            else
+                            {
+                                txt_FSourceOrder.Text = txt_FSourceOrder.Text + lst_gd[i].ToString();
+                            };
                         };
                         var strReturn = UtilityHelper.HttpPost("", "MesInvItemMovesManager/SelectScddToView", JsonConvert.SerializeObject(_obj));
                         var dt = UtilityHelper.ReturnToList(strReturn);
+                        if (dt.rtnCode == -102 && dt.rtnMsg == "委外")
+                        {
+                            MsgHelper.ShowError("提示：业务类型为委外(WW)时，只能选择委外订单！");
+                            return;
+                        }
+                        else if (dt.rtnCode == -102 && dt.rtnMsg == "生产")
+                        {
+                            MsgHelper.ShowError("提示：业务类型为标准(NORMAL)时，只能选择生产订单！");
+                            return;
+                        }
+                        ;
                         DataTable _newTable = dt.rtnData;
                         DataTable _oldTable = (DataTable)gcMx1.DataSource;
                         DataRow[] sourceRows = _newTable.Select();
@@ -197,25 +253,25 @@
                     }
                     catch(Exception ex)
                     {
-                        MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                        MsgHelper.ShowError("提示：" + ex.Message);
                     }
                 };
                 frm.ShowDialog();
             };
             #endregion
 
-            #region 2025-10-17 閫夋嫨濮斿璁㈠崟
+            #region 2025-10-17 选择委外订单
             btnScdd.Click += (s, e) =>
             {
                 string kcZz = txt_fapporgid.GetId();
                 if (string.IsNullOrEmpty(kcZz))
                 {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨鐢宠缁勭粐鍚庢墠鑳介�夋嫨濮斿璁㈠崟锛�");
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能选择委外订单！");
                     txt_fapporgid.Focus();
                     return;
                 }
                 var frm = new SelectScdd("1");
-                //璧嬪�肩粰鏄庣粏琛�
+                //赋值给明细表
                 frm.UpdateParent += (ss, ee) =>
                 {
                     try
@@ -243,7 +299,7 @@
                     }
                     catch (Exception ex)
                     {
-                        MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                        MsgHelper.ShowError("提示：" + ex.Message);
                     }
                 };
                 frm.ShowDialog();
@@ -251,6 +307,34 @@
             #endregion
 
         }
+
+        /// <summary>
+        /// 这是打印
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+        {
+            //guidKey, rptParameter
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_fBillNo, gridView1, "fBillNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.ShowError("请先选择你要操作的行！");
+                return;
+            }
+            this.toolBarMenu1.rptParameter = "rpt_sdzjdb{"
+                                               + "100"
+                                               + "," + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "}";
+            this.toolBarMenu1.guidKey = rowGuid;
+
+        }
+
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
             _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -258,7 +342,7 @@
             getPageList(1);
         }
         /// <summary>
-        /// 鍒嗛〉浜嬩欢
+        /// 分页事件
         /// </summary>
         /// <param name="curPage"></param>
         /// <param name="pageSize"></param>
@@ -267,7 +351,7 @@
             getPageList(curPage);
         }
         /// <summary>
-        /// 鏌ヨ浜嬩欢
+        /// 查询事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -281,7 +365,7 @@
             frm.ShowDialog();
         }
         /// <summary>
-        /// 鏌ヨ鍥炶皟
+        /// 查询回调
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -292,7 +376,7 @@
         }
 
         /// <summary>
-        /// 鍙栨秷浜嬩欢
+        /// 取消事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -302,7 +386,7 @@
         }
 
         /// <summary>
-        /// 鍒犻櫎浜嬩欢
+        /// 删除事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -313,10 +397,10 @@
                 lbGuid, txt_fBillNo, gridView1, "FBillNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.Warning("请先选择你要操作的行！");
                 return;
             }
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
                 return;
             var _obj = new
             {
@@ -329,7 +413,7 @@
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                 if (_rtn.rtnCode > 0)
                 {
-                    MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+                    MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                     if (xtraTabControl1.SelectedTabPageIndex == 0)
                     { }
                     else
@@ -337,16 +421,16 @@
                     getPageList(this.pageBar1.CurrentPage);
                 }
                 else
-                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
             }
             catch (Exception ex)
             {
-                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("提示：" + ex.Message);
             }
         }
 
         /// <summary>
-        /// 鍒锋柊浜嬩欢
+        /// 刷新事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -368,7 +452,7 @@
             }
         }
         /// <summary>
-        /// 淇敼浜嬩欢
+        /// 修改事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -378,7 +462,7 @@
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "FBillNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                 return;
             }
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -392,7 +476,7 @@
                 gvList.Add(gvMx1);
                 UtilityHelper.ChangeEnableByControl(splitMx1.Panel1.Controls, true, gvList);
             }
-            //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼渚涘簲鍟嗗拰缁勭粐srm,绂佺敤
+            //2025/07/12加上修改状态下不能修改供应商和组织srm,禁用
             txt_fapporgid.IsReadly = true;
             txt_ftranstype.ReadOnly = true;
             txt_fOwnerTypeIdHead.ReadOnly = true;
@@ -401,7 +485,7 @@
             txt_djtype.Properties.ReadOnly = true;
         }
         /// <summary>
-        /// 鏂板浜嬩欢
+        /// 新增事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -413,14 +497,14 @@
             gridViews.Add(gvMx1);
             UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
             Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-            //澧炲姞鏃讹紝榛樿缁勭粐
+            //增加时，默认组织
             string deftOrg = UtilityHelper.GetFirstOrg(txt_fapporgid);
             txt_fBusinessType.Properties.ReadOnly = true;
             txt_djtype.Properties.ReadOnly = true;
 
         }
         /// <summary>
-        /// 淇濆瓨浜嬩欢
+        /// 保存事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -434,55 +518,57 @@
             string dblx = txt_ftranstype.Text.ToString();
             string dchzlx = txt_fOwnerTypeIdHead.Text.ToString();
             string drhzlx = txt_fOwnerTypeInIdHead.Text.ToString();
+            string gdbh = txt_FSourceOrder.Text.ToString();
             //if (txt_fBillTypeID.SelectedIndex <= 0)
             //{
-            //    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择单据类型！");
             //    txt_fBillTypeID.Focus();
             //    return;
             //}
-            if (txt_fTransferDirect.SelectedIndex <= 0)
+            if (string.IsNullOrEmpty(dbfx))
             {
-                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨璋冩嫧鏂瑰悜锛�");
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择调拨方向！");
                 txt_fTransferDirect.Focus();
                 return;
             }
             if (string.IsNullOrEmpty(sqOrg))
             {
-                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鐢宠缁勭粐锛�");
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择申请组织！");
                 txt_fapporgid.Focus();
                 return;
             }
             //if (txt_fOwnerTypeIdHead.SelectedIndex <= 0)
             //{
-            //    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨嚭璐т富绫诲瀷锛�");
+            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择调出货主类型！");
             //    txt_fOwnerTypeIdHead.Focus();
             //    return;
             //}
             //if (txt_fOwnerTypeInIdHead.SelectedIndex <= 0)
             //{
-            //    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨叆璐т富绫诲瀷锛�");
+            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择调入货主类型！");
             //    txt_fOwnerTypeInIdHead.Focus();
             //    return;
             //}
             var _obj = new
             {
-                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                djlx = djlx,//鍗曟嵁绫诲瀷
-                ywlx = ywlx,//涓氬姟绫诲瀷
-                dbfx = dbfx,//璋冩嫧鏂瑰悜
-                sqOrg = sqOrg,//瀹¤缁勭粐
-                dblx = dblx,//璋冩嫧绫诲瀷
-                dchzlx = dchzlx,//璋冨嚭璐т富绫诲瀷
-                drhzlx = drhzlx,//璋冨叆璐т富绫诲瀷
-                inRemark = txt_fRemarks.Text.Trim(),//澶囨敞
+                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
+                djlx = djlx,//单据类型
+                ywlx = ywlx,//业务类型
+                dbfx = dbfx,//调拨方向
+                sqOrg = sqOrg,//审请组织
+                dblx = dblx,//调拨类型
+                dchzlx = dchzlx,//调出货主类型
+                drhzlx = drhzlx,//调入货主类型
+                inRemark = txt_fRemarks.Text.Trim(),//备注
                 list = new List<dynamic>(),
+                gdbh = gdbh //工单单号
             };
             gvMx1.CloseEditor();
             gvMx1.PostEditor();
             gvMx1.UpdateCurrentRow();
             if (gvMx1.DataRowCount <= 0)
             {
-                MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鐢宠鏄庣粏锛�");
+                MsgHelper.ShowError("明细不能为空，请选择你的申请明细！");
                 return;
             }
             for (var i = 0; i < gvMx1.DataRowCount; i++)
@@ -494,37 +580,37 @@
                     string _msl = row["shNum"].ToString();
                     if (string.IsNullOrEmpty(_msl))
                     {
-                        MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
+                        MsgHelper.ShowError("数量不能为空！");
                         return;
                     }
                     if (string.IsNullOrEmpty(row["dcOrgGuid"].ToString()))
                     {
-                        MsgHelper.ShowError("璋冨嚭缁勭粐涓嶈兘涓虹┖锛�");
+                        MsgHelper.ShowError("调出组织不能为空！");
                         return;
                     }
                     if (string.IsNullOrEmpty(row["dcCkGuid"].ToString()))
                     {
-                        MsgHelper.ShowError("璋冨嚭浠撳簱涓嶈兘涓虹┖锛�");
+                        MsgHelper.ShowError("调出仓库不能为空！");
                         return;
                     }
                     if (string.IsNullOrEmpty(row["drOrgGuid"].ToString()))
                     {
-                        MsgHelper.ShowError("璋冨叆缁勭粐涓嶈兘涓虹┖锛�");
+                        MsgHelper.ShowError("调入组织不能为空！");
                         return;
                     }
                     if (string.IsNullOrEmpty(row["drCkGuid"].ToString()))
                     {
-                        MsgHelper.ShowError("璋冨叆浠撳簱涓嶈兘涓虹┖锛�");
+                        MsgHelper.ShowError("调入仓库不能为空！");
                         return;
                     }
                     if (string.IsNullOrEmpty(row["dcHzGuid"].ToString()))
                     {
-                        MsgHelper.ShowError("璋冨嚭璐т富涓嶈兘涓虹┖锛�");
+                        MsgHelper.ShowError("调出货主不能为空！");
                         return;
                     }
                     if (string.IsNullOrEmpty(row["drHzGuid"].ToString()))
                     {
-                        MsgHelper.ShowError("璋冨叆璐т富涓嶈兘涓虹┖锛�");
+                        MsgHelper.ShowError("调入货主不能为空！");
                         return;
                     }
                     _obj.list.Add(new
@@ -539,6 +625,9 @@
                         drck = (row["drCkGuid"].ToString()),
                         dchz = (row["dcHzGuid"].ToString()),
                         drhz = (row["drHzGuid"].ToString()),
+                        gd = (row["daa001"].ToString()),
+                        gdmx = (row["dabErpId"].ToString()),
+                        bgy = (row["depotMan"].ToString()),
                     });
                 }
             }
@@ -548,7 +637,7 @@
                 ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                 if (_rtn.rtnCode > 0)
                 {
-                    ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+                    ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                     lbGuid.Text = _rtn.rtnData.outGuid;
                     txt_fBillNo.Text = _rtn.rtnData.outNo;
                     toolBarMenu1.isSetBtn = true;
@@ -559,15 +648,15 @@
                     Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                 }
                 else
-                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
             }
         }
         /// <summary>
-        /// 鏃ュ織
+        /// 日志
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -582,8 +671,8 @@
         /// <summary>
         /// 
         /// </summary>
-        /// <param name="curPage">绗嚑椤�</param>
-        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        /// <param name="curPage">第几页</param>
+        /// <param name="pageSize">每页几条</param>
         private void getPageList(int curPage)
         {
             gcMain1.DataSource = null;
@@ -611,18 +700,18 @@
                     else
                         UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                     gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
-                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
-                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                    pageBar1.TotalPages = dd.rtnData.pages;//总页
+                    pageBar1.CurrentPage = curPage;//当前页
+                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
                 }
                 else
                 {
-                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                    ToolBox.MsgHelper.ShowError("提示：" + dd.rtnMsg);
                 }
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
             }
 
         }
@@ -633,12 +722,12 @@
             if (toolBarMenu1.currentAction == "edit") isEdit = true;
             if (string.IsNullOrEmpty(strGuid))
             {
-                ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
                 return;
             }
             var _obj = new
             {
-                guid = strGuid,//涓诲缓
+                guid = strGuid,//主建
             };
             try
             {
@@ -672,17 +761,17 @@
                     }
                 }
                 else
-                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
             }
         }
 
 
         /// <summary>
-        ///     瀹℃牳浜嬩欢
+        ///     审核事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -692,7 +781,7 @@
         }
 
         /// <summary>
-        ///     鍙嶅鏍�
+        ///     反审核
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -702,7 +791,7 @@
             _toolCk(0);
         }
         /// <summary>
-        /// 鍞悗瀹℃牳
+        /// 售后审核
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -713,7 +802,7 @@
         }
 
         /// <summary>
-        /// 鍞悗鍙嶅鏍�
+        /// 售后反审核
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -723,7 +812,7 @@
             _toolCk(21);
         }
         /// <summary>
-        /// 宸ュ叿鏉′簨浠�
+        /// 工具条事件
         /// </summary>
         /// <param name="inFieldValue"></param>
         private void _toolCk(int _inFieldValue)
@@ -732,16 +821,16 @@
             switch (_inFieldValue)
             {
                 case 1:
-                    strMsg = "瀹℃牳";
+                    strMsg = "审核";
                     break;
                 case 0:
-                    strMsg = "鍙嶅鏍�";
+                    strMsg = "反审核";
                     break;
                 case 20:
-                    strMsg = "鍞悗瀹℃牳";
+                    strMsg = "售后审核";
                     break;
                 case 21:
-                    strMsg = "鍞悗鍙嶅鏍�";
+                    strMsg = "售后反审核";
                     break;
             }
             ;
@@ -750,10 +839,10 @@
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "FBillNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
-                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.ShowError("请先选择你要操作的行！");
                 return;
             }
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
                 return;
             var _obj = new
             {
@@ -779,7 +868,7 @@
                     }
                     else
                     {
-                        //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+                        //注意，这里和其它页面有点不一样
                         getPageList(this.pageBar1.CurrentPage);
                         int rowHandle = gridView1.LocateByValue("guid", rowGuid);
                         gridView1.FocusedRowHandle = rowHandle;
@@ -790,13 +879,13 @@
             }
             catch (Exception ex)
             {
-                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("提示：" + ex.Message);
             }
         }
 
 
         /// <summary>
-        /// 閫夋嫨鐗╂枡
+        /// 选择物料
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -815,7 +904,7 @@
         }
 
         /// <summary>
-        /// 鍒犻櫎鐗╂枡
+        /// 删除物料
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -828,7 +917,7 @@
             {
                 var dr = gvMx1.GetDataRow(rowhandle);
                 var mxGuid = dr["id"].ToString();
-                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+                if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
                     return;
                 if (string.IsNullOrEmpty(mxGuid))
                 {
@@ -848,22 +937,22 @@
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                     if (_rtn.rtnCode > 0)
                     {
-                        MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+                        MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                         getModel(lbGuid.Text);
                     }
                     else
-                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
                 {
-                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                    MsgHelper.ShowError("提示：" + ex.Message);
                 }
             }
         }
 
 
         /// <summary>
-        /// 鏌ユ壘璋冨嚭缁勭粐
+        /// 查找调出组织
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -883,7 +972,7 @@
             frm.ShowDialog();
         }
         /// <summary>
-        /// 鏌ユ壘璋冨嚭浠撳簱
+        /// 查找调出仓库
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -896,7 +985,7 @@
             var strOrgGuid = dr["dcOrgGuid"].ToString();
             if (string.IsNullOrEmpty(strOrgGuid))
             {
-                MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
+                MsgHelper.ShowError("提示：请先选择调出组织！");
                 return;
             }
             ;
@@ -911,7 +1000,7 @@
             frm.ShowDialog();
         }
         /// <summary>
-        /// 鏌ユ壘浠撲綅
+        /// 查找仓位
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -923,14 +1012,14 @@
             var dr = gvMx1.GetDataRow(rowhandle);
             if (dr["dcCkGuid"] == null)
             {
-                MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭浠撳簱锛�");
+                MsgHelper.ShowError("提示：请先选择调出仓库！");
                 return;
             }
             ;
             var strCkGuid = dr["dcCkGuid"].ToString();
             if (string.IsNullOrEmpty(strCkGuid))
             {
-                MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭浠撳簱锛�");
+                MsgHelper.ShowError("提示：请先选择调出仓库！");
                 return;
             }
             ;
@@ -946,7 +1035,7 @@
         }
 
         /// <summary>
-        /// 璋冨叆缁勭粐
+        /// 调入组织
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -966,7 +1055,7 @@
             frm.ShowDialog();
         }
         /// <summary>
-        /// 璋冨叆浠撳簱
+        /// 调入仓库
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -979,7 +1068,7 @@
             var strOrgGuid = dr["drOrgGuid"].ToString();
             if (string.IsNullOrEmpty(strOrgGuid))
             {
-                MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨叆缁勭粐锛�");
+                MsgHelper.ShowError("提示：请先选择调入组织！");
                 return;
             }
             ;
@@ -994,7 +1083,7 @@
             frm.ShowDialog();
         }
         /// <summary>
-        /// 璋冨叆浠撲綅
+        /// 调入仓位
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -1006,14 +1095,14 @@
             var dr = gvMx1.GetDataRow(rowhandle);
             if (dr["drCkGuid"] == null)
             {
-                MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+                MsgHelper.ShowError("提示：请先选择调入仓库！");
                 return;
             }
             ;
             var strCkGuid = dr["drCkGuid"].ToString();
             if (string.IsNullOrEmpty(strCkGuid))
             {
-                MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+                MsgHelper.ShowError("提示：请先选择调入仓库！");
                 return;
             }
             ;
@@ -1029,7 +1118,7 @@
         }
 
         /// <summary>
-        /// 璋冨叆璐т富
+        /// 调入货主
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -1041,7 +1130,7 @@
             int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
             //if (_drhzlx <= 0)
             //{
-            //    MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆璐т富绫诲瀷锛�");
+            //    MsgHelper.Warning("提示：请先选择调入货主类型！");
             //    return;
             //}
             SelectHz frm = new SelectHz("", _drhzlx.ToString());
@@ -1056,7 +1145,7 @@
             frm.ShowDialog();
         }
         /// <summary>
-        /// 璋冨嚭璐т富
+        /// 调出货主
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -1069,7 +1158,7 @@
             int _drhzlx = txt_fOwnerTypeIdHead.SelectedIndex;
             //if (_drhzlx <= 0)
             //{
-            //    MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭璐т富绫诲瀷锛�");
+            //    MsgHelper.Warning("提示：请先选择调出货主类型！");
             //    return;
             //}
             SelectHz frm = new SelectHz("", _drhzlx.ToString());
@@ -1084,7 +1173,7 @@
         }
 
         /// <summary>
-        ///  棰勮寮�宸ユ椂闂村彉鍖栦簨浠�
+        ///  预计开工时间变化事件
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -1095,15 +1184,21 @@
             if (string.IsNullOrEmpty(selectedValue))
                 return;
 
-            if (selectedValue == "濮斿璋冩嫧鐢宠鍗�(DBSQD02_WW)")
+            if (selectedValue == "委外调拨申请单(DBSQD02_WW)")
             {
-                SetComboBoxValue(txt_fBusinessType, "濮斿(WW)");
-                SetComboBoxValue(txt_djtype, "濮斿鐩存帴璋冩嫧鍗�(WWDB01_SYS)");
+                SetComboBoxValue(txt_fBusinessType, "委外(WW)");
+                SetComboBoxValue(txt_djtype, "委外直接调拨单(WWDB01_SYS)"); 
+
+            }
+            else if (selectedValue == "生产调拨申请单(DBSQD03_SC)")
+            {
+                SetComboBoxValue(txt_fBusinessType, "生产(SC)");
+                SetComboBoxValue(txt_djtype, "生产直接调拨单(SCDB01_SYS)");
             }
             else
             {
-                SetComboBoxValue(txt_fBusinessType, "鏍囧噯(NORMAL)");
-                SetComboBoxValue(txt_djtype, "鏍囧噯鐩存帴璋冩嫧鍗�(ZJDB01_SYS)");
+                SetComboBoxValue(txt_fBusinessType, "标准(NORMAL)");
+                SetComboBoxValue(txt_djtype, "标准直接调拨单(ZJDB01_SYS)");
             }
         }
 
@@ -1115,7 +1210,7 @@
             }
             else
             {
-                // 濡傛灉鍊间笉瀛樺湪锛岃缃负绗竴涓�夐」鎴栫┖
+                // 如果值不存在，设置为第一个选项或空
                 if (comboBox.Properties.Items.Count > 0)
                     comboBox.EditValue = comboBox.Properties.Items[0];
                 else

--
Gitblit v1.9.3