From 91ff86f2d3c6b4160c5785e5d16421a39aa936e6 Mon Sep 17 00:00:00 2001 From: jun Date: Tue, 10 Sep 2024 14:46:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=B7=A5=E5=AE=8C=E6=88=90=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=90=8D=E4=BA=8B=E5=8A=A1=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/api/base/IMesReworkTaskService.java | 2 +- .../controller/busi/MesReworkTaskController.java | 4 +-- .../serviceimpl/base/MesReworkTaskServiceImpl.java | 38 ++++++++++++---------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesReworkTaskService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesReworkTaskService.java index 8a78ff0..090521f 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesReworkTaskService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesReworkTaskService.java @@ -39,7 +39,7 @@ public interface IMesReworkTaskService { void doAssemblySnRepeat(MesReworkTaskRequestModel requestModel); - void reworkSuccess(MesReworkTaskRequestModel requestModel); + void doReworkSuccess(MesReworkTaskRequestModel requestModel); MesProduceSnPrintModel doPrint(MesReworkTaskRequestModel requestModel); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java index 33e1321..97d3b31 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java @@ -148,11 +148,11 @@ public class MesReworkTaskController { @PostMapping("/reworkSuccess") @ApiOperation(value = "返工成功") - public ResultBean reworkSuccess(@RequestBody MesReworkTaskRequestModel requestModel) { + public ResultBean doReworkSuccess(@RequestBody MesReworkTaskRequestModel requestModel) { // 数据校验 //ValidatorBean.checkNotNull(requestModel.getSn(), "条码不能为空"); try { - mesReworkTaskService.reworkSuccess(requestModel); + mesReworkTaskService.doReworkSuccess(requestModel); return ResultBean.success("返工成功"); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); 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 e9743ee..a0e95d2 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 @@ -252,7 +252,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { } @Override - public void reworkSuccess(MesReworkTaskRequestModel requestModel) { + public void doReworkSuccess(MesReworkTaskRequestModel requestModel) { MesReworkTask mesReworkTask = getMesReworkTask(requestModel); /** @@ -336,7 +336,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { snList.add(sn); mesProduceSnPrintModel.getMesProduceSnList().addAll(snList); //发送新老条码关系给WMS - createMove(requestModel.getSn(),sn.getProductSn(),organizeCode,requestModel.getUserName()); + doCreateMove(requestModel.getSn(),sn.getProductSn(),organizeCode,requestModel.getUserName()); //更新条码 ConvertBean.serviceModelUpdate(sn,requestModel.getUserName()); mesProduceSnRepository.update(sn); @@ -559,15 +559,17 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { public void recursionAssemblySnTree(List assemblyTree, MesReworkTaskRequestModel requestModel,long pid) { for (MesProductionAssemblyModel assembly : assemblyTree) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(assembly.getAssemblySn(), "productSn", packBean); - DdlPreparedPack.getStringEqualPack(requestModel.getAssemblyPartNo(), "assemblyPartNo", packBean); - DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue(), "assemblyStatus", packBean); - List mesProductionAssemblies = mesProductionAssemblyRepository.findByHqlWhere(packBean); assembly.setPid(pid); - if (!CollectionUtils.isEmpty(mesProductionAssemblies)) { - assembly.setChildren(parseArray(mesProductionAssemblies)); - recursionAssemblySnTree(assembly.getChildren(), requestModel, assembly.getId()); + if(MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.MATCH_TYPE_10.getValue() == assembly.getMatchType() && !StringUtils.isEmpty(assembly.getAssemblySn())){ + DdlPackBean packBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(assembly.getAssemblySn(), "productSn", packBean); + DdlPreparedPack.getStringEqualPack(requestModel.getAssemblyPartNo(), "assemblyPartNo", packBean); + DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue(), "assemblyStatus", packBean); + List mesProductionAssemblies = mesProductionAssemblyRepository.findByHqlWhere(packBean); + if (!CollectionUtils.isEmpty(mesProductionAssemblies)) { + assembly.setChildren(parseArray(mesProductionAssemblies)); + recursionAssemblySnTree(assembly.getChildren(), requestModel, assembly.getId()); + } } } } @@ -610,7 +612,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { //总成拆解 doProductReportReversal(requestModel,productSn); //装配件数据处理 - recursionCheck(requestModel.getAssemblyModelList(), requestModel.getOrganizeCode(), requestModel.getUserName(),mesConfigService.getCfgValue(requestModel.getOrganizeCode(), MesPcnExtConstWords.DISASSEMBLY_DEST_LOCATE)); + doRecursionCheck(requestModel.getAssemblyModelList(), requestModel.getOrganizeCode(), requestModel.getUserName(),mesConfigService.getCfgValue(requestModel.getOrganizeCode(), MesPcnExtConstWords.DISASSEMBLY_DEST_LOCATE)); } private void doProductReportReversal(MesReworkTaskRequestModel requestModel, String productSn) { @@ -635,7 +637,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { mesWorkOrderService.doProductReportReversal(mesWorkOrderDb,productVersion, requestModel.getUserName()); //移库 requestModel.setSn(produceSnDb.getProductSn()); - createMove(requestModel,getDestLocateNo(requestModel.getOrganizeCode(), produceSnDb.getProductSn()),productVersion.getReceiveInventoryPoint(),mesWorkOrderDb.getErpWorkCenter(),mesWorkOrderDb.getPartNo()); + doCreateMove(requestModel,getDestLocateNo(requestModel.getOrganizeCode(), produceSnDb.getProductSn()),productVersion.getReceiveInventoryPoint(),mesWorkOrderDb.getErpWorkCenter(),mesWorkOrderDb.getPartNo()); } private MesProductVersion getProductVersion(MesWorkOrder mesWorkOrderDb) { @@ -646,7 +648,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { return mesProductVersion; } - public void recursionCheck(List assemblyModelList,String organizeCode,String userName,String destLocate){ + public void doRecursionCheck(List assemblyModelList,String organizeCode,String userName,String destLocate){ for (MesProductionAssemblyModel assemblyModel : assemblyModelList) { //勾选 if (assemblyModel.getFlag() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { @@ -655,10 +657,10 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { updateOldSn(organizeCode,assemblyModel.getAssemblySn(), userName, MesExtEnumUtil.PRODUCE_QC_STATUS.SCRAP.getValue()); } //对于已勾选报废的子件，对于有零件号的项，产生移库（产线的材料库位->报废库（系统参数配置））。移库数量为报废时的明细数量； - createMove(getMesWorkCenter(organizeCode, assemblyModel.getWorkCenterCode()),destLocate, assemblyModel,userName); + doCreateMove(getMesWorkCenter(organizeCode, assemblyModel.getWorkCenterCode()),destLocate, assemblyModel,userName); //循环处理数据 if(!CollectionUtils.isEmpty(assemblyModel.getChildren())){ - recursionCheck(assemblyModel.getChildren(),organizeCode,userName,destLocate); + doRecursionCheck(assemblyModel.getChildren(),organizeCode,userName,destLocate); } } else if (assemblyModel.getFlag() == CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) { //装配解绑 @@ -838,7 +840,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { mesProduceSnRepository.update(produceSn); } - private MesMove createMove(String oldSn, String sn, String organizeCode, String userName) { + private MesMove doCreateMove(String oldSn, String sn, String organizeCode, String userName) { MesMove move = new MesMove(); move.setOrganizeCode(organizeCode); move.setFactoryCode(organizeCode); @@ -851,7 +853,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { return moveRepository.insert(move); } - private void createMove(MesWorkCenter mesWorkCenter, String destLocate, MesProductionAssemblyModel assemblyModel,String userName) { + private void doCreateMove(MesWorkCenter mesWorkCenter, String destLocate, MesProductionAssemblyModel assemblyModel,String userName) { MesMove move = new MesMove(); move.setMatnr(assemblyModel.getAssemblyPartNo()); move.setOrganizeCode(mesWorkCenter.getOrganizeCode()); @@ -868,7 +870,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { moveRepository.insert(move); } - private void createMove(MesReworkTaskRequestModel requestModel,String srcLocate, String destLocate,String workCenterCode,String partNo) { + private void doCreateMove(MesReworkTaskRequestModel requestModel,String srcLocate, String destLocate,String workCenterCode,String partNo) { MesPartSap mesPartSap = mesPartService.getMesPartSapByPartNo(partNo, requestModel.getOrganizeCode()); MesMove move = new MesMove(); move.setMatnr(mesPartSap.getPartNo());