From b3c8dfecf80366aeae3c61c1946223d795db62d4 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 20 Nov 2024 10:34:32 +0800
Subject: [PATCH] =?UTF-8?q?11/20=20=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mybatis/mapper/inv/invProductDao.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index ab850916..706861c0 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -10,13 +10,12 @@
                bp.cpmctymc,
                bp.measname,
                ip.relIdFk,
-               bp.ggxh,
+               COALESCE(bp.ggxh,bp.bzgg) as ggxh,
                ip.batchNo,
                ip.productionDate,
                ip.expireDate,
-               bp.ylqxzcrbarmc,
+               COALESCE(bp.ylqxzcrbarmc,bp.manufactory) as ylqxzcrbarmc,
                bp.zczbhhzbapzbh,
-               bp.bzgg,
                bp.packUnit,
                bp.prepnUnit,
                bp.prepnSpec,