From 3cc2210d25d930af7d2ad45eb6084473bbae7aaf Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 17 Nov 2025 14:39:11 +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 --- .../java/com/nu/entity/CgdInfoEntity.java | 10 +++++ .../xml/ConfigMaterialCategoryMapper.xml | 10 ++--- .../cgd/entity/NuInvoicingCgdInfo.java | 7 ++++ .../impl/NuInvoicingCgdMainServiceImpl.java | 14 ++++--- .../entity/BlWarehouseMaterialInfo.java | 8 ++++ .../mapper/BlWarehouseMaterialInfoMapper.java | 4 ++ .../xml/BlWarehouseMaterialInfoMapper.xml | 42 +++++++++++++++++++ 7 files changed, 84 insertions(+), 11 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java index 3fddc17..f20e5e3 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java @@ -108,6 +108,16 @@ public class CgdInfoEntity implements Serializable { private String jhType;//0拣货 1销账 + private BigDecimal totalPrice; + + @TableField(exist = false) + private java.lang.String categoryName; + @TableField(exist = false) + private java.lang.String typeName; + @TableField(exist = false) + private java.lang.String medicationName; + + // 格式化getter方法 public String getProcurementPrice() { diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml index c68ac2c..803c15d 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml @@ -14,9 +14,9 @@ b.id as type_id, c.id as medication_id from nu_config_material_category a - LEFT JOIN nu_config_material_type b on a.id = b.category_id and b.iz_enabled = 0 and b.del_flag = 0 - LEFT JOIN nu_config_material_medication c on b.id = c.type_id and c.iz_enabled = 0 and c.del_flag = 0 - where a.iz_enabled = 0 and a.del_flag = 0 + LEFT JOIN nu_config_material_type b on a.id = b.category_id and b.iz_enabled = 'Y' and b.del_flag = 0 + LEFT JOIN nu_config_material_medication c on b.id = c.type_id and c.iz_enabled = 'Y' and c.del_flag = 0 + where a.iz_enabled = 'Y' and a.del_flag = 0 order by a.sort asc,b.id asc,c.id asc ) a ${ew.customSqlSegment} @@ -31,7 +31,7 @@ select b.category_id,b.type_id,b.medication_id from nu_warehouse_material_info c ,nu_config_material_info b - where b.id = c.wl_id and c.del_flag = 0 and c.iz_enabled = 0 + where b.id = c.wl_id and c.del_flag = 0 and c.iz_enabled = 'Y' and c.kcsl - 0 <= b.lower_limit and c.nu_id = #{params.nuId} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java index baa8533..9e06b6f 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java @@ -151,6 +151,13 @@ public class NuInvoicingCgdInfo implements Serializable { @TableField(exist = false) private BigDecimal totalPrice; + @TableField(exist = false) + private java.lang.String categoryName; + @TableField(exist = false) + private java.lang.String typeName; + @TableField(exist = false) + private java.lang.String medicationName; + // // 格式化getter方法 // public BigDecimal getProcurementPrice() { 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 0566a0e..b4e4e13 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 @@ -231,7 +231,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl infoList = entry.getValue();//请购的物料列表 ConfigSuppliersInfo ConfigSuppliersInfo = gysMapper.selectById(suppliersId); - String cgdNo = sysUser.getOrgCode() + new SimpleDateFormat("yyyyMMdd").format(new Date()) + String.format("%03d", qgdXlhInt); + String cgdNo = new SimpleDateFormat("yyyyMMdd").format(new Date()) + String.format("%03d", qgdXlhInt); + cgdNo = sysUser.getOrgCode() + cgdNo; //生产采购单主表 NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain(); @@ -245,7 +246,6 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl cgdInfoList = new ArrayList<>(); BigDecimal totalPrice = new BigDecimal(0); String qgdId = ""; @@ -254,9 +254,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("wl_id",params.getWlId()); - queryWrapper.eq("nu_id",params.getNuId()); - List wlList = mterialInfoMapper.selectList(queryWrapper); + queryWrapper.eq("a.wl_id",params.getWlId()); + queryWrapper.eq("a.nu_id",params.getNuId()); + List wlList = mterialInfoMapper.wlInfo(queryWrapper); BlWarehouseMaterialInfo wlInfo = new BlWarehouseMaterialInfo(); if(wlList.size()>0){ wlInfo = wlList.get(0); @@ -284,12 +284,14 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl wlInfo(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml index 37978ed..21c5935 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml @@ -40,6 +40,48 @@ + +