From fc4fc29d572a5e72dbb7d8ed85227884af26f13d Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 17 Nov 2025 13:31:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8=E5=81=9C=E7=94=A8=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cgd/service/impl/NuInvoicingCgdMainServiceImpl.java     | 6 +++---
 .../controller/BlWarehouseMaterialInfoController.java       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
index a3a0d0a2..0566a0e4 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
@@ -118,7 +118,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
             queryWrapper.apply("kcsl <= lower_limit");
         }
         queryWrapper.eq("del_flag","0");
-        queryWrapper.eq("iz_enabled","0");
+        queryWrapper.eq("iz_enabled","Y");
         Page<BlWarehouseMaterialInfo> page = new Page<>(pageNo, pageSize);
         List<BlWarehouseMaterialInfo> list = mterialInfoMapper.selectList(page,queryWrapper);
         IPage<MaterialInfoEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
@@ -506,7 +506,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         }
         queryWrapper.eq("a.nu_id",configMaterialCategory.getNuId());
         queryWrapper.eq("a.del_flag","0");
-        queryWrapper.eq("a.iz_enabled","0");
+        queryWrapper.eq("a.iz_enabled","Y");
         queryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getCategoryId()),"b.category_id",configMaterialCategory.getCategoryId());
         queryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getTypeId()),"b.type_id",configMaterialCategory.getTypeId());
         queryWrapper.eq(StringUtils.isNotEmpty(configMaterialCategory.getMedicationId()),"b.medication_id",configMaterialCategory.getMedicationId());
@@ -691,7 +691,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         queryWrapper.eq("nu_id",cgdInfoEntityDto.getNuId());
         queryWrapper.apply("kcsl <= lower_limit");//库存小于下限的数据
         queryWrapper.eq("del_flag","0");//查询未删除的数据
-        queryWrapper.eq("iz_enabled","0");//查询启用的数据
+        queryWrapper.eq("iz_enabled","Y");//查询启用的数据
         queryWrapper.eq("isAdd","0");//查询未在购物车里的数据
         //库存预警数据
         List<BlWarehouseMaterialInfo> list = mterialInfoMapper.selectList(queryWrapper);
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java
index 1f9a76c1..d6aff671 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java
@@ -273,7 +273,7 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
                                                                 HttpServletRequest req) {
         QueryWrapper<BlWarehouseMaterialInfo> queryWrapper = QueryGenerator.initQueryWrapper(blWarehouseMaterialInfo, req.getParameterMap());
         queryWrapper.eq("del_flag","0");
-        queryWrapper.eq("iz_enabled","0");
+        queryWrapper.eq("iz_enabled","Y");
         queryWrapper.apply("kcsl - 0 > 0");
         Page<BlWarehouseMaterialInfo> page = new Page<BlWarehouseMaterialInfo>(pageNo, pageSize);
         IPage<BlWarehouseMaterialInfo> pageList = blWarehouseMaterialInfoService.page(page, queryWrapper);