From c40eecdf100bc5fb5007abbfb6dbe355e7d78f6e Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 21 一月 2021 19:07:58 +0800
Subject: [PATCH] 用户信息增加工序流水号

---
 SCM/基础资料/ClsIF_Process_View.cs    |    6 ++++--
 Model/基础资料/ClsGy_Process_Model.cs |    1 +
 SCM/系统管理/Xt_UserNew.cs            |   12 ++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs"
index 4d1c387..bd22662 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Process_Model.cs"
@@ -19,5 +19,6 @@
         public double HFixPrice;// 		money		//班产定额	(8小时工资)		New
         public double HOverFixPrice;//		money	//加班补贴定额	(8小时工资)			New
         public Int64 HProcMulID;//New
+        public string HProcNo;
     }
 }
diff --git "a/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Process_View.cs" "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Process_View.cs"
index 0252bca..69c646b 100644
--- "a/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Process_View.cs"
+++ "b/SCM/\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Process_View.cs"
@@ -20,11 +20,11 @@
         {
             base.MvarReportTitle = "宸ュ簭璁剧疆";
             base.MvarItemKey = "h_v_IF_Process";
-            base.SQLName = "Select HItemID,HNumber 宸ュ簭浠g爜,HName 宸ュ簭 from h_v_IF_Process where HStopflag=0   ";
+            base.SQLName = "Select HItemID,HNumber 宸ュ簭浠g爜,HName 宸ュ簭,HProcNo 宸ュ簭鍙� from h_v_IF_Process where HStopflag=0   ";
             base.SQLOrder = " Order by HItemID  ";
             base.SQLList = "Select top 100 * from " + MvarItemKey + " ";
             //涓嬫媺SQL
-            base.SQLNameForDown = " Select top 30 HItemID,HNumber 宸ュ簭浠g爜,HName 宸ュ簭 from h_v_IF_Process ";
+            base.SQLNameForDown = " Select top 30 HItemID,HNumber 宸ュ簭浠g爜,HName 宸ュ簭,HProcNo 宸ュ簭鍙� from h_v_IF_Process ";
             base.SQLOrderForDown = "  Order by HNumber ";
             base.SQLWhereForDown = "  where HStopflag=0  ";
         }
@@ -92,6 +92,7 @@
                 omodel.HStopflag = DBUtility.ClsPub.isBool(DS.Tables[0].Rows[0]["HStopflag"]);
                 omodel.HBarCode = DS.Tables[0].Rows[0]["HBarCode"].ToString().Trim();
                 omodel.HRemark = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
+                omodel.HProcNo = DS.Tables[0].Rows[0]["HProcNo"].ToString().Trim();
                 return true;
  
             }
@@ -149,6 +150,7 @@
                     oModel.HItemID = Pub_Class.ClsPub.isLong(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[0].Value);
                     oModel.HNumber = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[1].Value);
                     oModel.HName = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[2].Value);
+                    oModel.HRemark = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[3].Value);
                 }
                 else
                 {
diff --git "a/SCM/\347\263\273\347\273\237\347\256\241\347\220\206/Xt_UserNew.cs" "b/SCM/\347\263\273\347\273\237\347\256\241\347\220\206/Xt_UserNew.cs"
index be6f9ff..60619c6 100644
--- "a/SCM/\347\263\273\347\273\237\347\256\241\347\220\206/Xt_UserNew.cs"
+++ "b/SCM/\347\263\273\347\273\237\347\256\241\347\220\206/Xt_UserNew.cs"
@@ -20,6 +20,7 @@
         public Pub_Class.ClsPub.Enum_InputMode InputMode;  //录入状态标志(0-非录入状态 1-增加 2-修改)
         public string Czybm;
         public Int64 HOrgID = -1;
+        public string HProcNo = "";
         //窗体加载
         private void Xt_UserNew_Load(object sender, EventArgs e)
         {
@@ -178,7 +179,7 @@
             SCM.ClsXt_ORGANIZATIONS_View oORG = new ClsXt_ORGANIZATIONS_View();
             try
             {
-                oDs = oWeb.getDataSetBySQL("select Czybm,Czymc,Explain,HEmpID,HK3UserID,HCloudUserName,HCloudUserPsd,HKeeperID,HKeeper,HSecManagerID,HSecManager,HSellManID,HSellMan,HDeptID,HDept,HWhID,HWHName,HSupID,HSupName,HUSEORGID,HGroup,HGroupID,HProc,HProcNo,HSource,HSourceID,HWorkCenter,HWorkCenterID from Gy_Czygl where Czybm='" + sCzybm + "'", "Gy_Czygl", ref ClsPub.sExeReturnInfo);
+                oDs = oWeb.getDataSetBySQL("select Czybm,Czymc,Explain,HEmpID,HK3UserID,HCloudUserName,HCloudUserPsd,HKeeperID,HKeeper,HSecManagerID,HSecManager,HSellManID,HSellMan,HDeptID,HDept,HWhID,HWHName,HSupID,HSupName,HUSEORGID,HGroup,HGroupID,HProc,HProcNo,HProcName,HSource,HSourceID,HWorkCenter,HWorkCenterID from Gy_Czygl where Czybm='" + sCzybm + "'", "Gy_Czygl", ref ClsPub.sExeReturnInfo);
                 if (oDs == null)
                 {
                     MessageBox.Show("显示失败!原因:" + ClsPub.sExeReturnInfo);
@@ -237,11 +238,12 @@
                     textHGroupID.Text = oDs.Tables[0].Rows[0]["HGroup"].ToString().Trim();
                     textHGroupID.Tag = oDs.Tables[0].Rows[0]["HGroupID"].ToString().Trim();
                     textHProcNo.Text = oDs.Tables[0].Rows[0]["HProc"].ToString().Trim();
-                    textHProcNo.Tag = oDs.Tables[0].Rows[0]["HProcNo"].ToString().Trim();
+                    textHProcNo.Tag = oDs.Tables[0].Rows[0]["HProcName"].ToString().Trim();
                     textHWorkCenterID.Text = oDs.Tables[0].Rows[0]["HWorkCenter"].ToString().Trim();
                     textHWorkCenterID.Tag = oDs.Tables[0].Rows[0]["HWorkCenterID"].ToString().Trim();
                     textHSourceID.Text = oDs.Tables[0].Rows[0]["HSource"].ToString().Trim();
                     textHSourceID.Tag = oDs.Tables[0].Rows[0]["HSourceID"].ToString().Trim();
+                    HProcNo = oDs.Tables[0].Rows[0]["HProcNo"].ToString().Trim();
                 }
             }
             catch (Exception e)
@@ -373,7 +375,8 @@
                     ",HGroup='" + textHGroupID.Text.ToString() + "'" +
                     ",HGroupID=" + ClsPub.isLong(textHGroupID.Tag).ToString() +
                     ",HProc='" + textHProcNo.Text.ToString() +"'"+
-                    ",HProcNo='" + textHProcNo.Tag.ToString() +"'"+
+                    ",HProcName='" + textHProcNo.Tag.ToString() +"'"+
+                    ",HProcNo='" + HProcNo + "'" +
                     ",HWorkCenter='" + textHWorkCenterID.Text.ToString() + "'" +
                     ",HWorkCenterID=" + ClsPub.isLong(textHWorkCenterID.Tag).ToString() +
                     ",HSource='" + textHSourceID.Text.ToString() + "'" +
@@ -386,7 +389,7 @@
                     oWeb.getRunProc("insert into  System_UserGroupInfo (GroupId,UserId) values (" + ClsPub.isLong(Get_Code(this.LbYes.Items[i].ToString())) + ",'" + Czybm + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                 }
                 lblError.Text = "* 修改成功!";
-                tabControl1.SelectedIndex = 0;
+                tabControl1.SelectedIndex = 0; 
             }
         }
         //单据完整性判断
@@ -738,6 +741,7 @@
             {
                 this.textHProcNo.Text = oEmp.oModel.HName;
                 this.textHProcNo.Tag = oEmp.oModel.HNumber;
+                HProcNo = oEmp.oModel.HRemark;
             }
             else
             {

--
Gitblit v1.9.1