Merge branch 'uat-temp-nht-202505090001-46746' into yfai-20250418-dev

2 months ago · 6a83990a70
parent cbb9eace0e 4fb98f07a6
commit 6a83990a70
1 changed files with 1 additions and 0 deletions
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionAssemblyReplaceService.java
@ -111,6 +111,7 @@ public class MesFunctionAssemblyReplaceService extends BaseSwsService implements
        requestModel.setAssemblyPartStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue());
        mesReworkTaskService.doAssemblySnRepeatByScan(requestModel);

+        requestModel.setAssemblyPartStatus(null);
        List<MesProductionAssembly> mesProductionRecords = mesReworkTaskService.assemblyQuery(requestModel);
        paramMap.put(MesPcnExtConstWords.ORGANIZE_CODE, reqBean.getOrganizeCode());
        //根据配置查询生产队列工位推送信息