Merge repos.ubtob.net:usoft/mes-client

UAS_MES_BG/FunctionCode/Make/Make_ParseLog.cs

@@ -689,12 +689,13 @@ namespace UAS_MES_NEW.Make
                             List<string> ReelNo = new List<string>();
                             List<string> letNo = new List<string>();
 
-                            string Part_ = "";
+                            string Part_ = "",Side_="";
                             int letNoNum = 0;
                             foreach (var item in xmlList)
                             {
                                 MachineName.Add(item.MachineName);
-                                Part_ = item.Part.Split('.')[0];
+                                Part_ = item.Part.Split('.')[0].Split('-')[0];
+                                Side_ = item.Part.Split('.')[0].Split('-')[1];
                                 Station.Add(item.Station);
                                 ReelNo.Add(item.ReelNo);
                                 letNo.Add((++letNoNum).ToString());
@@ -710,7 +711,7 @@ namespace UAS_MES_NEW.Make
                                     "values('" + ps_id + "','" + Part_ + "','在录入','ENTERING','" + lineId + "','" + PS_CODE + "','A',SYSDATE,SYSDATE)", "insert");*/
 
                                 dh.ExecuteSql("insert into productsmt(ps_id,ps_prodcode,ps_status,ps_statuscode,PS_LINECODE,PS_CODE,PS_TABLE,PS_INDATE,PS_AUDITDATE,PS_AUDITMAN)" +
-                                    "values('" + ps_id + "','" + Part_ + "','已审核','AUDITED','" + lineId + "','" + PS_CODE + "','A',SYSDATE,SYSDATE,'"+ User.UserName +"')", "insert");
+                                    "values('" + ps_id + "','" + Part_ + "','已审核','AUDITED','" + lineId + "','" + PS_CODE + "','"+ Side_ + "',SYSDATE,SYSDATE,'"+ User.UserName +"')", "insert");
                             }
                             else
                             {
@@ -722,7 +723,7 @@ namespace UAS_MES_NEW.Make
                             }
                             sql.Clear();
                             sql.Append("insert into productsmtlocation(PSL_ID, PSL_PSID, PSL_DETNO, PSL_PRODCODE, PSL_REPCODE, PSL_LOCATION, PSL_BASEQTY, PSL_TABLE)" +
-                                "select productsmtlocation_seq.nextval,'" + ps_id + "',:letArr, :ReelNo,:ReelNo,:Station,BD_BASEQTY,'A' from bom@ERP " +
+                                "select productsmtlocation_seq.nextval,'" + ps_id + "',:letArr, :ReelNo,:ReelNo,:Station,BD_BASEQTY,'"+ Side_ + "' from bom@ERP " +
                                 "left join bomdetail@ERP on bo_id=bd_bomid where bo_mothercode='" + Part_ + "' and BD_SONCODE=:ReelNo");
                             dh.BatchInsert(sql.GetString(), new string[] { "letArr", "ReelNo", "ReelNo", "Station", "ReelNo" },
                                 letNo.ToArray(), ReelNo.ToArray(), ReelNo.ToArray(), Station.ToArray(), ReelNo.ToArray());
@@ -929,7 +930,7 @@ namespace UAS_MES_NEW.Make
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "日志解析", "日志解析成功", item.SN, "");
 
                             param.Add(item.SN);
-                            param.Add(item.Work_order);
+                            param.Add(omakeCode);
                             param.Add(item.Result == "PASS" ? "OK" : "NG");
                             param.Add(equiType);
                             param.Add(item.Details);

UAS_MES_HGS/FunctionCode/Make/Make_ImeiCheck.cs

@@ -69,8 +69,7 @@ namespace UAS_MES_NEW.Make
                 {
                     OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
                     sql.Clear();
-                    /*sql.Append("select max(ms_id) ms_id from makeserial where ms_sncode ='" + sncode.Text + "'");*/
-                    sql.Append("select max(MAL_ID) mal_id from makeaddresslist where MAL_SNCODE = '" + sncode.Text + "'");
+                    sql.Append("select ms_sncode from makeserial where ms_sncode ='" + sncode.Text + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     if (dt.Rows.Count == 0 || dt.Rows[0]["mal_id"].ToString() == "")
                     {
@@ -81,7 +80,7 @@ namespace UAS_MES_NEW.Make
                     {
                         sql.Clear();
                         /*sql.Append("select ms_sncode from  makeserial  where ms_id='" + dt.Rows[0]["ms_id"].ToString() + "'");*/
-                        sql.Append("select MAL_SN1_USER from makeaddresslist where MAL_ID = '" + dt.Rows[0]["ms_id"].ToString() + "'");
+                        sql.Append("select MAL_SN1_USER from makeaddresslist where MAL_SNCODE = '" + dt.Rows[0]["ms_sncode"].ToString() + "'");
                         info = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (info.Rows.Count > 0)
                         {

UAS_MES_HGS/UAS_MES_HGS.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.14.36202.13 d17.14
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS_MES_HGS", "UAS_MES_HGS.csproj", "{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBB3AFA6-BBAC-42DB-8E4C-E02D71A27630}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C6FD7080-F710-49FB-B595-090FBC9BD92F}
+	EndGlobalSection
+EndGlobal