From 379b7332b014689c4be8ceffd7485e1035e3680c Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 3 Dec 2025 14:34:36 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=B7=E9=A2=86=E5=8D=95pad?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20post=E6=93=8D=E4=BD=9C=E7=B1=BB=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97@AutoLog=202?= =?UTF-8?q?=E3=80=81=E7=A7=BB=E9=99=A4=E8=AF=B7=E9=A2=86=E8=BD=A6=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=85=A5=E5=8F=82=E8=B0=83=E6=95=B4=EF=BC=9A=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=A0=B9=E6=8D=AEnuid+elderid+wlid=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=203=E3=80=81=E8=AF=B7=E9=A2=86=E5=8D=95=E4=BD=9C=E5=BA=9F?= =?UTF-8?q?=E3=80=81=E5=9B=9E=E9=80=80=E3=80=81=E5=87=BA=E5=BA=93=E3=80=81?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E6=88=90=E5=8A=9F=E6=97=B6?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8D=95=E6=8D=AE=E6=9C=80=E6=96=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=204=E3=80=81pad=E6=8E=A5=E5=8F=A3-=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E5=8D=95-=E9=80=80=E8=B4=A7=E6=8C=87=E4=BB=A4=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=205=E3=80=81pad=E6=8E=A5=E5=8F=A3-?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=8D=95-=E6=8A=A4=E7=90=86=E5=8D=95?= =?UTF-8?q?=E5=85=83=E7=89=A9=E6=96=99=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=206=E3=80=81pad=E6=8E=A5=E5=8F=A3-=E9=80=80=E8=B4=A7=E5=8D=95-?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E8=BD=A6=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pad/invoicing/api/InvoicingQldApi.java | 25 ++- .../pad/invoicing/api/InvoicingThdApi.java | 77 ++++++++ .../com/nu/entity/InvoicingThdGwcEntity.java | 46 +++++ .../com/nu/entity/InvoicingThdInfoEntity.java | 46 +++++ .../com/nu/entity/InvoicingThdMainEntity.java | 90 +++++++++ .../main/java/com/nu/entity/NuKcslEntity.java | 51 +++++ .../modules/invoicing/api/IQinglingApi.java | 2 + .../nu/modules/invoicing/api/ITuiHuoApi.java | 20 ++ .../modules/nu/entity/NuInvoicingNuKcsl.java | 4 + .../nu/mapper/NuInvoicingNuKcslMapper.java | 3 + .../nu/mapper/xml/NuInvoicingNuKcslMapper.xml | 48 ++++- .../qld/mapper/NuInvoicingQldGwcMapper.java | 2 +- .../qld/mapper/NuInvoicingQldMainMapper.java | 4 +- .../mapper/xml/NuInvoicingQldGwcMapper.xml | 2 +- .../mapper/xml/NuInvoicingQldMainMapper.xml | 26 +++ .../service/INuInvoicingQldGwcService.java | 4 +- .../impl/NuInvoicingQldGwcServiceImpl.java | 5 - .../qld/service/impl/QingLingServiceImpl.java | 89 +++++---- .../NuInvoicingThdGwcController.java | 180 ++++++++++++++++++ .../NuInvoicingThdInfoController.java | 180 ++++++++++++++++++ .../NuInvoicingThdMainController.java | 180 ++++++++++++++++++ .../modules/thd/entity/NuInvoicingThdGwc.java | 81 ++++++++ .../thd/entity/NuInvoicingThdInfo.java | 81 ++++++++ .../thd/entity/NuInvoicingThdMain.java | 107 +++++++++++ .../thd/mapper/NuInvoicingThdGwcMapper.java | 17 ++ .../thd/mapper/NuInvoicingThdInfoMapper.java | 17 ++ .../thd/mapper/NuInvoicingThdMainMapper.java | 21 ++ .../mapper/xml/NuInvoicingThdGwcMapper.xml | 5 + .../mapper/xml/NuInvoicingThdInfoMapper.xml | 5 + .../mapper/xml/NuInvoicingThdMainMapper.xml | 42 ++++ .../service/INuInvoicingThdGwcService.java | 14 ++ .../service/INuInvoicingThdInfoService.java | 14 ++ .../service/INuInvoicingThdMainService.java | 14 ++ .../impl/NuInvoicingThdGwcServiceImpl.java | 19 ++ .../impl/NuInvoicingThdInfoServiceImpl.java | 19 ++ .../impl/NuInvoicingThdMainServiceImpl.java | 19 ++ .../thd/service/impl/ThdServiceImpl.java | 90 +++++++++ 37 files changed, 1587 insertions(+), 62 deletions(-) create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdGwcEntity.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdInfoEntity.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdMainEntity.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/NuKcslEntity.java create mode 100644 nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/controller/NuInvoicingThdGwcController.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/controller/NuInvoicingThdInfoController.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/controller/NuInvoicingThdMainController.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/entity/NuInvoicingThdGwc.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/entity/NuInvoicingThdInfo.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/entity/NuInvoicingThdMain.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/NuInvoicingThdGwcMapper.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/NuInvoicingThdInfoMapper.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/NuInvoicingThdMainMapper.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdGwcMapper.xml create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdInfoMapper.xml create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdMainMapper.xml create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/INuInvoicingThdGwcService.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/INuInvoicingThdInfoService.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/INuInvoicingThdMainService.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/NuInvoicingThdGwcServiceImpl.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/NuInvoicingThdInfoServiceImpl.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/NuInvoicingThdMainServiceImpl.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingQldApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingQldApi.java index 3570c4b..1d54408 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingQldApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingQldApi.java @@ -6,6 +6,7 @@ import com.nu.modules.invoicing.api.IQinglingApi; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -88,6 +89,7 @@ public class InvoicingQldApi { * @return */ @ApiOperation(value = "请领单-购物车-添加", notes = "请领单-购物车-添加") + @AutoLog(value = "请领单-购物车-添加") @PostMapping(value = "/addGwc") public Result addGwc(@RequestBody InvoicingQldGwcEntity dto) { boolean result = qinglingApi.addGwc(dto); @@ -106,6 +108,7 @@ public class InvoicingQldApi { * @return */ @ApiOperation(value = "请领单-购物车-移除物料", notes = "请领单-购物车-移除物料") + @AutoLog(value = "请领单-购物车-移除物料") @PostMapping(value = "/deleteGwcWl") public Result deleteGwcWl(@RequestBody InvoicingQldQueryEntity queryDto) { boolean result = qinglingApi.deleteGwcWl(queryDto); @@ -124,6 +127,7 @@ public class InvoicingQldApi { * @return */ @ApiOperation(value = "请领单-移除物料", notes = "请领单-移除物料") + @AutoLog(value = "请领单-移除物料") @PostMapping(value = "/deleteQldWl") public Result deleteQldWl(@RequestBody InvoicingQldQueryEntity queryDto) { boolean result = qinglingApi.deleteQldWl(queryDto); @@ -142,6 +146,7 @@ public class InvoicingQldApi { * @return */ @ApiOperation(value = "请领单-购物车-清空", notes = "请领单-购物车-清空") + @AutoLog(value = "请领单-购物车-清空") @PostMapping(value = "/removeAllGwc") public Result removeAllGwc(@RequestBody InvoicingQldQueryEntity queryDto) { boolean result = qinglingApi.removeAllGwc(queryDto); @@ -160,6 +165,7 @@ public class InvoicingQldApi { * @return */ @ApiOperation(value = "请领单-物料-置顶/取消置顶", notes = "请领单物料-置顶/取消置顶") + @AutoLog(value = "请领单-物料-置顶/取消置顶") @PostMapping(value = "/wlzd") public Result wlzd(@RequestBody InvoicingQldQueryEntity queryDto) { boolean result = qinglingApi.wlzd(queryDto); @@ -209,6 +215,7 @@ public class InvoicingQldApi { * @return */ @ApiOperation(value = "请领单-提交请领单", notes = "请领单-提交请领单") + @AutoLog(value = "请领单-提交请领单") @PostMapping(value = "/submitQld") public Result submitQld(@RequestBody InvoicingQldGwcEntity dto) { if (StringUtils.isBlank(dto.getNuId()) || StringUtils.isBlank(dto.getElderId())) { @@ -255,6 +262,7 @@ public class InvoicingQldApi { * @return */ @ApiOperation(value = "请领单-作废", notes = "请领单-作废") + @AutoLog(value = "请领单-作废") @PostMapping(value = "/cancellation") public Result cancellation(@RequestBody InvoicingQldMainEntity dto) { if (StringUtils.isBlank(dto.getQldNo())) { @@ -262,7 +270,7 @@ public class InvoicingQldApi { } boolean result = qinglingApi.cancellation(dto); if (result) { - return Result.OK("作废成功"); + return Result.OK(qinglingApi.queryQldByQldNo(dto.getQldNo())); } else { return Result.error("作废失败"); } @@ -275,6 +283,7 @@ public class InvoicingQldApi { * @return */ @ApiOperation(value = "请领单-单子改为已读", notes = "请领单-单子改为已读") + @AutoLog(value = "请领单-单子改为已读") @PostMapping(value = "/transRead") public Result transRead(@RequestBody InvoicingQldMainEntity dto) { if (StringUtils.isBlank(dto.getQldNo()) || StringUtils.isBlank(dto.getStatus())) { @@ -295,6 +304,7 @@ public class InvoicingQldApi { * @return */ @ApiOperation(value = "请领单-确认收货", notes = "请领单-确认收货") + @AutoLog(value = "请领单-确认收货") @PostMapping(value = "/confirmReceipt") public Result confirmReceipt(@RequestBody InvoicingQldMainEntity dto) { if (StringUtils.isBlank(dto.getQldNo()) || StringUtils.isBlank(dto.getNuId()) || StringUtils.isBlank(dto.getElderId())) { @@ -302,7 +312,7 @@ public class InvoicingQldApi { } boolean result = qinglingApi.confirmReceipt(dto); if (result) { - return Result.OK("收货成功"); + return Result.OK(qinglingApi.queryQldByQldNo(dto.getQldNo())); } else { return Result.error("收货失败"); } @@ -315,6 +325,7 @@ public class InvoicingQldApi { * @return */ @ApiOperation(value = "请领单-回退", notes = "请领单-回退") + @AutoLog(value = "请领单-回退") @PostMapping(value = "/orderReturn") public Result orderReturn(@RequestBody InvoicingQldMainEntity dto) { if (StringUtils.isBlank(dto.getQldNo())) { @@ -322,7 +333,7 @@ public class InvoicingQldApi { } boolean result = qinglingApi.orderReturn(dto); if (result) { - return Result.OK("回退成功"); + return Result.OK(qinglingApi.queryQldByQldNo(dto.getQldNo())); } else { return Result.error("回退失败"); } @@ -335,12 +346,17 @@ public class InvoicingQldApi { * @return */ @ApiOperation(value = "请领单-出库(单个/批量)", notes = "请领单-出库(单个/批量)") + @AutoLog(value = "请领单-出库(单个/批量)") @PostMapping(value = "/outbound") public Result> outbound(@RequestBody InvoicingQldMainEntity dto) { if (StringUtils.isBlank(dto.getQldNo())) { return Result.error("缺少参数"); } - return Result.ok(qinglingApi.outbound(dto)); + Map result = qinglingApi.outbound(dto); + if("success".equals(result.get("status"))){ + result.put("result", qinglingApi.queryQldByQldNo(dto.getQldNo())); + } + return Result.ok(result); } /** @@ -351,6 +367,7 @@ public class InvoicingQldApi { * @return */ @ApiOperation(value = "请领单-调整物料数量", notes = "请领单-调整物料数量") + @AutoLog(value = "请领单-调整物料数量") @PostMapping(value = "/updateQldWlSl") public Result updateQldWlSl(@RequestBody InvoicingQldQueryEntity queryDto) { boolean result = qinglingApi.updateQldWlSl(queryDto); 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 new file mode 100644 index 0000000..f0fd292 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java @@ -0,0 +1,77 @@ +package com.nu.modules.pad.invoicing.api; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.entity.InvoicingThdGwcEntity; +import com.nu.entity.InvoicingThdMainEntity; +import com.nu.entity.NuKcslEntity; +import com.nu.modules.invoicing.api.ITuiHuoApi; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 退货单 + */ +@RestController +@RequestMapping("/api/pad/invoicing/thd") +public class InvoicingThdApi { + + @Autowired + private ITuiHuoApi tuiHuoApi; + + /** + * 查询退货单 + * + * @param dto + * @return + */ + @ApiOperation(value = "查询退货单-分页列表查询", notes = "查询退货单-分页列表查询") + @GetMapping(value = "/thdList") + public Result> thdList(InvoicingThdMainEntity dto, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + IPage pageList = tuiHuoApi.thdList(pageNo, pageSize, dto); + return Result.OK(pageList); + } + + /** + * 查询退货单-可退货物料 + * + * @param dto + * @return + */ + @ApiOperation(value = "查询退货单-可退货物料", notes = "查询退货单-可退货物料") + @GetMapping(value = "/thdNuMaterialList") + public Result> thdNuMaterialList(InvoicingThdMainEntity dto) { + if (StringUtils.isBlank(dto.getNuId())) { + return Result.error("缺少参数"); + } + List pageList = tuiHuoApi.thdNuMaterialList(dto); + return Result.OK(pageList); + } + + /** + * 退货单-添加退货车 + * + * @param dto + * @return + */ + @ApiOperation(value = "退货单-添加退货车", notes = "退货单-添加退货车") + @AutoLog(value = "退货单-添加退货车") + @PostMapping(value = "/addThc") + public Result addThc(@RequestBody InvoicingThdGwcEntity dto) { + if (StringUtils.isBlank(dto.getPkId()) || StringUtils.isBlank(dto.getNuId()) || StringUtils.isBlank(dto.getElderId()) + || StringUtils.isBlank(dto.getKfId()) || StringUtils.isBlank(dto.getWlId())) { + return Result.error("缺少参数"); + } + if (dto.getThNum() == null || dto.getThNum() == 0) { + return Result.error("未填写退货数量"); + } + return Result.ok(tuiHuoApi.addThc(dto)); + } +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdGwcEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdGwcEntity.java new file mode 100644 index 0000000..32e02b1 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdGwcEntity.java @@ -0,0 +1,46 @@ +package com.nu.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 进销存-退货单-退货车 + * @Author: jeecg-boot + * @Date: 2025-12-03 + * @Version: V1.0 + */ +@Data +public class InvoicingThdGwcEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**createBy*/ + private String createBy; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**updateBy*/ + private String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**主表id nu_invoicing_thd_main.id*/ + private String pkId; + /**库房id nu_warehouse_material_info.nu_id*/ + private String kfId; + /**物料id nu_config_material_info.id*/ + private String wlId; + /**退货数量*/ + private Integer thNum; + /**nuid nu_base_info.nu_id*/ + private String nuId; + /**长者id nu_biz_elder_info.id*/ + private String elderId; +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdInfoEntity.java new file mode 100644 index 0000000..8b057aa --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdInfoEntity.java @@ -0,0 +1,46 @@ +package com.nu.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 进销存-退货单-子表 + * @Author: jeecg-boot + * @Date: 2025-12-03 + * @Version: V1.0 + */ +@Data +public class InvoicingThdInfoEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**createBy*/ + private String createBy; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**updateBy*/ + private String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**退货单号*/ + private String thdNo; + /**库房id nu_warehouse_material_info.nu_id*/ + private String kfId; + /**物料id nu_config_material_info.id*/ + private String wlId; + /**退货数量*/ + private Integer thNum; + /**nuid nu_base_info.nu_id*/ + private String nuId; + /**长者id nu_biz_elder_info.id*/ + private String elderId; +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdMainEntity.java new file mode 100644 index 0000000..e652923 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdMainEntity.java @@ -0,0 +1,90 @@ +package com.nu.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 进销存-退货单-主表 + * @Author: jeecg-boot + * @Date: 2025-12-03 + * @Version: V1.0 + */ +@Data +public class InvoicingThdMainEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**用的是nu_biz_nu_logistics_directive_order.id*/ + private String id; + /**服务发起人*/ + private String createBy; + /**服务发起时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**updateBy*/ + private String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**退货单号*/ + private String thdNo; + /**退货状态 0待执行 1已开始 2已结束*/ + private String status; + /**发起人*/ + private String fqBy; + /**发起时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date fqTime; + /**开始人*/ + private String ksBy; + /**开始时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date ksTime; + /**结束人*/ + private String jsBy; + /**结束时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date jsTime; + /**nuid nu_base_info.nu_id*/ + private String nuId; + /**长者id nu_biz_elder_info.id*/ + private String elderId; + /**是否已读 Y已读 N未读*/ + private String izRead; + + /** + * 护理单元名称 + */ + private String nuName; + + /** + * 搜索内容 + */ + private String searchContent; + + /** + * 发起人姓名 + */ + private String fqrName; + /** + * 开始人姓名 + */ + private String ksrName; + /** + * 结束人姓名 + */ + private String jsrName; + /** + * 退货指令执行状态 + */ + private String statusText; + +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/NuKcslEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/NuKcslEntity.java new file mode 100644 index 0000000..122984c --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/NuKcslEntity.java @@ -0,0 +1,51 @@ +package com.nu.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; + +/** + * @Description: 进销存-护理单元库存数量 + * @Author: jeecg-boot + * @Date: 2025-11-26 + * @Version: V1.0 + */ +@Data +public class NuKcslEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + /**库房id nu_warehouse_material_info.nu_id*/ + private java.lang.String kfId; + /** + * nuid nu_base_info.nu_id + */ + private String nuId; + /** + * 长者id nu_biz_elder_info.id + */ + private String elderId; + /** + * 物料id nu_config_material_info.id + */ + private String wlId; + /** + * 物料数量 + */ + private Integer wlNum; + /** + * 物料信息 + */ + private MaterialInfoEntity materialInfo; +} diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IQinglingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IQinglingApi.java index dd3b8fd..1e25f35 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IQinglingApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IQinglingApi.java @@ -48,4 +48,6 @@ public interface IQinglingApi { boolean deleteQldWl(InvoicingQldQueryEntity queryDto); boolean updateQldWlSl(InvoicingQldQueryEntity queryDto); + + InvoicingQldMainEntity queryQldByQldNo(String qldNo); } 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 new file mode 100644 index 0000000..5f8771c --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java @@ -0,0 +1,20 @@ +package com.nu.modules.invoicing.api; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.entity.InvoicingThdGwcEntity; +import com.nu.entity.InvoicingThdMainEntity; +import com.nu.entity.NuKcslEntity; + +import java.util.List; +import java.util.Map; + +/** + * 退货单 + */ +public interface ITuiHuoApi { + IPage thdList(Integer pageNo, Integer pageSize, InvoicingThdMainEntity dto); + + List thdNuMaterialList(InvoicingThdMainEntity dto); + + Map addThc(InvoicingThdGwcEntity dto); +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/entity/NuInvoicingNuKcsl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/entity/NuInvoicingNuKcsl.java index 1801dbb..2b88365 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/entity/NuInvoicingNuKcsl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/entity/NuInvoicingNuKcsl.java @@ -38,6 +38,10 @@ public class NuInvoicingNuKcsl implements Serializable { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") private java.lang.String id; + /**库房id nu_warehouse_material_info.nu_id*/ + @Excel(name = "库房id nu_warehouse_material_info.nu_id", width = 15) + @ApiModelProperty(value = "库房id nu_warehouse_material_info.nu_id") + private java.lang.String kfId; /**nuid nu_base_info.nu_id*/ @Excel(name = "nuid nu_base_info.nu_id", width = 15) @ApiModelProperty(value = "nuid nu_base_info.nu_id") 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 0f1bd97..afaba47 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 @@ -2,6 +2,8 @@ package com.nu.modules.nu.mapper; import java.util.List; +import com.nu.entity.InvoicingThdMainEntity; +import com.nu.entity.NuKcslEntity; import org.apache.ibatis.annotations.Param; import com.nu.modules.nu.entity.NuInvoicingNuKcsl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface NuInvoicingNuKcslMapper extends BaseMapper { + List thdNuMaterialList(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 3771b2b..706da9f 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 @@ -2,4 +2,50 @@ - \ No newline at end of file + + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldGwcMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldGwcMapper.java index abf72a4..1363dcd 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldGwcMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldGwcMapper.java @@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface NuInvoicingQldGwcMapper extends BaseMapper { - int deletePhysics(@Param("id") String gwcId); + int deletePhysics(NuInvoicingQldGwc gwcId); int removeAllGwc(InvoicingQldQueryEntity queryDto); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldMainMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldMainMapper.java index c95ff67..75ad2b3 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldMainMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/NuInvoicingQldMainMapper.java @@ -16,13 +16,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 进销存-请领单-主表 * @Author: jeecg-boot - * @Date: 2025-11-26 + * @Date: 2025-11-26 * @Version: V1.0 */ public interface NuInvoicingQldMainMapper extends BaseMapper { List queryUnFinishWlid(InvoicingQldGwcEntity dto); + InvoicingQldMainEntity queryQldByQldNo(@Param("qldNo") String dto); + IPage page(Page page, @Param("dto") InvoicingQldQueryEntity dto); List selectLogsByQldNos(@Param("qldNos") List qldNos); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldGwcMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldGwcMapper.xml index aa18280..5f95f56 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldGwcMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldGwcMapper.xml @@ -5,7 +5,7 @@ delete from nu_invoicing_qld_gwc - where id = #{id} + where nu_id = #{nuId} and elder_id = #{elderId} and wl_id = #{wlId} delete diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldMainMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldMainMapper.xml index ad3e656..b91529e 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldMainMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldMainMapper.xml @@ -12,6 +12,32 @@ and main.status in ('1', '3', '4') + + + select + main.*, + baseInfo.nu_name AS nuName, + sqrtemp.realname AS fqrName, + ksrtemp.realname AS ksrName, + jsrtemp.realname AS jsrName, + logStatus.item_text AS statusText + from nu_invoicing_thd_main main + left join nu_base_info baseInfo on main.nu_id = baseInfo.nu_id + left join sys_user sqrtemp on sqrtemp.id = main.fq_by + left join sys_user ksrtemp on ksrtemp.id = main.ks_by + left join sys_user jsrtemp on jsrtemp.id = main.js_by + LEFT JOIN sys_dict dict ON dict.dict_code = 'thd_status' + LEFT JOIN sys_dict_item logStatus ON logStatus.dict_id = dict.id AND logStatus.item_value = main.status + + + AND ( + sqrtemp.realname LIKE CONCAT('%', #{dto.searchContent}, '%') + or baseInfo.nu_name LIKE CONCAT('%', #{dto.searchContent}, '%') + or main.nu_id LIKE CONCAT('%', #{dto.searchContent}, '%') + ) + + + AND main.status IN + + #{status} + + + + ORDER BY + GREATEST( + COALESCE(main.update_time, '1970-01-01 00:00:00'), + COALESCE(main.create_time, '1970-01-01 00:00:00') + ) DESC, + main.create_time DESC + + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/INuInvoicingThdGwcService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/INuInvoicingThdGwcService.java new file mode 100644 index 0000000..71af3c1 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/INuInvoicingThdGwcService.java @@ -0,0 +1,14 @@ +package com.nu.modules.thd.service; + +import com.nu.modules.thd.entity.NuInvoicingThdGwc; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 进销存-退货单-退货车 + * @Author: jeecg-boot + * @Date: 2025-12-03 + * @Version: V1.0 + */ +public interface INuInvoicingThdGwcService extends IService { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/INuInvoicingThdInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/INuInvoicingThdInfoService.java new file mode 100644 index 0000000..15d38e2 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/INuInvoicingThdInfoService.java @@ -0,0 +1,14 @@ +package com.nu.modules.thd.service; + +import com.nu.modules.thd.entity.NuInvoicingThdInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 进销存-退货单-子表 + * @Author: jeecg-boot + * @Date: 2025-12-03 + * @Version: V1.0 + */ +public interface INuInvoicingThdInfoService extends IService { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/INuInvoicingThdMainService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/INuInvoicingThdMainService.java new file mode 100644 index 0000000..da77d5d --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/INuInvoicingThdMainService.java @@ -0,0 +1,14 @@ +package com.nu.modules.thd.service; + +import com.nu.modules.thd.entity.NuInvoicingThdMain; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 进销存-退货单-主表 + * @Author: jeecg-boot + * @Date: 2025-12-03 + * @Version: V1.0 + */ +public interface INuInvoicingThdMainService extends IService { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/NuInvoicingThdGwcServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/NuInvoicingThdGwcServiceImpl.java new file mode 100644 index 0000000..12b6992 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/NuInvoicingThdGwcServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.thd.service.impl; + +import com.nu.modules.thd.entity.NuInvoicingThdGwc; +import com.nu.modules.thd.mapper.NuInvoicingThdGwcMapper; +import com.nu.modules.thd.service.INuInvoicingThdGwcService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 进销存-退货单-退货车 + * @Author: jeecg-boot + * @Date: 2025-12-03 + * @Version: V1.0 + */ +@Service +public class NuInvoicingThdGwcServiceImpl extends ServiceImpl implements INuInvoicingThdGwcService { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/NuInvoicingThdInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/NuInvoicingThdInfoServiceImpl.java new file mode 100644 index 0000000..5ba123d --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/NuInvoicingThdInfoServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.thd.service.impl; + +import com.nu.modules.thd.entity.NuInvoicingThdInfo; +import com.nu.modules.thd.mapper.NuInvoicingThdInfoMapper; +import com.nu.modules.thd.service.INuInvoicingThdInfoService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 进销存-退货单-子表 + * @Author: jeecg-boot + * @Date: 2025-12-03 + * @Version: V1.0 + */ +@Service +public class NuInvoicingThdInfoServiceImpl extends ServiceImpl implements INuInvoicingThdInfoService { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/NuInvoicingThdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/NuInvoicingThdMainServiceImpl.java new file mode 100644 index 0000000..abdf104 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/NuInvoicingThdMainServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.thd.service.impl; + +import com.nu.modules.thd.entity.NuInvoicingThdMain; +import com.nu.modules.thd.mapper.NuInvoicingThdMainMapper; +import com.nu.modules.thd.service.INuInvoicingThdMainService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 进销存-退货单-主表 + * @Author: jeecg-boot + * @Date: 2025-12-03 + * @Version: V1.0 + */ +@Service +public class NuInvoicingThdMainServiceImpl extends ServiceImpl implements INuInvoicingThdMainService { + +} 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 new file mode 100644 index 0000000..dae2da8 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java @@ -0,0 +1,90 @@ +package com.nu.modules.thd.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.Maps; +import com.nu.entity.InvoicingThdGwcEntity; +import com.nu.entity.InvoicingThdMainEntity; +import com.nu.entity.NuKcslEntity; +import com.nu.modules.invoicing.api.ITuiHuoApi; +import com.nu.modules.nu.entity.NuInvoicingNuKcsl; +import com.nu.modules.nu.mapper.NuInvoicingNuKcslMapper; +import com.nu.modules.thd.entity.NuInvoicingThdGwc; +import com.nu.modules.thd.entity.NuInvoicingThdMain; +import com.nu.modules.thd.mapper.NuInvoicingThdGwcMapper; +import com.nu.modules.thd.mapper.NuInvoicingThdMainMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.Map; + +/** + * @Description: 进销存-退货单-通用处理 + * @Author: jeecg-boot + * @Date: 2025-12-03 + * @Version: V1.0 + */ +@Service +public class ThdServiceImpl implements ITuiHuoApi { + + @Autowired + private NuInvoicingThdMainMapper thdMainMapper; + @Autowired + private NuInvoicingNuKcslMapper nuKcslMapper; + @Autowired + private NuInvoicingThdGwcMapper thdGwcMapper; + + @Override + public IPage thdList(Integer pageNo, Integer pageSize, InvoicingThdMainEntity dto) { + Page page = new Page<>(pageNo, pageSize); + return thdMainMapper.thdList(page, dto); + } + + @Override + public List thdNuMaterialList(InvoicingThdMainEntity dto) { + return nuKcslMapper.thdNuMaterialList(dto); + } + + @Override + public Map addThc(InvoicingThdGwcEntity dto) { + Map result = Maps.newHashMap(); + + //检测退货数量是否小于等于护理单元库存数量 + QueryWrapper kcslQW = new QueryWrapper<>(); + kcslQW.eq("nu_id", dto.getNuId()); + kcslQW.eq("wl_id", dto.getWlId()); + NuInvoicingNuKcsl kcsl = nuKcslMapper.selectOne(kcslQW); + if (kcsl == null || kcsl.getWlNum() == null || kcsl.getWlNum() < dto.getThNum()) { + //护理单元无此物料/存量小于退货数量 + result.put("status","numError"); + return result; + } + + //退货车是否已存在此物料 + QueryWrapper thcQW = new QueryWrapper<>(); + thcQW.eq("pk_id",dto.getPkId()); + thcQW.eq("wl_id",dto.getWlId()); + List thcList = thdGwcMapper.selectList(thcQW); + if(!CollectionUtils.isEmpty(thcList)){ + //已存在该物料 + result.put("status","existed"); + return result; + } + + //可以添加到购物车 + NuInvoicingThdGwc thc = new NuInvoicingThdGwc(); + thc.setPkId(dto.getPkId());//主表id + thc.setNuId(dto.getNuId()); + thc.setElderId(dto.getElderId());//长者id + thc.setKfId(dto.getKfId());//库房id + thc.setWlId(dto.getWlId());//物料id + thc.setThNum(dto.getThNum());//退货数量 + thdGwcMapper.insert(thc);//新增 + + result.put("status","success"); + return result; + } +}