From 407a9d87ba0bd58e7795ff5387b0cb005d630bed Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 16:45:30 +0800
Subject: [PATCH] 生产入库逻辑修改,只有最后一道工序的报工才会入库,只有成品检验和原材料检验入库

---
 src/main/resources/mapper/production/ProductProcessMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductProcessMapper.xml b/src/main/resources/mapper/production/ProductProcessMapper.xml
index 5b1ac18..9213760 100644
--- a/src/main/resources/mapper/production/ProductProcessMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessMapper.xml
@@ -4,9 +4,11 @@
 
     <select id="listPage" resultType="com.ruoyi.production.dto.ProductProcessDto">
         SELECT
-        *
+        p.*,
+        dl.device_name AS deviceName
         FROM
         product_process p
+        left join device_ledger dl on p.device_ledger_id = dl.id
         <where>
             <if test="productProcessDto.name != null and productProcessDto.name != '' ">
                 AND  p.name LIKE CONCAT('%',#{productProcessDto.name},'%')

--
Gitblit v1.9.3