From a25a8b92e0746648936fd71c4d157184f8e7fbb6 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 25 Sep 2024 18:22:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E8=BF=94=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesReworkTaskServiceImpl.java | 17 +++++++++++++++-- .../serviceimpl/busi/MesPullingOrderInfoService.java | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java index a82f7af..2c3ca4e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java @@ -23,6 +23,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspection; import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspectionDetail; @@ -133,12 +134,19 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { @Autowired private MesQmsScrapRepository mesQmsScrapRepository; + @Autowired + private IMesWorkOrderExtService workOrderExtService; @Override public ListPager queryReworkTask(MesReworkTask mesReworkTask, Pager pager) { String organizeCode = !StringUtils.isEmpty(mesReworkTask.getOrganizeCode())?mesReworkTask.getOrganizeCode():AuthUtil.getOrganizeCode(); DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); if (mesReworkTask.getSn() != null) { - DdlPreparedPack.getStringEqualPack(mesReworkTask.getSn(), "sn", packBean); + MesProduceSn produceSn = (MesProduceSn) workOrderExtService.getWorkOrderSort(organizeCode, mesReworkTask.getSn(), false); + if(!StringUtil.isEmpty(produceSn)){ + DdlPreparedPack.getStringEqualPack(produceSn.getProductSn(), "sn", packBean); + }else { + DdlPreparedPack.getStringEqualPack(mesReworkTask.getSn(), "sn", packBean); + } } DdlPreparedPack.getStringEqualPack(mesReworkTask.getReworkOrder(), "reworkOrder", packBean); DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.REWORK_TASK_STATUS.CREATE.getValue(), "status", packBean); @@ -824,7 +832,12 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { private MesReworkTask getMesReworkTask(MesReworkTaskRequestModel requestModel) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode()); if (!StringUtils.isEmpty(requestModel.getSn())) { - DdlPreparedPack.getStringEqualPack(requestModel.getSn(), "sn", packBean); + MesProduceSn produceSn = (MesProduceSn) workOrderExtService.getWorkOrderSort(requestModel.getOrganizeCode(), requestModel.getSn(), false); + if(!StringUtil.isEmpty(produceSn)){ + DdlPreparedPack.getStringEqualPack(produceSn.getProductSn(), "sn", packBean); + }else { + DdlPreparedPack.getStringEqualPack(requestModel.getSn(), "sn", packBean); + } } if (!StringUtils.isEmpty(requestModel.getReworkOrder())) { DdlPreparedPack.getStringEqualPack(requestModel.getReworkOrder(), "reworkOrder", packBean); 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 d3bd874..3528b0a 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 @@ -111,9 +111,9 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService { //强过码 如果强过为true 不校验顺序 直接扫描完成修改状态为已扫描 //扫完单号 扫强过码校验通过后 单号顺序之前的单子变成无序 都可扫描 - String spsPass = configService.getCfgValue(bean.getOrganizeCode(), MesPcnExtConstWords.SPS_STRONGER_PASS); +// String spsPass = configService.getCfgValue(bean.getOrganizeCode(), MesPcnExtConstWords.SPS_STRONGER_PASS); if (mesPullingOrderInfo.getIsPassCode()==CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() - ||(!Objects.isNull(bean.getIsPass()) && spsPass.equals(bean.getIsPass()))) { + ||(!Objects.isNull(bean.getIsPass()) && CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()==bean.getIsPass())) { mesPullingOrderInfo.setPullOrderStatus(MesExtEnumUtil.PULL_ORDER_STATUS.JIS_PULL.getValue()); ConvertBean.serviceModelUpdate(mesPullingOrderInfo, userName); mesPullingOrderInfoRepository.update(mesPullingOrderInfo);