From 434d747f21e2f2df6e7a5528e6712d22705e5ed7 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 6 Jun 2024 18:05:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/mes/domain/MesMachineReport.java | 9 +++++++++ .../resources/mapper/mes/MesReportWorkMapper.xml | 3 +++ .../quality/controller/QcProjectTypeController.java | 9 +++++++++ .../com/op/quality/mapper/QcProjectTypeMapper.java | 4 ++++ .../op/quality/service/IQcProjectTypeService.java | 2 ++ .../service/impl/QcProjectTypeServiceImpl.java | 12 ++++++++++++ .../resources/mapper/quality/QcProjectTypeMapper.xml | 7 +++++++ 7 files changed, 46 insertions(+) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesMachineReport.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesMachineReport.java index f8d993ac..24af2eae 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesMachineReport.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesMachineReport.java @@ -21,6 +21,15 @@ public class MesMachineReport extends BaseEntity { private String productDateEnd; //查询结束时间 private String pduCode; //数据唯一键 private String shiftId; //班次 + private String equName; + + public String getEquName() { + return equName; + } + + public void setEquName(String equName) { + this.equName = equName; + } private List productNames; //产品名称列表 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 0fbd6966..3828ac70 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 @@ -854,6 +854,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE rfid_status = '1' AND equ.equipment_type_code = 'equ_type_cxj' + + and equ.equipment_name like concat('%', #{equName}, '%') + ) mt LEFT JOIN pro_order_workorder pow ON pow.workorder_id = mt.OrderCode WHERE pow.order_code IS NOT NULL diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcProjectTypeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcProjectTypeController.java index e6620279..f7124129 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcProjectTypeController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcProjectTypeController.java @@ -66,6 +66,15 @@ public class QcProjectTypeController extends BaseController { return success(qcProjectTypeService.selectQcProjectTypeById(id)); } + /** + * 获取检验方案维护详细信息 + */ + @RequiresPermissions("quality:qcProjectType:query") + @GetMapping(value = "/getProjectTypeInfoByCode/{projectTypeCode}") + public AjaxResult getProjectTypeInfoByCode(@PathVariable("projectTypeCode") String projectTypeCode) { + return success(qcProjectTypeService.selectQcProjectTypeByCode(projectTypeCode)); + } + /** * 新增检验方案维护 */ diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProjectTypeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProjectTypeMapper.java index 75ba76ff..0449fedd 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProjectTypeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcProjectTypeMapper.java @@ -60,4 +60,8 @@ public interface QcProjectTypeMapper { * @return 结果 */ public int deleteQcProjectTypeByIds(String[] ids); + + QcProjectType selectQcProjectTypeByCode(String projectTypeCode); + + int getTodayMaxNum(); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcProjectTypeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcProjectTypeService.java index ce05f3c9..d49ab171 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcProjectTypeService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcProjectTypeService.java @@ -61,4 +61,6 @@ public interface IQcProjectTypeService { public int deleteQcProjectTypeById(String id); List selectProjectTypeTree(QcProjectType qcProjectType); + + QcProjectType selectQcProjectTypeByCode(String projectTypeCode); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProjectTypeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProjectTypeServiceImpl.java index da44063c..c672d1e0 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProjectTypeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProjectTypeServiceImpl.java @@ -43,6 +43,13 @@ public class QcProjectTypeServiceImpl implements IQcProjectTypeService { return qcProjectTypeMapper.selectQcProjectTypeById(id); } + @Override + @DS("#header.poolName") + public QcProjectType selectQcProjectTypeByCode(String projectTypeCode) { + return qcProjectTypeMapper.selectQcProjectTypeByCode(projectTypeCode); + } + + /** * 查询检验方案维护列表 * @@ -70,6 +77,11 @@ public class QcProjectTypeServiceImpl implements IQcProjectTypeService { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; qcProjectType.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", "")); + + String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD,DateUtils.getNowDate()); + int liushuiNum = qcProjectTypeMapper.getTodayMaxNum(); + String liushuiStr = String.format("%04d", liushuiNum); + qcProjectType.setProjectTypeCode(bpDD+liushuiStr); return qcProjectTypeMapper.insertQcProjectType(qcProjectType); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml index 0f4db608..4d5a20d0 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProjectTypeMapper.xml @@ -44,6 +44,13 @@ where id = #{id} + + insert into qc_project_type