Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java

@@ -789,6 +789,8 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi
             ConvertBean.serviceModelInitialize(outPutStatistics, params.getUserInfo());
             outPutStatistics.setStartTime(outPutStatistics.getModifyDatetime());
             outPutStatistics.setEndTime(outPutStatistics.getStartTime());
+            outPutStatistics.setCategoryCode(params.getWorkCenterExtDb().getCategoryCode());
+            outPutStatistics.setCareerCode(params.getWorkCenterExtDb().getCareerCode());
             outPutStatistics = outPutStatisticsRepository.insert(outPutStatistics);
 
             MesOutPutStatisticsOqc outPutStatisticsOqc = new MesOutPutStatisticsOqc();