From dd86d8d1e6a95647fce127695e73ff947243dab1 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 27 Apr 2026 15:35:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nu/modules/pad/invoicing/api/InvoicingApi.java | 7 +++++++ .../src/main/java/com/nu/entity/MaterialInfoEntity.java | 1 + 2 files changed, 8 insertions(+) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java index b559e69b..e4317848 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java @@ -564,6 +564,13 @@ public class InvoicingApi { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = new QueryWrapper<>(); + if(StringUtils.isBlank(materialInfoEntity.getWlType())){ + queryWrapper.gt("a.kcsl",0); + }else if(StringUtils.equals("1",materialInfoEntity.getWlType())){ + queryWrapper.eq("a.kcsl",0); + }else if(StringUtils.equals("0",materialInfoEntity.getWlType())){ + queryWrapper.gt("a.kcsl",0); + } queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getSuppliers()),"c.suppliers_id", materialInfoEntity.getSuppliers()); queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getNuId()),"a.nu_id", materialInfoEntity.getNuId()); queryWrapper.eq(StringUtils.isNotBlank(materialInfoEntity.getWlId()),"a.wl_id", materialInfoEntity.getWlId()); diff --git a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java index 1a2bc058..b5de1b08 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java @@ -158,4 +158,5 @@ public class MaterialInfoEntity implements Serializable { private Double procurementPrice; @Dict(dicCode = "pd_type") private String pdType; + private String wlType;//用于查询出入库类型 0库存大于0 1库存等于0 }