From 082d6fd0d67afcf5e120525ba4088338d22f4ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Tue, 14 May 2024 17:05:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=20=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20NC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/pcn/apiservice/daoimpl/MesNcProcessingDao.java | 4 ++++ .../apiservice/serviceimpl/busi/MesInputDefectRecordService.java | 6 +++--- .../apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesNcProcessingDao.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesNcProcessingDao.java index c2257d1..5cd3d91 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesNcProcessingDao.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesNcProcessingDao.java @@ -3,7 +3,9 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.daoimpl; import cn.estsh.i3plus.ext.mes.pcn.apiservice.dao.IMesNcProcessingDao; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesNcProcessingPartAndLotModel; import cn.estsh.i3plus.pojo.base.common.Pager; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import javax.persistence.EntityManager; @@ -11,6 +13,8 @@ import javax.persistence.Query; import java.util.ArrayList; import java.util.List; +@Service +@Slf4j public class MesNcProcessingDao implements IMesNcProcessingDao { @Autowired diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java index 83234e9..ea5cf37 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java @@ -147,7 +147,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService //通过条码判断是单件还是批次， //扫描条码则是单件 没有条码是批次 - if (StringUtils.isEmpty(defectRecordList.get(0).getSerialNumber())) { + if (!StringUtils.isEmpty(defectRecordList.get(0).getSerialNumber())) { //检查条码 MesProduceSn produceSn = checkProduceSn(defectRecordList.get(0).getSerialNumber(), org); @@ -288,7 +288,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService DdlPackBean packBean = DdlPackBean.getDdlPackBean(org); DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(part.getPartTypeCode(), "partTypeCode", packBean); - DdlPreparedPack.getNumEqualPack(sides, "frontAndBackSides", packBean); + DdlPreparedPack.getNumEqualPack(sides, "sides", packBean); DdlPreparedPack.getInPackList(locationCodeList, "defectLocationCode", packBean); DdlPreparedPack.getInPackList(partTypeDefectCodeList, "defectCode", packBean); List alarmConfigList = defectAlarmConfigRepository.findByHqlWhere(packBean); @@ -301,7 +301,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService DdlPackBean packBean = DdlPackBean.getDdlPackBean(org); DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(part.getPartTypeCode(), "partTypeCode", packBean); - DdlPreparedPack.getNumEqualPack(sides, "frontAndBackSides", packBean); + DdlPreparedPack.getNumEqualPack(sides, "sides", packBean); DdlPreparedPack.getStringEqualPack(locationCode, "defectLocation", packBean); DdlPreparedPack.getInPackList(partTypeDefectCodeList, "defectCode", packBean); List alarmConfigList = defectAlarmConfigRepository.findByHqlWhere(packBean); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java index 68a483d..4cf7d7a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java @@ -66,8 +66,9 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS } //校验装车单状态 必须是未装车条码 - if (vehiclesOrder.getStatus() != MesPcnExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue()) { - throw new ImppBusiException(String.format("【%s】此装车单状态为【%s】,请选择状态为【%s】状态的装车单", loadingVehiclesOrder.getLoadingOrderNo(), vehiclesOrder.getStatus(), MesPcnExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue())); + if (vehiclesOrder.getStatus() != MesPcnExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() && vehiclesOrder.getStatus() != MesPcnExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()) { + throw new ImppBusiException(String.format("【%s】此装车单状态为【%s】,请选择状态为【%s】状态的装车单", loadingVehiclesOrder.getLoadingOrderNo(), + MesPcnExtEnumUtil.SHIPPING_ORDER_STATUS.valueOfDescription(vehiclesOrder.getStatus()), MesPcnExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getDescription())); }