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

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -113,9 +113,18 @@ namespace UAS_MES.OQC
         {
             if (ob_status.Text == "待检验")
             {
+                sql.Clear();
+                sql.Append("select wm_concat(ms_sncode) sn from oqcbatch left join oqcbatchdetail on ob_id=obd_obid left join makeserial ");
+                sql.Append("on ms_sncode=obd_sncode and obd_makecode=ms_makecode where ob_checkno='" + ob_checkno.Text + "' and ms_downstatus<>0");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows[0]["sn"].ToString() != "")
+                {
+                    OperateResult.AppendText(">>批次含有序列号" + dt.Rows[0]["sn"].ToString() + "处于下地状态，不允许保存抽样计划\n", Color.Red);
+                    return;
+                }
                 if (ob_source.Text == "返工" && ob_reworkcode.Text != "")
                 {
-                    dt = (DataTable)dh.ExecuteSql("select re_id from rework where re_code='" + ob_reworkcode.Text + "' and nvl(re_nullngfinsh,0)<>0", "select");
+                    dt = (DataTable)dh.ExecuteSql("select re_id from rework where re_code='" + ob_reworkcode.Text + "' and nvl(re_nullngfinsh,0)=0", "select");
                     if (dt.Rows.Count > 0)
                     {
                         sql.Clear();
@@ -125,7 +134,7 @@ namespace UAS_MES.OQC
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows[0]["sn"].ToString() != "")
                         {
-                            OperateResult.AppendText(">>序列号" + dt.Rows[0]["sn"].ToString() + "下一道不是OQC工序", Color.Red);
+                            OperateResult.AppendText(">>序列号" + dt.Rows[0]["sn"].ToString() + "下一道不是OQC工序\n", Color.Red);
                             return;
                         }
                     }