报表问题修复

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/AssemblyPartReportDaoImpl.java

@@ -40,6 +40,7 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao {
         dataQueryHql.append("mes_production_assembly.assemblyPartNo AS assemblyPartNo,");
         dataQueryHql.append("mes_production_assembly.assemblyPartName AS assemblyPartName,");
         dataQueryHql.append("mes_production_assembly.assemblySn AS assemblySn,");
+        dataQueryHql.append("mes_production_assembly.productSn AS productSn,");
         dataQueryHql.append("mes_production_assembly.isSkip AS isSkip,");
         dataQueryHql.append("mes_production_assembly.createDatetime AS createDatetime,");
         dataQueryHql.append("mes_production_assembly.createUser AS createUser,");

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

@@ -267,11 +267,13 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
     @Override
     protected void setPackQueryBean(MesWorkOrder bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringLikerPack(bean.getWorkOrderNo(), "workOrderNo", packBean);
-        DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partNameRdd", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCustPartNo(), "custPartNo", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getVinCode(), "vinCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getOrderFlag(), "orderFlag", packBean);
         if (!StringUtil.isEmpty(bean.getWorkOrderStatusQuery())) {
             DdlPreparedPack.getInPackList(Arrays.stream(bean.getWorkOrderStatusQuery().split(MesExtConstWords.COMMA)).map(Integer::parseInt).collect(Collectors.toList()), "workOrderStatus", packBean);
         } else DdlPreparedPack.getNumEqualPack(bean.getWorkOrderStatus(), "workOrderStatus", packBean);

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/AssemblyPartReportServiceImpl.java

@@ -25,7 +25,6 @@ public class AssemblyPartReportServiceImpl implements IAssemblyPartReportService
 
     @Override
     public ListPager<AssemblyPartReportModel> queryReport(AssemblyPartReportModel model, Pager pager) {
-        ListPager<AssemblyPartReportModel> result = assemblyPartReportDao.queryReport(model,pager);
-        return result;
+        return assemblyPartReportDao.queryReport(model,pager);
     }
 }