优化上料采集核对

UAS_MES_YD/PublicMethod/LogicHandler.cs

@@ -1111,14 +1111,14 @@ namespace UAS_MES_NEW.PublicMethod
                     if (iIfRepeat != "-1")
                     {
                         //判定条码是否已经上料了
-                        dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode=:sn and cm_status=0", "select",iSN);
+                        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 bar_prodcode,bar_code from barcode where bar_code=:sn", "select",iSN);
+                    dt = (DataTable)dh.ExecuteSql("select bar_prodcode,bar_code from barcode where bar_code=:sn", "select", iSN);
                     if (dt.Rows.Count > 0)
                     {
                         string bar_prodcode = dt.Rows[0]["bar_prodcode"].ToString();
@@ -1145,7 +1145,7 @@ namespace UAS_MES_NEW.PublicMethod
                 case "RULE":
                     if (iIfRepeat != "-1")
                     {
-                        dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode=:sn and cm_status=0", "select",iSN);
+                        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 + "已经上料";
@@ -1212,7 +1212,8 @@ namespace UAS_MES_NEW.PublicMethod
                         ErrMessage = iSN + "不在上料清单中，不允许上料";
                         return false;
                     }
-                    else {
+                    else
+                    {
                         return true;
                     }
                     break;
@@ -1281,6 +1282,7 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 case "MAKE":
                     string makecode = dh.getFieldDataByCondition("package", "pa_makecode", "pa_outboxcode='" + outboxcode + "'").ToString();
+                    pa_makecode = dh.getFieldDataByCondition("package", "pa_makecode", "pa_outboxcode='" + pa_outboxcode + "'").ToString();
                     if (makecode != pa_makecode && pa_makecode != "")
                     {
                         error = ">>当前箱" + outboxcode + "对应工单号" + makecode + "和所装" + type + "号" + pa_outboxcode + "对应工单" + pa_makecode + "不相等";