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,