From d048349afa13945aacf308252dc1e69e88d0cd8a Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Tue, 9 Dec 2025 09:03:57 +0800
Subject: [PATCH] =?UTF-8?q?pad=E6=8E=A5=E5=8F=A3-=E9=80=80=E8=B4=A7-?=
 =?UTF-8?q?=E5=B7=B2=E9=80=80=E8=B4=A7=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pad/invoicing/api/InvoicingThdApi.java    | 16 +++++++
 .../nu/modules/invoicing/api/ITuiHuoApi.java  |  2 +
 .../nu/mapper/NuInvoicingNuKcslMapper.java    |  2 +
 .../nu/mapper/xml/NuInvoicingNuKcslMapper.xml | 46 +++++++++++++++++++
 .../thd/service/impl/ThdServiceImpl.java      |  4 ++
 5 files changed, 70 insertions(+)

diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java
index e4f7e9db..ca9910d8 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java
@@ -239,4 +239,20 @@ public class InvoicingThdApi {
             return Result.error("操作失败");
         }
     }
+
+    /**
+     * 查询退货单-已退货物料
+     *
+     * @param dto
+     * @return
+     */
+    @ApiOperation(value = "查询退货单-已退货物料", notes = "查询退货单-已退货物料")
+    @GetMapping(value = "/thdMaterialList")
+    public Result<List<NuKcslEntity>> thdMaterialList(InvoicingThdMainEntity dto) {
+        if (StringUtils.isBlank(dto.getThdNo())) {
+            return Result.error("缺少参数");
+        }
+        List<NuKcslEntity> pageList = tuiHuoApi.thdMaterialList(dto);
+        return Result.OK(pageList);
+    }
 }
diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java
index f9aee339..b434d178 100644
--- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java
+++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java
@@ -33,4 +33,6 @@ public interface ITuiHuoApi {
     boolean transRead(InvoicingThdMainEntity dto);
 
     boolean requireTH(InvoicingThdMainEntity dto);
+
+    List<NuKcslEntity> thdMaterialList(InvoicingThdMainEntity dto);
 }
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/NuInvoicingNuKcslMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/NuInvoicingNuKcslMapper.java
index afaba47b..3889804c 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/NuInvoicingNuKcslMapper.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/NuInvoicingNuKcslMapper.java
@@ -17,4 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface NuInvoicingNuKcslMapper extends BaseMapper<NuInvoicingNuKcsl> {
 
     List<NuKcslEntity> thdNuMaterialList(InvoicingThdMainEntity dto);
+
+    List<NuKcslEntity> thdMaterialList(InvoicingThdMainEntity dto);
 }
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml
index e3577f48..c1bdd10d 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml
@@ -53,4 +53,50 @@
             </if>
         </where>
     </select>
+
+    <select id="thdMaterialList" resultType="com.nu.entity.NuKcslEntity">
+        select
+        material.id AS "materialInfo.id",
+        material.category_id AS "materialInfo.categoryId",
+        material.type_id AS "materialInfo.typeId",
+        material.medication_id AS "materialInfo.medicationId",
+        material.material_name AS "materialInfo.materialName",
+        material.material_no AS "materialInfo.materialNo",
+        material.specification_model AS "materialInfo.specificationModel",
+        material.sales_unit_price AS "materialInfo.salesUnitPrice",
+        material.reference_unit_price AS "materialInfo.referenceUnitPrice",
+        material.material_units AS "materialInfo.materialUnits",
+        material.multi_unit_switch AS "materialInfo.multiUnitSwitch",
+        material.one_unit AS "materialInfo.oneUnit",
+        material.one_unit_proportion AS "materialInfo.oneUnitProportion",
+        material.one_unit_price AS "materialInfo.oneUnitPrice",
+        material.two_unit AS "materialInfo.twoUnit",
+        material.two_unit_proportion AS "materialInfo.twoUnitProportion",
+        material.two_unit_price AS "materialInfo.twoUnitPrice",
+        material.multi_unit_type AS "materialInfo.multiUnitType",
+        material.suppliers AS "materialInfo.suppliers",
+        material.material_img AS "materialInfo.materialImg",
+        material.material_ident AS "materialInfo.materialIdent",
+        material.iz_enabled AS "materialInfo.izEnabled",
+        material.del_flag AS "materialInfo.delFlag",
+        material.create_by AS "materialInfo.createBy",
+        material.create_time AS "materialInfo.createTime",
+        material.update_by AS "materialInfo.updateBy",
+        material.update_time AS "materialInfo.updateTime",
+        material.sys_org_code AS "materialInfo.sysOrgCode",
+        material.pinyin AS "materialInfo.pinyin",
+        material.upper_limit AS "materialInfo.upperLimit",
+        material.lower_limit AS "materialInfo.lowerLimit",
+        material.tag_type AS "materialInfo.tagType",
+        material.iz_ybbx AS "materialInfo.izYbbx",
+        material.iz_jgyh AS "materialInfo.izJgyh",
+        info.th_num AS thNum
+        from nu_invoicing_thd_info info
+        LEFT JOIN nu_config_material_info material ON info.wl_id = material.id
+        <where>
+            <if test="thdNo != null and thdNo != ''">
+                and info.thd_no = #{thdNo}
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java
index 8acf91c6..fd936067 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java
@@ -522,4 +522,8 @@ public class ThdServiceImpl implements ITuiHuoApi {
         return true;
     }
 
+    @Override
+    public List<NuKcslEntity> thdMaterialList(InvoicingThdMainEntity dto) {
+        return nuKcslMapper.thdMaterialList(dto);
+    }
 }