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/MesWorkOrderService.java

@@ -742,11 +742,17 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         //1.获取生产加工记录production_record表中，report_status为待汇报状态的工单
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(workCenterCode,"workCenterCode",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack( MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_50.getValue(),"reportStatus",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack( MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue(),"reportStatus",ddlPackBean);
+        List<MesShift> collect = mesShiftList.stream().filter(s -> s.getShiftCode().equalsIgnoreCase("1")).collect(Collectors.toList());
+        String startTime=" 08:00:00";
+        if(!CollectionUtils.isEmpty(collect)){
+            MesShift mesShift= collect.get(0);
+            startTime= StringUtil.isEmpty(mesShift.getStartTime())?" 08:00:00":" "+mesShift.getStartTime()+":00";
+        }
         //获取前一天的早班到当天早班的区间的所有加工记录，统计个数
         DdlPreparedPack.timeBuilder(
-                new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(),1))+" 08:00:00",
-                TimeTool.getToday()+" 08:00:00",
+                new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(),1)) + startTime,
+                TimeTool.getToday() + startTime,
                 "completeDateTime", ddlPackBean, false);
 
         return  productionRecordRao.findByHqlWhere(ddlPackBean);

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyShowNosortStepService.java

@@ -207,7 +207,7 @@ public class MesAssemblyShowNosortStepService extends BaseStepService {
             //【非排序线】获取产品加工规则对应的装配件信息
             prodRuleContextList.add(prodRuleCfgExtService.getProdRuleNosortContext(new MesProdRuleContext(
                     reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), reqBean.getProcessCode(), productionProcessContext.getCraftCode())
-                    .copy(prodRuleNosortCfgList.get(0)).productSn(productionPsInContext.getProductSn()).foreignKey(productionPsInContext.foreignKey(foreignKey += 1).getForeignKey())));
+                    .copy(filterList.get(0)).productSn(productionPsInContext.getProductSn()).foreignKey(productionPsInContext.foreignKey(foreignKey += 1).getForeignKey())));
 
         }