From a5f66f55b2c176e8504b8a077e00acfe2dfb4b00 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 18 九月 2026 18:09:56 +0800
Subject: [PATCH] feat(生产报工): 报工完成按四类区分计数零件并分流质检入库

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

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 0a540bf..0e252c9 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -9,7 +9,6 @@
         <result column="product_id" property="productId" />
         <result column="model" property="model" />
         <result column="unit" property="unit" />
-        <result column="speculative_trading_name" property="speculativeTradingName" />
         <result column="tenant_id" property="tenantId" />
         <result column="product_name" property="productName" />
         <result column="product_id" property="productId" />
@@ -24,7 +23,7 @@
     </resultMap>
 
     <select id="listPageProductModel" resultMap="ProductModelVoResultMap">
-        select pm.*,p.product_name
+        select pm.*,p.product_name, ifnull(p.standard_quantity, 0) as product_standard_quantity
         from product_model pm
         left join product p on pm.product_id = p.id
         <where>
@@ -138,6 +137,7 @@
                pm.model as  model
         from product_model pm
         left join product p on p.id = pm.product_id
+        where p.id is not null
         order by p.id,pm.id desc
     </select>
 

--
Gitblit v1.9.3