From 6416b165e4a3c8ecc2d547ceef0fb3962d3c7b56 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 12 一月 2026 14:58:45 +0800
Subject: [PATCH] 1.查询产品信息列表接口，销售台账查询其产品的状态 2.增添不合格现象字段，取消生产状态字段 3.修改发货审批接口,发货审批通过，生产该订单出库记录 4.存在质检记录并已提交的销售台账删除时做出限制 5.生产报工投入，产出2:1调整
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 799257d..e4e665c 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -19,14 +19,11 @@
from product_model pm
left join product p on pm.product_id = p.id
<where>
- <if test="c.model != null || c.model != ''">
- and pm.model = like concat('%',#{c.model},'%')
+ <if test="c.model != null and c.model != ''">
+ and pm.model like concat('%',#{c.model},'%')
</if>
- <if test="c.productName != null || c.productName != ''">
- and p.product_name = like concat('%',#{c.productName},'%')
- </if>
- <if test="c.speculativeTradingName != null || c.speculativeTradingName != ''">
- and pm.speculative_trading_name like concat('%',#{c.speculativeTradingName},'%')
+ <if test="c.productName != null and c.productName != ''">
+ and p.product_name like concat('%',#{c.productName},'%')
</if>
</where>
order by pm.id
--
Gitblit v1.9.3