Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.Designer.cs

@@ -522,6 +522,7 @@
             this.columnHeader2,
             this.columnHeader3,
             this.columnHeader4});
+            this.WeighRecord.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.WeighRecord.Location = new System.Drawing.Point(563, 267);
             this.WeighRecord.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.WeighRecord.Name = "WeighRecord";

UAS-MES/FunctionCode/Make/Make_PositionStock.cs

@@ -78,7 +78,7 @@ namespace UAS_MES.Make
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count > 0)
                         {
-                            //输入的是物料批号的时候
+                            //输入的是条码号的时候
                             dt = (DataTable)dh.ExecuteSql("select nvl(bar_remain,0) bar_remain,bar_prodcode from barcode inner join product on pr_code=bar_prodcode where bar_code ='" + pr_batchnum.Text + "'", "select");
                             if (dt.Rows.Count > 0)
                             {
@@ -97,6 +97,7 @@ namespace UAS_MES.Make
                             }
                             else
                             {
+                                //是否包含备料的批管控物料号
                                 sql.Clear();
                                 sql.Append("select sp_id,sp_oneuseqty,sp_soncode,sp_prefix from stepbom left join stepproduct on sp_sbid=sb_id ");
                                 sql.Append("where sb_craftcode='" + ma_craftcode.Text + "' and  sb_prodcode='" + ma_prodcode.Text + "' and ");
@@ -109,6 +110,7 @@ namespace UAS_MES.Make
                                 }
                                 else
                                 {
+                                    //匹配批管控物料中的前缀和长度 
                                     sql.Clear();
                                     sql.Append("select sp_id,sp_oneuseqty,sp_soncode,sp_prefix from stepbom left join stepproduct on sp_sbid=sb_id ");
                                     sql.Append("where sb_craftcode='" + ma_craftcode.Text + "' and  sb_prodcode='" + ma_prodcode.Text + "' and ");
@@ -207,6 +209,7 @@ namespace UAS_MES.Make
                             dh.ExecuteSql("delete from makesourcestock where mss_id='" + id + "'", "delete");
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "岗位备料", "删除物料" + soncode, "", "");
                             OperateResult.AppendText(">>料号" + soncode + "删除成功\n");
+                            FillDataGridView();
                         }
                         else OperateResult.AppendText(">>料号" + soncode + "已被使用,不允许删除\n", Color.Red);
                     }

UAS-MES/Login.cs

@@ -142,7 +142,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 + "'");
+            UserInf = dh.getFieldsDataByCondition("Employee left join cs$userresource on ur_emcode=em_code left join cs$usergroup on ug_code=ur_groupcode", field, "upper(em_code)='" + UserName.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)

UAS-MES/PublicMethod/LogicHandler.cs

@@ -357,9 +357,9 @@ namespace UAS_MES.PublicMethod
         public static bool CheckUserLogin(string iUserCode, string iPassWord, out string oErrorMessage)
         {
             oErrorMessage = "";
-            string SQL = "select em_code from employee where em_code=:UserName and em_password =:PassWord";
+            string SQL = "select em_code from employee where upper(em_code)=:UserName and em_password =:PassWord";
             DataTable dt;
-            dt = (DataTable)dh.ExecuteSql(SQL, "select", iUserCode, iPassWord);
+            dt = (DataTable)dh.ExecuteSql(SQL, "select", iUserCode.ToUpper(), iPassWord);
             if (dt.Rows.Count > 0)
                 return true;
             else
@@ -387,7 +387,8 @@ namespace UAS_MES.PublicMethod
         public static bool CheckUserAndResourcePassed(string iUserCode, string iSourceCode, out string oErrorMessage)
         {
             oErrorMessage = "";
-            string SQL = "select em_code,em_type,em_name from employee where em_code=:UserName ";
+            iUserCode = iUserCode.ToUpper();
+            string SQL = "select em_code,em_type,em_name from employee where upper(em_code)=:UserName ";
             DataTable dt;
             dt = (DataTable)dh.ExecuteSql(SQL, "select", iUserCode);
             if (dt.Rows.Count > 0)