From 273e022117a84c1fa8f70cfe17e0cae67a324b61 Mon Sep 17 00:00:00 2001 From: jason Date: Tue, 15 Apr 2025 10:48:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A3=85=E8=BD=A6=E5=8D=95?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AE=8C=E6=88=90=E5=90=8E=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=A0=87=E5=BF=97=E6=9C=AA=E5=8F=98=E6=9B=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/api/report/IMesCimSeresReportService.java | 6 ++++-- .../controller/report/MesCimSeresReportController.java | 13 +++++++++---- .../serviceimpl/base/MesReworkTaskServiceImpl.java | 1 + .../serviceimpl/busi/MesShippingLoadingCheckService.java | 3 +++ .../serviceimpl/busi/MesSortShippingCheckService.java | 3 ++- .../serviceimpl/report/MesCimSeresReportServiceImpl.java | 11 +++++++++-- .../step/context/MesProductionProcessMonitorService.java | 2 ++ 7 files changed, 30 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/report/IMesCimSeresReportService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/report/IMesCimSeresReportService.java index b431087..a6193bc 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/report/IMesCimSeresReportService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/report/IMesCimSeresReportService.java @@ -9,11 +9,13 @@ import java.util.List; public interface IMesCimSeresReportService { - ListPager querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager); + ListPager querySrmSunSheetJisLogByPager(Integer status, String docNo, + String partClassCode, String partClassName, Pager pager); void doSrmSunSheetJisNormal(List ids); - ListPager queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, Pager pager); + ListPager queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, + String partClassCode, String partClassName, Pager pager); void doJisQueueNormal(List ids); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/report/MesCimSeresReportController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/report/MesCimSeresReportController.java index ae06e83..377e176 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/report/MesCimSeresReportController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/report/MesCimSeresReportController.java @@ -29,9 +29,11 @@ public class MesCimSeresReportController { @ApiOperation(value = "赛力斯JIS单接收日志", notes = "赛力斯JIS单接收日志") @GetMapping("/query-srm-sun-sheet-jis-log") - public ResultBean querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager){ + public ResultBean querySrmSunSheetJisLogByPager(Integer status, String docNo, String partClassCode, + String partClassName, Pager pager){ try { - ListPager queryResultListPager = mesCimSeresReportService.querySrmSunSheetJisLogByPager(status, docNo, pager); + ListPager queryResultListPager = + mesCimSeresReportService.querySrmSunSheetJisLogByPager(status, docNo, partClassCode, partClassName, pager); return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(queryResultListPager); } catch (ImppBusiException e) { return ResultBean.fail(e); @@ -56,9 +58,12 @@ public class MesCimSeresReportController { @ApiOperation(value = "赛力斯JIS队列接收日志", notes = "赛力斯JIS队列接收日志") @GetMapping("/query-jis-queue-log") - public ResultBean queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, Pager pager){ + public ResultBean queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, + String partClassCode, String partClassName, Pager pager){ try { - ListPager queryResultListPager = mesCimSeresReportService.queryJisQueueLogByPager(checkStatus, vin, materielCode, pager); + ListPager queryResultListPager = + mesCimSeresReportService.queryJisQueueLogByPager(checkStatus, vin, materielCode, partClassCode, + partClassName, pager); return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(queryResultListPager); } catch (ImppBusiException e) { return ResultBean.fail(e); 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 8b6470e..62c82d3 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 @@ -33,6 +33,7 @@ import cn.estsh.i3plus.pojo.mes.repository.*; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.SpringContextsUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; 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 fea7ae1..2b5af56 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 @@ -147,6 +147,9 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS if (StringUtils.isEmpty(loadingList)) { throw new ImppBusiException(String.format("【%s】此装车单不存在，请检查数据！", model.getOrderCode())); } + DdlPackBean loadingGroupPackBean = DdlPackBean.getDdlPackBean(loadingList.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(loadingList.getLoadingGroupNo(), "loadingGroupNo", loadingGroupPackBean); + MesLoadingGroup loadingGroup = mesLoadingGroupRDao.getByProperty(loadingGroupPackBean); //MesLoadingList loadingList = checkLoadingList(model.getOrderCode(), organizeCode,model.getIsPass(),userInfo); //根据扫描的发运单以及前端传的发运单明细，进行匹配，若没有找到扫描的发运单，则提示扫描的发运单号不在此装车单中，请检查数据！。 diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java index 0104ee8..83c2378 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java @@ -676,6 +676,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService if(!Objects.isNull(listDetail)){ //更新装车单明细对应的发运单状态=发运 listDetail.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue()); + listDetail.setSystemSyncStatus(CommonEnumUtil.FALSE); ConvertBean.serviceModelUpdate(listDetail, userInfo); listDetailRepository.update(listDetail); } @@ -1022,7 +1023,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService if (StringUtil.isEmpty(detail.getVin())) { MesPcnException.throwMesBusiException("发运单【%s】零件号【%s】vin号为空，请检查数据", orderManagement.getShippingCode(), detail.getPartNo()); } - final boolean matchCfgValue = mesConfigService.checkCfgValueIsContainItem(orderManagement.getOrganizeCode(), MesPcnExtConstWords.MES_SHIPPING_QUEUE_SAVE_CFG, null, null, ",", orderManagement.getShippingGroupCode()); + final boolean matchCfgValue = mesConfigService.checkCfgValueIsContainItem(orderManagement.getOrganizeCode(), MesPcnExtConstWords.MES_SHIPPING_QUEUE_SAVE_CFG, MesPcnExtConstWords.MES_SHIPPING_QUEUE_SAVE_CFG, null, ",", orderManagement.getShippingGroupCode()); if (!matchCfgValue) { return; } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java index d1381a9..91aee5d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/report/MesCimSeresReportServiceImpl.java @@ -29,11 +29,15 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService { private IMesCimSeresJisQueueRepository queueJisRDao; @Override - public ListPager querySrmSunSheetJisLogByPager(Integer status, String docNo, Pager pager) { + public ListPager querySrmSunSheetJisLogByPager(Integer status, String docNo, + String partClassCode, String partClassName, + Pager pager) { final String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringLikerPack(docNo, "docNo", packBean); DdlPreparedPack.getNumEqualPack(status, "status", packBean); + DdlPreparedPack.getStringLikerPack(partClassCode, "partClassCode", packBean); + DdlPreparedPack.getStringLikerPack(partClassName, "partClassName", packBean); DdlPreparedPack.getOrderBy("id", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), packBean); pager = PagerHelper.getPager(pager, runSheetJisRDao.findByHqlWhereCount(packBean)); @@ -52,12 +56,15 @@ public class MesCimSeresReportServiceImpl implements IMesCimSeresReportService { } @Override - public ListPager queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, Pager pager) { + public ListPager queryJisQueueLogByPager(Integer checkStatus, String vin, String materielCode, + String partClassCode, String partClassName, Pager pager) { final String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringLikerPack(vin, "vin", packBean); DdlPreparedPack.getStringLikerPack(materielCode, "materielCode", packBean); DdlPreparedPack.getNumEqualPack(checkStatus, "checkStatus", packBean); + DdlPreparedPack.getStringLikerPack(partClassCode, "partClassCode", packBean); + DdlPreparedPack.getStringLikerPack(partClassName, "partClassName", packBean); DdlPreparedPack.getOrderBy("id", CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), packBean); pager = PagerHelper.getPager(pager, queueJisRDao.findByHqlWhereCount(packBean)); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessMonitorService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessMonitorService.java index b7f4b90..b08d9e4 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessMonitorService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessMonitorService.java @@ -49,6 +49,8 @@ public class MesProductionProcessMonitorService extends BaseProcessMonitorServic public Boolean doJumpProcess(StationRequestBean requestBean) { //清除上下文中的所有业务数据 productionDispatchContextStepService.flushProductionDispatchContext(requestBean); + //清除可复用条码数据 + productionCustomContextStepService.removeRepeatAssemblySn(requestBean); return super.doJumpProcess(requestBean); }