From 58d629c66bee75b867d0fe30f3538de4b2c99a06 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 9 Jul 2024 10:49:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E5=8D=95om?= =?UTF-8?q?s=E8=B0=83=E7=94=A8=E5=BA=95=E5=B1=82=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aggregation/PurchasebackBillRest.java | 72 ++++++++++++ .../purchasebackbill/PurchasebackBill.java | 85 +++++++++++++++ .../PurchasebackBillDetailsVo.java | 102 +++++++++++++++++ .../purchasebackbill/PurchasebackBillDto.java | 103 ++++++++++++++++++ .../PurchasebackBillQuery.java | 58 ++++++++++ .../PurchasebackBillService.java | 56 ++++++++++ .../purchasebackbill/PurchasebackBillVo.java | 57 ++++++++++ .../PurchasebackDetail.java | 79 ++++++++++++++ .../PurchasebackDetailDetailsVo.java | 80 ++++++++++++++ .../PurchasebackDetailDto.java | 79 ++++++++++++++ .../PurchasebackDetailService.java | 38 +++++++ .../PurchaseBackBillFeign.java | 39 +++++++ 12 files changed, 848 insertions(+) create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchasebackBillRest.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBill.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetail.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetailDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetailDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetailService.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/purchase/purchasebackbill/PurchaseBackBillFeign.java diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchasebackBillRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchasebackBillRest.java new file mode 100644 index 0000000..8cd3243 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchasebackBillRest.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _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.purchasebackbill.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; + +@Api(tags = "采购退货单据") +@RestController +@RequestMapping("/apiadmin/pmspurchasebackbill") +public class PurchasebackBillRest { + + @Autowired + private PurchasebackBillService purchasebackBillService; + @Autowired + HttpServletResponse response; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return purchasebackBillService.listPageVo(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody PurchasebackBillDto dto){ + return purchasebackBillService.saveOrUpdateDto(dto); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + return purchasebackBillService.delAll(sids); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + return purchasebackBillService.fetchDetailsVoBySid(sid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBill.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBill.java new file mode 100644 index 0000000..70d6b85 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBill.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebackbill; + +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; + +@Data +@ApiModel(value = "采购退货单据", description = "采购退货单据") +@TableName("purchaseback_bill") +public class PurchasebackBill extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("来源单sid") + private String sourceBillSid; // 来源单sid + @ApiModelProperty("来源单编号") + private String sourceBillNo; // 来源单编号 + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("退货类型Key") + private String backTypeKey; // 退货类型Key + @ApiModelProperty("退货类型Value") + private String backTypeValue; // 退货类型Value + @ApiModelProperty("仓库sid") + private String wareHouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String wareHouseName; // 仓库名称 + @ApiModelProperty("配送方式Key") + private String deliveryTypeKey; // 配送方式Key + @ApiModelProperty("配送方式Value") + private String deliveryTypeValue; // 配送方式Value + @ApiModelProperty("币种") + private String currency; // 币种 + @ApiModelProperty("业务员sid") + private String salesUserSid; // 业务员sid + @ApiModelProperty("业务员姓名") + private String salesName; // 业务员姓名 + @ApiModelProperty("退误差调整金额") + private BigDecimal backErrorAmount; // 退误差调整金额 + @ApiModelProperty("退运费") + private BigDecimal backFreight; // 退运费 + @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 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillDetailsVo.java new file mode 100644 index 0000000..d4c05f5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillDetailsVo.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebackbill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import com.yxt.oms.biz.func.purchaseappendix.PurchaseAppendixUrl; +import com.yxt.oms.biz.func.purchasebackdetail.PurchasebackDetailDetailsVo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(value = "采购退货单据 视图数据详情", description = "采购退货单据 视图数据详情") +public class PurchasebackBillDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人sid") + private String createBySid; + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("来源单sid") + private String sourceBillSid; // 来源单sid + @ApiModelProperty("来源单编号") + private String sourceBillNo; // 来源单编号 + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("退货类型Key") + private String backTypeKey; // 退货类型Key + @ApiModelProperty("退货类型Value") + private String backTypeValue; // 退货类型Value + @ApiModelProperty("仓库sid") + private String wareHouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String wareHouseName; // 仓库名称 + @ApiModelProperty("配送方式Key") + private String deliveryTypeKey; // 配送方式Key + @ApiModelProperty("配送方式Value") + private String deliveryTypeValue; // 配送方式Value + @ApiModelProperty("币种") + private String currency; // 币种 + @ApiModelProperty("业务员sid") + private String salesUserSid; // 业务员sid + @ApiModelProperty("业务员姓名") + private String salesName; // 业务员姓名 + @ApiModelProperty("退误差调整金额") + private BigDecimal backErrorAmount; // 退误差调整金额 + @ApiModelProperty("退运费") + private BigDecimal backFreight; // 退运费 + @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 PurchasebackDetailList; + @ApiModelProperty("附件") + private List purchaseAppendixList = new ArrayList<>(); +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillDto.java new file mode 100644 index 0000000..5dad438 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillDto.java @@ -0,0 +1,103 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebackbill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import com.yxt.oms.biz.func.purchaseappendix.PurchaseAppendixUrl; +import com.yxt.oms.biz.func.purchasebackdetail.PurchasebackDetailDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(value = "采购退货单据 数据传输对象", description = "采购退货单据 数据传输对象") +public class PurchasebackBillDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("申请日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人sid") + private String createBySid; + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("来源单sid") + private String sourceBillSid; // 来源单sid + @ApiModelProperty("来源单编号") + private String sourceBillNo; // 来源单编号 + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("退货类型Key") + private String backTypeKey; // 退货类型Key + @ApiModelProperty("退货类型Value") + private String backTypeValue; // 退货类型Value + @ApiModelProperty("仓库sid") + private String wareHouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String wareHouseName; // 仓库名称 + @ApiModelProperty("配送方式Key") + private String deliveryTypeKey; // 配送方式Key + @ApiModelProperty("配送方式Value") + private String deliveryTypeValue; // 配送方式Value + @ApiModelProperty("币种") + private String currency; // 币种 + @ApiModelProperty("业务员sid") + private String salesUserSid; // 业务员sid + @ApiModelProperty("业务员姓名") + private String salesName; // 业务员姓名 + @ApiModelProperty("退误差调整金额") + private BigDecimal backErrorAmount; // 退误差调整金额 + @ApiModelProperty("退运费") + private BigDecimal backFreight; // 退运费 + @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 PurchasebackDetailList; + @ApiModelProperty("附件") + private List purchaseAppendixList = new ArrayList<>(); + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillQuery.java new file mode 100644 index 0000000..7f3ded4 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillQuery.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebackbill; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "采购退货单据 查询条件", description = "采购退货单据 查询条件") +public class PurchasebackBillQuery implements Query { + + @ApiModelProperty("创建开始日期") + private String createStartTime; + @ApiModelProperty("创建结束日期") + private String createEndTime; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("仓库") + private String wareHouseName; + @ApiModelProperty("业务员") + private String salesName; + + private String orgLevelKey; + @ApiModelProperty("组织全路径") + private String orgPath; + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillService.java new file mode 100644 index 0000000..030e954 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillService.java @@ -0,0 +1,56 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebackbill; + +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.purchase.purchasebackbill.PurchaseBackBillFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class PurchasebackBillService { + + @Autowired + private PurchaseBackBillFeign purchaseBackBillFeign; + + public ResultBean> listPageVo(PagerQuery pq) { + return purchaseBackBillFeign.listPage(pq); + } + + public ResultBean saveOrUpdateDto(PurchasebackBillDto dto) { + return purchaseBackBillFeign.save(dto); + } + + public ResultBean fetchDetailsVoBySid(String sid) { + return purchaseBackBillFeign.fetchDetailsBySid(sid); + } + + public ResultBean delAll(String[] sids) { + return purchaseBackBillFeign.delBySids(sids); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillVo.java new file mode 100644 index 0000000..6661c4f --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackbill/PurchasebackBillVo.java @@ -0,0 +1,57 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebackbill; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(value = "采购退货单据 视图数据对象", description = "采购退货单据 视图数据对象") +public class PurchasebackBillVo implements Vo { + + private String sid; // sid + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("业务日期") + private Date createTime; + @ApiModelProperty("业务类型") + private String backTypeValue; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("仓库") + private String wareHouseName; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("业务员") + private String salesName; + @ApiModelProperty("备注") + private String remarks; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetail.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetail.java new file mode 100644 index 0000000..6f60095 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetail.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebackdetail; + +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; + +@Data +@ApiModel(value = "采购退货单据明细", description = "采购退货单据明细") +@TableName("purchaseback_detail") +public class PurchasebackDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据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 String unit; // 计量单位 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 + @ApiModelProperty("已退数量") + private BigDecimal returnedCount; // 已退数量 + @ApiModelProperty("退货数量") + private BigDecimal backCount; // 退货数量 + + @ApiModelProperty("采购数量") + private BigDecimal count; + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("含税价") + private BigDecimal taxPrice; // 含税价 + + @ApiModelProperty("退货金额") + private BigDecimal backAmount; // 退货金额 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetailDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetailDetailsVo.java new file mode 100644 index 0000000..3ab75a5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetailDetailsVo.java @@ -0,0 +1,80 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebackdetail; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@ApiModel(value = "采购退货单据明细 视图数据详情", description = "采购退货单据明细 视图数据详情") +public class PurchasebackDetailDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据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 String unit; // 计量单位 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 + @ApiModelProperty("已退数量") + private BigDecimal returnedCount; // 已退数量 + @ApiModelProperty("退货数量") + private BigDecimal backCount; // 退货数量 + + @ApiModelProperty("采购数量") + private BigDecimal count; + @ApiModelProperty("采购金额") + private BigDecimal amount; + @ApiModelProperty("税额") + private BigDecimal taxAmount; + @ApiModelProperty("含税价") + private BigDecimal taxPrice; + + @ApiModelProperty("退货金额") + private BigDecimal backAmount; // 退货金额 + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetailDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetailDto.java new file mode 100644 index 0000000..048b1c6 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetailDto.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebackdetail; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@ApiModel(value = "采购退货单据明细 数据传输对象", description = "采购退货单据明细 数据传输对象") +public class PurchasebackDetailDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据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 String unit; // 计量单位 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 + @ApiModelProperty("已退数量") + private BigDecimal returnedCount; // 已退数量 + @ApiModelProperty("退货数量") + private BigDecimal backCount; // 退货数量 + + @ApiModelProperty("采购数量") + private BigDecimal count; + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("含税价") + private BigDecimal taxPrice; + + @ApiModelProperty("退货金额") + private BigDecimal backAmount; // 退货金额 + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetailService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetailService.java new file mode 100644 index 0000000..7ac29ad --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebackdetail/PurchasebackDetailService.java @@ -0,0 +1,38 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebackdetail; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.List; + +@Service +public class PurchasebackDetailService { + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebackbill/PurchaseBackBillFeign.java b/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebackbill/PurchaseBackBillFeign.java new file mode 100644 index 0000000..01f4fd0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebackbill/PurchaseBackBillFeign.java @@ -0,0 +1,39 @@ +package com.yxt.oms.feign.purchase.purchasebackbill; + +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.purchasebackbill.PurchasebackBillDetailsVo; +import com.yxt.oms.biz.func.purchasebackbill.PurchasebackBillDto; +import com.yxt.oms.biz.func.purchasebackbill.PurchasebackBillQuery; +import com.yxt.oms.biz.func.purchasebackbill.PurchasebackBillVo; +import com.yxt.oms.biz.func.purchasebill.PurchaseBillDetailsVo; +import com.yxt.oms.biz.func.purchasebill.PurchaseBillDto; +import com.yxt.oms.biz.func.purchasebill.PurchaseBillQuery; +import com.yxt.oms.biz.func.purchasebill.PurchaseBillVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +@FeignClient( + contextId = "ss-common-purchase-PurchaseBackBill", + name = "ss-common-purchase", + path = "/apiadmin/pmspurchasebackbill") +public interface PurchaseBackBillFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody PurchasebackBillDto dto); + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file