From 669fc03ae54f70846ccfcd815c0d2e0dba793106 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 19 Jul 2024 17:40:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=94=80?=
=?UTF-8?q?=E5=94=AE=E9=80=80=E8=B4=A7=E5=8D=95=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 3 +
.../aggregation/SmsSalesReturnRest.java | 87 ++++++++++++++
.../smssalesbill/SmsSalesBillDetailsVo.java | 4 +
.../func/smssalesbill/SmsSalesBillDto.java | 5 +-
.../biz/func/smssalesreturn/GoodsList.java | 29 +++++
.../func/smssalesreturn/SmsSalesReturn.java | 106 ++++++++++++++++++
.../SmsSalesReturnDetailsVo.java | 78 +++++++++++++
.../smssalesreturn/SmsSalesReturnDto.java | 79 +++++++++++++
.../smssalesreturn/SmsSalesReturnMapper.java | 63 +++++++++++
.../smssalesreturn/SmsSalesReturnMapper.xml | 13 +++
.../smssalesreturn/SmsSalesReturnQuery.java | 99 ++++++++++++++++
.../smssalesreturn/SmsSalesReturnService.java | 78 +++++++++++++
.../func/smssalesreturn/SmsSalesReturnVo.java | 96 ++++++++++++++++
.../yxt/oms/feign/portal/sysuser/SysUser.java | 72 ++++++++++++
.../feign/portal/sysuser/SysUserFeign.java | 4 +
.../smssalesreturn/SmsSalesReturnFeign.java | 82 ++++++++++++++
.../java/com/yxt/oms/utils/FileQueryUrl.java | 14 +++
17 files changed, 911 insertions(+), 1 deletion(-)
create mode 100644 .gitignore
create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesReturnRest.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/GoodsList.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturn.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDetailsVo.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDto.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.xml
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnQuery.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnService.java
create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnVo.java
create mode 100644 oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUser.java
create mode 100644 oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java
create mode 100644 oms/src/main/java/com/yxt/oms/utils/FileQueryUrl.java
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5f39bc0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/oms-biz.iml
+/gateway/gateway.iml
+/oms/oms.iml
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesReturnRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesReturnRest.java
new file mode 100644
index 0000000..6553d44
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesReturnRest.java
@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.smssalesreturn.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Delete;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: sms(销售退货)
+ * File: SmsSalesReturnFeignFallback.java
+ * Class: com.yxt.sales.apiadmin.SmsSalesReturnRest
+ * Description: 销售退货单据.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-19 16:53:05
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售退货单据")
+@RestController("com.yxt.sales.apiadmin.SmsSalesReturnRest")
+@RequestMapping("v1/smssalesreturn")
+public class SmsSalesReturnRest {
+
+ @Autowired
+ private SmsSalesReturnService smsSalesReturnService;
+
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ return smsSalesReturnService.listPageVo(pq);
+ }
+
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody SmsSalesReturnDto dto) {
+
+ return smsSalesReturnService.saveOrUpdateDto(dto);
+ }
+
+
+ @ApiOperation("根据sid批量删除")
+ @Delete("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids) {
+ return smsSalesReturnService.deleteBySids(sids);
+ }
+
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) {
+ return smsSalesReturnService.fetchDetailsVoBySid(sid);
+ }
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
index 3434082..8c039e4 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
@@ -27,10 +27,12 @@ package com.yxt.oms.biz.func.smssalesbill;
import com.yxt.common.core.vo.Vo;
+import com.yxt.oms.utils.FileQueryUrl;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -160,5 +162,7 @@ public class SmsSalesBillDetailsVo implements Vo {
@ApiModelProperty("结算金额")
private String settleAmount; // 结算金额
+ @ApiModelProperty("付款凭证")
+ private List files = new ArrayList<>(); // 付款凭证
}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
index b9d73cb..f77dcb7 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
@@ -27,10 +27,12 @@ package com.yxt.oms.biz.func.smssalesbill;
import com.yxt.common.core.dto.Dto;
+import com.yxt.oms.utils.FileQueryUrl;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -160,7 +162,8 @@ public class SmsSalesBillDto implements Dto {
@ApiModelProperty("结算金额")
private String settleAmount; // 结算金额
-
+ @ApiModelProperty("付款凭证")
+ private List files = new ArrayList<>(); // 付款凭证
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/GoodsList.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/GoodsList.java
new file mode 100644
index 0000000..2e395e2
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/GoodsList.java
@@ -0,0 +1,29 @@
+package com.yxt.oms.biz.func.smssalesreturn;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/19 17:23
+ */
+@Data
+public class GoodsList {
+ private String auxiliaryUnit;
+ private String backAmount;
+ private String backCount;
+ private String discountRtate;
+ private String goodSpuSid;
+ private String goodsSkuCode;
+ private String goodsSkuOwnSpec;
+ private String goodsSkuSid;
+ private String goodsSkuTitle;
+ private String goodsSpuName;
+ private String maxPrice;
+ private String remarks;
+ private String tradePrice;
+ private String unit;
+ private String warehouseRackCode;
+ private String warehouseRackSid;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturn.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturn.java
new file mode 100644
index 0000000..0b086d5
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturn.java
@@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: sms(销售退货)
+ * File: SmsSalesReturn.java
+ * Class: com.yxt.sales.api.smssalesreturn.SmsSalesReturn
+ * Description: 销售退货单据.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-19 16:53:05
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售退货单据", description = "销售退货单据")
+@TableName("sms_sales_return")
+public class SmsSalesReturn extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("制单人姓名")
+ private String createByName; // 制单人姓名
+ @ApiModelProperty("制单部门sid")
+ private String deptSid; // 制单部门sid
+ @ApiModelProperty("制单部门")
+ private String deptName; // 制单部门
+ @ApiModelProperty("单据编号")
+ private String billNo; // 单据编号
+ @ApiModelProperty("来源单sid（销售单sid）")
+ private String sourceBillSid; // 来源单sid（销售单sid）
+ @ApiModelProperty("来源单编号（订单编号）")
+ private String sourceBillNo; // 来源单编号（订单编号）
+ @ApiModelProperty("业务员sid")
+ private String salesUserSid; // 业务员sid
+ @ApiModelProperty("业务员姓名")
+ private String salesName; // 业务员姓名
+ @ApiModelProperty("单据类型key（销售退货等）")
+ private String billTypeKey; // 单据类型key（销售退货等）
+ @ApiModelProperty("单据类型value")
+ private String billTypeValue; // 单据类型value
+ @ApiModelProperty("物流公司")
+ private String LogisticsName; // 物流公司
+ @ApiModelProperty("快递单号")
+ private String logisticsNum; // 快递单号
+ @ApiModelProperty("客户sid")
+ private String customerSid; // 客户sid
+ @ApiModelProperty("客户名称")
+ private String customerName; // 客户名称
+ @ApiModelProperty("退误差调整金额")
+ private BigDecimal backErrorAmount; // 退误差调整金额
+ @ApiModelProperty("退优惠金额")
+ private BigDecimal backDiscountAmount; // 退优惠金额
+ @ApiModelProperty("抵扣欠款")
+ private BigDecimal deductDebts; // 抵扣欠款
+ @ApiModelProperty("结算账户")
+ private String bankAccount; // 结算账户
+ @ApiModelProperty("抵扣单号")
+ private String deductBillNo; // 抵扣单号
+ @ApiModelProperty("是否记预收款（1是，0否）")
+ private Integer isTotoPrepayment; // 是否记预收款（1是，0否）
+ @ApiModelProperty("转入预付款")
+ private BigDecimal toPrepayment; // 转入预付款
+ @ApiModelProperty("仓库sid")
+ private String warehouseSid; // 仓库sid
+ @ApiModelProperty("仓库名称")
+ private String warehouseName; // 仓库名称
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDetailsVo.java
new file mode 100644
index 0000000..8804ee7
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDetailsVo.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: sms(销售退货)
+ * File: SmsSalesReturnVo.java
+ * Class: com.yxt.sales.api.smssalesreturn.SmsSalesReturnVo
+ * Description: 销售退货单据 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-19 16:53:05
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售退货单据 视图数据详情", description = "销售退货单据 视图数据详情")
+public class SmsSalesReturnDetailsVo implements Vo {
+
+ private String amount;
+ private String billTypeKey;
+ private String billTypeValue;
+ private String createByName;
+ private String createBySid;
+ private String createOrgSid;
+ private String createTime;
+ private String customerName;
+ private String customerSid;
+ private String deliveryTypeKey;
+ private String deptName;
+ private String deptSid;
+ private List goodsList;
+ private String isFirstPay;
+ private String isTotoPrepayment;
+ private String logisticsName;
+ private String logisticsNum;
+ private String remarks;
+ private String salesName;
+ private String salesUserSid;
+ private String sid;
+ private String sourceBillNo;
+ private String sourceBillSid;
+ private String useOrgSid;
+ private String warehouseName;
+ private String warehouseSid;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDto.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDto.java
new file mode 100644
index 0000000..1afa871
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDto.java
@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: sms(销售退货)
+ * File: SmsSalesReturnDto.java
+ * Class: com.yxt.sales.api.smssalesreturn.SmsSalesReturnDto
+ * Description: 销售退货单据 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-19 16:53:05
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售退货单据 数据传输对象", description = "销售退货单据 数据传输对象")
+public class SmsSalesReturnDto implements Dto {
+
+ private String amount;
+ private String billTypeKey;
+ private String billTypeValue;
+ private String createByName;
+ private String createBySid;
+ private String createOrgSid;
+ private String createTime;
+ private String customerName;
+ private String customerSid;
+ private String deliveryTypeKey;
+ private String deptName;
+ private String deptSid;
+ private List goodsList;
+ private String isFirstPay;
+ private String isTotoPrepayment;
+ private String logisticsName;
+ private String logisticsNum;
+ private String remarks;
+ private String salesName;
+ private String salesUserSid;
+ private String sid;
+ private String sourceBillNo;
+ private String sourceBillSid;
+ private String useOrgSid;
+ private String warehouseName;
+ private String warehouseSid;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.java
new file mode 100644
index 0000000..66b07b7
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.java
@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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: sms(销售退货)
+ * File: SmsSalesReturnMapper.java
+ * Class: com.yxt.sales.biz.smssalesreturn.SmsSalesReturnMapper
+ * Description: 销售退货单据.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-19 16:53:05
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SmsSalesReturnMapper extends BaseMapper {
+
+ //@Update("update sms_sales_return 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 sms_sales_return")
+ List selectListVo();
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.xml
new file mode 100644
index 0000000..e7e63d7
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnQuery.java
new file mode 100644
index 0000000..fc9c83a
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnQuery.java
@@ -0,0 +1,99 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: sms(销售退货)
+ * File: SmsSalesReturnQuery.java
+ * Class: com.yxt.sales.api.smssalesreturn.SmsSalesReturnQuery
+ * Description: 销售退货单据 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-19 16:53:05
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售退货单据 查询条件", description = "销售退货单据 查询条件")
+public class SmsSalesReturnQuery implements Query {
+
+ /**
+ * 单据编号
+ */
+ private String billNo;
+ /**
+ * 单据类型key
+ */
+ private String billTypeKey;
+ /**
+ * 制单人姓名
+ */
+ private String createByName;
+ /**
+ * 创建组织sid
+ */
+ private String createOrgSid;
+ /**
+ * 客户名称
+ */
+ private String customerName;
+ /**
+ * 制单部门
+ */
+ private String deptName;
+ /**
+ * 制单结束日期
+ */
+ private String endDate;
+ /**
+ * 销售姓名(业务员)
+ */
+ private String salesName;
+ /**
+ * 订单编号
+ */
+ private String sourceBillNo;
+ /**
+ * 制单开始日期
+ */
+ private String startDate;
+ /**
+ * 使用组织sid
+ */
+ private String useOrgSid;
+ /**
+ * 仓库名称
+ */
+ private String warehouseName;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnService.java
new file mode 100644
index 0000000..ce7836f
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnService.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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 com.yxt.oms.feign.sales.smssalesreturn.SmsSalesReturnFeign;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: sms(销售退货)
+ * File: SmsSalesReturnService.java
+ * Class: com.yxt.sales.biz.smssalesreturn.SmsSalesReturnService
+ * Description: 销售退货单据 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-19 16:53:05
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SmsSalesReturnService extends MybatisBaseService {
+ @Autowired
+ private SmsSalesReturnFeign smsSalesReturnFeign;
+
+
+ public ResultBean> listPageVo(PagerQuery pq) {
+ return smsSalesReturnFeign.listPage(pq);
+ }
+
+ public ResultBean saveOrUpdateDto(SmsSalesReturnDto dto) {
+ return smsSalesReturnFeign.save(dto);
+ }
+
+ public ResultBean deleteBySids(String[] sids) {
+ return smsSalesReturnFeign.delBySids(sids);
+ }
+
+ public ResultBean fetchDetailsVoBySid(String sid) {
+ return smsSalesReturnFeign.fetchDetailsBySid(sid);
+ }
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnVo.java
new file mode 100644
index 0000000..1322253
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnVo.java
@@ -0,0 +1,96 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: sms(销售退货)
+ * File: SmsSalesReturnVo.java
+ * Class: com.yxt.sales.api.smssalesreturn.SmsSalesReturnVo
+ * Description: 销售退货单据 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-19 16:53:05
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售退货单据 视图数据对象", description = "销售退货单据 视图数据对象")
+public class SmsSalesReturnVo implements Vo {
+
+ /**
+ * 总金额
+ */
+ private String amount;
+ /**
+ * 单据编号
+ */
+ private String billNo;
+ /**
+ * 单据类型value
+ */
+ private String billTypeValue;
+ /**
+ * 制单人姓名
+ */
+ private String createByName;
+ /**
+ * 制单日期
+ */
+ private String createTime;
+ /**
+ * 客户名称
+ */
+ private String customerName;
+ /**
+ * 制单部门
+ */
+ private String deptName;
+ /**
+ * 物流单号
+ */
+ private String logisticsNum;
+ /**
+ * 业务员
+ */
+ private String salesName;
+ private String sid;
+ /**
+ * 订单编号
+ */
+ private String sourceBillNo;
+ /**
+ * 仓库名称
+ */
+ private String warehouseName;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUser.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUser.java
new file mode 100644
index 0000000..40c74e0
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUser.java
@@ -0,0 +1,72 @@
+package com.yxt.oms.feign.portal.sysuser;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui_portal(门户建设)
+ * File: SysUser.java
+ * Class: com.yxt.anrui.portal.api.sysuser.SysUser
+ * Description: 用户表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表", description = "用户表")
+@TableName("sys_user")
+@Data
+public class SysUser extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+
+ @ApiModelProperty("登录名，登录名不能相同")
+ private String userName;
+
+ @ApiModelProperty("密码（加密或签名后）")
+ private String password;
+
+ @ApiModelProperty("密码修改时限")
+ private String pwdDayslimit;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("最后一次密码修改时间")
+ private Date pwdModifyTime;
+
+ @ApiModelProperty("在线状态（0为离线、1为在线）")
+ private Integer onlineState;
+
+ @ApiModelProperty("用户登录时随机生成身份验证字符串")
+ private String token;
+
+ @ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员")
+ private String isAdmin;
+
+ @ApiModelProperty("手机登录唯一标识，手机与用户绑定字段")
+ private String appId;
+
+ @ApiModelProperty("关联的人员sid")
+ private String staffSid;
+
+ @ApiModelProperty("手机号")
+ private String mobile;
+
+ @ApiModelProperty("用户类型:1员工、2客户、3供应商")
+ private Integer userType;
+
+ @ApiModelProperty("用户头像")
+ private String headImage;
+ @TableField(exist = false)
+ private String orgSid;
+ private String accountType;////账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java
index 9adbaa2..c1e2c36 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java
@@ -91,4 +91,8 @@ public interface SysUserFeign {
@ApiOperation("删除记录根据sid")
@GetMapping("/delBySid/{sid}")
public ResultBean delBySid(@PathVariable("sid") String sid);
+
+ @ApiOperation("根据sid查询用户信息")
+ @PostMapping("/selectBySid")
+ public ResultBean selectBySid(@RequestParam("sid") String sid);
}
diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java
new file mode 100644
index 0000000..8ab6cce
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java
@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.feign.sales.smssalesreturn;
+
+import com.yxt.oms.biz.func.smssalesreturn.SmsSalesReturnDetailsVo;
+import com.yxt.oms.biz.func.smssalesreturn.SmsSalesReturnDto;
+import com.yxt.oms.biz.func.smssalesreturn.SmsSalesReturnQuery;
+import com.yxt.oms.biz.func.smssalesreturn.SmsSalesReturnVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: sms(销售退货)
+ * File: SmsSalesReturnFeign.java
+ * Class: com.yxt.sales.api.smssalesreturn.SmsSalesReturnFeign
+ * Description: 销售退货单据.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-19 16:53:05
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售退货单据")
+@FeignClient(
+ contextId = "sms-SmsSalesReturn",
+ name = "sms",
+ path = "v1/smssalesreturn"
+ )
+public interface SmsSalesReturnFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody SmsSalesReturnDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
diff --git a/oms/src/main/java/com/yxt/oms/utils/FileQueryUrl.java b/oms/src/main/java/com/yxt/oms/utils/FileQueryUrl.java
new file mode 100644
index 0000000..f4d9699
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/utils/FileQueryUrl.java
@@ -0,0 +1,14 @@
+package com.yxt.oms.utils;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/19 15:06
+ */
+@Data
+public class FileQueryUrl {
+
+ private String url;
+}