From 73086b1adc3d880634d4d11c35c1c2bb4eefa505 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 16 四月 2026 18:01:45 +0800
Subject: [PATCH] feat:1、工序要加是否质检、是否入库、是否报工      2、生产订单-领料、退料后端开发(关联订单,工序,bom,工艺路线)

---
 src/main/resources/mapper/device/DeviceRepairMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index ab11bd2..aeb87a8 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -21,7 +21,8 @@
                 dr.update_user,
                dr.tenant_id,
                dl.device_name,
-               dl.device_model
+               dl.device_model,
+               dr.machinery_category
         from device_repair dr
         left join device_ledger dl on dr.device_ledger_id = dl.id
         <where>
@@ -33,7 +34,7 @@
                 and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
             </if>
             <if test="deviceRepairDto.status != null">
-                and dl.status = #{deviceRepairDto.status}
+                and dr.status = #{deviceRepairDto.status}
             </if>
             <if test="deviceRepairDto.remark != null">
                 and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
@@ -66,6 +67,7 @@
                dr.update_user,
                dr.tenant_id,
                dl.device_name,
+               dr.machinery_category,
                dl.device_model
         from device_repair dr
                  left join device_ledger dl on dr.device_ledger_id = dl.id

--
Gitblit v1.9.3