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

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -222,7 +222,7 @@ namespace UAS_MES.Make
                             CollectData.Add(code.Text);
                             SPID.Add(sp_id);
                             CollectDataSonCode.Add(sp_soncode);
-                            OperateResult.AppendText(">>物料" + code.Text + "采集成功\n", Color.Green, code);
+                            OperateResult.AppendText(">>物料" + code.Text + "采集成功,条码号" + code.Text + "\n", Color.Green, code);
                             RemainIndex = RemainIndex + 1;
                         }
                         else

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -382,7 +382,7 @@ namespace UAS_MES.Make
             RemainIndex = RemainIndex + 1;
             CollectData.Add(code.Text);
             SPID.Add(sp_id);
-            OperateResult.AppendText(">>物料" + sp_soncode + "采集成功\n", Color.Green);
+            OperateResult.AppendText(">>物料" + sp_soncode + "采集成功,条码" + code.Text + "\n", Color.Green);
             code.Clear();
             //如果+1后不小于B序列的长度，则已采集完成，不需要进行提示了
             if (RemainIndex < RemainList.Length)

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -579,6 +579,7 @@ namespace UAS_MES.Make
                                 //删除箱的明细
                                 SQLS2.Add("delete from packagedetail where pd_outboxcode='" + pa_outboxcode.Text + "'");
                                 dh.ExecuteSQLTran(SQLS2.ToArray());
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "卡通箱拆解", "成功", pa_outboxcode.Text, ob_checkno.Text);
                                 OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "成功拆解!\n", Color.Green);
                                 LoadGridData();
                                 LoadCheckQTY();

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -339,21 +339,18 @@ namespace UAS_MES.Make
                                 ////箱号不存在的情况
                                 if (LogicHandler.Packing(sn_code.Text, pa_outboxcode.Text, AutoGenBoxCode.Checked, "标准", User.UserSourceCode, User.UserCode, pr_outboxinnerqty.Text, Cancel.Checked, out oOutBoxCode, out ErrorMessage))
                                 {
-                                    //if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code.Text, "包装采集", "装箱成功", User.UserCode, out ErrorMessage))
-                                    //{
                                     //提示正确返回时传递的信息
                                     if (ErrorMessage.Contains("AFTERSUCCESS"))
                                         OperateResult.AppendText(">>" + ErrorMessage + "\n");
                                     LoadCheckQTY();
                                     OperateResult.AppendText(">>序列号" + sn_code.Text + "采集成功！\n", Color.Green);
-                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "卡通箱采集", "卡通箱"+pa_outboxcode.Text+"采集成功", sn_code.Text, "");
+                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "卡通箱采集", "卡通箱" + pa_outboxcode.Text + "采集成功", sn_code.Text, "");
                                     LastSncode = sn_code.Text;
                                     //满箱更新状态为1
                                     LoadData();
                                     //采集完后如果是第一个装的序列号，把序列号的NextStepCode赋值给箱号
                                     if (pa_currentqty.Text == "1")
                                     {
-                                        //  string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsID + "'").ToString();
                                         dh.UpdateByCondition("package", "pa_nextstep='" + User.CurrentStepCode + "', PA_CURRENTSTEP = '" + User.CurrentStepCode + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
                                     }
                                     LoadGridData();
@@ -380,7 +377,6 @@ namespace UAS_MES.Make
                                         if (AutoPrint.Checked)
                                             Print_Click(new object(), new EventArgs());
                                     }
-                                    //}
                                 }
                                 else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                             }
@@ -390,7 +386,7 @@ namespace UAS_MES.Make
                         {
                             if (LogicHandler.Packing(sn_code.Text, pa_outboxcode.Text, AutoGenBoxCode.Checked, "标准", User.UserSourceCode, User.UserCode, pr_outboxinnerqty.Text, Cancel.Checked, out oOutBoxCode, out ErrorMessage))
                             {
-                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "卡通箱采集", "卡通箱" + pa_outboxcode.Text +"取消采集成功", sn_code.Text, "");
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "卡通箱采集", "卡通箱" + pa_outboxcode.Text + "取消采集成功", sn_code.Text, "");
                                 LoadGridData();
                                 pa_status.Text = "0";
                                 OperateResult.AppendText(">>已从该箱中移除序列号" + sn_code.Text + "\n", Color.Green, sn_code);
@@ -679,6 +675,7 @@ namespace UAS_MES.Make
                                 //删除箱的明细
                                 SQLS2.Add("delete from packagedetail where pd_outboxcode='" + pa_outboxcode.Text + "'");
                                 dh.ExecuteSQLTran(SQLS2.ToArray());
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "卡通箱拆解", "成功", pa_outboxcode.Text, ob_checkno.Text);
                                 OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "成功拆解!\n", Color.Green);
                                 LoadGridData();
                                 LoadCheckQTY();

UAS_CustomerInterface/MesHelper.cs

@@ -25,7 +25,7 @@ namespace UAS.MES
         bool SetMobileData(string iTSN, string iSN, string iSourceCode, string iOperator, string iResult, string iErrCode, string flag, out string oErrorMessage);
         bool SetPcbaData(string iSN, string iResCode, string iOperator, string iResult, string iErrCode, out string oErrMessage);
         bool GoMo(string iMO, string iSN, string iResCode, out string oErrMessage);
-        bool GetSNAllInfo(string iSN, out string oMoCode, out string oSaleCode, out string oProdType, out string oSoftVersion1, out string oSoftVersion2, out string oSoftVersion3, out string oMaterialCode1, out string oMaterialCode2, out string oMaterialCode3, out string oWifi, out string oBT, out string oIMEI1, out string oIMEI2, out string oIMEI3, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oErrMessage);
+        bool GetSNAllInfo(string iSN, out string oMakeCode, out string oSaleCode, out string oProdType, out string oSoftVersion1, out string oSoftVersion2, out string oSoftVersion3, out string oMaterialCode1, out string oMaterialCode2, out string oMaterialCode3, out string oMAC, out string oBT, out string oIMEI1, out string oIMEI2, out string oIMEI3, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oErrMessage);
     }
 
     [Guid("707D771D-AA71-4BC1-B2DA-05CBBA868362")]
@@ -1042,10 +1042,89 @@ namespace UAS.MES
                 cmd.Connection.Open();
             }
         }
-
-        public bool GetSNAllInfo(string iSN, out string oMoCode, out string oSaleCode, out string oProdType, out string oSoftVersion1, out string oSoftVersion2, out string oSoftVersion3, out string oMaterialCode1, out string oMaterialCode2, out string oMaterialCode3, out string oWifi, out string oBT, out string oIMEI1, out string oIMEI2, out string oIMEI3, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oErrMessage)
+        /// <summary>
+        /// 获取序列号所有的信息
+        /// </summary>
+        /// <param name="iSN"></param>
+        /// <param name="oMakeCode"></param>
+        /// <param name="oSaleCode"></param>
+        /// <param name="oProdType"></param>
+        /// <param name="oSoftVersion1"></param>
+        /// <param name="oSoftVersion2"></param>
+        /// <param name="oSoftVersion3"></param>
+        /// <param name="oMaterialCode1"></param>
+        /// <param name="oMaterialCode2"></param>
+        /// <param name="oMaterialCode3"></param>
+        /// <param name="oMAC"></param>
+        /// <param name="oBT"></param>
+        /// <param name="oIMEI1"></param>
+        /// <param name="oIMEI2"></param>
+        /// <param name="oIMEI3"></param>
+        /// <param name="oMEID"></param>
+        /// <param name="oNetCode"></param>
+        /// <param name="oPSN"></param>
+        /// <param name="oID1"></param>
+        /// <param name="oID2"></param>
+        /// <param name="oID3"></param>
+        /// <param name="oErrMessage"></param>
+        /// <returns></returns>
+        public bool GetSNAllInfo(string iSN, out string oMakeCode, out string oSaleCode, out string oProdType, out string oSoftVersion1, out string oSoftVersion2, out string oSoftVersion3, out string oMaterialCode1, out string oMaterialCode2, out string oMaterialCode3, out string oMAC, out string oBT, out string oIMEI1, out string oIMEI2, out string oIMEI3, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oErrMessage)
         {
-            throw new NotImplementedException();
+            oMakeCode = "";
+            oSaleCode = "";
+            oProdType = "";
+            oSoftVersion1 = "";
+            oSoftVersion2 = "";
+            oSoftVersion3 = "";
+            oMaterialCode1 = "";
+            oMaterialCode2 = "";
+            oMaterialCode3 = "";
+            oMAC = "";
+            oBT = "";
+            oIMEI1 = "";
+            oIMEI2 = "";
+            oIMEI3 = "";
+            oMEID = "";
+            oNetCode = "";
+            oPSN = "";
+            oID1 = "";
+            oID2 = "";
+            oID3 = "";
+            oErrMessage = "";
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            string[] param = new string[] { iSN, oMakeCode,oSaleCode,oProdType,oSoftVersion1,oSoftVersion2,oSoftVersion3,oMaterialCode1,oMaterialCode2,oMaterialCode3, oMAC, oBT, oIMEI1,oIMEI2,oIMEI3,oMEID,oNetCode,oPSN,oID1,oID2,oID3, oErrMessage };
+            string[] ParamName = new string[] { "v_i_sncode", "v_o_makecode", "v_o_salecode", "v_o_prodtype", "v_o_softverision1", "v_o_softverision2", "v_o_softverision3", "v_o_materialcode1", "v_o_materialcode2", "v_o_materialcode3", "v_o_mac", "v_o_bt", "v_o_imei1", "v_o_imei2", "v_o_imei3", "v_o_meid", "v_o_netcode", "v_o_psn", "v_o_id1", "v_o_id2", "v_o_id3", "v_o_errmsg" };
+            CallProcedure("CS_DLLGETSNINFO", ParamName, ref param);
+            oMakeCode = param[1];
+            oSaleCode = param[2];
+            oProdType = param[3];
+            oSoftVersion1 = param[4];
+            oSoftVersion2 = param[5];
+            oSoftVersion3 = param[6];
+            oMaterialCode1 = param[7];
+            oMaterialCode2 = param[8];
+            oMaterialCode3 = param[9];
+            oMAC = param[10];
+            oBT = param[11];
+            oIMEI1 = param[12];
+            oIMEI2 = param[13];
+            oIMEI3 = param[14];
+            oMEID = param[15];
+            oNetCode = param[16];
+            oPSN = param[17];
+            oID1 = param[18];
+            oID2 = param[19];
+            oID3 = param[20];
+            oErrMessage = param[21];
+            if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
+                return true;
+            else
+                return false;
         }
     }
 }

UAS_MesInterface(4.0)/MesHelper.cs

@@ -39,7 +39,7 @@ namespace BenQGuru.eMES.DLLService
         //用于存放批量执行的SQL
         List<string> sqls = new List<string>();
         //系统默认的的连接字符串
-        private string ConnectionStrings = "Data Source=192.168.230.200/orcl;User ID=MES_TEST;PassWord=select!#%*(;";
+        private string ConnectionStrings = "Data Source=192.168.230.200/orcl;User ID=MES;PassWord=select!#%*(;";
         //用户选择的数据库的连接字符串
         private OracleConnection connection;
         //用户选择的数据库的连接字符串
@@ -278,7 +278,11 @@ namespace BenQGuru.eMES.DLLService
                 return false;
             }
             oErrMessage = "";
-            string ms_id = getFieldDataByCondition("MakeSerial", "max(ms_id) ms_id", "ms_sncode='" + iSN + "' or ms_firstsn in (select firstsn from makesnrelation where sn='" + iSN + "')").ToString();
+            sql.Clear();
+            sql.Append("select max(ms_id) from makeserial where ms_sncode in (select '"+ iSN + "' from dual union select ");
+            sql.Append("beforesn from makesnrelation where sn='"+ iSN + "' and beforesn<>' ')");
+            DataTable dt = (DataTable)ExecuteSql(sql.ToString(), "select");
+            string ms_id = dt.Rows[0][0].ToString();
             oMoCode = getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id + "'").ToString();
             if (oMoCode != "")
                 return true;