章政 8 жил өмнө
parent
commit
cee4c5b36c

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -171,7 +171,7 @@ namespace UAS_MES.Make
                         {
                             //判断线外,必须已完工并且未入库
                             dt = (DataTable)dh.ExecuteSql("select wm_concat(ms_sncode) from mes_package_view  left join makeserial on v_barcode=ms_sncode where  v_outboxcode='" + outboxcode.Text + "' and ms_status<>2", "select");
-                            if (dt.Rows[0][0].ToString() != "" || (unfinpack != "0" || unfinpack == ""))
+                            if (dt.Rows[0][0].ToString() != "" &&  (unfinpack != "0" || unfinpack == ""))
                             {
                                 OperateResult.AppendText(">>序列号" + dt.Rows[0][0].ToString() + "尚未完工\n", Color.Red);
                                 return;