Merge branch 'master' of repos.ubtob.net:usoft/mes-client

UAS_MES_BG/Login.cs

@@ -143,7 +143,7 @@ namespace UAS_MES_NEW
         {
             //设置全局用户信息
             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, "upper(em_code)='" + UserName.Text.ToUpper() + "'");
+            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() + "' or upper(EM_MOBILE)='" + UserName.Text+"'");
             DataTable dt = dh.getFieldsDataByCondition("source left join step on sc_stepcode=st_code", new string[] { "st_badgroupcode", "sc_wccode", "sc_code", "sc_stepcode", "sc_stepname", "sc_linecode" }, "upper(sc_code)='" + Source.Text.ToUpper() + "'");
             //存在岗位资源则要求添加
             if (dt.Rows.Count > 0)

UAS_MES_BG/PublicMethod/LogicHandler.cs

@@ -77,9 +77,9 @@ namespace UAS_MES_NEW.PublicMethod
         public static bool CheckUserLogin(string iUserCode, string iPassWord, out string oErrorMessage)
         {
             oErrorMessage = "";
-            string SQL = "select em_code from employee where upper(em_code)=:UserName and em_password =:PassWord";
+            string SQL = "select em_code from employee where (upper(em_code)=:UserName or upper(em_mobile)=:UserName1) and em_password =:PassWord";
             DataTable dt;
-            dt = (DataTable)dh.ExecuteSql(SQL, "select", iUserCode.ToUpper(), iPassWord);
+            dt = (DataTable)dh.ExecuteSql(SQL, "select", iUserCode.ToUpper(), iUserCode.ToUpper(), iPassWord);
             if (dt.Rows.Count > 0)
                 return true;
             else
@@ -109,9 +109,9 @@ namespace UAS_MES_NEW.PublicMethod
             oErrorMessage = "";
             iUserCode = iUserCode.ToUpper();
             iSourceCode = iSourceCode.ToUpper();
-            string SQL = "select em_code,em_type from employee where upper(em_code)=:UserName ";
+            string SQL = "select em_code,em_type from employee where upper(em_code)=:UserName or upper(em_mobile)=:UserName1 ";
             DataTable dt;
-            dt = (DataTable)dh.ExecuteSql(SQL, "select", iUserCode);
+            dt = (DataTable)dh.ExecuteSql(SQL, "select", iUserCode, iUserCode.ToUpper());
             if (dt.Rows.Count > 0)
             {
                 string em_type = dt.Rows[0]["em_type"].ToString();
@@ -591,7 +591,7 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 if (iMakeCode != oMakeCode && oMakeCode != "" && iMakeCode != "" && oStatus != "2")
                 {
-                    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号" + iSN + "所属工单"+ oMakeCode + "与当前工单"+ iMakeCode + "不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号" + iSN + "所属工单" + oMakeCode + "与当前工单" + iMakeCode + "不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                     //如果选择不切换赋值当前界面工单
                     if (ChangeMakeCode != "Yes")
                     {
@@ -632,7 +632,7 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 if (iSNMakecode != ctl.Text && ctl.Text != "")
                 {
-                    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号" + iSN + "所属工单"+ iSNMakecode+"与当前工单"+ ctl.Text + "不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                    string ChangeMakeCode = System.Windows.Forms.MessageBox.Show("序列号" + iSN + "所属工单" + iSNMakecode + "与当前工单" + ctl.Text + "不同，是否切换？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                     //如果选择不切换赋值当前界面工单
                     if (ChangeMakeCode == "Yes")
                     {
@@ -783,7 +783,7 @@ namespace UAS_MES_NEW.PublicMethod
                 dh.ExecuteSql("delete from oqcbatchdetail where obd_sncode='" + iSnCode + "'", "delete");
             }
             //删除SMT版绑定关系
-           // dh.ExecuteSql("delete from smtbind where sb_barcode = '"+iSnCode+"' and sb_makecode = '"+ iMakeCode + "'", "delete");
+            // dh.ExecuteSql("delete from smtbind where sb_barcode = '"+iSnCode+"' and sb_makecode = '"+ iMakeCode + "'", "delete");
             //之前保存的不良就不再调用
             DataTable dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_stepcode", "nvl(ms_ifrework,0)ms_ifrework", "ms_status" }, "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
             if (dt.Rows.Count > 0)
@@ -1420,23 +1420,25 @@ namespace UAS_MES_NEW.PublicMethod
                     oErrMsg = "序列号:" + iSN + "长度错误，不满足产品防呆规则!";
                     return false;
                 }
-                if (psr_prefix.Length>iSN.Length|| iSN.Substring(0, psr_prefix.Length) != psr_prefix)
+                if (psr_prefix.Length > iSN.Length || iSN.Substring(0, psr_prefix.Length) != psr_prefix)
                 {
                     oErrMsg = "序列号:" + iSN + "前缀错误，不满足产品防呆规则!";
                     return false;
                 }
             }
             //判断维护号段范围
-            dt = (DataTable)dh.ExecuteSql("select 1 from makesnruledetail where msd_makecode='"+iMakeCode+"'", "select");
-            if (dt.Rows.Count > 0) {
-                dt = (DataTable)dh.ExecuteSql("select 1 from makesnruledetail where msd_makecode='" + iMakeCode + "' and msd_sncode='"+iSN+"'", "select");
-                if (dt.Rows.Count == 0) {
+            dt = (DataTable)dh.ExecuteSql("select 1 from makesnruledetail where msd_makecode='" + iMakeCode + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                dt = (DataTable)dh.ExecuteSql("select 1 from makesnruledetail where msd_makecode='" + iMakeCode + "' and msd_sncode='" + iSN + "'", "select");
+                if (dt.Rows.Count == 0)
+                {
                     oErrMsg = "序列号:" + iSN + "不在工单防呆起始结束范围内!";
                     return false;
                 }
             }
             //判断导入清单范围
-            dt = (DataTable)dh.ExecuteSql("select 1 from makesnlist where msl_makecode='"+iMakeCode+"'", "select");
+            dt = (DataTable)dh.ExecuteSql("select 1 from makesnlist where msl_makecode='" + iMakeCode + "'", "select");
             if (dt.Rows.Count > 0)
             {
                 dt = (DataTable)dh.ExecuteSql("select 1 from makesnlist where msd_makecode='" + iMakeCode + "' and msl_sncode='" + iSN + "'", "select");

UAS_MES_JC/FunctionCode/Make/Make_FeedingCollection.cs

@@ -262,8 +262,9 @@ namespace UAS_MES_NEW.Make
                                     sql.Append("mcd_stepname,sp_fsoncode,ms_craftcode,ms_craftname,:barcode,1,sysdate,'" + User.UserCode + "','" + User.UserLineCode + "',ma_wccode,");
                                     sql.Append("'" + User.UserSourceCode + "',:sp_id,0,1,ms_firstsn from make left join makecraftdetail on mcd_maid=ma_id  left join stepproduct on sp_stepcode=mcd_stepcode ");
                                     sql.Append(" and sp_mothercode = ma_prodcode left join makeserial on ms_makecode=ma_code and sp_craftcode=ms_craftcode ");
-                                    sql.Append("where ma_code='" + make_code + "'and sp_id=:sp_id1 and mcd_stepcode = '" + User.CurrentStepCode + "' and ms_sncode='" + sn_code.Text + "'");
-                                    dh.BatchInsert(sql.GetString(), new string[] { "soncode", "barcode", "sp_id", "sp_id1" }, CollectDataSonCode.ToArray(), CollectData.ToArray(), SPID.ToArray(), SPID.ToArray());
+                                    sql.Append("where ma_code='" + make_code + "'and sp_id=:sp_id1 and mcd_stepcode = '" + User.CurrentStepCode + "' and ms_sncode='" + sn_code.Text + "'" +
+                                        "and :sp_id2 not in (select cm_spid from craftmaterial where cm_status=0 and cm_sncode='"+sn_code.Text+"') ");
+                                    dh.BatchInsert(sql.GetString(), new string[] { "soncode", "barcode", "sp_id", "sp_id1","sp_id2" }, CollectDataSonCode.ToArray(), CollectData.ToArray(), SPID.ToArray(), SPID.ToArray(), SPID.ToArray());
                                     sn_code.Clear();
                                     SPID.Clear();
                                     TSN.Clear();

UAS_MES_JC/FunctionCode/Query/Query_ExeProgress.cs

@@ -65,12 +65,13 @@ namespace UAS_MES_NEW.Query
         {
             if (e.KeyCode == Keys.Enter)
             {
-                dt = (DataTable)dh.ExecuteSql("select cm_sncode from craftmaterial where cm_barcode='" + sn_code.Text + "' and nvl(cm_status,0)=0", "select");
                 string sncode = sn_code.Text;
-                if (dt.Rows.Count > 0)
-                {
-                    sn_code.Text = dt.Rows[0]["cm_sncode"].ToString();
-                }
+                //dt = (DataTable)dh.ExecuteSql("select cm_sncode from craftmaterial where cm_barcode='" + sn_code.Text + "' and nvl(cm_status,0)=0", "select");
+              
+                //if (dt.Rows.Count > 0)
+                //{
+                //    sn_code.Text = dt.Rows[0]["cm_sncode"].ToString();
+                //}
                 ms_id = (DataTable)dh.ExecuteSql("select beforesn,sn from makesnrelation where beforesn='" + sn_code.Text + "' or sn='" + sn_code.Text + "'", "select");
                 if (ms_id.Rows.Count > 0)
                 {

UAS_MES_ZJT/DataOperate/ExcelHandler.cs

@@ -20,11 +20,10 @@ namespace UAS_MES_NEW.DataOperate
         /// </summary>
         public string ExportExcel(DataTable dt, string FolderPath)
         {
-            //创建一个内存流，用来接收转换成Excel的内容
             MemoryStream ms;
             ms = DataTableToExcel(dt);
             //以系统当前时间命名文件，FileMode.Create表示创建文件，FileAccess.Write表示拥有写的权限
-            string filePath = @FolderPath + "\\" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
+            string filePath = FolderPath;
             FileStream fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
             byte[] data = ms.ToArray();
             fs.Write(data, 0, data.Length);

UAS_MES_ZJT/FunctionCode/Special/Special_Reset.cs

@@ -68,7 +68,7 @@ namespace UAS_MES_NEW.Special
             }
             string makecode = dt.Rows[0]["ms_makecode"].ToString();
             string stname = dh.getFieldDataByCondition("step", "st_name", "st_code = '" + stepcode + "'").ToString();
-            dh.ExecuteSql("update makeserial set ms_status=1,ms_outboxcode='',ms_printcount = 0, ms_nextstepcode= '" + stepcode + "' where ms_sncode='" + sncode + "' and ms_makecode='" + makecode + "'", "update");
+            dh.ExecuteSql("update makeserial set ms_status=1,ms_outboxcode='',ms_stepcode='',ms_printcount = 0, ms_nextstepcode= '" + stepcode + "' where ms_sncode='" + sncode + "' and ms_makecode='" + makecode + "'", "update");
             dh.ExecuteSql("delete makebad where mb_sncode = '" + sncode + "' and mb_makecode='" + makecode + "' and mb_status = 0", "delete");
             dh.ExecuteSql("delete labelprintlog where lpl_value = '" + sncode + "'  ", "delete");
             sql.Clear();