箱号物料核对逻辑修改

UAS_MES_YD/FunctionCode/Packing/Packing_PackageCollection.cs

@@ -263,8 +263,8 @@ namespace UAS_MES_NEW.Packing
                             dt = (DataTable)dh.ExecuteSql("select mm_prodcode,ma_code,pr_detail,pr_kind from makematerial left join make on mm_code=ma_code left join product on pr_code=mm_prodcode\r\nwhere pr_kind='卡通箱' and (mm_prodcode='"+outboxprcode.Text+"' or instr(MM_REPPRODCODE,'"+outboxprcode.Text+"')>0) and ma_code='"+oMakeCode+"'", "select");
                             if (dt.Rows.Count == 0) {
                                 OperateResult.AppendText("箱号:" + outboxprcode.Text + ",不允许用在当前工单\n", Color.Red);
+                                return;
                             }
-                            return;
                         }
                         PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code and cr_prodcode = ms_prodcode", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
                         //获取序列号信息

UAS_MES_YD/FunctionCode/Packing/Packing_PackageCollectionWeigh.cs

@@ -332,8 +332,8 @@ namespace UAS_MES_NEW.Packing
                             if (dt.Rows.Count == 0)
                             {
                                 OperateResult.AppendText("箱号:" + outboxprcode.Text + ",不允许用在当前工单\n", Color.Red);
+                                return;
                             }
-                            return;
                         }
                         //PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
                         sql.Clear();

UAS_MES_YD/FunctionCode/Packing/Packing_PackageCollectionWeigh_HAOQ.cs

@@ -317,8 +317,8 @@ namespace UAS_MES_NEW.Packing
                             if (dt.Rows.Count == 0)
                             {
                                 OperateResult.AppendText("箱号:" + outboxprcode.Text + ",不允许用在当前工单\n", Color.Red);
+                                return;
                             }
-                            return;
                         }
                         //PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
                         sql.Clear();