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

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -177,7 +177,7 @@ namespace UAS_MES.Make
                         if (pa_nextstep == "")
                         {
                             //判断线外，必须已完工并且未入库
-                            dt = (DataTable)dh.ExecuteSql("select wm_concat(ms_sncode) from mes_package_view  left join makeserial on v_barcode=ms_sncode where  v_outboxcode='" + outboxcode.Text + "' and ms_status<>2", "select");
+                            dt = (DataTable)dh.ExecuteSql("select wm_concat(ms_sncode) from mes_package_view  left join makeserial on v_barcode=ms_sncode and v_makecode = ms_makecode where  v_outboxcode='" + outboxcode.Text + "' and ms_status<>2", "select");
                             if (dt.Rows[0][0].ToString() != "" && (unfinpack != "0" || unfinpack == ""))
                             {
                                 OperateResult.AppendText(">>序列号" + dt.Rows[0][0].ToString() + "尚未完工\n", Color.Red);

UAS-MES/Login.cs

@@ -74,18 +74,23 @@ namespace UAS_MES
                 DB.ValueMember = "db_user";
                 DB.Text = BaseUtil.GetCacheData("LastLoginSob").ToString();
                 LoginButton.Enabled = true;
-
-                string nowtime = dh.getFieldDataByCondition("dual", "to_char(sysdate,'yyyy-MM-dd HH24:mm:ss')", "1=1").ToString();
-                //取得数据库时间
-                DateTime dt;
-                DateTimeFormatInfo dtFormat = new DateTimeFormatInfo();
-                dtFormat.ShortDatePattern = "yyyy-MM-dd hh:mm:ss";
-                dt = Convert.ToDateTime(nowtime, dtFormat);
-                //转换System.DateTime到SYSTEMTIME
-                SYSDATE.SYSTEMTIME st = new SYSDATE.SYSTEMTIME();
-                st.FromDateTime(dt);
-                //调用Win32 API设置系统时间
-                SYSDATE.Win32API.SetLocalTime(ref st);
+                //获取数据库时间与系统当前时间比较
+                //string nowtime = dh.getFieldDataByCondition("dual", "to_char(sysdate,'yyyy-MM-dd HH24:mm:ss')", "1=1").ToString();
+                //string sysdate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                ////系统当前时间如果小于数据库时间则更新至数据库时间
+                //if (nowtime.CompareTo(sysdate) > 0)
+                //{
+                //    //取得数据库时间
+                //    DateTime dt;
+                //    DateTimeFormatInfo dtFormat = new DateTimeFormatInfo();
+                //    dtFormat.ShortDatePattern = "yyyy-MM-dd hh:mm:ss";
+                //    dt = Convert.ToDateTime(nowtime, dtFormat);
+                //    //转换System.DateTime到SYSTEMTIME
+                //    SYSDATE.SYSTEMTIME st = new SYSDATE.SYSTEMTIME();
+                //    st.FromDateTime(dt);
+                //    //调用Win32 API设置系统时间
+                //    SYSDATE.Win32API.SetLocalTime(ref st);
+                //}
             }
             catch (Exception ex)
             {