Merge remote-tracking branch 'origin/master'

1 month ago · f01b4010d3
4 changed files with 53 additions and 96 deletions
--- 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(厂家退库) <br/>
- * File: BaseManufacturerRetwareFeign.java <br/>
- * Class: com.yxt.anrui.base.api.basemanufacturerretware.BaseManufacturerRetwareFeign <br/>
- * Description: 厂家退库表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-07-05 17:02:32 <br/>
- *
- * @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<String> createPdf(@RequestParam("sid") String sid);
-        
+
    @ApiOperation("根据sid删除记录")
    @DeleteMapping("/delBySids")
    @ResponseBody
    public ResultBean delBySids(@RequestBody String[] sids);
-      
+
    @ApiOperation("根据SID获取一条记录")
    @GetMapping("/fetchDetailsBySid/{sid}")
    @ResponseBody
--- 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(厂家退库) <br/>
- * File: BaseManufacturerRetwareFeignFallback.java <br/>
- * Class: com.yxt.anrui.base.biz.basemanufacturerretware.BaseManufacturerRetwareRest <br/>
- * Description: 厂家退库表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-07-05 17:02:32 <br/>
- *
- * @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<String> withdrawalPdf(String cgtkdSid, String printerType) {
-        return baseManufacturerRetwareService.withdrawalPdf(cgtkdSid,printerType);
+        return baseManufacturerRetwareService.withdrawalPdf(cgtkdSid, printerType);
    }
 }
--- 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<FinPaymentapplyMa
                            finPaymentrecordDto.setPayChannel(finPaymentapplyDetailVo.getCostTitleKey());
                            finPaymentrecordDto.setPayCostType("payCostType");
                        }
+                        finPaymentrecordDto.setFinDataType(0);
                        //款项详情
                        finPaymentrecordDto.setCostTitleKey(finPaymentapplyDetailVo.getCostTitleKey());
                        finPaymentrecordDto.setCostTitleValue(finPaymentapplyDetailVo.getCostTitleValue());
@ -699,6 +700,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                        finPaymentrecordService.saveDto(finPaymentrecordDto);
                        List<FinPaymentapplyDetailsBelowDetailsVo> finPaymentapplyDetailsBelowDetailsVos = finPaymentapplyDetailsBelowService.selByMainSid(finPaymentapplyDetailVo.getSid());
                        for (FinPaymentapplyDetailsBelowDetailsVo finPaymentapplyDetailsBelowDetailsVo : finPaymentapplyDetailsBelowDetailsVos) {
+                            finPaymentrecordDto.setFinDataType(1);
                            //款项名称
                            finPaymentrecordDto.setCostTypeKey(finPaymentapplyDetailsBelowDetailsVo.getCostTitleKey());
                            finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailsBelowDetailsVo.getCostTitleValue());
--- 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(车辆入库单查询) <br/>
- * File: ScmApplyInboundQueryFeignFallback.java <br/>
- * Class: com.yxt.anrui.scm.biz.scmapplyinboundquery.ScmApplyInboundQueryRest <br/>
- * Description: 车辆入库单查询. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-01-28 15:55:31 <br/>
- *
- * @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<PagerVo<ScmApplyInboundQueryVo>> listPage(@RequestBody PagerQuery<ScmApplyInboundQueryQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<ScmApplyInboundQueryVo> pv = scmApplyInboundQueryService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ScmApplyInboundQueryVo>> listPage(@RequestBody PagerQuery<ScmApplyInboundQueryQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmApplyInboundQueryVo> pv = scmApplyInboundQueryService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }

-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean<String> save(@RequestBody ScmApplyInboundQueryDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		String sid = scmApplyInboundQueryService.saveOrUpdateDto(dto);
-		return rb.success().setData(sid);
-	}
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean<String> 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<ScmApplyInboundQueryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		ScmApplyInboundQueryDetailsVo vo = scmApplyInboundQueryService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    public ResultBean<ScmApplyInboundQueryDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmApplyInboundQueryDetailsVo vo = scmApplyInboundQueryService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }

-	@Override
-	public ResultBean<PdfPath> createPdf(String cgrkdSid,String printerType) {
-		return scmApplyInboundQueryService.createPdf(cgrkdSid,printerType);
-	}
+    @Override
+    public ResultBean<PdfPath> 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<Integer> fetchByApplicationCode(String applicationCode) {
-		return scmApplyInboundQueryService.fetchByApplicationCode(applicationCode);
-	}
+    @Override
+    public ResultBean<Integer> fetchByApplicationCode(String applicationCode) {
+        return scmApplyInboundQueryService.fetchByApplicationCode(applicationCode);
+    }
 }