From c40e5c75ee6f6ccfbe1c42a952bbb872d936af54 Mon Sep 17 00:00:00 2001 From: jun Date: Sat, 19 Oct 2024 17:36:28 +0800 Subject: [PATCH] =?UTF-8?q?CBR=E6=8A=A5=E5=B7=A5=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/api/base/IMesProductOffLineService.java | 5 ++++- .../serviceimpl/base/MesProductOffLineServiceImpl.java | 11 +++++++++++ .../mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProductOffLineService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProductOffLineService.java index 0c77416..340c80e 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProductOffLineService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProductOffLineService.java @@ -14,6 +14,9 @@ import java.util.List; **/ public interface IMesProductOffLineService extends IBaseMesService{ - @ApiOperation("查询报工数据") + @ApiOperation("根据汇报条码查询报工数据") List findMesProductOffLineByProductSn(String productSn, String organizeCode); + + @ApiOperation("根据加工记录ID查询报工数据") + List findMesProductOffLineByRecordId(String recordId, String organizeCode); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineServiceImpl.java index 99c1fc8..1590805 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineServiceImpl.java @@ -30,4 +30,15 @@ public class MesProductOffLineServiceImpl extends BaseMesService findMesProductOffLineByRecordId(String recordId, String organizeCode) { + if(StringUtil.isEmpty(recordId) || StringUtil.isEmpty(organizeCode)){ + return null; + } + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(recordId,"productionRecordId",packBean); + DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.REPORT_TYPE.REPORT.getValue(),"reportType",packBean); + return baseRDao.findByHqlWhere(packBean); + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index f56b408..61c366a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -1346,6 +1346,7 @@ public class MesWorkOrderService extends BaseMesService implements if (CollectionUtils.isEmpty(oldProductOffLineList)) { MesException.throwMesBusiException("条码【%s】未查询到报工数据", model.getSn()); } + oldProductOffLineList = mesProductOffLineService.findMesProductOffLineByRecordId(oldProductOffLineList.iterator().next().getProductionRecordId(), model.getOrganizeCode()); oldProductOffLineList.forEach(item -> { item.setReportType(MesExtEnumUtil.REPORT_TYPE.CBR.getValue()); item.setOrderNo(model.getShipOrderNo());