From e0e08736bf1f0be89468ebfc81c4b8b235875963 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 12 Oct 2023 16:53:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8E=A5=E5=8F=A33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WCSInterfaceController.java | 4 +-- .../java/com/op/mes/mapper/MesMapper.java | 4 +++ .../service/impl/IWCInterfaceServiceImpl.java | 16 +++++++++--- .../main/resources/mapper/mes/MesMapper.xml | 26 ++++++++++++++++++- 4 files changed, 43 insertions(+), 7 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java index 9c04657a..a0891629 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java @@ -63,7 +63,7 @@ public class WCSInterfaceController extends BaseController { if(CollectionUtils.isEmpty(lgdtos)){ return error("参数信息为空"); } - if(StringUtils.isNotBlank(lgdtos.get(0).getFactoryCode())){ + if(StringUtils.isBlank(lgdtos.get(0).getFactoryCode())){ return error("工厂信息为空"); } return success(WCInterfaceService.saveLGusedLog(lgdtos)); @@ -87,7 +87,7 @@ public class WCSInterfaceController extends BaseController { boardDTO.setYmd(DateUtils.getDate()); } - if(StringUtils.isEmpty(boardDTO.getEquTypeCode())){ + if(StringUtils.isEmpty(boardDTO.getEquTypeCode())){//设备类型 return error("[equTypeCode] is not null"); } return success(WCInterfaceService.getMesBoardEquProductionToday(boardDTO)); diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java index ce535378..b19af438 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java @@ -34,4 +34,8 @@ public interface MesMapper { List getBoardFactory(BoardDTO boardDTO); int addBatchLGInfo(@Param("list") List lgdtos); + + List getTotalNumL(BoardDTO boardDTO); + + List getEveryNumL(BoardDTO boardDTO); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 490efdbe..a58c50d7 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -147,10 +147,17 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { public Map getMesBoardEquProductionToday(BoardDTO boardDTO) { DynamicDataSourceContextHolder.push("ds_"+boardDTO.getFactory());// 这是数据源的key Map boardMap = new HashMap(); + List totals = null; + List everys = null; + if("equ_type_lg".equals(boardDTO.getEquTypeCode())){//equ_type_lg 湿料罐 + boardDTO.setYmd(boardDTO.getYmd().replace("-","")); + totals = mesMapper.getTotalNumL(boardDTO); + everys = mesMapper.getEveryNumL(boardDTO); + }else{//成型机、烘房、收坯机 + totals = mesMapper.getTotalNum(boardDTO); + everys = mesMapper.getEveryNum(boardDTO); + } - List totals = mesMapper.getTotalNum(boardDTO);// - - List everys = mesMapper.getEveryNum(boardDTO);// boardMap.put("totalNum", totals); boardMap.put("everyNum", everys); @@ -159,7 +166,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { @Override public List getBoardFactory(BoardDTO boardDTO) { - //DynamicDataSourceContextHolder.push("master");// 这是数据源的key + DynamicDataSourceContextHolder.push("master");// 这是数据源的key return mesMapper.getBoardFactory(boardDTO); } @@ -170,6 +177,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { for(LGInfoDto lgdto:lgdtos){ lgdto.setId(IdUtils.simpleUUID()); lgdto.setCreateTime(nowTime); + lgdto.setDeviceCode("L"+lgdto.getDeviceCode()); } int saveNum = mesMapper.addBatchLGInfo(lgdtos); diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 136e73d9..04cd7632 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item.id},#{item.deviceCode}, #{item.used},#{item.usedUnit}, #{item.createDate},#{item.lgCreateTime}, - #{item.factoryCode},#{item.createTime}, + #{item.factoryCode},#{item.createTime} ) @@ -112,6 +112,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_name deptName from sys_dept where parent_id = '1' and del_flag = '0' + +