From ef2cae1d7b9ba75f8281bf36f8230b651a9ea382 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 4 Jun 2024 11:44:01 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=94=A8=E5=B7=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/device/EquRepairOrderMapper.xml | 2 +- .../op-open/src/main/resources/mapper/open/OpenMapper.xml | 2 +- .../main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml index 40c7bc48f..fdaac173e 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml @@ -348,7 +348,7 @@ sn.notice_type noticeType, sn.notice_content noticeContent, btu.user_name userCode, - btu.wx_id wxId + case when btu.wx_id is null then btu.user_name else btu.wx_id end wxId from sys_notice_group sng left join sys_notice sn on sng.notice_id = sn.notice_id left join base_team_user btu on sng.group_code = btu.team_code diff --git a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml index c6e8efcb0..fb3d6d09b 100644 --- a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml +++ b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml @@ -392,7 +392,7 @@ sn.notice_type noticeType, sn.notice_content noticeContent, btu.user_name userCode, - btu.wx_id wxId + case when btu.wx_id is null then btu.user_name else btu.wx_id end wxId from sys_notice_group sng left join sys_notice sn on sng.notice_id = sn.notice_id left join base_team_user btu on sng.group_code = btu.team_code diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index f30ebd2a1..bb9b10931 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -492,7 +492,7 @@ sn.notice_type noticeType, sn.notice_content noticeContent, btu.user_name userCode, - btu.wx_id wxId + case when btu.wx_id is null then btu.user_name else btu.wx_id end wxId from sys_notice_group sng left join sys_notice sn on sng.notice_id = sn.notice_id left join base_team_user btu on sng.group_code = btu.team_code From 4c42e02780c5fdba29cbf7f0f23227cfa1bfa04f Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 4 Jun 2024 14:15:48 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=8F=90=E9=86=92+=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/plan/domain/ProOrderWorkorder.java | 10 ++++ .../impl/ProOrderWorkorderServiceImpl.java | 32 ++--------- .../mapper/plan/ProOrderWorkorderMapper.xml | 14 +++-- .../impl/QcCheckTaskIncomeServiceImpl.java | 2 +- .../impl/QcCheckTaskProduceServiceImpl.java | 57 ++++++++++++++++++- 5 files changed, 78 insertions(+), 37 deletions(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java index 23134b663..37b807902 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java @@ -1,5 +1,6 @@ package com.op.plan.domain; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -231,6 +232,7 @@ public class ProOrderWorkorder extends TreeEntity { // 车数 private Integer carNum; private Integer sortNo; + private BigDecimal umrez; public Integer getCarNum() { return carNum; @@ -267,6 +269,14 @@ public class ProOrderWorkorder extends TreeEntity { // 供湿料计划使用 private String bucketName1; + public BigDecimal getUmrez() { + return umrez; + } + + public void setUmrez(BigDecimal umrez) { + this.umrez = umrez; + } + public String getMaterialName1() { return materialName1; } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index fcf98e0ee..04d014089 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -1155,21 +1155,6 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { String username = SecurityUtils.getUsername(); List workOrders = proOrderWorkorderMapper.selectWorkOrderIdByBatch(workOrderCode); - // 系数 - Long coefficient = 1L; - if(workOrders.size()==2){ - // 获取子母工单数量 - Optional pQuantity = workOrders.stream().filter(item -> "0".equals(item.getParentOrder())) - .findFirst().map(ProOrderWorkorder::getQuantitySplit); - Optional cQuantity = workOrders.stream().filter(item -> !"0".equals(item.getParentOrder())) - .findFirst().map(ProOrderWorkorder::getQuantitySplit); - - if (pQuantity.isPresent() && cQuantity.isPresent()) { - coefficient = cQuantity.get() / pQuantity.get(); - } - }else if(workOrders.size()==3){ - //TODO; - } int count = 0; for (int m=0;m diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 2eeb607a9..141441ccb 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -281,7 +281,7 @@ public class QcCheckTaskIncomeServiceImpl implements } int s = qcCheckTaskDetailMapper.addBatch(items); - //发企业微信--------------------开始(跟班组无关) + //发企业微信--------------------开始 SysNoticeGroup noticeQo = new SysNoticeGroup(); noticeQo.setNoticeId(6L); List notices = qcCheckTaskIncomeMapper.getNoticesGroup(noticeQo); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index a2e3fddc5..6e13f0f77 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -11,9 +11,13 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.R; @@ -26,8 +30,11 @@ import com.op.quality.domain.*; import com.op.quality.mapper.*; import com.op.quality.service.IQcCheckTaskDefectService; import com.op.quality.service.IQcCheckTaskUserService; +import com.op.system.api.RemoteOpenService; import com.op.system.api.RemoteUserService; +import com.op.system.api.domain.SysNoticeGroup; import com.op.system.api.domain.SysUser; +import com.op.system.api.domain.dto.WechartDTO; import com.op.system.api.domain.mes.ProOrderWorkorderDTO; import com.op.system.api.domain.quality.QcMaterialGroupDetailDTO; import com.op.system.api.domain.quality.QcUserMaterialDTO; @@ -88,6 +95,11 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService @Autowired private QcCheckTaskUserMapper qcCheckTaskUserMapper; + @Autowired + private RemoteOpenService remoteOpenService; + + private static Pattern p2= Pattern.compile("<[^>]+>"); + /** * 查询生产过程检验任务 * @@ -189,6 +201,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService qcCheckTaskProduce.setCreateTime(nowDate); qcCheckTaskProduce.setTypeCode("produce");//大检验节点 /**qc_task_user start**/ + List users = null; if(StringUtils.isNotBlank(qcCheckTaskProduce.getCheckManName())){ String checkManName = qcCheckTaskProduce.getCheckManName(); String checkManCode = qcCheckTaskProduce.getCheckManCode(); @@ -211,7 +224,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService qcCheckTaskProduce.setCheckManName(""); qcCheckTaskProduce.setCheckManCode(""); /**qc_user_material取默认检查人**/ - List users = qcCheckTaskIncomeMapper.getUserByCheckType(qcCheckTaskProduce.getCheckType()); + users = qcCheckTaskIncomeMapper.getUserByCheckType(qcCheckTaskProduce.getCheckType()); if(!CollectionUtils.isEmpty(users)){ for(QcUserMaterialDTO user:users){ user.setId(IdUtils.fastSimpleUUID()); @@ -269,7 +282,47 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService item.setFactoryCode(factoryCode); item.setStatus("Y"); } - return qcCheckTaskDetailMapper.addBatch(items); + int bn = qcCheckTaskDetailMapper.addBatch(items); + + //发企业微信--------------------开始 + SysNoticeGroup noticeQo = new SysNoticeGroup(); + if(qcCheckTaskProduce.getCheckType().equals("checkTypeSC")){ + noticeQo.setNoticeId(19L); + }else if(qcCheckTaskProduce.getCheckType().equals("checkTypeSCXJ")){ + noticeQo.setNoticeId(20L); + } + + List notices = qcCheckTaskIncomeMapper.getNoticesGroup(noticeQo); + if(!CollectionUtils.isEmpty(notices)) { + + List wecharts = new ArrayList<>(); + //去主库查微信id + DynamicDataSourceContextHolder.push("master");// 这是数据源的key + List userCodes = users.stream() + .map(QcUserMaterialDTO::getUserCode) + .collect(Collectors.toList()); + List wxids = qcCheckTaskIncomeMapper.getWxId(userCodes); + for (String wxid : wxids) { + WechartDTO wechart0 = new WechartDTO(); + wechart0.setUserId(wxid); + String contentInfo = notices.get(0).getNoticeContent(); + contentInfo = contentInfo.replace("${checkNo}", qcCheckTaskProduce.getCheckNo() + "\n"); + Matcher m = p2.matcher(contentInfo); + contentInfo = m.replaceAll(""); + wechart0.setText(contentInfo); + wecharts.add(wechart0); + } + logger.info("质检检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts)); + if (!CollectionUtils.isEmpty(wecharts)) { + new Thread(() -> { + AjaxResult result = remoteOpenService.sendWeChartMessage(wecharts); + logger.info("质检检验企业微信提醒结果：" + JSONObject.toJSONString(result)); + + }).start(); + } + //发企业微信--------------------结束 + } + return bn; } /** From 0c0184020a0a1966632314cb1815ff518266d483 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 4 Jun 2024 14:58:00 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=8D=87=E7=BA=A72?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/plan/service/impl/ProOrderWorkorderServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 04d014089..1a28b5a3b 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -1173,11 +1173,11 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { if(proOrderWorkorderBatch.getNewBatchQuantity() != null){ Long newBatchQuantity = proOrderWorkorderBatch.getNewBatchQuantity(); - if(m==0 || m== workOrders.size()-1){ + if(m==0){ // 设置子工单数量 batch.setBatchQuantity(newBatchQuantity); }else{ - batch.setBatchQuantity(workOrders.get(m+1).getUmrez() + batch.setBatchQuantity(workOrders.get(m-1).getUmrez() .multiply(new BigDecimal(newBatchQuantity)).longValue()); } } @@ -1219,7 +1219,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { // 设置子工单数量 batch.setNewBatchQuantity(newBatchQuantity); }else{ - batch.setNewBatchQuantity(workOrders.get(m+1).getUmrez() + batch.setNewBatchQuantity(workOrders.get(m-1).getUmrez() .multiply(new BigDecimal(newBatchQuantity)).longValue()); } } From 0f107864a4c759fb53be7187979d6b315f9cd5bd Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 4 Jun 2024 15:09:38 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=97=A5=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8-=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/mes/MesReportWorkMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 7ebd9c154..5173b1c53 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -693,10 +693,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and be.workshop_code = #{workCenter} and be.equipment_type_code = #{equipmentTypeCode} - and CONVERT(varchar(10),pow.product_date, 23) > CONVERT(varchar(10), #{productDateStart}, 23) + and CONVERT(varchar(10),pow.product_date, 23) >= CONVERT(varchar(10), #{productDateStart}, 23) - and CONVERT(varchar(10), #{productDateEnd}, 23) > CONVERT(varchar(10),pow.product_date, 23) + and CONVERT(varchar(10), #{productDateEnd}, 23) >= CONVERT(varchar(10),pow.product_date, 23) order by be.equipment_code From 556e1f9030a55d563309f7d5a9f542f33194d496 Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 5 Jun 2024 10:41:40 +0800 Subject: [PATCH 05/10] =?UTF-8?q?update=20-=20=E8=83=BD=E6=BA=90=E8=A1=A8?= =?UTF-8?q?=E5=85=B7=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../record/mapper/RecordDnbInstantMapper.java | 8 +++ .../report/controller/BoardController.java | 27 +++++++++ .../energy/report/service/IBoardService.java | 16 ++++++ .../report/service/impl/BoardServiceImpl.java | 57 ++++++++++++++++--- .../mapper/record/RecordDnbInstantMapper.xml | 36 ++++++++++++ .../mapper/report/ReportPointDnbMapper.xml | 12 ++-- 6 files changed, 142 insertions(+), 14 deletions(-) diff --git a/op-modules/op-energy/src/main/java/com/op/energy/record/mapper/RecordDnbInstantMapper.java b/op-modules/op-energy/src/main/java/com/op/energy/record/mapper/RecordDnbInstantMapper.java index 3a68283b1..bfa610d61 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/record/mapper/RecordDnbInstantMapper.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/record/mapper/RecordDnbInstantMapper.java @@ -3,6 +3,7 @@ package com.op.energy.record.mapper; import com.op.energy.record.domain.RecordDnbInstant; import java.util.List; +import java.util.Map; /** @@ -75,4 +76,11 @@ public interface RecordDnbInstantMapper { * @return */ List selectRealTimeParentList(RecordDnbInstant baseDnbInstant); + + /** + * 实时数据 + * @param paramMap + * @return + */ + List tablewareDetailsInfo(Map paramMap); } diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/controller/BoardController.java b/op-modules/op-energy/src/main/java/com/op/energy/report/controller/BoardController.java index ff295eec4..6973796e9 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/report/controller/BoardController.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/report/controller/BoardController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -271,4 +272,30 @@ public class BoardController extends BaseController { return AjaxResult.success(result); } + /** + * new表具状态-线路配置信息 + * @param paramMap + * @return + */ + @ResponseBody + @GetMapping("/fixtureStatus") + public AjaxResult fixtureStatus(@RequestParam(required = false) Map paramMap){ + Map result = boardService.fixtureStatus(paramMap); + return AjaxResult.success(result); + } + + /** + * 表具实时状态 + * @param paramMap + * @return + */ + @GetMapping( "/tablewareDetailsInfo") + @ResponseBody + public AjaxResult tablewareDetailsInfo(@RequestParam(required = false) Map paramMap){ + Map result = boardService.tablewareDetailsInfo(paramMap); + return AjaxResult.success(result); + } + + + } diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/service/IBoardService.java b/op-modules/op-energy/src/main/java/com/op/energy/report/service/IBoardService.java index 3a496ea72..9a6da6218 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/report/service/IBoardService.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/report/service/IBoardService.java @@ -2,6 +2,7 @@ package com.op.energy.report.service; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -53,4 +54,19 @@ public interface IBoardService { * @return */ ArrayList> parkEnergyRanking(Map paramMap); + + /** + * new表具状态信息 + * @param paramMap + * @return + */ + Map fixtureStatus(Map paramMap); + + /** + * 表具实时状态 + * @param paramMap + * @return + */ + Map tablewareDetailsInfo(Map paramMap); + } diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/BoardServiceImpl.java b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/BoardServiceImpl.java index 17a645825..72667ee50 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/BoardServiceImpl.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/BoardServiceImpl.java @@ -2,10 +2,7 @@ package com.op.energy.report.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; -import com.op.energy.base.domain.BaseCollectDeviceInfo; -import com.op.energy.base.domain.BaseLineMonitor; -import com.op.energy.base.domain.BaseTypeRelation; -import com.op.energy.base.domain.SysDatasource; +import com.op.energy.base.domain.*; import com.op.energy.base.mapper.BaseCollectDeviceInfoMapper; import com.op.energy.base.mapper.BaseLineMonitorMapper; import com.op.energy.base.mapper.BaseTypeRelationMapper; @@ -26,10 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import static com.op.energy.base.service.impl.BaseLineMonitorServiceImpl.getNextLevelLineMonitorList; @@ -348,4 +342,51 @@ public class BoardServiceImpl implements IBoardService { } return result; } + + /** + * new表具状态信息 + * @param paramMap + * @return + */ + @Override + @DS("#header.poolName") + public Map fixtureStatus(Map paramMap) { + HashMap result = new HashMap<>(); + if (String.valueOf(paramMap.get("energyType")).equals("")) { + return result; + } + BaseLineMonitor lineMonitor = new BaseLineMonitor(); + lineMonitor.setMonitorType(Long.valueOf(String.valueOf(paramMap.get("energyType")))); + List list = baseLineMonitorService.selectBaseLineMonitorList(lineMonitor); + List ztrees = new ArrayList(); + for (BaseLineMonitor baseLineMonitor : list) { + Ztree ztree = new Ztree(); + ztree.setId(baseLineMonitor.getObjid()); + ztree.setpId(baseLineMonitor.getParentId()); + ztree.setName(baseLineMonitor.getMonitorName()); + ztree.setTitle(baseLineMonitor.getMonitorId()); + ztrees.add(ztree); + } + result.put("result", ztrees); + return result; + } + + /** + * 表具实时状态 + * @param paramMap + * @return + */ + @Override + @DS("#header.poolName") + public Map tablewareDetailsInfo(Map paramMap) { + HashMap result = new HashMap<>(); + if (paramMap.containsKey("energyType") && String.valueOf(paramMap.get("energyType")).equals("2")){ + List recordDnbInstants = recordDnbInstantMapper.tablewareDetailsInfo(paramMap); + result.put("result", recordDnbInstants.get(0)); + } + return result; + } + + + } diff --git a/op-modules/op-energy/src/main/resources/mapper/record/RecordDnbInstantMapper.xml b/op-modules/op-energy/src/main/resources/mapper/record/RecordDnbInstantMapper.xml index 12c387298..4b5d7f864 100644 --- a/op-modules/op-energy/src/main/resources/mapper/record/RecordDnbInstantMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/record/RecordDnbInstantMapper.xml @@ -198,4 +198,40 @@ + + diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml index 05a1204ed..ed81c996c 100644 --- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml @@ -72,7 +72,7 @@ and point_time = #{pointTime} and (report_point_dnb.monitor_id = #{monitorSubset} OR report_point_dnb.monitor_id IN - (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors))) + (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0)) and begin_time between #{params.beginBeginTime} and #{params.endBeginTime} @@ -106,7 +106,7 @@ where report_point_dnb.objid = #{objid} + + + + and sample_code = #{sampleCode} + + + and sample_aql = #{sampleAql} + + + and attr1 = #{attr1} + + + and factory_code = #{factoryCode} + + + and max_bad_quality = #{maxBadQuality} + + + and check_type = #{checkType} + + + and type_code = #{typeCode} + + + and aql1 = #{aql1} + + + and aql2 = #{aql2} + + + and aql3 = #{aql3} + + + and aql4 = #{aql4} + + + and aql5 = #{aql5} + + + and aql6 = #{aql6} + + + and aql7 = #{aql7} + + + and aql8 = #{aql8} + + + and aql9 = #{aql9} + + + and aql10 = #{aql10} + + + and aql11 = #{aql11} + + + and aql12 = #{aql12} + + + and aql13 = #{aql13} + + + and aql14 = #{aql14} + + + and aql15 = #{aql15} + + + and aql16 = #{aql16} + + + and aql17 = #{aql17} + + + and aql18 = #{aql18} + + + and aql19 = #{aql19} + + + and aql20 = #{aql20} + + + and aql21 = #{aql21} + + + and aql22 = #{aql22} + + + and aql23 = #{aql23} + + + and aql24 = #{aql24} + + + and aql25 = #{aql25} + + + and aql26 = #{aql26} + + + + + + + + insert into qc_sample_rule_aql + + id, + + sample_code, + + sample_aql, + + attr1, + + create_by, + + create_time, + + update_by, + + update_time, + + factory_code, + + del_flag, + + max_bad_quality, + + check_type, + + type_code, + + aql1, + + aql2, + + aql3, + + aql4, + + aql5, + + aql6, + + aql7, + + aql8, + + aql9, + + aql10, + + aql11, + + aql12, + + aql13, + + aql14, + + aql15, + + aql16, + + aql17, + + aql18, + + aql19, + + aql20, + + aql21, + + aql22, + + aql23, + + aql24, + + aql25, + + aql26, + + + + #{id}, + + #{sampleCode}, + + #{sampleAql}, + + #{attr1}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + #{factoryCode}, + + #{delFlag}, + + #{maxBadQuality}, + + #{checkType}, + + #{typeCode}, + + #{aql1}, + + #{aql2}, + + #{aql3}, + + #{aql4}, + + #{aql5}, + + #{aql6}, + + #{aql7}, + + #{aql8}, + + #{aql9}, + + #{aql10}, + + #{aql11}, + + #{aql12}, + + #{aql13}, + + #{aql14}, + + #{aql15}, + + #{aql16}, + + #{aql17}, + + #{aql18}, + + #{aql19}, + + #{aql20}, + + #{aql21}, + + #{aql22}, + + #{aql23}, + + #{aql24}, + + #{aql25}, + + #{aql26}, + + + + + + update qc_sample_rule_aql + + sample_code = + #{sampleCode}, + + sample_aql = + #{sampleAql}, + + attr1 = + #{attr1}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + factory_code = + #{factoryCode}, + + del_flag = + #{delFlag}, + + max_bad_quality = + #{maxBadQuality}, + + check_type = + #{checkType}, + + type_code = + #{typeCode}, + + aql1 = + #{aql1}, + + aql2 = + #{aql2}, + + aql3 = + #{aql3}, + + aql4 = + #{aql4}, + + aql5 = + #{aql5}, + + aql6 = + #{aql6}, + + aql7 = + #{aql7}, + + aql8 = + #{aql8}, + + aql9 = + #{aql9}, + + aql10 = + #{aql10}, + + aql11 = + #{aql11}, + + aql12 = + #{aql12}, + + aql13 = + #{aql13}, + + aql14 = + #{aql14}, + + aql15 = + #{aql15}, + + aql16 = + #{aql16}, + + aql17 = + #{aql17}, + + aql18 = + #{aql18}, + + aql19 = + #{aql19}, + + aql20 = + #{aql20}, + + aql21 = + #{aql21}, + + aql22 = + #{aql22}, + + aql23 = + #{aql23}, + + aql24 = + #{aql24}, + + aql25 = + #{aql25}, + + aql26 = + #{aql26}, + + + where id = #{id} + + + + delete from qc_sample_rule_aql where id = #{id} + + + + delete from qc_sample_rule_aql where id in + + #{id} + + + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcSampleRuleCodeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcSampleRuleCodeMapper.xml new file mode 100644 index 000000000..f4d938e4b --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcSampleRuleCodeMapper.xml @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, start_value, end_value, attr1, create_by, create_time, update_by, update_time, factory_code, del_flag, sample_code, check_type, type_code, check_level from qc_sample_rule_code + + + + + + + + insert into qc_sample_rule_code + + id, + + start_value, + + end_value, + + attr1, + + create_by, + + create_time, + + update_by, + + update_time, + + factory_code, + + del_flag, + + sample_code, + + check_type, + + type_code, + + check_level, + + + + #{id}, + + #{startValue}, + + #{endValue}, + + #{attr1}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + #{factoryCode}, + + #{delFlag}, + + #{sampleCode}, + + #{checkType}, + + #{typeCode}, + + #{checkLevel}, + + + + + + update qc_sample_rule_code + + start_value = + #{startValue}, + + end_value = + #{endValue}, + + attr1 = + #{attr1}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + factory_code = + #{factoryCode}, + + del_flag = + #{delFlag}, + + sample_code = + #{sampleCode}, + + check_type = + #{checkType}, + + type_code = + #{typeCode}, + + check_level = + #{checkLevel}, + + + where id = #{id} + + + + delete from qc_sample_rule_code where id = #{id} + + + + delete from qc_sample_rule_code where id in + + #{id} + + + From da8a504b398665c72bbaacb3261c3fb74292c02d Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 6 Jun 2024 11:28:23 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=97=A5=E7=94=9F=E4=BA=A7=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/mes/MesMapper.xml | 15 ++++++++------- .../resources/mapper/mes/MesReportWorkMapper.xml | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) 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 97620f474..e232097c0 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 @@ -455,14 +455,15 @@ mr.work_time, mr2.quantity_feedback, ROUND( mr2.quantity_feedback/mr.work_time,2) AS actXl - from mes_line ml - left join( - select top 1 use_man,work_time,machine_code,report_code - from mes_report_work where del_flag = '0' and machine_code = #{equCode} and parent_order !='0' order by create_time desc - ) mr on mr.machine_code = ml.line_code - left join mes_report_work mr2 on mr2.report_code = mr.report_code and mr2.parent_order ='0' + from ( + select top 1 use_man,work_time,machine_code,report_code,product_code + from mes_report_work where del_flag = '0' and machine_code = #{equCode} and parent_order !='0' order by create_time desc + ) mr + left join mes_report_work mr2 on mr2.report_code = mr.report_code and mr2.parent_order ='0' + left join mes_line ml on mr.machine_code = ml.line_code + left join mes_line_product mlp on mlp.belong_to = ml.id and mr2.product_code = mlp.product_code where ml.line_code = #{equCode} - and ml.del_flag='0' + and ml.del_flag='0' and mlp.del_flag='0' diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 5173b1c53..0fbd69669 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -687,7 +687,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from base_equipment be left join pro_order_workorder pow on be.equipment_code = pow.workorder_name left join mes_line ml on be.equipment_code = ml.line_code - where be.del_flag = '0' and be.sap_code is not null and pow.status = 'w3' + left join mes_line_product mlp on mlp.belong_to = ml.id and pow.product_code = mlp.product_code + where be.del_flag = '0' and be.sap_code is not null and pow.status = 'w3' and mlp.del_flag='0' and pow.parent_order = '0' and pow.del_flag='0' and ml.del_flag='0' and be.sap_name like concat('%', #{sapName}, '%') and be.workshop_code = #{workCenter}