diff --git a/yxt-fms-biz/README.md b/yxt-fms-biz/README.md
new file mode 100644
index 0000000000..3b700c234f
--- /dev/null
+++ b/yxt-fms-biz/README.md
@@ -0,0 +1,3 @@
+yxt-fms-biz
+
+财务管理后台程序及接口
\ No newline at end of file
diff --git a/yxt-fms-biz/pom.xml b/yxt-fms-biz/pom.xml
new file mode 100644
index 0000000000..4d806f64cd
--- /dev/null
+++ b/yxt-fms-biz/pom.xml
@@ -0,0 +1,134 @@
+
+
+
+
+ com.yxt
+ yxt-parent
+ 0.0.1
+
+
+ 4.0.0
+
+ yxt-fms-biz
+ com.yxt.fms
+ 2.0.1
+
+
+
+ com.yxt
+ yxt-common-base
+ 0.0.1
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-openfeign
+
+
+
+
+ mysql
+ mysql-connector-java
+ runtime
+
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+
+
+ com.baomidou
+ mybatis-plus-annotation
+
+
+ junit
+ junit
+ compile
+
+
+
+ org.projectlombok
+ lombok
+ 1.18.26
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+
+ cn.dev33
+ sa-token-spring-boot-starter
+ 1.37.0
+
+
+ cn.hutool
+ hutool-all
+ 5.8.23
+
+
+ cn.hutool
+ hutool-core
+ 5.8.23
+
+
+ com.google.zxing
+ core
+ 3.5.2
+
+
+ com.alibaba
+ easyexcel
+ 3.3.2
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+ 2.5.6
+
+
+
+ repackage
+
+
+
+
+
+
+
+ src/main/java
+
+ **/*Mapper.xml
+
+
+
+ src/main/resources
+
+ **/*.*
+
+ false
+
+
+
+
+
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/YxtFmsBizApplication.java b/yxt-fms-biz/src/main/java/com/yxt/fms/YxtFmsBizApplication.java
new file mode 100644
index 0000000000..9257664341
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/YxtFmsBizApplication.java
@@ -0,0 +1,22 @@
+package com.yxt.fms;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@SpringBootApplication(scanBasePackages = {
+ "com.yxt.fms.config",
+ "com.yxt.common.base.config",
+ "com.yxt.fms"
+})
+// 启用自带定时任务
+@EnableScheduling
+@EnableFeignClients(basePackages = {})
+public class YxtFmsBizApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(YxtFmsBizApplication.class, args);
+ }
+
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/apiadmin/AdminHomeRest.java b/yxt-fms-biz/src/main/java/com/yxt/fms/apiadmin/AdminHomeRest.java
new file mode 100644
index 0000000000..db394425c9
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/apiadmin/AdminHomeRest.java
@@ -0,0 +1,10 @@
+package com.yxt.fms.apiadmin;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController("com.yxt.fms.apiadmin.AdminHomeRest")
+@RequestMapping("/apiadmin/home")
+public class AdminHomeRest {
+
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/apiadmin/FmsPaysettleRest.java b/yxt-fms-biz/src/main/java/com/yxt/fms/apiadmin/FmsPaysettleRest.java
new file mode 100644
index 0000000000..53f3346a1c
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/apiadmin/FmsPaysettleRest.java
@@ -0,0 +1,109 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.apiadmin;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.fms.biz.fmspaysettle.*;
+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;
+
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsPaysettleFeignFallback.java
+ * Class: biz.biz.fmspaysettle.FmsPaysettleRest
+ * Description: 付款结算.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "付款结算")
+@RestController
+@RequestMapping("/apiadmin/v1/fmspaysettle")
+public class FmsPaysettleRest {
+
+ @Autowired
+ private FmsPaysettleService fmsPaysettleService;
+
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = fmsPaysettleService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody FmsPaysettleDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ fmsPaysettleService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ fmsPaysettleService.delBySids(sids);
+ return rb.success();
+ }
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ FmsPaysettleDetailsVo vo = fmsPaysettleService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+ @ApiOperation("采购入库结算")
+ @PostMapping("/cgrkPay")
+ public ResultBean cgrkPay(@RequestBody FmsPaysettleCGRKDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ fmsPaysettleService.cgrkPay(dto);
+ return rb.success();
+ }
+
+ @ApiOperation("根据来源SID获取一条记录")
+ @GetMapping("/fetchBySourceSid/{sourceBillSid}")
+ public ResultBean fetchBySourceSid(@PathVariable("sourceBillSid") String sourceBillSid){
+ ResultBean rb = ResultBean.fireFail();
+ FmsPaysettle paysettle = fmsPaysettleService.fetchBySourceSid(sourceBillSid);
+ return rb.success().setData(paysettle);
+ }
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/apiadmin/FmsReceivesettleRest.java b/yxt-fms-biz/src/main/java/com/yxt/fms/apiadmin/FmsReceivesettleRest.java
new file mode 100644
index 0000000000..381f852e07
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/apiadmin/FmsReceivesettleRest.java
@@ -0,0 +1,121 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.apiadmin;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.fms.biz.fmspaysettle.FmsPaysettleCGRKDto;
+import com.yxt.fms.biz.fmspaysettle.FmsPaysettleCGTKDto;
+import com.yxt.fms.biz.fmsreceivesettle.*;
+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;
+
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsReceivesettleFeignFallback.java
+ * Class: biz.biz.fmsreceivesettle.FmsReceivesettleRest
+ * Description: 收款结算.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "收款结算")
+@RestController
+@RequestMapping("/apiadmin/v1/fmsreceivesettle")
+public class FmsReceivesettleRest {
+
+ @Autowired
+ private FmsReceivesettleService fmsReceivesettleService;
+
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = fmsReceivesettleService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody FmsReceivesettleDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ fmsReceivesettleService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @ApiOperation("逻辑删除")
+ @PostMapping("/updateIsDelete")
+ public ResultBean updateIsDelete(@RequestParam("sourceSid") String sourceSid){
+ ResultBean rb = ResultBean.fireFail();
+ fmsReceivesettleService.updateIsDelete(sourceSid);
+ return rb.success();
+ }
+
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ fmsReceivesettleService.delBySids(sids);
+ return rb.success();
+ }
+
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ FmsReceivesettleDetailsVo vo = fmsReceivesettleService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+ @ApiOperation("采购退库结算")
+ @PostMapping("/cgtkPay")
+ public ResultBean cgtkPay(@RequestBody FmsPaysettleCGTKDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ fmsReceivesettleService.cgtkPay(dto);
+ return rb.success();
+ }
+
+ @ApiOperation("根据来源SID获取一条记录")
+ @GetMapping("/fetchBySourceSid/{sourceBillSid}")
+ public ResultBean fetchBySourceSid(@PathVariable("sourceBillSid") String sourceBillSid){
+ ResultBean rb = ResultBean.fireFail();
+ FmsReceivesettle receivesettle = fmsReceivesettleService.fetchBySourceSid(sourceBillSid);
+ return rb.success().setData(receivesettle);
+ }
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettle.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettle.java
new file mode 100644
index 0000000000..65a6103540
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettle.java
@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmspaysettle;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsPaysettle.java
+ * Class: biz.api.fmspaysettle.FmsPaysettle
+ * Description: 付款结算.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款结算", description = "付款结算")
+@TableName("fms_paysettle")
+public class FmsPaysettle extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("结算人姓名")
+ private String createByName; // 结算人姓名
+ @ApiModelProperty("来源单sid")
+ private String sourceBillSid; // 来源单sid
+ @ApiModelProperty("来源单编号")
+ private String sourceBillNo; // 来源单编号
+ @ApiModelProperty("业务类型key")
+ private String busTypeKey; // 业务类型key
+ @ApiModelProperty("业务类型value（销售退货、采购入库）")
+ private String busTypeValue; // 业务类型value（销售退货、采购入库）
+ @ApiModelProperty("收款人编号")
+ private String payeeNo; // 收款人编号
+ @ApiModelProperty("收款人名称")
+ private String payeeName; // 收款人名称
+ @ApiModelProperty("收款人银行账号")
+ private String payeeBankAccount; // 收款人银行账号
+ @ApiModelProperty("应付金额")
+ private BigDecimal payableAmount; // 应付金额
+ @ApiModelProperty("预付款抵扣")
+ private BigDecimal prepaymentdeductAmount; // 预付款抵扣
+ @ApiModelProperty("结算方式key")
+ private String settleKey; // 结算方式key
+ @ApiModelProperty("结算方式value")
+ private String settleValue; // 结算方式value
+ @ApiModelProperty("结算金额")
+ private BigDecimal settleAmount; // 结算金额
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleKey; // 其他结算方式
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleValue; // 其他结算方式
+ @ApiModelProperty("其他结算金额")
+ private String otherSettleAmount; // 其他结算金额
+ @ApiModelProperty("欠款金额")
+ private BigDecimal debts; // 欠款金额
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("结算时间")
+ private Date settleTime; // 结算时间
+
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleCGRKDto.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleCGRKDto.java
new file mode 100644
index 0000000000..7aaf60f168
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleCGRKDto.java
@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmspaysettle;
+
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.fms.feign.pms.pmspurchasebill.PmsPurchaseBillDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsPaysettleDto.java
+ * Class: biz.api.fmspaysettle.FmsPaysettleDto
+ * Description: 付款结算 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款结算 数据传输对象", description = "付款结算 数据传输对象")
+public class FmsPaysettleCGRKDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("采购单")
+ private PmsPurchaseBillDto pmsPurchaseBill;
+ @ApiModelProperty("创建者")
+ private String createBySid;
+ @ApiModelProperty("结算人姓名")
+ private String createByName; // 结算人姓名
+ @ApiModelProperty("来源单sid")
+ private String sourceBillSid; // 来源单sid
+ @ApiModelProperty("来源单编号")
+ private String sourceBillNo; // 来源单编号
+ @ApiModelProperty("业务类型key")
+ private String busTypeKey; // 业务类型key
+ @ApiModelProperty("业务类型value（销售退货、采购入库）")
+ private String busTypeValue; // 业务类型value（销售退货、采购入库）
+ @ApiModelProperty("收款人编号")
+ private String payeeNo; // 收款人编号
+ @ApiModelProperty("收款人名称")
+ private String payeeName; // 收款人名称
+ @ApiModelProperty("收款人银行账号")
+ private String payeeBankAccount; // 收款人银行账号
+ @ApiModelProperty("应付金额")
+ private String payableAmount; // 应付金额
+ @ApiModelProperty("预付款抵扣")
+ private String prepaymentdeductAmount; // 预付款抵扣
+ @ApiModelProperty("结算方式key")
+ private String settleKey; // 结算方式key
+ @ApiModelProperty("结算方式value")
+ private String settleValue; // 结算方式value
+ @ApiModelProperty("结算金额")
+ private String settleAmount; // 结算金额
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleKey; // 其他结算方式
+ @ApiModelProperty("其他结算金额")
+ private String otherSettleValue; // 其他结算金额
+ @ApiModelProperty("欠款金额")
+ private String debts; // 欠款金额
+ @ApiModelProperty("结算时间")
+ private String settleTime; // 结算时间
+
+}
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleCGTKDto.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleCGTKDto.java
new file mode 100644
index 0000000000..71ec9d5245
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleCGTKDto.java
@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmspaysettle;
+
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.fms.feign.pms.pmspurchasebackbill.PmsPurchasebackBillDto;
+import com.yxt.fms.feign.pms.pmspurchasebill.PmsPurchaseBillDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsPaysettleDto.java
+ * Class: biz.api.fmspaysettle.FmsPaysettleDto
+ * Description: 付款结算 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款结算 数据传输对象", description = "付款结算 数据传输对象")
+public class FmsPaysettleCGTKDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("采购退货单")
+ private PmsPurchasebackBillDto pmsPurchasebackBillDto;
+ @ApiModelProperty("创建者")
+ private String createBySid;
+ @ApiModelProperty("结算人姓名")
+ private String createByName; // 结算人姓名
+ @ApiModelProperty("来源单sid")
+ private String sourceBillSid; // 来源单sid
+ @ApiModelProperty("来源单编号")
+ private String sourceBillNo; // 来源单编号
+ @ApiModelProperty("业务类型key")
+ private String busTypeKey; // 业务类型key
+ @ApiModelProperty("业务类型value（销售退货、采购入库）")
+ private String busTypeValue; // 业务类型value（销售退货、采购入库）
+ @ApiModelProperty("收款人编号")
+ private String payeeNo; // 收款人编号
+ @ApiModelProperty("收款人名称")
+ private String payeeName; // 收款人名称
+ @ApiModelProperty("收款人银行账号")
+ private String payeeBankAccount; // 收款人银行账号
+ @ApiModelProperty("应付金额")
+ private String payableAmount; // 应付金额
+ @ApiModelProperty("预付款抵扣")
+ private String prepaymentdeductAmount; // 预付款抵扣
+ @ApiModelProperty("结算方式key")
+ private String settleKey; // 结算方式key
+ @ApiModelProperty("结算方式value")
+ private String settleValue; // 结算方式value
+ @ApiModelProperty("结算金额")
+ private String settleAmount; // 结算金额
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleKey; // 其他结算方式
+ @ApiModelProperty("其他结算金额")
+ private String otherSettleValue; // 其他结算金额
+ @ApiModelProperty("欠款金额")
+ private String debts; // 欠款金额
+ @ApiModelProperty("结算时间")
+ private String settleTime; // 结算时间
+
+}
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleDetailsVo.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleDetailsVo.java
new file mode 100644
index 0000000000..810075fc5d
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleDetailsVo.java
@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmspaysettle;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsPaysettleVo.java
+ * Class: biz.api.fmspaysettle.FmsPaysettleVo
+ * Description: 付款结算 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款结算 视图数据详情", description = "付款结算 视图数据详情")
+public class FmsPaysettleDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("结算人姓名")
+ private String createByName; // 结算人姓名
+ @ApiModelProperty("来源单sid")
+ private String sourceBillSid; // 来源单sid
+ @ApiModelProperty("来源单编号")
+ private String sourceBillNo; // 来源单编号
+ @ApiModelProperty("业务类型key")
+ private String busTypeKey; // 业务类型key
+ @ApiModelProperty("业务类型value（销售退货、采购入库）")
+ private String busTypeValue; // 业务类型value（销售退货、采购入库）
+ @ApiModelProperty("收款人编号")
+ private String payeeNo; // 收款人编号
+ @ApiModelProperty("收款人名称")
+ private String payeeName; // 收款人名称
+ @ApiModelProperty("收款人银行账号")
+ private String payeeBankAccount; // 收款人银行账号
+ @ApiModelProperty("应付金额")
+ private BigDecimal payableAmount; // 应付金额
+ @ApiModelProperty("预付款抵扣")
+ private BigDecimal prepaymentdeductAmount; // 预付款抵扣
+ @ApiModelProperty("结算方式key")
+ private String settleKey; // 结算方式key
+ @ApiModelProperty("结算方式value")
+ private String settleValue; // 结算方式value
+ @ApiModelProperty("结算金额")
+ private BigDecimal settleAmount; // 结算金额
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleKey; // 其他结算方式
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleValue; // 其他结算方式
+ @ApiModelProperty("其他结算金额")
+ private String otherSettleAmount; // 其他结算金额
+ @ApiModelProperty("欠款金额")
+ private BigDecimal debts; // 欠款金额
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("结算时间")
+ private Date settleTimeStart; // 结算时间
+ private Date settleTimeEnd; // 结算时间
+
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleDto.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleDto.java
new file mode 100644
index 0000000000..2fccf07bf0
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleDto.java
@@ -0,0 +1,96 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmspaysettle;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsPaysettleDto.java
+ * Class: biz.api.fmspaysettle.FmsPaysettleDto
+ * Description: 付款结算 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款结算 数据传输对象", description = "付款结算 数据传输对象")
+public class FmsPaysettleDto implements Dto {
+
+ private String sid; // sid
+ @ApiModelProperty("创建者")
+ private String createBySid;
+ @ApiModelProperty("结算人姓名")
+ private String createByName; // 结算人姓名
+ @ApiModelProperty("来源单sid")
+ private String sourceBillSid; // 来源单sid
+ @ApiModelProperty("来源单编号")
+ private String sourceBillNo; // 来源单编号
+ @ApiModelProperty("业务类型key")
+ private String busTypeKey; // 业务类型key
+ @ApiModelProperty("业务类型value（销售退货、采购入库）")
+ private String busTypeValue; // 业务类型value（销售退货、采购入库）
+ @ApiModelProperty("收款人编号")
+ private String payeeNo; // 收款人编号
+ @ApiModelProperty("收款人名称")
+ private String payeeName; // 收款人名称
+ @ApiModelProperty("收款人银行账号")
+ private String payeeBankAccount; // 收款人银行账号
+ @ApiModelProperty("应付金额")
+ private String payableAmount; // 应付金额
+ @ApiModelProperty("预付款抵扣")
+ private String prepaymentdeductAmount; // 预付款抵扣
+ @ApiModelProperty("结算方式key")
+ private String settleKey; // 结算方式key
+ @ApiModelProperty("结算方式value")
+ private String settleValue; // 结算方式value
+ @ApiModelProperty("结算金额")
+ private String settleAmount; // 结算金额
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleKey; // 其他结算方式
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleValue; // 其他结算方式
+ @ApiModelProperty("其他结算金额")
+ private String otherSettleAmount; // 其他结算金额
+ @ApiModelProperty("欠款金额")
+ private String debts; // 欠款金额
+ @ApiModelProperty("结算时间")
+ private String settleTime; // 结算时间
+
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleMapper.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleMapper.java
new file mode 100644
index 0000000000..1c2dc1eabe
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleMapper.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmspaysettle;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsPaysettleMapper.java
+ * Class: biz.biz.fmspaysettle.FmsPaysettleMapper
+ * Description: 付款结算.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface FmsPaysettleMapper extends BaseMapper {
+
+ //@Update("update fms_paysettle set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from fms_paysettle")
+ List selectListVo();
+
+ @Select("select * from fms_paysettle where sourceBillSid =#{sourceBillSid}")
+ FmsPaysettle fetchBySourceSid(@Param("sourceBillSid") String sourceBillSid);
+}
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleMapper.xml b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleMapper.xml
new file mode 100644
index 0000000000..3781ef4ecf
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleQuery.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleQuery.java
new file mode 100644
index 0000000000..802e85a2d6
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleQuery.java
@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmspaysettle;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsPaysettleQuery.java
+ * Class: biz.api.fmspaysettle.FmsPaysettleQuery
+ * Description: 付款结算 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款结算 查询条件", description = "付款结算 查询条件")
+public class FmsPaysettleQuery implements Query {
+
+ @ApiModelProperty("结算人姓名")
+ private String createByName; // 结算人姓名
+ @ApiModelProperty("来源单sid")
+ private String sourceBillSid; // 来源单sid
+ @ApiModelProperty("来源单编号")
+ private String sourceBillNo; // 来源单编号
+ @ApiModelProperty("业务类型key")
+ private String busTypeKey; // 业务类型key
+ @ApiModelProperty("业务类型value（销售退货、采购入库）")
+ private String busTypeValue; // 业务类型value（销售退货、采购入库）
+ @ApiModelProperty("收款人编号")
+ private String payeeNo; // 收款人编号
+ @ApiModelProperty("收款人名称")
+ private String payeeName; // 收款人名称
+ @ApiModelProperty("收款人银行账号")
+ private String payeeBankAccount; // 收款人银行账号
+ @ApiModelProperty("应付金额")
+ private BigDecimal payableAmount; // 应付金额
+ @ApiModelProperty("预付款抵扣")
+ private BigDecimal prepaymentdeductAmount; // 预付款抵扣
+ @ApiModelProperty("结算方式key")
+ private String settleKey; // 结算方式key
+ @ApiModelProperty("结算方式value")
+ private String settleValue; // 结算方式value
+ @ApiModelProperty("结算金额")
+ private BigDecimal settleAmount; // 结算金额
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleKey; // 其他结算方式
+ @ApiModelProperty("其他结算金额")
+ private String otherSettleValue; // 其他结算金额
+ @ApiModelProperty("欠款金额")
+ private BigDecimal debts; // 欠款金额
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("结算时间")
+ private Date settleTimeStart; // 结算时间
+ private Date settleTimeEnd; // 结算时间
+
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleService.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleService.java
new file mode 100644
index 0000000000..4a1b70740b
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleService.java
@@ -0,0 +1,120 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmspaysettle;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.fms.feign.pms.pmspurchasebill.PmsPurchaseBillDto;
+import com.yxt.fms.feign.pms.pmspurchasebill.PmsPurchaseBillFeign;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsPaysettleService.java
+ * Class: biz.biz.fmspaysettle.FmsPaysettleService
+ * Description: 付款结算 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class FmsPaysettleService extends MybatisBaseService {
+
+ @Resource
+ private PmsPurchaseBillFeign pmsPurchaseBillFeign;
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ FmsPaysettleQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(FmsPaysettleDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ this.insertByDto(dto);
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(FmsPaysettleDto dto){
+ FmsPaysettle entity = new FmsPaysettle();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(FmsPaysettleDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ FmsPaysettle entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public FmsPaysettleDetailsVo fetchDetailsVoBySid(String sid){
+ FmsPaysettle entity = fetchBySid(sid);
+ FmsPaysettleDetailsVo vo = new FmsPaysettleDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+ public void cgrkPay(FmsPaysettleCGRKDto dto) {
+ PmsPurchaseBillDto pmsPurchaseBillDto = dto.getPmsPurchaseBill();
+ String sid = pmsPurchaseBillFeign.save(pmsPurchaseBillDto).getData();
+ FmsPaysettleDto fmsPaysettleDto = new FmsPaysettleDto();
+ BeanUtil.copyProperties(dto,fmsPaysettleDto);
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ fmsPaysettleDto.setSourceBillSid(sid);
+ this.insertByDto(fmsPaysettleDto);
+ return;
+ }
+ this.updateByDto(fmsPaysettleDto);
+ }
+
+ public FmsPaysettle fetchBySourceSid(String sourceBillSid) {
+ return baseMapper.fetchBySourceSid(sourceBillSid);
+ }
+}
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleVo.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleVo.java
new file mode 100644
index 0000000000..6dcc6730e2
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmspaysettle/FmsPaysettleVo.java
@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmspaysettle;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsPaysettleVo.java
+ * Class: biz.api.fmspaysettle.FmsPaysettleVo
+ * Description: 付款结算 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款结算 视图数据对象", description = "付款结算 视图数据对象")
+public class FmsPaysettleVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("结算人姓名")
+ private String createByName; // 结算人姓名
+ @ApiModelProperty("来源单sid")
+ private String sourceBillSid; // 来源单sid
+ @ApiModelProperty("来源单编号")
+ private String sourceBillNo; // 来源单编号
+ @ApiModelProperty("业务类型key")
+ private String busTypeKey; // 业务类型key
+ @ApiModelProperty("业务类型value（销售退货、采购入库）")
+ private String busTypeValue; // 业务类型value（销售退货、采购入库）
+ @ApiModelProperty("收款人编号")
+ private String payeeNo; // 收款人编号
+ @ApiModelProperty("收款人名称")
+ private String payeeName; // 收款人名称
+ @ApiModelProperty("收款人银行账号")
+ private String payeeBankAccount; // 收款人银行账号
+ @ApiModelProperty("应付金额")
+ private BigDecimal payableAmount; // 应付金额
+ @ApiModelProperty("预付款抵扣")
+ private BigDecimal prepaymentdeductAmount; // 预付款抵扣
+ @ApiModelProperty("结算方式key")
+ private String settleKey; // 结算方式key
+ @ApiModelProperty("结算方式value")
+ private String settleValue; // 结算方式value
+ @ApiModelProperty("结算金额")
+ private BigDecimal settleAmount; // 结算金额
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleKey; // 其他结算方式
+ @ApiModelProperty("其他结算金额")
+ private String otherSettleValue; // 其他结算金额
+ @ApiModelProperty("欠款金额")
+ private BigDecimal debts; // 欠款金额
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("结算时间")
+ private Date settleTimeStart; // 结算时间
+ private Date settleTimeEnd; // 结算时间
+
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettle.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettle.java
new file mode 100644
index 0000000000..938c29b47b
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettle.java
@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmsreceivesettle;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsReceivesettle.java
+ * Class: biz.api.fmsreceivesettle.FmsReceivesettle
+ * Description: 收款结算.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "收款结算", description = "收款结算")
+@TableName("fms_receivesettle")
+public class FmsReceivesettle extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("结算人姓名")
+ private String createByName; // 结算人姓名
+ @ApiModelProperty("来源单sid")
+ private String sourceBillSid; // 来源单sid
+ @ApiModelProperty("来源单号")
+ private String sourceBillNo; // 来源单号
+ @ApiModelProperty("业务类型key")
+ private String busTypeKey; // 业务类型key
+ @ApiModelProperty("业务类型value（销售出库、采购退货）")
+ private String busTypeValue; // 业务类型value（销售出库、采购退货）
+ @ApiModelProperty("付款人编号")
+ private String payerNo; // 付款人编号
+ @ApiModelProperty("付款人名称")
+ private String payerName; // 付款人名称
+ @ApiModelProperty("应收金额")
+ private BigDecimal receivableAmount; // 应收金额
+ @ApiModelProperty("订金抵扣")
+ private BigDecimal depositdeductAmount; // 订金抵扣
+ @ApiModelProperty("结算方式key")
+ private String settleKey; // 结算方式key
+ @ApiModelProperty("结算方式value")
+ private String settleValue; // 结算方式value
+ @ApiModelProperty("结算金额")
+ private BigDecimal settleAmount; // 结算金额
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleKey; // 其他结算方式
+ @ApiModelProperty("其他结算金额")
+ private String otherSettleValue; // 其他结算金额
+ @ApiModelProperty("其他结算金额")
+ private String otherSettleAmount; // 其他结算金额
+ @ApiModelProperty("欠款金额")
+ private BigDecimal debts; // 欠款金额
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("结算时间")
+ private Date settleTime; // 结算时间
+
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleDetailsVo.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleDetailsVo.java
new file mode 100644
index 0000000000..722831d060
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleDetailsVo.java
@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmsreceivesettle;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsReceivesettleVo.java
+ * Class: biz.api.fmsreceivesettle.FmsReceivesettleVo
+ * Description: 收款结算 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "收款结算 视图数据详情", description = "收款结算 视图数据详情")
+public class FmsReceivesettleDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("结算人姓名")
+ private String createByName; // 结算人姓名
+ @ApiModelProperty("来源单sid")
+ private String sourceBillSid; // 来源单sid
+ @ApiModelProperty("来源单号")
+ private String sourceBillNo; // 来源单号
+ @ApiModelProperty("业务类型key")
+ private String busTypeKey; // 业务类型key
+ @ApiModelProperty("业务类型value（销售出库、采购退货）")
+ private String busTypeValue; // 业务类型value（销售出库、采购退货）
+ @ApiModelProperty("付款人编号")
+ private String payerNo; // 付款人编号
+ @ApiModelProperty("付款人名称")
+ private String payerName; // 付款人名称
+ @ApiModelProperty("应收金额")
+ private BigDecimal receivableAmount; // 应收金额
+ @ApiModelProperty("订金抵扣")
+ private BigDecimal depositdeductAmount; // 订金抵扣
+ @ApiModelProperty("结算方式key")
+ private String settleKey; // 结算方式key
+ @ApiModelProperty("结算方式value")
+ private String settleValue; // 结算方式value
+ @ApiModelProperty("结算金额")
+ private BigDecimal settleAmount; // 结算金额
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleKey; // 其他结算方式
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleValue; // 其他结算方式
+ @ApiModelProperty("其他结算金额")
+ private String otherSettleAmount; // 其他结算金额
+ @ApiModelProperty("欠款金额")
+ private BigDecimal debts; // 欠款金额
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("结算时间")
+ private Date settleTimeStart; // 结算时间
+ private Date settleTimeEnd; // 结算时间
+
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleDto.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleDto.java
new file mode 100644
index 0000000000..707b4b9d63
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleDto.java
@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmsreceivesettle;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsReceivesettleDto.java
+ * Class: biz.api.fmsreceivesettle.FmsReceivesettleDto
+ * Description: 收款结算 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "收款结算 数据传输对象", description = "收款结算 数据传输对象")
+public class FmsReceivesettleDto implements Dto {
+
+ private String sid; // sid
+ @ApiModelProperty("创建者")
+ private String createBySid;
+ @ApiModelProperty("结算人姓名")
+ private String createByName; // 结算人姓名
+ @ApiModelProperty("来源单sid")
+ private String sourceBillSid; // 来源单sid
+ @ApiModelProperty("来源单号")
+ private String sourceBillNo; // 来源单号
+ @ApiModelProperty("业务类型key")
+ private String busTypeKey; // 业务类型key
+ @ApiModelProperty("业务类型value（销售出库、采购退货）")
+ private String busTypeValue; // 业务类型value（销售出库、采购退货）
+ @ApiModelProperty("付款人编号")
+ private String payerNo; // 付款人编号
+ @ApiModelProperty("付款人名称")
+ private String payerName; // 付款人名称
+ @ApiModelProperty("应收金额")
+ private String receivableAmount; // 应收金额
+ @ApiModelProperty("订金抵扣")
+ private String depositdeductAmount; // 订金抵扣
+ @ApiModelProperty("结算方式key")
+ private String settleKey; // 结算方式key
+ @ApiModelProperty("结算方式value")
+ private String settleValue; // 结算方式value
+ @ApiModelProperty("结算金额")
+ private String settleAmount; // 结算金额
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleKey; // 其他结算方式
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleValue; // 其他结算方式
+ @ApiModelProperty("其他结算金额")
+ private String otherSettleAmount; // 其他结算金额
+ @ApiModelProperty("欠款金额")
+ private String debts; // 欠款金额
+ @ApiModelProperty("结算时间")
+ private String settleTime; // 结算时间
+
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleMapper.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleMapper.java
new file mode 100644
index 0000000000..c5e8efc21c
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleMapper.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmsreceivesettle;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsReceivesettleMapper.java
+ * Class: biz.biz.fmsreceivesettle.FmsReceivesettleMapper
+ * Description: 收款结算.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface FmsReceivesettleMapper extends BaseMapper {
+
+ //@Update("update fms_receivesettle set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from fms_receivesettle")
+ List selectListVo();
+
+ @Select("select * from fms_receivesettle where sourceBillSid =#{sourceBillSid} and isDelete = 0")
+ FmsReceivesettle fetchBySourceSid(@Param("sourceBillSid") String sourceBillSid);
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleMapper.xml b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleMapper.xml
new file mode 100644
index 0000000000..a5098eeafb
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleQuery.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleQuery.java
new file mode 100644
index 0000000000..ac50136290
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleQuery.java
@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmsreceivesettle;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsReceivesettleQuery.java
+ * Class: biz.api.fmsreceivesettle.FmsReceivesettleQuery
+ * Description: 收款结算 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "收款结算 查询条件", description = "收款结算 查询条件")
+public class FmsReceivesettleQuery implements Query {
+
+ @ApiModelProperty("结算人姓名")
+ private String createByName; // 结算人姓名
+ @ApiModelProperty("来源单sid")
+ private String sourceBillSid; // 来源单sid
+ @ApiModelProperty("来源单号")
+ private String sourceBillNo; // 来源单号
+ @ApiModelProperty("业务类型key")
+ private String busTypeKey; // 业务类型key
+ @ApiModelProperty("业务类型value（销售出库、采购退货）")
+ private String busTypeValue; // 业务类型value（销售出库、采购退货）
+ @ApiModelProperty("付款人编号")
+ private String payerNo; // 付款人编号
+ @ApiModelProperty("付款人名称")
+ private String payerName; // 付款人名称
+ @ApiModelProperty("应收金额")
+ private BigDecimal receivableAmount; // 应收金额
+ @ApiModelProperty("订金抵扣")
+ private BigDecimal depositdeductAmount; // 订金抵扣
+ @ApiModelProperty("结算方式key")
+ private String settleKey; // 结算方式key
+ @ApiModelProperty("结算方式value")
+ private String settleValue; // 结算方式value
+ @ApiModelProperty("结算金额")
+ private BigDecimal settleAmount; // 结算金额
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleKey; // 其他结算方式
+ @ApiModelProperty("其他结算金额")
+ private String otherSettleValue; // 其他结算金额
+ @ApiModelProperty("欠款金额")
+ private BigDecimal debts; // 欠款金额
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("结算时间")
+ private Date settleTimeStart; // 结算时间
+ private Date settleTimeEnd; // 结算时间
+
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleService.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleService.java
new file mode 100644
index 0000000000..b986f94ba0
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleService.java
@@ -0,0 +1,133 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmsreceivesettle;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.fms.biz.fmspaysettle.FmsPaysettleCGTKDto;
+import com.yxt.fms.biz.fmspaysettle.FmsPaysettleDto;
+import com.yxt.fms.feign.pms.pmspurchasebackbill.PmsPurchaseBackBillFeign;
+import com.yxt.fms.feign.pms.pmspurchasebackbill.PmsPurchasebackBillDto;
+import com.yxt.fms.feign.pms.pmspurchasebill.PmsPurchaseBillDto;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsReceivesettleService.java
+ * Class: biz.biz.fmsreceivesettle.FmsReceivesettleService
+ * Description: 收款结算 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class FmsReceivesettleService extends MybatisBaseService {
+
+ @Resource
+ private PmsPurchaseBackBillFeign pmsPurchaseBackBillFeign;
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ FmsReceivesettleQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(FmsReceivesettleDto dto) {
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ this.insertByDto(dto);
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(FmsReceivesettleDto dto) {
+ FmsReceivesettle entity = new FmsReceivesettle();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(FmsReceivesettleDto dto) {
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ FmsReceivesettle entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public FmsReceivesettleDetailsVo fetchDetailsVoBySid(String sid) {
+ FmsReceivesettle entity = fetchBySid(sid);
+ FmsReceivesettleDetailsVo vo = new FmsReceivesettleDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+ public FmsReceivesettle fetchBySourceSid(String sourceBillSid) {
+ return baseMapper.fetchBySourceSid(sourceBillSid);
+ }
+
+ public void cgtkPay(FmsPaysettleCGTKDto dto) {
+ PmsPurchasebackBillDto pmsPurchasebackBillDto = dto.getPmsPurchasebackBillDto();
+ String sid = pmsPurchaseBackBillFeign.save(pmsPurchasebackBillDto).getData();
+ FmsReceivesettleDto fmsReceivesettleDto = new FmsReceivesettleDto();
+ BeanUtil.copyProperties(dto, fmsReceivesettleDto);
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ fmsReceivesettleDto.setSourceBillSid(sid);
+ this.insertByDto(fmsReceivesettleDto);
+ return;
+ }
+ this.updateByDto(fmsReceivesettleDto);
+ }
+
+ public void updateIsDelete(String sourceSid) {
+ FmsReceivesettle receivesettle = baseMapper.fetchBySourceSid(sourceSid);
+ if (null != receivesettle) {
+ receivesettle.setIsDelete(1);
+ baseMapper.updateById(receivesettle);
+ }
+ }
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleVo.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleVo.java
new file mode 100644
index 0000000000..98325b79b7
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/fmsreceivesettle/FmsReceivesettleVo.java
@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.biz.fmsreceivesettle;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-fms(yxt-fms)
+ * File: FmsReceivesettleVo.java
+ * Class: biz.api.fmsreceivesettle.FmsReceivesettleVo
+ * Description: 收款结算 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 17:04:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "收款结算 视图数据对象", description = "收款结算 视图数据对象")
+public class FmsReceivesettleVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("结算人姓名")
+ private String createByName; // 结算人姓名
+ @ApiModelProperty("来源单sid")
+ private String sourceBillSid; // 来源单sid
+ @ApiModelProperty("来源单号")
+ private String sourceBillNo; // 来源单号
+ @ApiModelProperty("业务类型key")
+ private String busTypeKey; // 业务类型key
+ @ApiModelProperty("业务类型value（销售出库、采购退货）")
+ private String busTypeValue; // 业务类型value（销售出库、采购退货）
+ @ApiModelProperty("付款人编号")
+ private String payerNo; // 付款人编号
+ @ApiModelProperty("付款人名称")
+ private String payerName; // 付款人名称
+ @ApiModelProperty("应收金额")
+ private BigDecimal receivableAmount; // 应收金额
+ @ApiModelProperty("订金抵扣")
+ private BigDecimal depositdeductAmount; // 订金抵扣
+ @ApiModelProperty("结算方式key")
+ private String settleKey; // 结算方式key
+ @ApiModelProperty("结算方式value")
+ private String settleValue; // 结算方式value
+ @ApiModelProperty("结算金额")
+ private BigDecimal settleAmount; // 结算金额
+ @ApiModelProperty("其他结算方式")
+ private String otherSettleKey; // 其他结算方式
+ @ApiModelProperty("其他结算金额")
+ private String otherSettleValue; // 其他结算金额
+ @ApiModelProperty("欠款金额")
+ private BigDecimal debts; // 欠款金额
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("结算时间")
+ private Date settleTimeStart; // 结算时间
+ private Date settleTimeEnd; // 结算时间
+
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/biz/package-info.java b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/package-info.java
new file mode 100644
index 0000000000..4dd9c57576
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/biz/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 宇信通 仓库管理 项目后台逻辑和接口
+ */
+package com.yxt.fms.biz;
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/config/SaTokenConfigure.java b/yxt-fms-biz/src/main/java/com/yxt/fms/config/SaTokenConfigure.java
new file mode 100644
index 0000000000..6a1a45fc8e
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/config/SaTokenConfigure.java
@@ -0,0 +1,114 @@
+package com.yxt.fms.config;//package com.yxt.wms.config;
+//
+//import cn.dev33.satoken.interceptor.SaInterceptor;
+//import cn.dev33.satoken.stp.StpUtil;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+///**
+// * @author wangpengfei
+// * @date 2023/5/16 14:43
+// */
+//@Configuration
+//public class SaTokenConfigure implements WebMvcConfigurer {
+// @Value("${image.url.prefix:http://127.0.0.1:8080/upload/}")
+// private String urlPrefix;
+// // 注册 Sa-Token 拦截器
+// @Override
+// public void addInterceptors(InterceptorRegistry registry) {
+// // 注册 Sa-Token 拦截器，校验规则为 StpUtil.checkLogin() 登录校验。
+//
+// registry.addInterceptor(new SaInterceptor(handler -> StpUtil.checkLogin()))
+// .addPathPatterns("/**")
+// .excludePathPatterns("/sysuser/doLogin")
+// .excludePathPatterns("/lpkgiftcard/gifCardByCustomerSid")
+// .excludePathPatterns("/empcardgift/gifCardByCustomerSid")
+// .excludePathPatterns("/empcard/getEmpCardByCustomerSid")
+// .excludePathPatterns("/lpkgiftcard/getGifCardBySid/**")
+// .excludePathPatterns("/empcardgift/getGifCardBySid/**")
+// .excludePathPatterns("/empcard/getEmpCardBySid/**")
+// .excludePathPatterns("/lpkgiftcard/isSaturAndSun/**")
+// .excludePathPatterns("/empcardgift/isSaturAndSun/**")
+// .excludePathPatterns("/empcard/isSaturAndSun/**")
+// .excludePathPatterns("/lpkgiftcard/getReservationBySid/**")
+// .excludePathPatterns("/lpksreservoorder/submission")
+// .excludePathPatterns("/lpksreservoorder/exportExcelByStore")
+// .excludePathPatterns("/empsreservoorder/createNewUserBagOrder")
+// .excludePathPatterns("/lpksreservoorders/submission")
+// .excludePathPatterns("/empsreservoorder/ordersList")
+// .excludePathPatterns("/empsreservoorder/submission")
+// .excludePathPatterns("/empsreservoorder/submissionEmp")
+// .excludePathPatterns("/empcardgift/generateCard")
+// .excludePathPatterns("/lpkgiftcard/bindCard")
+// .excludePathPatterns("/empcard/bindCard")
+// .excludePathPatterns("/lpksreservoorder/orderByCardSid/**")
+// .excludePathPatterns("/lpksreservoorder/orderListByUserSid/**")
+// .excludePathPatterns("/lpksreservoorder/orderDetails/**")
+// .excludePathPatterns("/newcomerrecorecord/recommendNewUsers")
+// .excludePathPatterns("/newcomerrecorecord/recommendedAssistance")
+// .excludePathPatterns("/newcomerrecorecord/recordList/**")
+// .excludePathPatterns("/transferrecords/transferRecordsList")
+// .excludePathPatterns("/empsreservoorder/createVegeOrder")
+// .excludePathPatterns("/empsreservoorder/OrderDetails/**")
+// .excludePathPatterns("/empsreservoorder/changePayState/**")
+// .excludePathPatterns("/lpkgoods/goodsDetails/**")
+// .excludePathPatterns("/lpkstore/getAllStoreByQuery")
+// .excludePathPatterns("/vegetablecellar/receiveTransferGoods")
+// .excludePathPatterns("/transferrecords/submission")
+// .excludePathPatterns("/lpkgiftcard/getCardByBank")
+// .excludePathPatterns("/empcard/getEmpCard")
+// .excludePathPatterns("/empcardgift/shareEmpCard/**")
+// .excludePathPatterns("/empcardgift/generateEmpCardGift")
+// .excludePathPatterns("/empcardgift/generateEmpCard")
+// .excludePathPatterns("/lpkcustomer/wxSilentLogin")
+// .excludePathPatterns("/lpkgiftcard/gifCardsByCustomerSid")
+// .excludePathPatterns("/lpkgoods/getAllGiftBag")
+// .excludePathPatterns("/appletgiftbag/getGiftBagBySid/**")
+// .excludePathPatterns("/appletgiftbag/appletGiftBagList")
+// .excludePathPatterns("/lpkgiftcard/cardShareDetail/**")
+// .excludePathPatterns("/lpkgiftcard/cardShareGoodsDetail/**")
+// .excludePathPatterns("/empcardgift/generateTopEmpCard/**")
+// .excludePathPatterns("/empsreservoorder/createOrder")
+// .excludePathPatterns("/appletgiftbag/recommendRecord/**")
+// //2024-01-17
+// .excludePathPatterns("/lpkgiftcard/getAllGoodsType/**")
+// .excludePathPatterns("/appletnotice/getNotice")
+// .excludePathPatterns("/empsreservoorder/getPreOrder")
+// .excludePathPatterns("/lpkgoods/getAllGoodsType/**")
+// .excludePathPatterns("/transferrecords/submission")
+// .excludePathPatterns("/vegetablecellar/receiveTransferGoods")
+// .excludePathPatterns("/customerstore/isSaturAndSun")
+// .excludePathPatterns("/lpkgiftcard/getGoodsByType/**")
+// .excludePathPatterns("/lpkgoods/getGoodsTypeAndBrand")
+// .excludePathPatterns("/lpkgoods/getGoodsByType")
+// .excludePathPatterns("/lpksreservoorders/orderListByUserSid")
+// .excludePathPatterns("/appletgiftbag/newUserQuota")
+// .excludePathPatterns("/shoppingcart/addShoppingCart")
+// .excludePathPatterns("/shoppingcart/getGoodsWeight")
+// .excludePathPatterns("/shoppingcart/shoppingCartList")
+// .excludePathPatterns("/shoppingcart/delShoppingCart/**")
+// .excludePathPatterns("/lpkgoods/vegeCellarTypeList")
+// .excludePathPatterns("/vegetablecellar/addGoods/**")
+// .excludePathPatterns("/lpkgoods/vegeCellarList")
+// .excludePathPatterns("/customerstore/getStoreBySid/**")
+// .excludePathPatterns("/lpkgiftcard/bindAllCard")
+// .excludePathPatterns("/lpkcustomer/customerInfo/**")
+// .excludePathPatterns("/vegetablecellar/saveGoods")
+// .excludePathPatterns("/transferrecords/getTransferByCode/**")
+// //2024-01-18
+// .excludePathPatterns("/lpkcustomer/getCustomerInfo/**")
+// .excludePathPatterns("/lpkcustomer/modifyUserNickName")
+// .excludePathPatterns("/lpkcustomer/modifyHeadImage")
+// .excludePathPatterns("/upload/**")
+// .excludePathPatterns("/lpkcustomer/getPhoneNumber")
+// .excludePathPatterns("/lpkcustomer/getRealInfo/**")
+// .excludePathPatterns("/lpkcustomer/saveRealInfo")
+// .excludePathPatterns("/pms/PmsBrand/getList")
+// .excludePathPatterns("/LpkCustomerBank/getBankList")
+// .excludePathPatterns("/lpkcustomer/updateCustomerBank")
+// .excludePathPatterns("//wxapi/**")
+// ;
+// }
+//}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/config/SaTokenGloableException.java b/yxt-fms-biz/src/main/java/com/yxt/fms/config/SaTokenGloableException.java
new file mode 100644
index 0000000000..48df786187
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/config/SaTokenGloableException.java
@@ -0,0 +1,67 @@
+package com.yxt.fms.config;
+
+import com.yxt.common.base.config.handler.GlobalExceptionHandler;
+import com.yxt.common.core.result.ResultBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.validation.BindException;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.NoHandlerFoundException;
+
+/**
+ * @author dimengzhe
+ * @date 2020/9/12 3:23
+ * @description 全局异常处理
+ */
+@RestControllerAdvice
+public class SaTokenGloableException extends GlobalExceptionHandler {
+
+ private static final Logger L = LoggerFactory.getLogger(GlobalExceptionHandler.class);
+
+ public SaTokenGloableException() {
+ }
+ @ExceptionHandler({Exception.class})
+ public ResultBean handleException(Exception e) {
+ if(null !=e.getMessage()){
+ if(e.getMessage().contains("token 无效：")){
+ L.error(e.getMessage(), e);
+ return ResultBean.fireFail().setCode("5000").setMsg("系统异常：：" + e.getMessage());
+ }
+ if(e.getMessage().contains("未能读取到有效 token")){
+// L.error(e.getMessage(), e);
+ return ResultBean.fireFail().setMsg("系统异常：：" + e.getMessage());
+ }
+ }
+
+ L.error(e.getMessage(), e);
+ return ResultBean.fireFail().setMsg("系统异常：：" + e.getMessage());
+ }
+ @ExceptionHandler({NoHandlerFoundException.class})
+ public ResultBean handlerNoFoundException(Exception e) {
+ L.error(e.getMessage(), e);
+ return ResultBean.fireFail().setCode("404").setMsg("路径不存在，请检查路径是否正确");
+ }
+
+// @ExceptionHandler({Exception.class})
+// public ResultBean handleException(Exception e) {
+// L.error(e.getMessage(), e);
+// return ResultBean.fireFail().setMsg("系统异常：：" + e.getMessage());
+// }
+
+ @ExceptionHandler({BindException.class})
+ public ResultBean validatedBindException(BindException e) {
+ L.error(e.getMessage(), e);
+ String message = ((ObjectError)e.getAllErrors().get(0)).getDefaultMessage();
+ return ResultBean.fireFail().setCode("405").setMsg(message);
+ }
+
+ @ExceptionHandler({MethodArgumentNotValidException.class})
+ public ResultBean validExceptionHandler(MethodArgumentNotValidException e) {
+ L.error(e.getMessage(), e);
+ String message = e.getBindingResult().getFieldError().getDefaultMessage();
+ return ResultBean.fireFail().setCode("405").setMsg(message);
+ }
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/config/package-info.java b/yxt-fms-biz/src/main/java/com/yxt/fms/config/package-info.java
new file mode 100644
index 0000000000..d035582e41
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 宇信通监管项目-光伏（山海新能源）项目后台逻辑和接口-接口声明
+ */
+package com.yxt.fms.config;
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/package-info.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/package-info.java
new file mode 100644
index 0000000000..0111e6c42c
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 宇信通监管项目-光伏（山海新能源）项目后台逻辑和接口-接口声明
+ */
+package com.yxt.fms.feign;
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchaseBackBillFeign.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchaseBackBillFeign.java
new file mode 100644
index 0000000000..b089f65a76
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchaseBackBillFeign.java
@@ -0,0 +1,25 @@
+package com.yxt.fms.feign.pms.pmspurchasebackbill;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.fms.feign.pms.pmspurchasebill.PmsPurchaseBillDto;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/20
+ **/
+@FeignClient(
+ contextId = "yxt-pms-PmsPurchaseBackBill",
+ name = "yxt-pms",
+ path = "/apiadmin/pms/pmspurchasebackbill",
+ fallback = PmsPurchaseBackBillFeignFallback.class)
+public interface PmsPurchaseBackBillFeign {
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody PmsPurchasebackBillDto dto);
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchaseBackBillFeignFallback.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchaseBackBillFeignFallback.java
new file mode 100644
index 0000000000..f0c31bb719
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchaseBackBillFeignFallback.java
@@ -0,0 +1,19 @@
+package com.yxt.fms.feign.pms.pmspurchasebackbill;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.fms.feign.pms.pmspurchasebill.PmsPurchaseBillDto;
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/20
+ **/
+@Component
+public class PmsPurchaseBackBillFeignFallback implements PmsPurchaseBackBillFeign {
+
+ @Override
+ public ResultBean save(PmsPurchasebackBillDto dto) {
+ return null;
+ }
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java
new file mode 100644
index 0000000000..d63b2275f9
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java
@@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.feign.pms.pmspurchasebackbill;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Project: yxt-pms(采购)
+ * File: PmsPurchasebackBillVo.java
+ * Class: com.yxt.pms.api.pmspurchasebackbill.PmsPurchasebackBillVo
+ * Description: 采购退货单据 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 16:16:12
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购退货单据 视图数据详情", description = "采购退货单据 视图数据详情")
+public class PmsPurchasebackBillDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("备注")
+ private String remarks;
+ @ApiModelProperty("制单人sid")
+ private String createBySid;
+ @ApiModelProperty("制单人姓名")
+ private String createByName; // 制单人姓名
+ @ApiModelProperty("来源单sid（采购单sid）")
+ private String sourceBillSid; // 来源单sid（采购单sid）
+ @ApiModelProperty("来源单编号")
+ private String sourceBillNo; // 来源单编号
+ @ApiModelProperty("单据编号")
+ private String billNo; // 单据编号
+ @ApiModelProperty("退误差调整金额")
+ private BigDecimal backErrorAmount; // 退误差调整金额
+ @ApiModelProperty("退优惠金额")
+ private BigDecimal backDiscountAmount; // 退优惠金额
+ @ApiModelProperty("抵扣欠款")
+ private BigDecimal deductDebts; // 抵扣欠款
+ @ApiModelProperty("抵扣单号")
+ private String deductBillNo; // 抵扣单号
+ @ApiModelProperty("转入预付款")
+ private BigDecimal toPrepayment; // 转入预付款
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("采购退货单明细")
+ private List pmsPurchasebackDetailList;
+}
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java
new file mode 100644
index 0000000000..656205545e
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java
@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.feign.pms.pmspurchasebackbill;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Project: yxt-pms(采购)
+ * File: PmsPurchasebackBillDto.java
+ * Class: com.yxt.pms.api.pmspurchasebackbill.PmsPurchasebackBillDto
+ * Description: 采购退货单据 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 16:16:12
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购退货单据 数据传输对象", description = "采购退货单据 数据传输对象")
+public class PmsPurchasebackBillDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("备注")
+ private String remarks;
+ @ApiModelProperty("制单人sid")
+ private String createBySid;
+ @ApiModelProperty("制单人姓名")
+ private String createByName; // 制单人姓名
+ @ApiModelProperty("来源单sid（采购单sid）")
+ private String sourceBillSid; // 来源单sid（采购单sid）
+ @ApiModelProperty("来源单编号")
+ private String sourceBillNo; // 来源单编号
+ @ApiModelProperty("单据编号")
+ private String billNo; // 单据编号
+ @ApiModelProperty("退误差调整金额")
+ private BigDecimal backErrorAmount; // 退误差调整金额
+ @ApiModelProperty("退优惠金额")
+ private BigDecimal backDiscountAmount; // 退优惠金额
+ @ApiModelProperty("抵扣欠款")
+ private BigDecimal deductDebts; // 抵扣欠款
+ @ApiModelProperty("抵扣单号")
+ private String deductBillNo; // 抵扣单号
+ @ApiModelProperty("转入预付款")
+ private BigDecimal toPrepayment; // 转入预付款
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("采购退货单明细")
+ private List pmsPurchasebackDetailList;
+
+}
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackDetailDetailsVo.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackDetailDetailsVo.java
new file mode 100644
index 0000000000..7685dc1058
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackDetailDetailsVo.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.feign.pms.pmspurchasebackbill;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-pms(采购)
+ * File: PmsPurchasebackDetailVo.java
+ * Class: com.yxt.pms.api.pmspurchasebackdetail.PmsPurchasebackDetailVo
+ * Description: 采购退货单据明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 16:16:12
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购退货单据明细 视图数据详情", description = "采购退货单据明细 视图数据详情")
+public class PmsPurchasebackDetailDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("制单人姓名")
+ private String createByName; // 制单人姓名
+ @ApiModelProperty("单据sid")
+ private String billSid; // 单据sid
+ @ApiModelProperty("商品库存sid")
+ private String inventorySid; // 商品库存sid
+ @ApiModelProperty("商品基础信息Sid")
+ private String goodsSpuSid; // 商品基础信息Sid
+ @ApiModelProperty("商品名称")
+ private String goodsSpuName; // 商品名称
+ @ApiModelProperty("商品Skusid")
+ private String goodsSkuSid; // 商品Skusid
+ @ApiModelProperty("商品Sku名称")
+ private String goodsSkuTitle; // 商品Sku名称
+ @ApiModelProperty("商品编码（图号）")
+ private String goodsSkuCode; // 商品编码（图号）
+ @ApiModelProperty("规格")
+ private String goodsSkuOwnSpec; // 规格
+ @ApiModelProperty("退货前的库存数量")
+ private BigDecimal currentCount; // 退货前的库存数量
+ @ApiModelProperty("计量单位")
+ private String unit; // 计量单位
+ @ApiModelProperty("仓库sid")
+ private String warehouseSid; // 仓库sid
+ @ApiModelProperty("仓库名称")
+ private String warehouseName; // 仓库名称
+ @ApiModelProperty("库区/货位sid")
+ private String areaSid; // 库区/货位sid
+ @ApiModelProperty("库区名称")
+ private String warehouseAreaName; // 库区名称
+ @ApiModelProperty("货架sid")
+ private String rackSid; // 货架sid
+ @ApiModelProperty("货架名称")
+ private String warehouseRackName; // 货架名称
+ @ApiModelProperty("已退数量")
+ private BigDecimal returnedCount; // 已退数量
+ @ApiModelProperty("退货数量")
+ private BigDecimal backCount; // 退货数量
+ @ApiModelProperty("税额")
+ private BigDecimal maxAmount; // 税额
+ @ApiModelProperty("含税价")
+ private BigDecimal maxPrice; // 含税价
+ @ApiModelProperty("退货金额")
+ private BigDecimal backAmount; // 退货金额
+
+}
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackDetailDto.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackDetailDto.java
new file mode 100644
index 0000000000..fefb26ca5b
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackDetailDto.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.feign.pms.pmspurchasebackbill;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-pms(采购)
+ * File: PmsPurchasebackDetailDto.java
+ * Class: com.yxt.pms.api.pmspurchasebackdetail.PmsPurchasebackDetailDto
+ * Description: 采购退货单据明细 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 16:16:12
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购退货单据明细 数据传输对象", description = "采购退货单据明细 数据传输对象")
+public class PmsPurchasebackDetailDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("制单人姓名")
+ private String createByName; // 制单人姓名
+ @ApiModelProperty("单据sid")
+ private String billSid; // 单据sid
+ @ApiModelProperty("商品库存sid")
+ private String inventorySid; // 商品库存sid
+ @ApiModelProperty("商品基础信息Sid")
+ private String goodsSpuSid; // 商品基础信息Sid
+ @ApiModelProperty("商品名称")
+ private String goodsSpuName; // 商品名称
+ @ApiModelProperty("商品Skusid")
+ private String goodsSkuSid; // 商品Skusid
+ @ApiModelProperty("商品Sku名称")
+ private String goodsSkuTitle; // 商品Sku名称
+ @ApiModelProperty("商品编码（图号）")
+ private String goodsSkuCode; // 商品编码（图号）
+ @ApiModelProperty("规格")
+ private String goodsSkuOwnSpec; // 规格
+ @ApiModelProperty("退货前的库存数量")
+ private BigDecimal currentCount; // 退货前的库存数量
+ @ApiModelProperty("计量单位")
+ private String unit; // 计量单位
+ @ApiModelProperty("仓库sid")
+ private String warehouseSid; // 仓库sid
+ @ApiModelProperty("仓库名称")
+ private String warehouseName; // 仓库名称
+ @ApiModelProperty("库区/货位sid")
+ private String areaSid; // 库区/货位sid
+ @ApiModelProperty("库区名称")
+ private String warehouseAreaName; // 库区名称
+ @ApiModelProperty("货架sid")
+ private String rackSid; // 货架sid
+ @ApiModelProperty("货架名称")
+ private String warehouseRackName; // 货架名称
+ @ApiModelProperty("已退数量")
+ private BigDecimal returnedCount; // 已退数量
+ @ApiModelProperty("退货数量")
+ private BigDecimal backCount; // 退货数量
+ @ApiModelProperty("税额")
+ private BigDecimal maxAmount; // 税额
+ @ApiModelProperty("含税价")
+ private BigDecimal maxPrice; // 含税价
+ @ApiModelProperty("退货金额")
+ private BigDecimal backAmount; // 退货金额
+
+}
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDetailDto.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDetailDto.java
new file mode 100644
index 0000000000..eefd58ebd3
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDetailDto.java
@@ -0,0 +1,98 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.feign.pms.pmspurchasebill;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailDto.java
+ * Class: com.yxt.pms.api.pmspurchasebilldetail.PmsPurchaseBillDetailDto
+ * Description: 采购单据明细 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单据明细 数据传输对象", description = "采购单据明细 数据传输对象")
+public class PmsPurchaseBillDetailDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("单据sid")
+ private String billSid; // 单据sid
+ @ApiModelProperty("商品基础信息Sid")
+ private String goodSpuSid; // 商品基础信息Sid
+ @ApiModelProperty("商品名称")
+ private String goodsSpuName; // 商品名称
+ @ApiModelProperty("商品Skusid")
+ private String goodsSkuSid; // 商品Skusid
+ @ApiModelProperty("商品Sku名称")
+ private String goodsSkuTitle; // 商品Sku名称
+ @ApiModelProperty("商品编码（图号）")
+ private String goodsSkuCode; // 商品编码（图号）
+ @ApiModelProperty("规格型号")
+ private String goodsSkuOwnSpec; // 规格型号
+ @ApiModelProperty("采购前库存数量")
+ private BigDecimal currentCount; // 采购前库存数量
+ @ApiModelProperty("仓库sid")
+ private String warehouseSid; // 仓库sid
+ @ApiModelProperty("仓库名称")
+ private String warehouseName; // 仓库名称
+ @ApiModelProperty("库区/货位sid")
+ private String warehouseAreaSid; // 库区/货位sid
+ @ApiModelProperty("库区名称")
+ private String warehouseAreaName; // 库区名称
+ @ApiModelProperty("货架sid")
+ private String warehouseRackSid; // 货架sid
+ @ApiModelProperty("货架名称")
+ private String warehouseRackName; // 货架名称
+ @ApiModelProperty("单位成本（进货价）")
+ private BigDecimal cost; // 单位成本（进货价）
+ @ApiModelProperty("采购数量")
+ private BigDecimal count; // 采购数量
+ @ApiModelProperty("税额")
+ private BigDecimal taxAmount; // 税额
+ @ApiModelProperty("含税价")
+ private BigDecimal taxPrice; // 含税价
+ @ApiModelProperty("采购金额")
+ private BigDecimal amount; // 采购金额
+ @ApiModelProperty("销售单价")
+ private BigDecimal salesPrice; // 销售单价
+ @ApiModelProperty("最低零售价")
+ private BigDecimal minimumSalesPrice; // 最低零售价
+
+}
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDto.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDto.java
new file mode 100644
index 0000000000..8ee34d0a24
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDto.java
@@ -0,0 +1,108 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.feign.pms.pmspurchasebill;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDto.java
+ * Class: com.yxt.pms.api.pmspurchasebill.PmsPurchaseBillDto
+ * Description: 采购单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单 数据传输对象", description = "采购单 数据传输对象")
+public class PmsPurchaseBillDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("备注")
+ private String remarks;
+ @ApiModelProperty("制单人sid")
+ private String createBySid;
+ @ApiModelProperty("制单人姓名")
+ private String createByName; // 制单人姓名
+ @ApiModelProperty("来源单sid（工单sid）")
+ private String sourceBillSid; // 来源单sid（工单sid）
+ @ApiModelProperty("来源单编号/外部编号")
+ private String sourceBillNo; // 来源单编号/外部编号
+ @ApiModelProperty("单据编号")
+ private String billNo; // 单据编号
+ @ApiModelProperty("采购类型Key")
+ private String purchaseTypeKey; // 采购类型Key
+ @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
+ private String purchaseTypeValue; // 采购类型Value（厂家采购、外采、其他）
+ @ApiModelProperty("供应商sid")
+ private String supplierSid; // 供应商sid
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商联系电话")
+ private String supplierPhone; // 供应商联系电话
+ @ApiModelProperty("票据类型key")
+ private String billTypeKey; // 票据类型key
+ @ApiModelProperty("票据类型value(不含税、增值税、普通税、已含增值税)")
+ private String billTypeValue; // 票据类型value(不含税、增值税、普通税、已含增值税)
+ @ApiModelProperty("是否需要开发票（是1，否0）")
+ private Integer isInvoicing; // 是否需要开发票（是1，否0）
+ @ApiModelProperty("发票号码")
+ private String invoiceCode; // 发票号码
+ @ApiModelProperty("采购员sid（单选）")
+ private String purchaserSid; // 采购员sid（单选）
+ @ApiModelProperty("采购员姓名")
+ private String purchaserName; // 采购员姓名
+ @ApiModelProperty("库管员sid（单选）")
+ private String storekeeperSid; // 库管员sid（单选）
+ @ApiModelProperty("库管员姓名")
+ private String storekeeperName; // 库管员姓名
+ @ApiModelProperty("运费")
+ private BigDecimal freight; // 运费
+ @ApiModelProperty("优惠金额")
+ private BigDecimal discountAmount; // 优惠金额
+ @ApiModelProperty("应付金额（=采购金额+运费-优惠金额）")
+ private BigDecimal payableAmount; // 应付金额（=采购金额+运费-优惠金额）
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("采购单商品明细")
+ private List pmsPurchaseBillDetailList;
+ @ApiModelProperty("采购单扩展")
+ private PmsPurchaseBillExtendDto pmsPurchaseBillExtend;
+}
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillExtendDto.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillExtendDto.java
new file mode 100644
index 0000000000..b719a17b8e
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillExtendDto.java
@@ -0,0 +1,86 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.fms.feign.pms.pmspurchasebill;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtendDto.java
+ * Class: com.yxt.pms.api.pmspurchasebillextend.PmsPurchaseBillExtendDto
+ * Description: 采购单扩展 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单扩展 数据传输对象", description = "采购单扩展 数据传输对象")
+public class PmsPurchaseBillExtendDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("制单人姓名")
+ private String createByName; // 制单人姓名
+ @ApiModelProperty("采购单sid")
+ private String purchaseBillSid; // 采购单sid
+ @ApiModelProperty("加价方式（统一加价率、区间加价率、仓库加价率）")
+ private String markupType; // 加价方式（统一加价率、区间加价率、仓库加价率）
+ @ApiModelProperty("进价不同时的价格策略（加权平均、分别计价）")
+ private String priceStrategy; // 进价不同时的价格策略（加权平均、分别计价）
+ @ApiModelProperty("临时加价率")
+ private Integer tempMarkupRate; // 临时加价率
+ @ApiModelProperty("误差调整金额")
+ private BigDecimal errorAmount; // 误差调整金额
+ @ApiModelProperty("发货人姓名")
+ private String shipperName; // 发货人姓名
+ @ApiModelProperty("发货人手机")
+ private String shipperMob; // 发货人手机
+ @ApiModelProperty("发货省市区sid")
+ private String deliveryAreaSid; // 发货省市区sid
+ @ApiModelProperty("发货详细地址")
+ private String deliveryAddress; // 发货详细地址
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("到货日期")
+ private Date arrivalDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("付款期限")
+ private Date paymentTerm; // 付款期限
+ @ApiModelProperty("仓库sid")
+ private String wareHouseSid; // 仓库sid
+
+}
\ No newline at end of file
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillFeign.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillFeign.java
new file mode 100644
index 0000000000..2a4cb5d5e6
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillFeign.java
@@ -0,0 +1,26 @@
+package com.yxt.fms.feign.pms.pmspurchasebill;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/20
+ **/
+@FeignClient(
+ contextId = "yxt-pms-PmsPurchaseBill",
+ name = "yxt-pms",
+ path = "/apiadmin/pms/pmspurchasebill",
+ fallback = PmsPurchaseBillFeignFallback.class)
+public interface PmsPurchaseBillFeign {
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody PmsPurchaseBillDto dto);
+}
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillFeignFallback.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillFeignFallback.java
new file mode 100644
index 0000000000..7fed4d6f25
--- /dev/null
+++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillFeignFallback.java
@@ -0,0 +1,18 @@
+package com.yxt.fms.feign.pms.pmspurchasebill;
+
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/20
+ **/
+@Component
+public class PmsPurchaseBillFeignFallback implements PmsPurchaseBillFeign {
+
+ @Override
+ public ResultBean save(PmsPurchaseBillDto dto) {
+ return null;
+ }
+}
diff --git a/yxt-fms-biz/src/main/resources/application-devv.yml b/yxt-fms-biz/src/main/resources/application-devv.yml
new file mode 100644
index 0000000000..022d83410a
--- /dev/null
+++ b/yxt-fms-biz/src/main/resources/application-devv.yml
@@ -0,0 +1,30 @@
+spring:
+ datasource:
+ hikari:
+ max-lifetime: 500000
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://39.104.100.138:3306/yxt_fms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+ username: root
+ password: yxt_mysql_138
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 39.104.100.138:8848
+ register-enabled: false
+ redis:
+ database: 3 # Redis数据库索引（默认为0）
+ host: 39.104.100.138
+ jedis:
+ pool:
+ max-active: -1 #连接池最大连接数（使用负值表示没有限制）
+ max-idle: 8 #连接池中的最大空闲连接
+ max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+ min-idle: 0 # 连接池中的最小空闲连接
+ password: 123456
+ port: 6379
+ timeout: 0 # 连接超时时间（毫秒）
+image:
+ upload:
+ path: D:\\anrui\\upload\\
+ url:
+ prefix: http://192.168.1.106:8111/upload/
diff --git a/yxt-fms-biz/src/main/resources/application-pro.yml b/yxt-fms-biz/src/main/resources/application-pro.yml
new file mode 100644
index 0000000000..1b0ead5deb
--- /dev/null
+++ b/yxt-fms-biz/src/main/resources/application-pro.yml
@@ -0,0 +1,27 @@
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://120.46.172.184:3306/yxt_fms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ username: root
+ password: '@anrui18033887500'
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 127.0.0.1:8848
+ redis:
+ database: 3 # Redis数据库索引（默认为0）
+ host: 127.0.0.1
+ jedis:
+ pool:
+ max-active: -1 #连接池最大连接数（使用负值表示没有限制）
+ max-idle: 8 #连接池中的最大空闲连接
+ max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+ min-idle: 0 # 连接池中的最小空闲连接
+ password: 123456
+ port: 6379
+ timeout: 0 # 连接超时时间（毫秒）
+image:
+ upload:
+ path: D:\anrui\upload\
+ url:
+ prefix: http://120.46.172.184/api/upload/
diff --git a/yxt-fms-biz/src/main/resources/application-test.yml b/yxt-fms-biz/src/main/resources/application-test.yml
new file mode 100644
index 0000000000..9a6cf88afa
--- /dev/null
+++ b/yxt-fms-biz/src/main/resources/application-test.yml
@@ -0,0 +1,31 @@
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://172.18.0.4:3306/yxt_fms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ username: root
+ password: yxt_mysql_138
+ hikari:
+ minimum-idle: 3
+ max-lifetime: 30000
+ maximum-pool-size: 10
+ cloud:
+ nacos:
+ discovery:
+ server-addr: 172.18.0.5:8848
+ redis:
+ database: 3 # Redis数据库索引（默认为0）
+ host: 172.18.0.7
+ jedis:
+ pool:
+ max-active: -1 #连接池最大连接数（使用负值表示没有限制）
+ max-idle: 8 #连接池中的最大空闲连接
+ max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+ min-idle: 0 # 连接池中的最小空闲连接
+ password: 123456
+ port: 6379
+ timeout: 0 # 连接超时时间（毫秒）
+image:
+ upload:
+ path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
+ url:
+ prefix: http://anrui.yyundong.com/upload/
diff --git a/yxt-fms-biz/src/main/resources/application.yml b/yxt-fms-biz/src/main/resources/application.yml
new file mode 100644
index 0000000000..06c54ac208
--- /dev/null
+++ b/yxt-fms-biz/src/main/resources/application.yml
@@ -0,0 +1,50 @@
+spring:
+ application:
+ name: yxt-fms
+ profiles:
+ active: devv
+# active: test
+# active: pro
+ messages:
+ # 国际化资源文件路径
+ basename: i18n/messages
+ servlet:
+ #上传文件
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 100MB
+ devtools:
+ restart:
+ # 热部署开关
+ enabled: true
+
+server:
+ port: 7304
+ max-http-header-size: 102400
+ undertow:
+ max-http-post-size: -1
+
+#mybatis
+mybatis-plus:
+ # 配置mapper的扫描，找到所有的mapper.xml映射文件
+ mapper-locations: classpath*:**Mapper.xml
+ global-config:
+ refresh: true
+ db-config:
+ #定义生成ID的类型
+ id-type: Auto
+ db-type: mysql
+ configuration:
+ map-underscore-to-camel-case: false
+ cache-enabled: true
+ call-setters-on-nulls: true
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+#rocketmq:
+# producer:
+# group: yxt-supervise-gf
+# name-server: 127.0.0.1:9876
+
+
+
+
diff --git a/yxt-fms-biz/src/main/resources/logback-spring.xml b/yxt-fms-biz/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000000..1a756cd90a
--- /dev/null
+++ b/yxt-fms-biz/src/main/resources/logback-spring.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+ %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${log.base}.log
+
+ ${log.base}.%d{yyyyMMdd}.%i.log.zip
+
+
+
+ 1MB
+
+
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}
+ -%msg%n
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt-fms-biz/src/test/java/com/yxt/fms/YxtFmsApplicationTests.java b/yxt-fms-biz/src/test/java/com/yxt/fms/YxtFmsApplicationTests.java
new file mode 100644
index 0000000000..44fb0db2d4
--- /dev/null
+++ b/yxt-fms-biz/src/test/java/com/yxt/fms/YxtFmsApplicationTests.java
@@ -0,0 +1,13 @@
+package com.yxt.fms;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class YxtFmsApplicationTests {
+
+ @Test
+ void contextLoads() {
+ }
+
+}