APS二开服务业务数据转换模型数据

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

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONConfig;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -170,8 +171,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         processOperationProcessEquService.remove(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>().in(ApsProcessOperationProcessEquDo::getBlankid,blankids));
         // 模型转换
         ProductionScheduleVo productionScheduleVo = apsPlanModelSet(apsBlankOrders);
-        System.out.println("排程数据：" + JSONUtil.toJsonStr(productionScheduleVo));
-        logger.info("排程数据：" + JSONUtil.toJsonStr(productionScheduleVo));
+        JSONConfig jsonConfig = JSONConfig.create();
+        jsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
+        System.out.println("排程数据：" + JSONUtil.toJsonStr(productionScheduleVo,jsonConfig));
+        logger.info("排程数据：" + JSONUtil.toJsonStr(productionScheduleVo,jsonConfig));
         // APS平台排程接口调用
         ProductionScheduleRetVo productionScheduleRetVo = rwApsServer.productionSchedule(productionScheduleVo);
         // 排程结果保存
@@ -396,7 +399,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         // 单次加工时长
                         processes.setUnitProduceTime(operationDo.getOnceprocessmin().intValue());
                         processes.setProduceTime(processes.getUnitProduceTime()*processes.getProducePcNum());
-
+                        processes.setMinWaitTime(operationDo.getMinflowwaitmin().intValue());
+                        processes.setMaxWaitTime(operationDo.getMaxflowwaitmin().intValue());
                         // 上道工序
                         if(StringUtils.isNotBlank(operationDo.getPreviousprocessid())){
                             processes.setPreviousProcessesIds(Arrays.asList(operationDo.getPreviousprocessid().split(",")));
@@ -650,6 +654,12 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                                         }
                                         // 批次
                                         processes.setProducePcNum(1);
+                                        // 最小等待时长
+                                        processes.setMinWaitTime(processOperationM.getMinflowwaitmin().intValue());
+                                        // 最大等待时长
+                                        processes.setMaxWaitTime(processOperationM.getMaxflowwaitmin().intValue());
+                                        // 合并加工的为瓶颈工序
+                                        processes.setBottleneck(true);
                                         // 单次加工时长
                                         processes.setUnitProduceTime(processOperationM.getOnceprocessmin().intValue());
                                         processes.setProduceTime(processOperationM.getOnceprocessmin().intValue());