yhluo 4 дней назад
Родитель
Сommit
d5cfcff558

+ 1 - 1
UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.cs

@@ -181,7 +181,7 @@ namespace UAS_MES_NEW.Make
             SQL.Clear();
             SQL.Append($@"INSERT INTO burn_inspect (burn_inspect_id,BURNLOTNO,BURNID,
                 inspect_res,inspect_time,inspect_name,inspect_num) VALUES (burn_inspect_seq.NEXTVAL, '{BurnLotnoVal.Text}',{burnId},
-                '{testResult}',sysdate,'{User.UserName}','{InspectNumVal.Text.Trim()}')");
+                '{testResult}',sysdate,'{EmployeeVal.Text.Trim()}','{InspectNumVal.Text.Trim()}')");
             dh.ExecuteSql(SQL.ToString(), "insert");
 
             ShowMsg(1, $"{BurnLotnoVal.Text} 记录抽检结果{testResult} 成功");

+ 17 - 6
UAS_MES_WEIP/FunctionCode/Make/Make_PcbClean.cs

@@ -139,16 +139,27 @@ namespace UAS_MES_NEW.Make
                 return;
             }
             WoVal.Text = dt.Rows[0]["SB_MAKECODE"].ToString();
+            string mainSn,singleSn;
+            mainSn = dt.Rows[0]["SB_MAINCODE"].ToString();
 
             dt = (DataTable)dh.ExecuteSql($@"select * from make,product where ma_code = '{WoVal.Text}' and ma_prodcode = pr_code", "select");
             SpecVal.Text = dt.Rows[0]["PR_SPEC"].ToString();
 
-            dh.ExecuteSql($@"INSERT INTO sn_clean (CLEAN_ID,SN,WORK_ORDER,LINE,SIDE,UPDATE_TIME,UPDATE_NAME)
-                VALUES (CLEAN_ID_SEQ.NEXTVAL, '{SnVal.Text}','{WoVal.Text}','{LineVal.Text}','{SideVal.Text}',sysdate,'{EmployeeVal.Text}')", "insert");
-            ShowMsg(1, $"序列号:{SnVal.Text} 已记录清洗");
-            SnVal.Focus();
-            SnVal.SelectAll();
-            SnVal.Text = "";
+            dt = (DataTable)dh.ExecuteSql($@"select * from smtbind where sb_maincode = '{mainSn}'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                foreach (DataRow item in dt.Rows)
+                {
+                    singleSn = item["sb_barcode"].ToString();
+
+                    dh.ExecuteSql($@"INSERT INTO sn_clean (CLEAN_ID,SN,WORK_ORDER,LINE,SIDE,UPDATE_TIME,UPDATE_NAME)
+                    VALUES (CLEAN_ID_SEQ.NEXTVAL, '{singleSn}','{WoVal.Text}','{LineVal.Text}','{SideVal.Text}',sysdate,'{EmployeeVal.Text}')", "insert");
+                    ShowMsg(1, $"序列号:{singleSn} 已记录清洗");
+                    SnVal.Focus();
+                    SnVal.SelectAll();
+                    SnVal.Text = "";
+                }
+            }
 
             dt = (DataTable)dh.ExecuteSql($@"SELECT sn, work_order,line,side,update_time,update_name FROM sn_clean WHERE line = '{LineVal.Text}' AND side = '{SideVal.Text}' ORDER BY update_time DESC", "select");
             DataBox.DataSource = dt;

+ 20 - 9
UAS_MES_WEIP/FunctionCode/Make/Make_PcbCleanCheck.cs

@@ -71,24 +71,35 @@ namespace UAS_MES_NEW.Make
             SideVal.Items.Add(dt.Rows[0]["SIDE"].ToString());
             EmployeeVal.Text = dt.Rows[0]["UPDATE_NAME"].ToString();
             SpecVal.Text = dt.Rows[0]["PR_SPEC"].ToString();
-
             LineVal.SelectedIndex = 0;
             SideVal.SelectedIndex = 0;
 
-            string SQL = $@"UPDATE sn_clean SET check_type = -1,check_time = sysdate,check_name = '{CheckEmployeeVal.Text}'
-                WHERE clean_id = (SELECT MAX(clean_id) FROM sn_clean WHERE sn = '{SnVal.Text}')";
-
-            dh.ExecuteSql(SQL, "update");
-
-            ShowMsg(1, $"序列号:{SnVal.Text} 核对清洗成功");
+            string singleSn;
+            dt = (DataTable)dh.ExecuteSql($@"SELECT * FROM smtbind WHERE sb_maincode IN 
+                (SELECT sb_maincode FROM smtbind WHERE sb_barcode = '{SnVal.Text}')", "select");
+            if (dt.Rows.Count > 0)
+            {
+                foreach (DataRow item in dt.Rows)
+                {
+                    singleSn = item["sb_barcode"].ToString();
+
+                    if (string.IsNullOrEmpty(singleSn))
+                    {
+                        continue;
+                    }
+
+                    dh.ExecuteSql($@"UPDATE sn_clean SET check_type = -1,check_time = sysdate,check_name = '{CheckEmployeeVal.Text}'
+                        WHERE clean_id = (SELECT MAX(clean_id) FROM sn_clean WHERE sn = '{singleSn}')", "update");
+                    ShowMsg(1, $"序列号:{singleSn} 核对清洗成功");
+                }
+            }
+            SnVal.Text = "";
 
             dt = (DataTable)dh.ExecuteSql($@"SELECT sn,work_order,line,side,update_time,update_name,check_type FROM sn_clean WHERE work_order = '{ms_makecode_Val.Text}'", "select");
             if (dt.Rows.Count > 0)
             {
                 DataBox.DataSource = dt;
             }
-
-            SnVal.Text = "";
         }
 
         private void ClearMsg_Click(object sender, EventArgs e)