From 658c78b15f22ed7a174e37cd73ae6fc3626a4a70 Mon Sep 17 00:00:00 2001 From: PQZ Date: Tue, 22 Oct 2024 15:20:39 +0800 Subject: [PATCH 1/3] 1 --- .../src/main/resources/mapper/base/RepairStatisticsMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml b/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml index 3f526343..287db120 100644 --- a/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml +++ b/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml @@ -11,7 +11,7 @@ SELECT COALESCE(sdd.label, '未知') AS name, - COUNT(roi.id) + COUNT(roi.id) AS value FROM repair_order_info roi LEFT JOIN system_dict_data sdd ON roi.pay_type = sdd.value AND sdd.dict_type = 'repair_pay_type' AND sdd.deleted = 0 From 44feda727351ca16222e773edce037ce4e7a47cf Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Tue, 22 Oct 2024 15:57:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E9=A2=86=E9=80=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E5=90=8E=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DlRepairSoServiceImpl.java | 25 +++++++++++++++++++ .../module/tickets/entity/DlTicketWares.java | 3 +++ .../mapper/tickets/DlTicketWaresMapper.xml | 6 +++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java index 6f867bbe..1f1dd665 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.common.RepairErrorCodeConstants; import cn.iocoder.yudao.common.SoStatusEnum; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.module.base.service.RepairWorkerService; import cn.iocoder.yudao.module.company.entity.Company; import cn.iocoder.yudao.module.company.service.CompanyService; import cn.iocoder.yudao.module.project.entity.RepairWares; @@ -85,6 +86,10 @@ public class DlRepairSoServiceImpl extends ServiceImpl flag = list.stream().filter(item -> !item.getWaresStatus().equals("01")).collect(Collectors.toList()); dlTicketWares.setStatus(CollectionUtil.isEmpty(flag) ? "03" : "04"); ticketWaresService.updateById(dlTicketWares); + + // 查主表记录 + DlRepairSo newSo = baseMapper.selectById(id); + // 通知仓库 + repairWorkerService.sentMessage(Long.valueOf(newSo.getCreator()), newSo.getUserName() + "已确认领料单:" + newSo.getSoNo()); } /** @@ -351,6 +371,11 @@ public class DlRepairSoServiceImpl extends ServiceImpl + @@ -24,7 +25,8 @@ dtw.repair_id as repair_id, dtw.repair_name as repair_name, dtw.adviser_id as adviser_id, - dtw.adviser_name as adviser_name + dtw.adviser_name as adviser_name, + dtw.license_number from dl_ticket_wares dtw left join dl_repair_tickets drt on dtw.ticket_id = drt.id @@ -39,7 +41,7 @@ or drt.ticket_no like concat('%', #{map.query}, '%') or - drt.car_no like concat('%', #{map.query}, '%') + dtw.license_number like concat('%', #{map.query}, '%') ) From 44b7a934030e9bd21bbc737a03e935c890054b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Tue, 22 Oct 2024 16:16:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=B4=E4=BF=AEapp=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=97=B6=E7=9A=84bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/tickets/DlRepairTitemMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml index 60f6b7bd..73d98ddd 100644 --- a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml +++ b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml @@ -19,7 +19,7 @@ sale_name = #{saleName}, - WHERE ticket_id = #{ticketId} + WHERE ticket_id = #{ticketId} and project_id = #{projectId}