From a509e548032dfbb9a4cca2788b9df28131264b8b Mon Sep 17 00:00:00 2001 From: LGH <1746689524@qq.com> Date: Wed, 20 Jul 2022 08:47:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=A0=E4=B8=BAreadyIn=E5=9C=A8=E5=A4=9A?= =?UTF-8?q?=E7=94=A8=E7=82=89=E7=AC=AC=E4=B8=80=E6=89=98=E7=9B=98=E4=B8=8B?= =?UTF-8?q?=E6=B2=B9=E5=90=8E=E4=B8=80=E7=9B=B4=E5=AD=98=E5=9C=A8,?= =?UTF-8?q?=E5=88=B0=E5=87=BA=E7=82=89=E4=B8=BA=E6=AD=A2.=E6=89=80?= =?UTF-8?q?=E4=BB=A5=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D=E7=82=89=E5=AD=90?= =?UTF-8?q?=E5=9C=A8=E5=8A=A0=E5=B7=A5=E7=9A=84=E4=BB=BB=E5=8A=A1,?= =?UTF-8?q?=E5=A4=A7=E4=BA=8E=E4=B8=80=E6=9D=A1,=E5=88=99=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=A0=B9=E6=8D=AEreadyIn=E5=8F=91=E8=B5=B7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mt/wms/empty/task/ScheduledTask.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java index bf8a513..46b5a96 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java @@ -534,6 +534,12 @@ public class ScheduledTask extends BaseService { //查询炉子是否allowIn Boolean kilnAllowIn = kilnAllowIn(kilnInfo.getId()); if (kilnReadyIn||kilnAllowIn){ + //因为readyIn在多用炉第一托盘下油后一直存在,到出炉为止.所以查询当前炉子在加工的任务,大于一条,则不再根据readyIn发起任务 + List currTaskList = currTaskServiceBiz.list(new QueryWrapper() + .eq(CurrTask.KILN_ID, kilnInfo.getId()).eq(CurrTask.IS_IN, 1)); + if (currTaskList.size()>1){ + continue; + } //缓存区是否有目标位置为工业炉的待加工任务 List inStockInfoList = inStockInfoServiceBiz.list(new QueryWrapper() .eq(InStockInfo.TYPE, 1)