From e5663b19d3a701fe9892a38781ff3955bbfb3516 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 26 Mar 2025 16:58:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentapplyService.java | 2 + .../ScmApplyInboundQueryRest.java | 105 ++++++++---------- 2 files changed, 47 insertions(+), 60 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 60ba3ef764..7e407f3201 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -669,6 +669,7 @@ public class FinPaymentapplyService extends MybatisBaseService finPaymentapplyDetailsBelowDetailsVos = finPaymentapplyDetailsBelowService.selByMainSid(finPaymentapplyDetailVo.getSid()); for (FinPaymentapplyDetailsBelowDetailsVo finPaymentapplyDetailsBelowDetailsVo : finPaymentapplyDetailsBelowDetailsVos) { + finPaymentrecordDto.setFinDataType(1); //款项名称 finPaymentrecordDto.setCostTypeKey(finPaymentapplyDetailsBelowDetailsVo.getCostTitleKey()); finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailsBelowDetailsVo.getCostTitleValue()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java index e924bf3b61..b6c7b76ba9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java @@ -34,77 +34,62 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - -/** - * Project: anrui-scm(车辆入库单查询)
- * File: ScmApplyInboundQueryFeignFallback.java
- * Class: com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryRest
- * Description: 车辆入库单查询.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-01-28 15:55:31
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "车辆入库单查询") -@RestController("com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryRest") +@RestController @RequestMapping("v1/scmapplyinboundquery") public class ScmApplyInboundQueryRest implements ScmApplyInboundQueryFeign { - @Autowired - private ScmApplyInboundQueryService scmApplyInboundQueryService; + @Autowired + private ScmApplyInboundQueryService scmApplyInboundQueryService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = scmApplyInboundQueryService.listPageVo(pq); - return rb.success().setData(pv); - } + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmApplyInboundQueryService.listPageVo(pq); + return rb.success().setData(pv); + } - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ScmApplyInboundQueryDto dto){ - ResultBean rb = ResultBean.fireFail(); - String sid = scmApplyInboundQueryService.saveOrUpdateDto(dto); - return rb.success().setData(sid); - } + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmApplyInboundQueryDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = scmApplyInboundQueryService.saveOrUpdateDto(dto); + return rb.success().setData(sid); + } - @Override - @ApiOperation("根据sid批量删除") + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - scmApplyInboundQueryService.delBySids(sids); - return rb.success(); - } + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + scmApplyInboundQueryService.delBySids(sids); + return rb.success(); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - ScmApplyInboundQueryDetailsVo vo = scmApplyInboundQueryService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + ScmApplyInboundQueryDetailsVo vo = scmApplyInboundQueryService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } - @Override - public ResultBean createPdf(String cgrkdSid,String printerType) { - return scmApplyInboundQueryService.createPdf(cgrkdSid,printerType); - } + @Override + public ResultBean createPdf(String cgrkdSid, String printerType) { + return scmApplyInboundQueryService.createPdf(cgrkdSid, printerType); + } - @Override - public ResultBean ctcgykd(String cgrkdSid) { - return scmApplyInboundQueryService.ctcgykd(cgrkdSid); - } + @Override + public ResultBean ctcgykd(String cgrkdSid) { + return scmApplyInboundQueryService.ctcgykd(cgrkdSid); + } - @Override - public ResultBean fetchByApplicationCode(String applicationCode) { - return scmApplyInboundQueryService.fetchByApplicationCode(applicationCode); - } + @Override + public ResultBean fetchByApplicationCode(String applicationCode) { + return scmApplyInboundQueryService.fetchByApplicationCode(applicationCode); + } } From a7ce3ffdebb1e361cb5c5d01debc410b2d83b522 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 26 Mar 2025 17:02:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseManufacturerRetwareFeign.java | 17 ++----------- .../BaseManufacturerRetwareRest.java | 25 +++---------------- 2 files changed, 6 insertions(+), 36 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeign.java index 9b9aaaf4a1..d8b5ec747e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerretware/BaseManufacturerRetwareFeign.java @@ -37,19 +37,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * Project: anrui-base(厂家退库)
- * File: BaseManufacturerRetwareFeign.java
- * Class: com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFeign
- * Description: 厂家退库表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-07-05 17:02:32
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "厂家退库表") @FeignClient( contextId = "anrui-base-BaseManufacturerRetware", @@ -77,12 +64,12 @@ public interface BaseManufacturerRetwareFeign { @PostMapping("/createPdf") @ResponseBody public ResultBean createPdf(@RequestParam("sid") String sid); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareRest.java index 928b228aa4..75b9d7d6e9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareRest.java @@ -33,31 +33,14 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - -import java.util.List; - -import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetware; import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareQuery; import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareVo; import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDetailsVo; import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareDto; import com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFeign; -/** - * Project: anrui-base(厂家退库)
- * File: BaseManufacturerRetwareFeignFallback.java
- * Class: com.yxt.anrui.base.biz.basemanufacturerretware.BaseManufacturerRetwareRest
- * Description: 厂家退库表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-07-05 17:02:32
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "厂家退库表") -@RestController("com.yxt.anrui.base.biz.basemanufacturerretware.BaseManufacturerRetwareRest") +@RestController @RequestMapping("v1/basemanufacturerretware") public class BaseManufacturerRetwareRest implements BaseManufacturerRetwareFeign { @@ -104,10 +87,10 @@ public class BaseManufacturerRetwareRest implements BaseManufacturerRetwareFeign return baseManufacturerRetwareService.fetchAll(sid); } - @ApiOperation("生成厂家退库库单pdf") - @PostMapping("/withdrawalPdf") + @ApiOperation("生成厂家退库库单pdf") + @PostMapping("/withdrawalPdf") @Override public ResultBean withdrawalPdf(String cgtkdSid, String printerType) { - return baseManufacturerRetwareService.withdrawalPdf(cgtkdSid,printerType); + return baseManufacturerRetwareService.withdrawalPdf(cgtkdSid, printerType); } }