From 7141d36c1a675823bbfc5f9770fe564916dead63 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 2 Jan 2024 18:21:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A9=AC=E9=92=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/config/thread/TestCollector.java | 21 --- .../config/thread/ThreadMonitorCollector.java | 30 ++++ .../controller/monitor/MonitorController.java | 7 +- .../service/monitor/MonitorService.java | 5 + .../monitor/impl/MonitorServiceImpl.java | 15 +- .../user/impl/ISysUserServiceImpl.java | 1 + .../acs/service/impl/AcsToWmsServiceImpl.java | 6 +- .../IPdmBdRequestMaterialRecordService.java | 6 + ...PdmBdRequestMaterialRecordServiceImpl.java | 18 ++- .../service/IPdmBdWorkorderService.java | 7 + .../dao/mapper/PdmBdWorkorderMapper.java | 21 ++- .../dao/mapper/PdmBdWorkorderMapper.xml | 13 ++ .../impl/PdmBdWorkorderServiceImpl.java | 11 ++ .../report/controller/ReportController.java | 7 +- .../nl/wms/report/service/ReportService.java | 9 ++ .../service/dao/mapper/ReportMapper.java | 3 + .../service/dao/mapper/ReportMapper.xml | 11 ++ .../service/dao/vo/InsideDrumLineVo.java | 17 +++ .../service/impl/ReportServiceImpl.java | 8 + .../task_manage/task/tasks/hn/HNMLTask.java | 5 +- ...tp.core.monitor.collector.MetricsCollector | 2 +- .../src/views/monitor/server/thread.vue | 138 ++++++++++++++++++ .../src/views/system/user/index.vue | 2 +- .../views/wms/das/insideDrumLine/index.vue | 63 ++++++++ .../src/views/wms/pdm/record/index.vue | 5 + .../src/views/wms/pdm/workerorder/index.vue | 1 + 26 files changed, 391 insertions(+), 41 deletions(-) delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TestCollector.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/ThreadMonitorCollector.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/InsideDrumLineVo.java create mode 100644 lms/nladmin-ui/src/views/monitor/server/thread.vue create mode 100644 lms/nladmin-ui/src/views/wms/das/insideDrumLine/index.vue diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TestCollector.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TestCollector.java deleted file mode 100644 index 35bc57d..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TestCollector.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.config.thread; - -import org.dromara.dynamictp.common.entity.ThreadPoolStats; -import org.dromara.dynamictp.core.monitor.collector.AbstractCollector; - -/** - * @Author: lyd - * @Description: - * @Date: 2023/12/25 - */ -public class TestCollector extends AbstractCollector { - @Override - public void collect(ThreadPoolStats threadPoolStats) { -// System.out.println("ssssssssssssssss:" + threadPoolStats); - } - - @Override - public String type() { - return "test_collect"; - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/ThreadMonitorCollector.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/ThreadMonitorCollector.java new file mode 100644 index 0000000..53889fc --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/ThreadMonitorCollector.java @@ -0,0 +1,30 @@ +package org.nl.config.thread; + +import lombok.extern.slf4j.Slf4j; +import org.dromara.dynamictp.common.entity.ThreadPoolStats; +import org.dromara.dynamictp.core.monitor.collector.AbstractCollector; + +/** + * @Author: lyd + * @Description: 线程监控 + * @Date: 2023/12/25 + */ +@Slf4j +public class ThreadMonitorCollector extends AbstractCollector { + public static ThreadPoolStats TOMCAT_THREAD; + public static ThreadPoolStats EL_THREAD; + @Override + public void collect(ThreadPoolStats threadPoolStats) { + if ("tomcatTp".equals(threadPoolStats.getPoolName())) { + ThreadMonitorCollector.TOMCAT_THREAD = threadPoolStats; + } else { + ThreadMonitorCollector.EL_THREAD = threadPoolStats; + } + log.info("线程池数据:{}", threadPoolStats); + } + + @Override + public String type() { + return "test_collect"; + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java index ae4135d..442ef96 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java @@ -30,16 +30,19 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequiredArgsConstructor - @RequestMapping("/api/monitor") public class MonitorController { private final MonitorService serverService; @GetMapping - @SaCheckPermission("monitor:list") public ResponseEntity query() { return new ResponseEntity<>(serverService.getServers(), HttpStatus.OK); } + + @GetMapping("/getThreadData") + public ResponseEntity getThreadData() { + return new ResponseEntity<>(serverService.getThreadData(), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/MonitorService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/MonitorService.java index baaee66..0f9c66d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/MonitorService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/MonitorService.java @@ -15,6 +15,9 @@ */ package org.nl.system.service.monitor; +import org.dromara.dynamictp.common.entity.ThreadPoolStats; + +import java.util.List; import java.util.Map; /** @@ -29,4 +32,6 @@ public interface MonitorService { * @return Map */ Map getServers(); + + List getThreadData(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java index 9c49a29..9bb68f1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java @@ -17,9 +17,11 @@ package org.nl.system.service.monitor.impl; import cn.hutool.core.date.BetweenFormatter; import cn.hutool.core.date.DateUtil; +import org.dromara.dynamictp.common.entity.ThreadPoolStats; import org.nl.common.utils.ElAdminConstant; import org.nl.common.utils.FileUtil; import org.nl.common.utils.StringUtils; +import org.nl.config.thread.ThreadMonitorCollector; import org.nl.system.service.monitor.MonitorService; import org.springframework.stereotype.Service; import oshi.SystemInfo; @@ -35,10 +37,7 @@ import oshi.util.Util; import java.lang.management.ManagementFactory; import java.text.DecimalFormat; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author Zheng Jie @@ -73,6 +72,14 @@ public class MonitorServiceImpl implements MonitorService { return resultMap; } + @Override + public List getThreadData() { + List res = new ArrayList<>(); + res.add(ThreadMonitorCollector.TOMCAT_THREAD); + res.add(ThreadMonitorCollector.EL_THREAD); + return res; + } + /** * 获取磁盘信息 * diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java index 686ed6b..9306ee3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java @@ -125,6 +125,7 @@ public class ISysUserServiceImpl extends ServiceImpl imp } catch (Exception ex) { throw new RuntimeException(); } + sysUser.setPassword(SaSecureUtil.md5BySalt(sysUser.getPassword(), GeneralDefinition.SALT)); sysUser.setUpdate_time(new Date()); sysUser.setUpdate_id(SecurityUtils.getCurrentUserId()); this.updateById(sysUser); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 68e2a26..036e556 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -605,6 +605,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } catch (Exception e) { log.info("调用mes异常:{}", e.getMessage()); } + // 清除要料表多余的要料单 + requestMaterialRecordService.toClearExcessMaterial(bdWorkorder.getWorkorder_code()); return BaseResponse.responseOk(requestNo); } @@ -667,8 +669,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 压机设备编码 String yjDeviceCode = basePoint.getParent_point_code(); SchBasePoint devicePoint = pointService.getById(yjDeviceCode); - // 获取当前工单 - PdmBdWorkorder productionTask = workorderService.getDeviceProductionTask(yjDeviceCode); + // 获取当前工单: 可能未开工，未开工就拿第一条 + PdmBdWorkorder productionTask = workorderService.getDeviceOneTask(yjDeviceCode); // 校验物料是否正确 if (ObjectUtil.isEmpty(productionTask)) { throw new BadRequestException("压机" + yjDeviceCode + "工单不存在!"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/IPdmBdRequestMaterialRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/IPdmBdRequestMaterialRecordService.java index adff362..9b9f4e3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/IPdmBdRequestMaterialRecordService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/IPdmBdRequestMaterialRecordService.java @@ -71,4 +71,10 @@ public interface IPdmBdRequestMaterialRecordService extends IService getLeftJoinWorkOrderList(String materialCode); + + /** + * 清除多余要料信息 + * @param workorderCode / + */ + void toClearExcessMaterial(String workorderCode); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/impl/PdmBdRequestMaterialRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/impl/PdmBdRequestMaterialRecordServiceImpl.java index d1878ee..f3af5fa 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/impl/PdmBdRequestMaterialRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/impl/PdmBdRequestMaterialRecordServiceImpl.java @@ -41,6 +41,7 @@ public class PdmBdRequestMaterialRecordServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); + lam.orderByDesc(PdmBdRequestMaterialRecord::getCreate_time); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); pdmBdRequestMaterialRecordMapper.selectPage(pages, lam); return pages; @@ -66,8 +67,11 @@ public class PdmBdRequestMaterialRecordServiceImpl extends ServiceImpl ids) { - // 真删除 - pdmBdRequestMaterialRecordMapper.deleteBatchIds(ids); + PdmBdRequestMaterialRecord requestMaterialRecord = new PdmBdRequestMaterialRecord(); + requestMaterialRecord.setIs_delete(true); + requestMaterialRecord.setUpdate_time(DateUtil.now()); + pdmBdRequestMaterialRecordMapper.update(requestMaterialRecord, new LambdaQueryWrapper() + .in(PdmBdRequestMaterialRecord::getRecord_id, ids)); } @Override @@ -102,4 +106,14 @@ public class PdmBdRequestMaterialRecordServiceImpl extends ServiceImpl() + .eq(PdmBdRequestMaterialRecord::getWorkorder_id, workorderCode) + .eq(PdmBdRequestMaterialRecord::getIs_delete, false)); + } + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java index 65ada76..cb91ac1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/IPdmBdWorkorderService.java @@ -185,4 +185,11 @@ public interface IPdmBdWorkorderService extends IService { * @return / */ PdmBdWorkorder selectByIdLock(String id); + + /** + * 获取压机第一条工单 + * @param yjDeviceCode / + * @return / + */ + PdmBdWorkorder getDeviceOneTask(String yjDeviceCode); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.java index 3e29f79..239b740 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.java @@ -48,8 +48,8 @@ public interface PdmBdWorkorderMapper extends BaseMapper { /** * 获取设备未生产的工单 * - * @param device - * @return + * @param device / + * @return / */ List getAcsWorkOrderVos(String device); @@ -58,17 +58,28 @@ public interface PdmBdWorkorderMapper extends BaseMapper { /** * 获取叫料工单 * - * @return + * @return / */ List getNeedCallMaterial(); + /** + * 获取未生产 + * @return / + */ List getNotIssueOrder(); /** * 悲观锁查找工单数据 * - * @param id - * @return + * @param id / + * @return / */ PdmBdWorkorder selectByIdLock(String id); + + /** + * 获取压机当天第一条工单 + * @param yjDeviceCode / + * @return / + */ + PdmBdWorkorder getDeviceOneTask(String yjDeviceCode); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml index a5d4009..757fb6f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml @@ -29,6 +29,7 @@ AND wo.create_time #{query.end_time} + ORDER BY wo.update_time DESC + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java index 459ada5..786c79d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java @@ -24,6 +24,7 @@ import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.ext.acs.service.dto.to.wms.AcsResponse; import org.nl.wms.ext.mes.service.WmsToMesService; import org.nl.wms.ext.mes.service.dto.MesOrderInfo; +import org.nl.wms.pdm.record.service.IPdmBdRequestMaterialRecordService; import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; import org.nl.wms.pdm.workorder.service.dao.mapper.PdmBdWorkorderMapper; @@ -76,6 +77,8 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl queryAll(PdmBdWorkorderQuery query, PageQuery page) { @@ -345,6 +348,9 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl inventoryMaterialTimeoutWarning(Map json, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(reportService.inventoryMaterialTimeoutWarning(json, page)), HttpStatus.OK); } + + @GetMapping("/insideDrumLineReport") + @Log("滚筒线内物料实时报表") + public ResponseEntity insideDrumLineReport(Map json, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(reportService.insideDrumLineReport(json, page)), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java index 273478b..fedecba 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java @@ -3,6 +3,7 @@ package org.nl.wms.report.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; import org.nl.wms.report.service.dao.vo.IOKilnReportVo; +import org.nl.wms.report.service.dao.vo.InsideDrumLineVo; import org.nl.wms.report.service.dao.vo.MaterialTimeoutVo; import java.util.Map; @@ -49,5 +50,13 @@ public interface ReportService { */ IPage inventoryMaterialTimeoutWarning(Map json, PageQuery page); + /** + * 滚筒线数据 + * @param json + * @param page + * @return + */ + IPage insideDrumLineReport(Map json, PageQuery page); + // IPage<> mudTransfer(JSONObject json, PageQuery page); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java index ed0fae3..acc9398 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java @@ -3,6 +3,7 @@ package org.nl.wms.report.service.dao.mapper; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.wms.report.service.dao.vo.IOKilnReportVo; +import org.nl.wms.report.service.dao.vo.InsideDrumLineVo; import org.nl.wms.report.service.dao.vo.MaterialTimeoutVo; /** @@ -18,4 +19,6 @@ public interface ReportMapper { IPage inKilnReport(IPage pages, JSONObject object); IPage inventoryMaterialTimeoutWarning(IPage pages, JSONObject object); + + IPage insideDrumLineReport(IPage pages, JSONObject object); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml index 057228c..1c04d05 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml @@ -58,4 +58,15 @@ AND p.point_status = '3' AND vg.instorage_time DATE_SUB(NOW(), INTERVAL 30 DAY) + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/InsideDrumLineVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/InsideDrumLineVo.java new file mode 100644 index 0000000..fbddb0e --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/InsideDrumLineVo.java @@ -0,0 +1,17 @@ +package org.nl.wms.report.service.dao.vo; + +import lombok.Data; + +/** + * @Author: lyd + * @Description: 滚筒线数据 + * @Date: 2024/1/2 + */ +@Data +public class InsideDrumLineVo { + private String vehicle_code; + private String pcsn; + private String material_qty; + private String material_code; + private String material_name; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java index 0ba7295..0d98a81 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java @@ -8,6 +8,7 @@ import org.nl.common.domain.query.PageQuery; import org.nl.wms.report.service.ReportService; import org.nl.wms.report.service.dao.mapper.ReportMapper; import org.nl.wms.report.service.dao.vo.IOKilnReportVo; +import org.nl.wms.report.service.dao.vo.InsideDrumLineVo; import org.nl.wms.report.service.dao.vo.MaterialTimeoutVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -52,4 +53,11 @@ public class ReportServiceImpl implements ReportService { pages = reportMapper.inventoryMaterialTimeoutWarning(pages, new JSONObject(query)); return pages; } + + @Override + public IPage insideDrumLineReport(Map query, PageQuery page) { + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pages = reportMapper.insideDrumLineReport(pages, new JSONObject(query)); + return pages; + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java index 05cba83..a7f1f39 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java @@ -260,9 +260,10 @@ public class HNMLTask extends AbstractTask { groupEntity.setPoint_name(endPointObj.getPoint_name()); groupEntity.setMove_way(groupEntity.getMove_way() + " -> " + endPointObj.getPoint_code()); groupEntity.setMaterial_id(one.getMaterial_id()); - // mark: *根据压机的工单物料标识查找静置时间 + // mark: *根据压机的工单物料标识查找静置时间, 先根据工单，在根据物料信息 MdBaseMaterial mdBaseMaterial = materialService.getById(one.getMaterial_id()); - groupEntity.setStanding_time(mdBaseMaterial.getStanding_time()); + groupEntity.setStanding_time(one.getStanding_time() == 0 + ? mdBaseMaterial.getStanding_time() : one.getStanding_time()); } } // 更新组盘数据 diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/META-INF/services/org.dromara.dynamictp.core.monitor.collector.MetricsCollector b/lms/nladmin-system/nlsso-server/src/main/resources/META-INF/services/org.dromara.dynamictp.core.monitor.collector.MetricsCollector index 50ff5dd..56f5f86 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/META-INF/services/org.dromara.dynamictp.core.monitor.collector.MetricsCollector +++ b/lms/nladmin-system/nlsso-server/src/main/resources/META-INF/services/org.dromara.dynamictp.core.monitor.collector.MetricsCollector @@ -1 +1 @@ -org.nl.config.thread.TestCollector +org.nl.config.thread.ThreadMonitorCollector diff --git a/lms/nladmin-ui/src/views/monitor/server/thread.vue b/lms/nladmin-ui/src/views/monitor/server/thread.vue new file mode 100644 index 0000000..e4819c6 --- /dev/null +++ b/lms/nladmin-ui/src/views/monitor/server/thread.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/system/user/index.vue b/lms/nladmin-ui/src/views/system/user/index.vue index 647b879..cfd53fb 100644 --- a/lms/nladmin-ui/src/views/system/user/index.vue +++ b/lms/nladmin-ui/src/views/system/user/index.vue @@ -91,7 +91,7 @@ />
- + diff --git a/lms/nladmin-ui/src/views/wms/das/insideDrumLine/index.vue b/lms/nladmin-ui/src/views/wms/das/insideDrumLine/index.vue new file mode 100644 index 0000000..c78cb95 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/das/insideDrumLine/index.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/pdm/record/index.vue b/lms/nladmin-ui/src/views/wms/pdm/record/index.vue index 279206c..59062b2 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/record/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/record/index.vue @@ -37,6 +37,11 @@ {{ scope.row.is_finish ? '是' : '否'}} + + +