From 1e123568c2f561013f5636e45dc0db30b17a3517 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 10 九月 2026 16:39:26 +0800
Subject: [PATCH] feat(basic): 添加产品条码功能并完善生产统计报表
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 0a540bf..d8395ea 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -9,10 +9,11 @@
<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" />
+ <result column="product_code" property="productCode" />
+ <result column="barcode" property="barcode" />
</resultMap>
<resultMap id="ProductModelVoResultMap" type="com.ruoyi.basic.vo.ProductModelVo" extends="BaseResultMap">
@@ -31,6 +32,9 @@
<if test="c.model != null and c.model != ''">
and pm.model like concat('%',#{c.model},'%')
</if>
+ <if test="c.barcode != null and c.barcode != ''">
+ and pm.barcode like concat('%',#{c.barcode},'%')
+ </if>
<if test="c.productName != null and c.productName != ''">
and p.product_name like concat('%',#{c.productName},'%')
</if>
--
Gitblit v1.9.3