判断卡通箱内产品是否正确完工逻辑修改

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

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