回退更新站点

UAS_MES_YDCY/FunctionCode/Make/Make_StepType.cs

@@ -161,7 +161,7 @@ namespace UAS_MES_NEW.Make
             string stepName = dtStepName.Rows.Count > 0 ? dtStepName.Rows[0]["st_name"].ToString() : "";
 
             //五、把查到的工序编号回写到 makeserial 的下道工序字段（用主键 ms_id 更新）
-            dh.ExecuteSql("update makeserial set ms_nextstepcode='" + cdStepCode + "' where ms_id='" + msId + "'", "update");
+            dh.ExecuteSql("update makeserial set ms_checkstep='',ms_nextstepcode='" + cdStepCode + "' where ms_id='" + msId + "'", "update");
 
             OperateResult.AppendText("<<" + sn + "执行" + stepTypeName + "，下一工序为" + cdStepCode + "(" + stepName + ")\n", Color.Green, sncode);
             //记录操作日志：抽检(工序)类型 + 具体更新的工序

UAS_MES_YDCY/FunctionCode/OQC/OQC_PlanMaintain_Cust.cs

@@ -231,11 +231,11 @@ namespace UAS_MES_NEW.OQC
                             sql.Append("craftdetail on cd_crid = cr_id where cr_prodcode = '" + ms_prodcode.Text + "'  and cd_detno >= " + stepno + ") ");
                             sql.Append("and cm_sncode='" + ms_sncode.Text + "' and cm_makecode='" + oMakeCode + "'");
                             dh.ExecuteSql(sql.ToString(), "update");
-                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_nextstepcode='" + pcd_okretuenstep + "' where ms_id='" + oMSID + "'", "select");
+                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_checkstep='',ms_nextstepcode='" + pcd_okretuenstep + "' where ms_id='" + oMSID + "'", "select");
                         }
                         else
                         {
-                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0 where ms_id='" + oMSID + "'", "select");
+                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_checkstep='' where ms_id='" + oMSID + "'", "select");
                         }
                     }
                     else
@@ -287,7 +287,7 @@ namespace UAS_MES_NEW.OQC
                 sql.Append("where not exists (select ois_id from OQCItemSamples where OIS_SNCODE='" + ms_sncode.Text + "' and ois_itemcode =:ois_itemcode)");
                 dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng", "ois_itemcode" },
                     oi_itemcode_insert.ToArray(), ois_ifng_insert.ToArray(), oi_itemcode_insert.ToArray());
-                dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_status=3,ms_nextstepcode='' where ms_id='" + oMSID + "'", "select");
+                dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_checkstep='',ms_status=3,ms_nextstepcode='' where ms_id='" + oMSID + "'", "select");
 
                 if (ms_ifqccheck == "-1")
                 {
@@ -315,11 +315,11 @@ namespace UAS_MES_NEW.OQC
                             sql.Append("craftdetail on cd_crid = cr_id where cr_prodcode = '" + ms_prodcode.Text + "'  and cd_detno >= " + stepno + ") ");
                             sql.Append("and cm_sncode='" + ms_sncode.Text + "' and cm_makecode='" + oMakeCode + "'");
                             dh.ExecuteSql(sql.ToString(), "update");
-                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_nextstepcode='" + pcd_ngretuenstep + "' where ms_id='" + oMSID + "'", "select");
+                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_checkstep='',ms_nextstepcode='" + pcd_ngretuenstep + "' where ms_id='" + oMSID + "'", "select");
                         }
                         else
                         {
-                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0 where ms_id='" + oMSID + "'", "select");
+                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_checkstep='' where ms_id='" + oMSID + "'", "select");
                         }
                     }
                     else

UAS_MES_YDCY/FunctionCode/OQC/OQC_PlanMaintain_NEW.cs

@@ -234,11 +234,11 @@ namespace UAS_MES_NEW.OQC
                             sql.Append("craftdetail on cd_crid = cr_id where cr_prodcode = '" + ms_prodcode.Text + "'  and cd_detno >= " + stepno + ") ");
                             sql.Append("and cm_sncode='" + ms_sncode.Text + "' and cm_makecode='" + oMakeCode + "'");
                             dh.ExecuteSql(sql.ToString(), "update");
-                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_outboxcode='',ms_nextstepcode='" + pcd_okretuenstep + "' where ms_id='" + oMSID + "'", "select");
+                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_checkstep='',ms_outboxcode='',ms_nextstepcode='" + pcd_okretuenstep + "' where ms_id='" + oMSID + "'", "select");
                         }
                         else
                         {
-                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_outboxcode='' where ms_id='" + oMSID + "'", "select");
+                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_checkstep='',ms_outboxcode='' where ms_id='" + oMSID + "'", "select");
                         }
                         dh.ExecuteSql("delete from packagedetail where pd_outboxcode='" + ms_outboxcode + "' and pd_barcode='" + ms_sncode.Text + "'", "delete");
                         //减少箱内容量
@@ -272,7 +272,7 @@ namespace UAS_MES_NEW.OQC
                         }
                     }
                 }
-                dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0 where ms_id='" + oMSID + "'", "select");
+                dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_checkstep='' where ms_id='" + oMSID + "'", "select");
                 //if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, ms_sncode.Text, "良品采集", "OK", User.UserCode, out ErrorMessage))
                 //{
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "采集良品", "采集良品成功", ms_sncode.Text, "");
@@ -295,7 +295,7 @@ namespace UAS_MES_NEW.OQC
                 //sql.Append("where not exists (select ois_id from OQCItemSamples where OIS_SNCODE='" + ms_sncode.Text + "' and ois_itemcode =:ois_itemcode)");
                 dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng"/*, "ois_itemcode" */},
                     oi_itemcode_insert.ToArray(), ois_ifng_insert.ToArray(), oi_itemcode_insert.ToArray());
-                dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_status=3,ms_nextstepcode='' where ms_id='" + oMSID + "'", "select");
+                dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_checkstep='',ms_status=3,ms_nextstepcode='' where ms_id='" + oMSID + "'", "select");
 
 
                 dh.ExecuteSql("insert into makebad(MB_ID, MB_MAKECODE, MB_MSCODE, MB_SNCODE, MB_INMAN, MB_INDATE, MB_STEPCODE, MB_SOURCECODE, MB_BADCODE, MB_BGCODE, " +
@@ -330,11 +330,11 @@ namespace UAS_MES_NEW.OQC
                             sql.Append("craftdetail on cd_crid = cr_id where cr_prodcode = '" + ms_prodcode.Text + "'  and cd_detno >= " + stepno + ") ");
                             sql.Append("and cm_sncode='" + ms_sncode.Text + "' and cm_makecode='" + oMakeCode + "'");
                             dh.ExecuteSql(sql.ToString(), "update");
-                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_outboxcode='',ms_nextstepcode='" + pcd_ngretuenstep + "' where ms_id='" + oMSID + "'", "select");
+                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_checkstep='',ms_outboxcode='',ms_nextstepcode='" + pcd_ngretuenstep + "' where ms_id='" + oMSID + "'", "select");
                         }
                         else
                         {
-                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_outboxcode='' where ms_id='" + oMSID + "'", "select");
+                            dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_checkstep='',ms_outboxcode='' where ms_id='" + oMSID + "'", "select");
                         }
                         dh.ExecuteSql("delete from packagedetail where pd_outboxcode='" + ms_outboxcode + "' and pd_barcode='" + ms_sncode.Text + "'", "delete");
                         //减少箱内容量