From 2bb948e6c454e80c039a0414ae972e2f0cb6a0f8 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 25 Sep 2024 13:15:11 +0800 Subject: [PATCH] =?UTF-8?q?JIS=E7=89=A9=E6=96=99=E6=8B=89=E5=8A=A8PCN=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AE=E5=B7=A5=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java index 506087e..1b8e7b2 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java @@ -120,8 +120,8 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService { // if (!StringUtil.isEmpty(bean.orderBy())) { // packBean.setOrderByStr(bean.orderBy()); // } else { - //顺序校验 根据未扫描单号 1 、2 、3，如果没有强过码 必须先扫1 再扫2 - DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"pullingOrderNo"}, packBean); + //顺序校验 根据未扫描单号 1 、2 、3，如果没有强过码 必须先扫1 再扫2 pullingOrderNo修改位workOrderNo + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"workOrderNo"}, packBean); // } List pullingOrderInfos = mesPullingOrderInfoRepository.findByHqlWhere(packBean); if (!CollectionUtils.isEmpty(pullingOrderInfos)) {