From ccc1b0d541d8f3bdd2bcb72dd0b5533e68b886d5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 09 六月 2025 09:53:37 +0800
Subject: [PATCH] 采购明细报表

---
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs |   90 +++++++++++++++++++++++++++++++++------------
 1 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 3ffbf41..cb731d4 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -18,7 +18,6 @@
     public partial class Jyxm : DevExpress.XtraEditors.XtraUserControl
     {
         private List<FilterEntity> _filterList = new List<FilterEntity>();
-        string _ucItem = "";//鐗╂枡
         private readonly string _webServiceName = "MesQmCheckitemManager/";
         public string strType = "";//iqc type
         public decimal dfValue = 1;  //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒�1
@@ -40,13 +39,22 @@
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            toolBarMenu1.xlsInService = "XlsInItemJyxm&" + strType;
+            //绫诲瀷锛宨qc,ipqc宸℃锛宨pqc棣栨鏌�,fqc锛宨qc鐨勬牱鍝佸�奸粯璁や负5锛屽叾瀹冧负1
             txt_ftype.Text = strType;
             if (strType == "iqc")
                 dfValue = 5;
+            //濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
             if (strType != "ipqc宸℃")
             {
                 gvMx1.Columns["stationName"].Visible = false;
             }
+            //濡傛灉鏄痠pqc棣栨锛屾樉绀鸿璇�
+            if (strType != "ipqc棣栨")
+            {
+                gvMx1.Columns["isRzxx"].Visible = false;
+            }
+            //鏂拌鍒濆鍊�
             this.gvMx1.InitNewRow += (s, e) =>
         {
             this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
@@ -55,7 +63,7 @@
         };
             this.toolBarMenu1.getXmlConfig();
             Form parentForm = this.FindForm();
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "foneChecked", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -82,7 +90,7 @@
                     Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒");
                     return;
                 }
-                JyxmShow frm = new JyxmShow(lbGuid.Text.Trim(), strType);
+                JyxmShowCopy frm = new JyxmShowCopy(lbGuid.Text.Trim(), strType);
                 frm.ShowDialog();
             };
         }
@@ -248,7 +256,7 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-            string _ItemId = txt_itemId.GetId();
+            string _ItemId = txt_itemId.EditValue.ToString().Trim();
             if (string.IsNullOrEmpty(_ItemId))
             {
                 MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
@@ -309,6 +317,10 @@
                         string _Fstand = row["Fstand"].ToString();
                         string _FupAllow = row["FupAllow"].ToString();
                         string _FdownAllow = row["FdownAllow"].ToString();
+                        string _isRzxxTxt = row["isRzxx"].ToString();
+                        bool _isRzxx = false;
+                        if (_isRzxxTxt == "1" || _isRzxxTxt.ToUpper() == "true".ToUpper())
+                            _isRzxx = true;
                         //鍋囧涓変釜閮戒负绌洪�氳繃
                         if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
                         {
@@ -349,6 +361,8 @@
                             FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
                             ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
                             stationName = row["stationName"].ToString(),
+                            FcheckType = row["FcheckType"].ToString(),
+                            isRzxx = _isRzxx,
                         });
                     }
                 }
@@ -439,7 +453,10 @@
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
-
+        /// <summary>
+        /// 璇诲彇瀹炰綋
+        /// </summary>
+        /// <param name="strGuid"></param>
         private void getModel(string strGuid)
         {
             bool isEdit = false;
@@ -464,12 +481,10 @@
                 if (_rtn.rtnCode > 0)
                 {
                     var dy = _rtn.rtnData;
-                    _ucItem = dy.itemId;
                     lbGuid.Text = strGuid;
                     var gvList = new List<GridView>();
                     gvList.Add(gvMx1);
                     UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
-                    _ucItem = "";
                     var _job = JObject.Parse(strJson);
                     var array = new JArray();
                     foreach (var a in _job["rtnData"]["list"]) array.Add(a);
@@ -480,6 +495,7 @@
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
                         gvMx1.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                     }
                     else
                     {
@@ -572,19 +588,27 @@
         #region 浠ヤ笅涓虹绉嶄笅鎷�
         private void _setIno()
         {
-            this.txt_fSubsidiary.EditChanged += (s, e) =>
+            txt_itemId.Click += (s, e) =>
             {
-                string _orgId = txt_fSubsidiary.GetId();
-                if (string.IsNullOrEmpty(_orgId))
-                    return;
-                txt_itemId.getSuppler(_orgId, _ucItem, " ", strType);
-            };
-            txt_itemId.EditChanged += (s, e) =>
-            {
-                if (!string.IsNullOrEmpty(this.txt_itemId.GetModel()))
-                    txt_gg.Text = this.txt_itemId.GetModel();
-                if (!string.IsNullOrEmpty(this.txt_itemId.GetCode()))
-                    txt_itemNo.Text = this.txt_itemId.GetCode();
+                var frm = new JyxmShow(this.strType);
+                frm.UpdateParent += (ss, ee) =>
+                {
+                    try
+                    {
+                        var lst = new List<dynamic>();
+                        lst = ee.DynamicList;
+                        txt_itemId.Text = lst[0].itemId;
+                        txt_gg.Text = lst[0].itemModel;
+                        txt_mc.Text = lst[0].itemName;
+                        txt_itemNo.Text = lst[0].itemNo;
+                        txt_fSubsidiary.Text = lst[0].fSubsidiary;
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show(ex.Message);
+                    }
+                };
+                frm.ShowDialog();
             };
             _getListJyxm();
             _getListJygj();
@@ -592,7 +616,9 @@
             _getListJssp();
             _getListJysp();
             _getListStation();
+            _getListGroup();
         }
+
         /// <summary>
         /// 璇诲彇妫�楠岄」鐩�
         /// </summary>
@@ -639,8 +665,6 @@
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-
-
         }
         /// <summary>
         /// 璇诲彇妫�楠屽伐鍏�
@@ -680,8 +704,6 @@
                 foreach (DataRow dr in dt.Rows)
                 {
                     rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
-                    //rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
-                    //string ddddd = dr["SampleSizeName"].ToString();
                 }
             }
             catch (Exception ex)
@@ -726,7 +748,22 @@
                 ,"7.鐗规畩妫�楠屾按骞�(S4)"
             });
         }
-
+        /// <summary>
+        /// 璇诲彇妫�楠屾按骞�
+        /// </summary>
+        private void _getListGroup()
+        {
+            rptGroup.Items.AddRange(new string[] {
+               "澶栬"
+               ,"棰滆壊"
+               ,"灏哄"
+               , "鍏抽敭閮ㄤ欢涓�鑷存��"
+               , "鍝佹按娴嬭瘯"
+                ,"鍒剁儹鎬ц兘"
+                ,"杩涙按鍘嬪姏"
+                ,"鐢垫皵鎬ц兘"
+            });
+        }
         /// <summary>
         /// 鍏宠仈妫�楠屾爣鍑嗗悕绉�
         /// </summary>
@@ -748,6 +785,11 @@
                 gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
             }
         }
+        /// <summary>
+        /// 绉诲嚭鏄庣粏
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
             gvMx1.CloseEditor();

--
Gitblit v1.9.3