Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java

@@ -577,12 +577,8 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode());
         DdlPreparedPack.getInPackList(mesProductionAssemblyList.stream().map(MesProductionAssembly::getAssemblySn).distinct().collect(Collectors.toList()), "productSn", packBean);
         DdlPreparedPack.getNumEqualPack(requestModel.getIsOrigSn(), "isOrigSn", packBean);
-        if (!StringUtils.isEmpty(requestModel.getAssemblyPartNo())) {
-            DdlPreparedPack.getStringEqualPack(requestModel.getAssemblyPartNo(), "assemblyPartNo", packBean);
-        }
-        if (!Objects.isNull(requestModel.getAssemblyPartStatus())) {
-            DdlPreparedPack.getNumEqualPack(requestModel.getAssemblyPartStatus(), "assemblyStatus", packBean);
-        }
+        DdlPreparedPack.getStringEqualPack(requestModel.getAssemblyPartNo(), "assemblyPartNo", packBean);
+        DdlPreparedPack.getNumEqualPack(requestModel.getAssemblyPartStatus(), "assemblyStatus", packBean);
         List<MesProductionAssembly> mesProductionAssemblies = mesProductionAssemblyRepository.findByHqlWhere(packBean);
         if(!CollectionUtils.isEmpty(mesProductionAssemblies)){
             recursionAssemblySn(mesProductionAssemblies,requestModel);