添加工作中心参数

UAS-MES/Entity/User.cs

@@ -50,5 +50,9 @@
         /// 用户所属的线别
         /// </summary>
         public static string UserLineCode;
+        /// <summary>
+        /// 资源所属工作中心
+        /// </summary>
+        public static string WorkCenter;
     }
 }

UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -180,7 +180,7 @@ namespace UAS_MES.Make
                                     }
                                     else
                                     {
-                                        OperateResult.AppendText(">>序列号不允许为空\n", Color.Red, sn_code);
+                                        OperateResult.AppendText(">>TSN不存在\n", Color.Red, sn_code);
                                         return;
                                     }
                                 }
@@ -219,10 +219,11 @@ namespace UAS_MES.Make
                                 string craftcode = MaInf.Rows[0]["ma_craftcode"].ToString();
                                 string craftname = MaInf.Rows[0]["ma_craftname"].ToString();
                                 string firstsn = SnInf.Rows[0]["ms_firstsn"].ToString();
-                                //取工作中心
+                                //工作中心为空的时候取工单的工作中心
                                 string workcenter = User.WorkCenter;
                                 if (workcenter == "")
                                     workcenter = MaInf.Rows[0]["ma_wccode"].ToString();
+                                //工单合同为空的时候取序列号合同，更新合同回工单
                                 string salecode = MaInf.Rows[0]["ma_salecode"].ToString();
                                 if (salecode == "")
                                 {
@@ -242,6 +243,10 @@ namespace UAS_MES.Make
                                 dh.ExecuteSql(sql.GetString(), "insert");
                                 dh.ExecuteSql("update make set ma_inqty=nvl(ma_inqty,0)+1 where ma_id='" + ma_id + "'", "update");
                                 dh.ExecuteSql("update makeserial set ms_nextmacode='" + ma_code.Text + "' where ms_id='" + Msid + "'", "update");
+                                if (ReWorkAsRelateTSN.Checked)
+                                {
+
+                                }
                             }
                             else OperateResult.AppendText(">>序列号" + sn_code.Text + "不存在\n", Color.Red, sn_code);
                         }
@@ -260,7 +265,7 @@ namespace UAS_MES.Make
                 if (dh.CheckExist("make", "ma_kind='返工' and ma_statuscode='STARTED' and ma_code='" + ma_code.Text + "'"))
                 {
                     sql.Clear();
-                    sql.Append("select ma_id,ma_code,pr_code,pr_detail,pr_spec,ma_qty,nvl(ma_savemacbt,0) ma_savemacbt,nvl(ma_saveimei, 0)");
+                    sql.Append("select ma_id,ma_craftcode,ma_code,pr_code,pr_detail,pr_spec,ma_qty,nvl(ma_savemacbt,0) ma_savemacbt,nvl(ma_saveimei, 0)");
                     sql.Append("ma_saveimei from make left join product on ma_prodcode=pr_code where ma_code='" + ma_code.Text + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     BaseUtil.SetFormValue(this.Controls, dt);

UAS-MES/Login.cs

@@ -143,7 +143,7 @@ namespace UAS_MES
             //设置全局用户信息
             string[] field = { "em_code,em_depart,em_type,em_name,em_position,em_professname,em_type,ug_code,ug_name" };
             UserInf = dh.getFieldsDataByCondition("Employee left join cs$userresource on ur_emcode=em_code left join cs$usergroup on ug_code=ur_groupcode", field, "em_code='" + UserName.Text + "'");
-            DataTable dt = dh.getFieldsDataByCondition("source", new string[] { "sc_code", "sc_stepcode", "sc_stepname", "sc_linecode" }, "upper(sc_code)='" + Source.Text.ToUpper() + "'");
+            DataTable dt = dh.getFieldsDataByCondition("source", new string[] { "sc_wccode","sc_code", "sc_stepcode", "sc_stepname", "sc_linecode" }, "upper(sc_code)='" + Source.Text.ToUpper() + "'");
             //存在岗位资源则要求添加
             if (dt.Rows.Count > 0)
             {
@@ -151,6 +151,7 @@ namespace UAS_MES
                 User.CurrentStepName = dt.Rows[0]["sc_stepname"].ToString();
                 User.UserLineCode = dt.Rows[0]["sc_linecode"].ToString();
                 User.UserSourceCode = dt.Rows[0]["sc_code"].ToString();
+                User.WorkCenter = dt.Rows[0]["sc_wccode"].ToString();
             }
             //通过Source表关联岗位资源编号查询出当前的执行工序
             User.UserCode = UserInf.Rows[0]["em_code"].ToString();