From 7f048a74ebe1398093506a9b8a25d7e9080c79bd Mon Sep 17 00:00:00 2001 From: songxiaopeng <1393756821@qq.com> Date: Fri, 26 Apr 2024 17:33:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cockpit/controller/CockPitController.java | 7 +++ .../wms/cockpit/service/CockpitService.java | 3 ++ .../wms/cockpit/service/dao/KilnInfoVo.java | 16 +++++++ .../service/dao/ShiftProductionVo.java | 1 + .../service/impl/CockpitServiceImpl.java | 19 ++++++++ .../cockpit/service/mapper/CockPitMapper.java | 8 ++++ .../cockpit/service/mapper/CockPitMapper.xml | 48 +++++++++++++++++++ 7 files changed, 102 insertions(+) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/KilnInfoVo.java diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java index 310bbc1..45a7c56 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/controller/CockPitController.java @@ -45,6 +45,13 @@ public class CockPitController { return new ResponseEntity<>(cockpitService.sortingMonitor(), HttpStatus.OK); } + @PostMapping("/klineInfo") + @Log("窑看板") + @ApiOperation("窑看板") + public ResponseEntity klineInfo(){ + return new ResponseEntity<>(cockpitService.getKlineInfo(), HttpStatus.OK); + } + @PostMapping("/screenTableData") @Log("大屏-两侧图表") @ApiOperation("大屏-两侧图表") diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/CockpitService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/CockpitService.java index aefa5ed..2fca1fa 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/CockpitService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/CockpitService.java @@ -5,6 +5,7 @@ import org.nl.common.domain.query.PageQuery; import org.nl.wms.cockpit.service.dao.*; import org.nl.wms.das.device.record.service.dao.DasDeviceErrorRecord; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -27,6 +28,8 @@ public interface CockpitService { */ ConcurrentHashMap sortingMonitor(); + Map> getKlineInfo(); + ConcurrentHashMap screenTableData(); ConcurrentHashMap deviceCondition(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/KilnInfoVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/KilnInfoVo.java new file mode 100644 index 0000000..13b6cda --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/KilnInfoVo.java @@ -0,0 +1,16 @@ +package org.nl.wms.cockpit.service.dao; + +import lombok.Data; + +import java.util.List; + +/** + * @author 窑看板 + */ +@Data +public class KilnInfoVo { + private String vehicleCode; + private String materialCode; + private String materialModel; + private String materialQty; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/ShiftProductionVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/ShiftProductionVo.java index 1f63b24..ce1bde3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/ShiftProductionVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/ShiftProductionVo.java @@ -16,4 +16,5 @@ public class ShiftProductionVo { private String workOrderCode; private String pointCode; private String planQty; + private String qualifyRate; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java index 9ec7902..7a0a9be 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java @@ -15,6 +15,8 @@ import org.nl.wms.ext.acs.service.dto.to.wms.AcsResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; @@ -64,6 +66,9 @@ public class CockpitServiceImpl implements CockpitService { int qualified = Integer.parseInt(productionVo.getQualifiedQty()); int lastQty = plan - unqualified - qualified; productionVo.setLastQty(String.valueOf(Math.max(lastQty, 0))); + BigDecimal planBig = new BigDecimal(plan); + BigDecimal quaBig = new BigDecimal(qualified); + productionVo.setQualifyRate(String.valueOf(quaBig.divide(planBig, 2, RoundingMode.HALF_UP))); } return shiftProductionList; }, pool); @@ -179,6 +184,20 @@ public class CockpitServiceImpl implements CockpitService { return resultMap; } + @Override + public Map> getKlineInfo() { + Map> res = new HashMap<>(); + List inKilnInfoVos = cockPitMapper.selectInKilnBoard(); + List outKilnInfoVos = cockPitMapper.selectOutKilnBoard(); + List oneKilnInfoVos = cockPitMapper.selectOneKilnInfo(); + List twoKilnInfoVos = cockPitMapper.selectTwoKilnInfo(); + res.put("inKilnInfoVos", inKilnInfoVos); + res.put("outKilnInfoVos", outKilnInfoVos); + res.put("oneKilnInfoVos", oneKilnInfoVos); + res.put("twoKilnInfoVos", twoKilnInfoVos); + return res; + } + @Override public ConcurrentHashMap screenTableData() { ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java index 6df6015..baf6e09 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.java @@ -71,4 +71,12 @@ public interface CockPitMapper { ShiftProductionVo selectQtByVo(ShiftProductionVo productionVo); + List selectInKilnBoard(); + + List selectOutKilnBoard(); + + List selectOneKilnInfo(); + + List selectTwoKilnInfo(); + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml index 7e3fb10..a214061 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml @@ -70,6 +70,8 @@ LEFT JOIN md_base_material m ON m.material_id = w.material_id LEFT JOIN md_cs_customerbase c ON w.customer = c.cust_id WHERE w.region_code = 'YZ' + and (w.workorder_status = '3' and w.realproduceend_date is null) + or (STR_TO_DATE(w.realproduceend_date, '%Y-%m-%d') = CURRENT_DATE) ORDER BY w.team DESC, w.workorder_status @@ -376,5 +378,51 @@ WHERE workorder_code = #{workOrderCode} AND get_station = #{pointCode} + + + +