Merge remote-tracking branch 'origin/master'

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -738,8 +738,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         processes.setProcessType(operationDo.getProcess());
                         // 单次加工时长
                         processes.setUnitProduceTime(operationDo.getOnceprocessmin().intValue());
-                        processes.setProduceTime(processes.getUnitProduceTime() * processes.getProducePcNum());
-                        if (operationDo.getMinflowwaitmin() != null) {
+                        processes.setProduceTime(processes.getUnitProduceTime()*processes.getProducePcNum());
+//                        processes.setProduceTime(operationDo.getProcesstotaltime().intValue());
+                        if(operationDo.getMinflowwaitmin() != null){
                             processes.setMinWaitTime(operationDo.getMinflowwaitmin().intValue());
                         }
                         if (operationDo.getMaxflowwaitmin() != null) {