Эх сурвалжийг харах

修改上料采集特殊字符校验

callm 2 өдөр өмнө
parent
commit
fdf5f5cdf6

+ 2 - 2
UAS_MES_YDCY/FunctionCode/Make/Make_ColorBoxLoadPrintBZ.cs

@@ -453,8 +453,8 @@ namespace UAS_MES_NEW.Make
             SPID.Add(sp_id);
             OperateResult.AppendText(">>物料" + sp_soncode + "采集成功,条码" + code.Text + "\n", Color.Green);
             LabelDataGridView.Rows[RemainIndex].Cells["BarCode"].Value = code.Text;
-            if (code.Text.Length > 80)
-                OperateResult.AppendText(">>采集条码" + code.Text + "程度超过长度限制80,内容截取前80位进行采集\n", Color.Red);
+            //if (code.Text.Length > 80)
+            //    OperateResult.AppendText(">>采集条码" + code.Text + "程度超过长度限制80,内容截取前80位进行采集\n", Color.Red);
             code.Clear();
             RemainIndex = RemainIndex + 1;
             //如果+1后不小于B序列的长度,则已采集完成,不需要进行提示了

+ 2 - 2
UAS_MES_YDCY/FunctionCode/Make/Make_FeedingCollection.cs

@@ -562,8 +562,8 @@ namespace UAS_MES_NEW.Make
             SPID.Add(sp_id);
             OperateResult.AppendText(">>物料" + sp_soncode + "采集成功,条码" + code.Text + "\n", Color.Green);
             LabelDataGridView.Rows[RemainIndex].Cells["BarCode"].Value = code.Text;
-            if (code.Text.Length > 80)
-                OperateResult.AppendText(">>采集条码" + code.Text + "程度超过长度限制80,内容截取前80位进行采集\n", Color.Red);
+            //if (code.Text.Length > 80)
+            //    OperateResult.AppendText(">>采集条码" + code.Text + "程度超过长度限制80,内容截取前80位进行采集\n", Color.Red);
             code.Clear();
             RemainIndex = RemainIndex + 1;
             //如果+1后不小于B序列的长度,则已采集完成,不需要进行提示了

+ 7 - 8
UAS_MES_YDCY/PublicMethod/LogicHandler.cs

@@ -1368,14 +1368,14 @@ namespace UAS_MES_NEW.PublicMethod
                         }
                         else
                         {
-                            dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode='" + iSN + "' and cm_status=0", "select");
+                            dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode=:sn and cm_status=0", "select", iSN);
                             if (dt.Rows.Count > 0)
                             {
                                 ErrMessage = "条码" + iSN + "已经上料";
                                 return false;
                             }
 
-                            dt = (DataTable)dh.ExecuteSql("select code from BANPRODLIST where code='" + iSN + "' and status=0", "select");
+                            dt = (DataTable)dh.ExecuteSql("select code from BANPRODLIST where code=:sn and status=0", "select",iSN);
                             if (dt.Rows.Count > 0)
                             {
                                 ErrMessage = "条码" + iSN + "在禁止上料清单中,不允许上料";
@@ -1520,7 +1520,7 @@ namespace UAS_MES_NEW.PublicMethod
                     if (iIfRepeat != "-1")
                     {
                         //判定条码是否已经上料了
-                        dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode='" + iSN + "' and cm_status=0", "select");
+                        dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode=:sn and cm_status=0", "select", iSN);
                         if (dt.Rows.Count > 0)
                         {
                             ErrMessage = "条码" + iSN + "已经上料";
@@ -1600,14 +1600,13 @@ namespace UAS_MES_NEW.PublicMethod
                             }
                             else
                             {
-                                dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode='" + iSN + "' and cm_status=0", "select");
+                                dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode=:sn and cm_status=0", "select", iSN);
                                 if (dt.Rows.Count > 0)
                                 {
                                     ErrMessage = "条码" + iSN + "已经上料";
                                     return false;
                                 }
-
-                                dt = (DataTable)dh.ExecuteSql("select code from BANPRODLIST where code='" + iSN + "' and status=0", "select");
+                                dt = (DataTable)dh.ExecuteSql("select code from BANPRODLIST where code=:sn and status=0", "select", iSN);
                                 if (dt.Rows.Count > 0)
                                 {
                                     ErrMessage = "条码" + iSN + "在禁止上料清单中,不允许上料";
@@ -1772,7 +1771,7 @@ namespace UAS_MES_NEW.PublicMethod
                     if (iIfRepeat != "-1")
                     {
                         //判定条码是否已经上料了
-                        dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode='" + iSN + "' and cm_status=0", "select");
+                        dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode=:sn and cm_status=0", "select", iSN);
                         if (dt.Rows.Count > 0)
                         {
                             ErrMessage = "条码" + iSN + "已经上料";
@@ -1806,7 +1805,7 @@ namespace UAS_MES_NEW.PublicMethod
                 case "RULE":
                     if (iIfRepeat != "-1")
                     {
-                        dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode='" + iSN + "' and cm_status=0", "select");
+                        dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode=:sn and cm_status=0", "select", iSN);
                         if (dt.Rows.Count > 0)
                         {
                             ErrMessage = "条码" + iSN + "已经上料";