From 668ec05713e93122647bb81dca6f63abddfa8e9c Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 5 Jul 2024 09:35:47 +0800 Subject: [PATCH] =?UTF-8?q?oms=E9=87=87=E8=B4=AD=E5=8D=95=E3=80=81?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/purchase/PurchaseApplication.java | 2 +- .../apiadmin/PurchaseBillAmountRest.java | 40 ++++ .../apiadmin/PurchaseBillDetailRest.java | 60 ++++++ .../apiadmin/PurchaseBillExtendRest.java | 42 ++++ .../apiadmin/PurchaseBillInvoiceRest.java | 58 +++++ .../purchase/apiadmin/PurchaseBillRest.java | 74 +++++++ .../apiadmin/PurchasebackBillRest.java | 74 +++++++ .../apiadmin/PurchasebackDetailRest.java | 60 ++++++ .../purchasebackbill/PurchasebackBill.java | 85 ++++++++ .../PurchasebackBillDetailsVo.java | 103 +++++++++ .../purchasebackbill/PurchasebackBillDto.java | 99 +++++++++ .../PurchasebackBillMapper.java | 65 ++++++ .../PurchasebackBillMapper.xml | 83 +++++++ .../PurchasebackBillQuery.java | 84 ++++++++ .../PurchasebackBillService.java | 204 ++++++++++++++++++ .../purchasebackbill/PurchasebackBillVo.java | 89 ++++++++ .../PurchasebackDetail.java | 92 ++++++++ .../PurchasebackDetailDetailsVo.java | 94 ++++++++ .../PurchasebackDetailDto.java | 92 ++++++++ .../PurchasebackDetailMapper.java | 65 ++++++ .../PurchasebackDetailMapper.xml | 21 ++ .../PurchasebackDetailQuery.java | 50 +++++ .../PurchasebackDetailService.java | 93 ++++++++ .../PurchasebackDetailVo.java | 50 +++++ .../biz/purchasebill/PurchaseBill.java | 103 +++++++++ .../purchasebill/PurchaseBillDetailsVo.java | 107 +++++++++ .../biz/purchasebill/PurchaseBillDto.java | 104 +++++++++ .../biz/purchasebill/PurchaseBillMapper.java | 59 +++++ .../biz/purchasebill/PurchaseBillMapper.xml | 76 +++++++ .../biz/purchasebill/PurchaseBillQuery.java | 79 +++++++ .../biz/purchasebill/PurchaseBillService.java | 180 ++++++++++++++++ .../biz/purchasebill/PurchaseBillVo.java | 90 ++++++++ .../PurchaseChoiceBillDetailsVo.java | 85 ++++++++ .../purchasebill/PurchaseChoiceBillQuery.java | 79 +++++++ .../purchasebill/PurchaseChoiceBillVo.java | 92 ++++++++ .../PurchaseBillAmount.java | 82 +++++++ .../PurchaseBillAmountDetailsVo.java | 95 ++++++++ .../PurchaseBillAmountDto.java | 95 ++++++++ .../PurchaseBillAmountMapper.java | 41 ++++ .../PurchaseBillAmountMapper.xml | 6 + .../PurchaseBillAmountService.java | 50 +++++ .../PurchaseBillDetail.java | 102 +++++++++ .../PurchaseBillDetailDetailsVo.java | 102 +++++++++ .../PurchaseBillDetailDto.java | 102 +++++++++ .../PurchaseBillDetailMapper.java | 65 ++++++ .../PurchaseBillDetailMapper.xml | 46 ++++ .../PurchaseBillDetailQuery.java | 93 ++++++++ .../PurchaseBillDetailReportQuery.java | 59 +++++ .../PurchaseBillDetailReportVo.java | 77 +++++++ .../PurchaseBillDetailService.java | 113 ++++++++++ .../PurchaseBillDetailSumVo.java | 71 ++++++ .../PurchaseBillDetailVo.java | 96 +++++++++ .../PurchaseBillExtend.java | 72 +++++++ .../PurchaseBillExtendDetailsVo.java | 70 ++++++ .../PurchaseBillExtendDto.java | 70 ++++++ .../PurchaseBillExtendMapper.java | 60 ++++++ .../PurchaseBillExtendMapper.xml | 6 + .../PurchaseBillExtendQuery.java | 83 +++++++ .../PurchaseBillExtendService.java | 67 ++++++ .../PurchaseBillExtendVo.java | 85 ++++++++ .../PurchaseBillInvoice.java | 81 +++++++ .../PurchaseBillInvoiceDetailsVo.java | 81 +++++++ .../PurchaseBillInvoiceDto.java | 81 +++++++ .../PurchaseBillInvoiceMapper.java | 67 ++++++ .../PurchaseBillInvoiceMapper.xml | 13 ++ .../PurchaseBillInvoiceQuery.java | 80 +++++++ .../PurchaseBillInvoiceService.java | 94 ++++++++ .../PurchaseBillInvoiceVo.java | 81 +++++++ .../PurchaseReceiptBillService.java | 1 - 69 files changed, 5218 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/yxt/purchase/apiadmin/PurchaseBillAmountRest.java create mode 100644 src/main/java/com/yxt/purchase/apiadmin/PurchaseBillDetailRest.java create mode 100644 src/main/java/com/yxt/purchase/apiadmin/PurchaseBillExtendRest.java create mode 100644 src/main/java/com/yxt/purchase/apiadmin/PurchaseBillInvoiceRest.java create mode 100644 src/main/java/com/yxt/purchase/apiadmin/PurchaseBillRest.java create mode 100644 src/main/java/com/yxt/purchase/apiadmin/PurchasebackBillRest.java create mode 100644 src/main/java/com/yxt/purchase/apiadmin/PurchasebackDetailRest.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBill.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillDetailsVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillDto.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.xml create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillQuery.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillService.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetail.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDetailsVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDto.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.xml create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailQuery.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailService.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBill.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDetailsVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDto.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillDetailsVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillQuery.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmount.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDetailsVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDto.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountMapper.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountMapper.xml create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountService.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.xml create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailQuery.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailReportQuery.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailReportVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailService.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailSumVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtend.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDetailsVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDto.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendMapper.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendMapper.xml create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendQuery.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendService.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoice.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceDetailsVo.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceDto.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceMapper.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceMapper.xml create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceQuery.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceService.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceVo.java diff --git a/src/main/java/com/yxt/purchase/PurchaseApplication.java b/src/main/java/com/yxt/purchase/PurchaseApplication.java index bd87d80..a087aa2 100644 --- a/src/main/java/com/yxt/purchase/PurchaseApplication.java +++ b/src/main/java/com/yxt/purchase/PurchaseApplication.java @@ -12,7 +12,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication(scanBasePackages = { "com.yxt.purchase.config", "com.yxt.common.base.config", - "com.yxt.goods" + "com.yxt.purchase" }) // 启用自带定时任务 @EnableScheduling diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillAmountRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillAmountRest.java new file mode 100644 index 0000000..4a1bae8 --- /dev/null +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillAmountRest.java @@ -0,0 +1,40 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.apiadmin; + +import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountService; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "采购单-费用/预付款") +@RestController +@RequestMapping("/apiadmin/purchasebillamount") +public class PurchaseBillAmountRest { + + @Autowired + private PurchaseBillAmountService purchaseBillAmountService; +} diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillDetailRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillDetailRest.java new file mode 100644 index 0000000..0b5f92e --- /dev/null +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillDetailRest.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.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.purchase.biz.purchasebilldetail.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "采购单据明细") +@RestController +@RequestMapping("/apiadmin/pmspurchasebilldetail") +public class PurchaseBillDetailRest { + + @Autowired + private PurchaseBillDetailService purchaseBillDetailService; + + @ApiOperation("采购明细报表") + @PostMapping("/purDetailReForm") + public ResultBean> purDetailReForm(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = purchaseBillDetailService.purDetailReForm(pq); + return rb.success().setData(pv); + } + + @ApiOperation("采购汇总报表") + @PostMapping("/purSumReForm") + public ResultBean> purSumReForm(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = purchaseBillDetailService.purSumReForm(pq); + return rb.success().setData(pv); + } +} diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillExtendRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillExtendRest.java new file mode 100644 index 0000000..537a0c8 --- /dev/null +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillExtendRest.java @@ -0,0 +1,42 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.apiadmin; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.purchase.biz.purchasebillextend.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "采购单扩展") +@RestController +@RequestMapping("/apiadmin/pmspurchasebillextend") +public class PurchaseBillExtendRest { + + @Autowired + private PurchaseBillExtendService purchaseBillExtendService; +} diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillInvoiceRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillInvoiceRest.java new file mode 100644 index 0000000..9ec767c --- /dev/null +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillInvoiceRest.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.apiadmin; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.purchase.biz.purchasebillinvoice.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "采购单-发票") +@RestController +@RequestMapping("/apiadmin/pmspurchasebillinvoice") +public class PurchaseBillInvoiceRest { + + @Autowired + private PurchaseBillInvoiceService purchaseBillInvoiceService; + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody PurchaseBillInvoiceDto dto){ + ResultBean rb = ResultBean.fireFail(); + purchaseBillInvoiceService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + PurchaseBillInvoiceDetailsVo vo = purchaseBillInvoiceService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillRest.java new file mode 100644 index 0000000..b1a50a1 --- /dev/null +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillRest.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.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.purchase.biz.purchasebill.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "采购单") +@RestController +@RequestMapping("/apiadmin/purchasebill") +public class PurchaseBillRest { + + @Autowired + private PurchaseBillService purchaseBillService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = purchaseBillService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody PurchaseBillDto dto){ + ResultBean rb = ResultBean.fireFail(); + String sid = purchaseBillService.saveOrUpdateDto(dto); + return rb.success().setData(sid); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + return purchaseBillService.delAll(sids); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + PurchaseBillDetailsVo vo = purchaseBillService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchasebackBillRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchasebackBillRest.java new file mode 100644 index 0000000..7fc7564 --- /dev/null +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchasebackBillRest.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.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.purchase.biz.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){ + ResultBean rb = ResultBean.fireFail(); + PurchasebackBillDetailsVo vo = purchasebackBillService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchasebackDetailRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchasebackDetailRest.java new file mode 100644 index 0000000..9a20a60 --- /dev/null +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchasebackDetailRest.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.apiadmin; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.purchase.biz.purchasebackdetail.PurchasebackDetailDetailsVo; +import com.yxt.purchase.biz.purchasebackdetail.PurchasebackDetailDto; +import com.yxt.purchase.biz.purchasebackdetail.PurchasebackDetailService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "采购退货单据明细") +@RestController +@RequestMapping("/apiadmin/pmspurchasebackdetail") +public class PurchasebackDetailRest { + + @Autowired + private PurchasebackDetailService purchasebackDetailService; + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody PurchasebackDetailDto dto){ + ResultBean rb = ResultBean.fireFail(); + purchasebackDetailService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + PurchasebackDetailDetailsVo vo = purchasebackDetailService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBill.java b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBill.java new file mode 100644 index 0000000..51c93ff --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBill.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.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/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillDetailsVo.java new file mode 100644 index 0000000..62ffb26 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillDetailsVo.java @@ -0,0 +1,103 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebackbill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import com.yxt.purchase.biz.purchasebackdetail.PurchasebackDetailDetailsVo; +import com.yxt.purchase.biz.purchasebill.PurchaseChoiceBillDetailsVo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +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 PurchaseChoiceBillDetailsVo PurchaseChoiceBillDetailsVo; +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillDto.java b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillDto.java new file mode 100644 index 0000000..05e8c6e --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillDto.java @@ -0,0 +1,99 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebackbill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import com.yxt.purchase.biz.purchasebackdetail.PurchasebackDetailDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +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; + +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.java b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.java new file mode 100644 index 0000000..fcf6a46 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebackbill; + +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 java.math.BigDecimal; +import java.util.Map; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackBillMapper.java
+ * Class: com.yxt.pms.biz.purchasebackbill.PmsPurchasebackBillMapper
+ * Description: 采购退货单据.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:47
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PurchasebackBillMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + String selectNum(String billNo); + + int updateFlowFiled(Map map); + + int checkNodeStateBySourceBillSid(String sourceBillSid); + + BigDecimal checkPayableAmountBySourceBillSid(String sourceBillSid); + + int selectBySid(String join); +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.xml new file mode 100644 index 0000000..f7cd3cd --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + UPDATE pms_purchaseback_bill + SET nodeState=#{nodeState}, nodeId=#{taskDefKey} + + , finishTime = NOW() + + + , procDefId=#{procDefId} + + + , procInstId=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid=#{sid} + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillQuery.java b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillQuery.java new file mode 100644 index 0000000..c547c07 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillQuery.java @@ -0,0 +1,84 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebackbill; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackBillQuery.java
+ * Class: com.yxt.pms.api.purchasebackbill.PmsPurchasebackBillQuery
+ * 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 PurchasebackBillQuery implements Query { + + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("申请人") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建开始日期") + private String createStartTime; + @ApiModelProperty("创建结束日期") + private String createEndTime; + @ApiModelProperty("办结开始日期") + private String finishStartTime; + @ApiModelProperty("办结结束日期") + private String finishEndTime; + @ApiModelProperty("来源单编号") + private String sourceBillNo; + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; + @ApiModelProperty("供应商名称") + private String supplierName; + + private String orgLevelKey; + @ApiModelProperty("组织全路径") + private String orgPath; + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillService.java b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillService.java new file mode 100644 index 0000000..47270da --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillService.java @@ -0,0 +1,204 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebackbill; + +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.purchase.biz.purchasebackdetail.PurchasebackDetailDetailsVo; +import com.yxt.purchase.biz.purchasebackdetail.PurchasebackDetailDto; +import com.yxt.purchase.biz.purchasebackdetail.PurchasebackDetailService; +import com.yxt.purchase.biz.purchasebill.PurchaseBill; +import com.yxt.purchase.biz.purchasebill.PurchaseBillService; +import com.yxt.purchase.biz.purchasebill.PurchaseChoiceBillDetailsVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; + +@Service +public class PurchasebackBillService extends MybatisBaseService { + + @Autowired + private PurchasebackDetailService purchasebackDetailService; + @Autowired + private PurchaseBillService purchaseBillService; + + public ResultBean> listPageVo(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PurchasebackBillQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgLevelKey())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = query.getOrgLevelKey(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } + }/* else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + }*/ + if (StringUtils.isNotBlank(query.getCreateOrgName())) { + qw.like("ppb.createOrgName", query.getCreateOrgName()); + } + if (StringUtils.isNotBlank(query.getDeptName())) { + qw.like("ppb.deptName", query.getDeptName()); + } + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.like("ppb.createByName", query.getCreateByName()); + } + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("ppb.billNo", query.getBillNo()); + } + if (StringUtils.isNotBlank(query.getSourceBillNo())) { + qw.like("pb.billNo", query.getSourceBillNo()); + } + if (StringUtils.isNotBlank(query.getPurchaseTypeValue())) { + qw.like("pb.purchaseTypeValue", query.getPurchaseTypeValue()); + } + if (StringUtils.isNotBlank(query.getPurchaseReasonValue())) { + qw.like("pb.purchaseReasonValue", query.getPurchaseReasonValue()); + } + if (StringUtils.isNotBlank(query.getPayTypeValue())) { + qw.like("pb.payTypeValue", query.getPayTypeValue()); + } + if (StringUtils.isNotBlank(query.getSupplierName())) { + qw.like("pb.supplierName", query.getSupplierName()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndTime), "date_format (ppb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + String finishStartTime = query.getFinishStartTime(); + String finishEndTime = query.getFinishEndTime(); + qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')" + ); + qw.orderByDesc("ppb.createTime"); + qw.groupBy("ppb.sid"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } + + public ResultBean saveOrUpdateDto(PurchasebackBillDto dto) { + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + List purchasebackDetailList = dto.getPurchasebackDetailList(); + if (StringUtils.isBlank(dtoSid)) { + String sid = this.insertByDto(dto); + for (PurchasebackDetailDto purchasebackDetailDto : purchasebackDetailList) { + purchasebackDetailDto.setBillSid(sid); + purchasebackDetailService.saveOrUpdateDto(purchasebackDetailDto); + } + return rb.success().setData(sid); + } + this.updateByDto(dto); + purchasebackDetailService.delByMainSid(dtoSid); + for (PurchasebackDetailDto purchasebackDetailDto : purchasebackDetailList) { + purchasebackDetailDto.setBillSid(dtoSid); + purchasebackDetailService.saveOrUpdateDto(purchasebackDetailDto); + } + return rb.success().setData(dtoSid); + } + + public String insertByDto(PurchasebackBillDto dto) { + PurchasebackBill entity = new PurchasebackBill(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return entity.getSid(); + } + + public void updateByDto(PurchasebackBillDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + PurchasebackBill entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public PurchasebackBillDetailsVo fetchDetailsVoBySid(String sid) { + PurchasebackBill entity = fetchBySid(sid); + PurchasebackBillDetailsVo vo = new PurchasebackBillDetailsVo(); + BeanUtil.copyProperties(entity, vo); + List purchasebackDetailDetailsVos = purchasebackDetailService.selByMainSid(sid); + for (PurchasebackDetailDetailsVo purchasebackDetailDetailsVo : purchasebackDetailDetailsVos) { + purchasebackDetailDetailsVo.setAmount(purchasebackDetailDetailsVo.getCount().multiply(purchasebackDetailDetailsVo.getTaxPrice())); + } + vo.setPurchasebackDetailList(purchasebackDetailDetailsVos); + PurchaseBill purchaseBill = purchaseBillService.fetchBySid(entity.getSourceBillSid()); + PurchaseChoiceBillDetailsVo purchaseChoiceBillDetailsVo = new PurchaseChoiceBillDetailsVo(); + BeanUtil.copyProperties(purchaseBill, purchaseChoiceBillDetailsVo); + vo.setPurchaseChoiceBillDetailsVo(purchaseChoiceBillDetailsVo); + return vo; + } + + public ResultBean delAll(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + //查询该sid中是否有流程不是待提交的 + int count = baseMapper.selectBySid(StringUtils.join(sids, ",")); + if (count > 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); + } + delBySids(sids); + for (String sid : sids) { + purchasebackDetailService.delByMainSid(sid); + } + return rb.success(); + } +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillVo.java b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillVo.java new file mode 100644 index 0000000..693b741 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillVo.java @@ -0,0 +1,89 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.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; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackBillVo.java
+ * Class: com.yxt.pms.api.purchasebackbill.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 PurchasebackBillVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("创建时间") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结时间") + private Date finishTime; + @ApiModelProperty("来源单编号") + private String sourceBillNo; + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("退货金额") + private String backAmountCount; + @ApiModelProperty("应收金额") + private String receivableAmount; + + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("流程实例的sid") + private String procInstId; +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetail.java b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetail.java new file mode 100644 index 0000000..f1fff76 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetail.java @@ -0,0 +1,92 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.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; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackDetail.java
+ * Class: com.yxt.pms.api.purchasebackdetail.PmsPurchasebackDetail
+ * 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 = "采购退货单据明细") +@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/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDetailsVo.java new file mode 100644 index 0000000..9a71d53 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDetailsVo.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.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; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackDetailVo.java
+ * Class: com.yxt.pms.api.purchasebackdetail.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 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/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDto.java b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDto.java new file mode 100644 index 0000000..1a304e2 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDto.java @@ -0,0 +1,92 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.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; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackDetailDto.java
+ * Class: com.yxt.pms.api.purchasebackdetail.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 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/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.java b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.java new file mode 100644 index 0000000..8995917 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebackdetail; + +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.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.math.BigDecimal; +import java.util.List; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackDetailMapper.java
+ * Class: com.yxt.pms.biz.purchasebackdetail.PmsPurchasebackDetailMapper
+ * Description: 采购退货单据明细.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:47
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PurchasebackDetailMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + @Delete("delete from pms_purchaseback_detail where billSid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from pms_purchaseback_detail where billSid = #{billSid}") + List selByMainSid(String billSid); + + BigDecimal checkReturnedCount(@Param("goodsSkuSid") String goodsSkuSid,@Param("sourceBillSid") String sourceBillSid); +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.xml new file mode 100644 index 0000000..49007bb --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailQuery.java b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailQuery.java new file mode 100644 index 0000000..452eb82 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailQuery.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebackdetail; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackDetailQuery.java
+ * Class: com.yxt.pms.api.purchasebackdetail.PmsPurchasebackDetailQuery
+ * 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 PurchasebackDetailQuery implements Query { + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailService.java b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailService.java new file mode 100644 index 0000000..0a0f9c9 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailService.java @@ -0,0 +1,93 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebackdetail; + +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.vo.PagerVo; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.List; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackDetailService.java
+ * Class: com.yxt.pms.biz.purchasebackdetail.PmsPurchasebackDetailService
+ * Description: 采购退货单据明细 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:47
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class PurchasebackDetailService extends MybatisBaseService { + + public PagerVo listPageVo(PagerQuery pq) { + PurchasebackDetailQuery 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(PurchasebackDetailDto dto){ + this.insertByDto(dto); + } + + public void insertByDto(PurchasebackDetailDto dto){ + PurchasebackDetail entity = new PurchasebackDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public PurchasebackDetailDetailsVo fetchDetailsVoBySid(String sid){ + PurchasebackDetail entity = fetchBySid(sid); + PurchasebackDetailDetailsVo vo = new PurchasebackDetailDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public List selByMainSid(String billSid) { + return baseMapper.selByMainSid(billSid); + } + + public BigDecimal checkReturnedCount(String goodsSkuSid,String sourceBillSid) { + return baseMapper.checkReturnedCount(goodsSkuSid,sourceBillSid); + } +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailVo.java b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailVo.java new file mode 100644 index 0000000..3f55d15 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailVo.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebackdetail; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackDetailVo.java
+ * Class: com.yxt.pms.api.purchasebackdetail.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 PurchasebackDetailVo implements Vo { + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBill.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBill.java new file mode 100644 index 0000000..103af04 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBill.java @@ -0,0 +1,103 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebill; + +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.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBill.java
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBill
+ * Description: 采购单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:45
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单", description = "采购单") +@TableName("purchase_bill") +public class PurchaseBill extends BaseEntity { + private static final long serialVersionUID = 1L; + + @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("采购原因key") + private String purchaseReasonKey; // 采购原因key + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; // 采购原因（储备/客户订单/在修车辆） + @ApiModelProperty("付款方式key") + private String payTypeKey; // 付款方式key + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; // 付款方式value（预付款/月结/单笔付款） + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商联系电话") + private String supplierPhone; // 供应商联系电话 + @ApiModelProperty("采购员sid（单选）") + private String purchaserSid; // 采购员sid（单选） + @ApiModelProperty("采购员姓名") + private String purchaserName; // 采购员姓名 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预计到货日期") + private Date deliveryDate; // 预计到货日期 + @ApiModelProperty("仓库sid") + private String wareHouseSid; + @ApiModelProperty("仓库名称") + private String wareHouseName; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("创建部门sid") + private String deptSid; + @ApiModelProperty("创建部门") + private String deptName; + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDetailsVo.java new file mode 100644 index 0000000..6478c44 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDetailsVo.java @@ -0,0 +1,107 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDetailsVo; +import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDto; +import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDetailsVo; +import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDto; +import com.yxt.purchase.biz.purchasebillextend.PurchaseBillExtendDetailsVo; +import com.yxt.purchase.biz.purchasebillextend.PurchaseBillExtendDto; +import com.yxt.purchase.biz.purchasebillinvoice.PurchaseBillInvoiceDetailsVo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(value = "采购单 视图数据详情", description = "采购单 视图数据详情") +public class PurchaseBillDetailsVo implements Vo { + + private String 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("采购原因key") + private String purchaseReasonKey; // 采购原因key + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; // 采购原因（储备/客户订单/在修车辆） + @ApiModelProperty("付款方式key") + private String payTypeKey; // 付款方式key + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; // 付款方式value（预付款/月结/单笔付款） + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商联系电话") + private String supplierPhone; // 供应商联系电话 + @ApiModelProperty("采购员sid（单选）") + private String purchaserSid; // 采购员sid（单选） + @ApiModelProperty("采购员姓名") + private String purchaserName; // 采购员姓名 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预计到货日期") + private Date deliveryDate; // 预计到货日期 + @ApiModelProperty("仓库sid") + private String wareHouseSid; + @ApiModelProperty("仓库名称") + private String wareHouseName; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("创建部门sid") + private String deptSid; + @ApiModelProperty("创建部门") + private String deptName; + + @ApiModelProperty("采购单费用/预付款") + private PurchaseBillAmountDetailsVo purchaseBillAmount; + @ApiModelProperty("采购单扩展") + private PurchaseBillExtendDetailsVo purchaseBillExtend; + @ApiModelProperty("采购单商品明细") + private List purchaseBillDetailList; +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDto.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDto.java new file mode 100644 index 0000000..39bbcb9 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillDto.java @@ -0,0 +1,104 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDto; +import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDto; +import com.yxt.purchase.biz.purchasebillextend.PurchaseBillExtendDto; +import com.yxt.purchase.biz.purchasebillinvoice.PurchaseBillInvoiceDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(value = "采购单 数据传输对象", description = "采购单 数据传输对象") +public class PurchaseBillDto implements Dto { + + private String 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("采购原因key") + private String purchaseReasonKey; // 采购原因key + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; // 采购原因（储备/客户订单/在修车辆） + @ApiModelProperty("付款方式key") + private String payTypeKey; // 付款方式key + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; // 付款方式value（预付款/月结/单笔付款） + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商联系电话") + private String supplierPhone; // 供应商联系电话 + @ApiModelProperty("采购员sid（单选）") + private String purchaserSid; // 采购员sid（单选） + @ApiModelProperty("采购员姓名") + private String purchaserName; // 采购员姓名 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预计到货日期") + private Date deliveryDate; // 预计到货日期 + @ApiModelProperty("仓库sid") + private String wareHouseSid; + @ApiModelProperty("仓库名称") + private String wareHouseName; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("创建部门sid") + private String deptSid; + @ApiModelProperty("创建部门") + private String deptName; + + @ApiModelProperty("采购单费用/预付款") + private PurchaseBillAmountDto purchaseBillAmount; + @ApiModelProperty("采购单扩展") + private PurchaseBillExtendDto purchaseBillExtend; + @ApiModelProperty("采购单商品明细") + private List purchaseBillDetailList; +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.java new file mode 100644 index 0000000..181a98c --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebill; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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 java.util.Map; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillMapper.java
+ * Class: com.yxt.pms.biz.purchasebill.PmsPurchaseBillMapper
+ * 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 + */ +@Mapper +public interface PurchaseBillMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + IPage choiceBillListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + String selectNum(String billNo); +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml new file mode 100644 index 0000000..55ea4fc --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java new file mode 100644 index 0000000..1bb78b9 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebill; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillQuery.java
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillQuery
+ * Description: 采购单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:45
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单 查询条件", description = "采购单 查询条件") +public class PurchaseBillQuery implements Query { + + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("仓库名称") + private String wareHouseName; + @ApiModelProperty("收货状态key") + private String receiveStateKey; + @ApiModelProperty("物流单号") + private String logisticsNum; + @ApiModelProperty("发货状态key") + private String deliveryStateKey; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("采购员姓名") + private String purchaserName; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("创建开始日期") + private String createStartTime; + @ApiModelProperty("创建结束日期") + private String createEndTime; + + private String orgLevelKey; + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java new file mode 100644 index 0000000..b80d67c --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java @@ -0,0 +1,180 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebill; + +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.purchase.biz.purchasebillamount.PurchaseBillAmountDetailsVo; +import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountDto; +import com.yxt.purchase.biz.purchasebillamount.PurchaseBillAmountService; +import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDetailsVo; +import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDto; +import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailService; +import com.yxt.purchase.biz.purchasebillextend.PurchaseBillExtendDetailsVo; +import com.yxt.purchase.biz.purchasebillextend.PurchaseBillExtendDto; +import com.yxt.purchase.biz.purchasebillextend.PurchaseBillExtendService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; + +@Service +public class PurchaseBillService extends MybatisBaseService { + + @Autowired + private PurchaseBillAmountService purchaseBillAmountService; + @Autowired + private PurchaseBillExtendService purchaseBillExtendService; + @Autowired + private PurchaseBillDetailService purchaseBillDetailService; + + + public PagerVo listPageVo(PagerQuery pq) { + PurchaseBillQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getSupplierName())) { + qw.like("pb.supplierName", query.getSupplierName()); + } + if (StringUtils.isNotBlank(query.getWareHouseName())) { + qw.like("pb.wareHouseName", query.getWareHouseName()); + } + if (StringUtils.isNotBlank(query.getReceiveStateKey())) { + qw.eq("pbe.receiveStateValue", query.getReceiveStateKey()); + } + if (StringUtils.isNotBlank(query.getLogisticsNum())) { + qw.like("pbe.logisticsNum", query.getLogisticsNum()); + } + if (StringUtils.isNotBlank(query.getDeliveryStateKey())) { + qw.eq("pbe.deliveryStateValue", query.getDeliveryStateKey()); + } + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("pb.billNo", query.getBillNo()); + } + if (StringUtils.isNotBlank(query.getPurchaserName())) { + qw.like("pb.purchaserName", query.getPurchaserName()); + } + if (StringUtils.isNotBlank(query.getRemarks())) { + qw.like("pb.remarks", query.getRemarks()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + qw.orderByDesc("pb.createTime"); + qw.groupBy("pb.sid"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public String saveOrUpdateDto(PurchaseBillDto dto) { + String dtoSid = dto.getSid(); + PurchaseBillAmountDto purchaseBillAmount = dto.getPurchaseBillAmount(); + PurchaseBillExtendDto purchaseBillExtend = dto.getPurchaseBillExtend(); + List purchaseBillDetailList = dto.getPurchaseBillDetailList(); + if (StringUtils.isBlank(dtoSid)) { + String sid = this.insertByDto(dto); + //保存采购单费用/预付款 + purchaseBillAmount.setBillSid(sid); + purchaseBillAmountService.insertByDto(purchaseBillAmount); + //保存采购单扩展 + purchaseBillExtend.setBillSid(sid); + purchaseBillExtendService.insertByDto(purchaseBillExtend); + //保存商品信息 + for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) { + purchaseBillDetailDto.setBillSid(sid); + purchaseBillDetailService.insertByDto(purchaseBillDetailDto); + } + return sid; + } + this.updateByDto(dto); + purchaseBillAmountService.delByMainSid(dtoSid); + purchaseBillExtendService.delByMainSid(dtoSid); + purchaseBillDetailService.delByMainSid(dtoSid); + //保存采购单费用/预付款 + purchaseBillAmount.setBillSid(dtoSid); + purchaseBillAmountService.insertByDto(purchaseBillAmount); + //保存采购单扩展 + purchaseBillExtend.setBillSid(dtoSid); + purchaseBillExtendService.insertByDto(purchaseBillExtend); + //保存商品信息 + for (PurchaseBillDetailDto purchaseBillDetailDto : purchaseBillDetailList) { + purchaseBillDetailDto.setBillSid(dtoSid); + purchaseBillDetailService.insertByDto(purchaseBillDetailDto); + } + return dtoSid; + } + + public String insertByDto(PurchaseBillDto dto) { + PurchaseBill entity = new PurchaseBill(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return entity.getSid(); + } + + public void updateByDto(PurchaseBillDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + PurchaseBill entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public PurchaseBillDetailsVo fetchDetailsVoBySid(String sid) { + PurchaseBill entity = fetchBySid(sid); + PurchaseBillDetailsVo vo = new PurchaseBillDetailsVo(); + BeanUtil.copyProperties(entity, vo); + PurchaseBillAmountDetailsVo purchaseBillAmountDetailsVo = purchaseBillAmountService.selByMainSid(sid); + vo.setPurchaseBillAmount(purchaseBillAmountDetailsVo); + PurchaseBillExtendDetailsVo purchaseBillExtendDetailsVo = purchaseBillExtendService.selByMainSid(sid); + vo.setPurchaseBillExtend(purchaseBillExtendDetailsVo); + List purchaseBillDetailDetailsVos = purchaseBillDetailService.selByMainSid(sid); + vo.setPurchaseBillDetailList(purchaseBillDetailDetailsVos); + return vo; + } + + public ResultBean delAll(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + delBySids(sids); + for (String sid : sids) { + purchaseBillAmountService.delByMainSid(sid); + purchaseBillExtendService.delByMainSid(sid); + purchaseBillDetailService.delByMainSid(sid); + } + return rb.success(); + } +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillVo.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillVo.java new file mode 100644 index 0000000..189096a --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillVo.java @@ -0,0 +1,90 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebill; + + +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.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillVo.java
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo
+ * 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 PurchaseBillVo implements Vo { + + private String sid; // sid + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("业务日期") + private Date createTime; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("采购员姓名") + private String purchaserName; + @ApiModelProperty("仓库名称") + private String wareHouseName; + @ApiModelProperty("收货状态value") + private Integer receiveStateValue; + @ApiModelProperty("商品总额") + private String amountTotal; + @ApiModelProperty("采购运费") + private BigDecimal freight; + @ApiModelProperty("其它费用") + private BigDecimal otherAmount; + @ApiModelProperty("预付金额") + private BigDecimal prepayment; + @ApiModelProperty("物流单号") + private String logisticsNum; + @ApiModelProperty("生产进度") + private String productProgress; + @ApiModelProperty("总采购数量") + private String countTotal; + @ApiModelProperty("发货状态value") + private Integer deliveryStateValue; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人姓名") + private String createByName; +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillDetailsVo.java new file mode 100644 index 0000000..5ab164e --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillDetailsVo.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebill; + + +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.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillVo.java
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo
+ * 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 PurchaseChoiceBillDetailsVo implements Vo { + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("单据日期") + private Date createTime; + @ApiModelProperty("采购员姓名") + private String purchaserName; + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; + @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)") + private String billType; + @ApiModelProperty("税率") + private BigDecimal taxRate; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("采购金额合计") + private BigDecimal amountCount; + @ApiModelProperty("运费") + private BigDecimal freight; + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; + @ApiModelProperty("误差调整金额") + private BigDecimal errorAmount; + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillQuery.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillQuery.java new file mode 100644 index 0000000..fcdde1d --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillQuery.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebill; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillQuery.java
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillQuery
+ * Description: 采购单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:45
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单原单 查询条件", description = "采购单 查询条件") +public class PurchaseChoiceBillQuery implements Query { + + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("申请人") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建开始日期") + private String createStartTime; + @ApiModelProperty("创建结束日期") + private String createEndTime; + @ApiModelProperty("办结开始日期") + private String finishStartTime; + @ApiModelProperty("办结结束日期") + private String finishEndTime; + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; + + private String createOrgSid; +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillVo.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillVo.java new file mode 100644 index 0000000..2d1079b --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillVo.java @@ -0,0 +1,92 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailDetailsVo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(value = "采购单 视图数据对象", description = "采购单 视图数据对象") +public class PurchaseChoiceBillVo implements Vo { + + private String sid; // sid + + /*仅页面展示*/ + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结时间") + private Date finishTime; + + @ApiModelProperty("单据编号") + private String billNo; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("单据日期") + private Date createTime; + @ApiModelProperty("采购员姓名") + private String purchaserName; + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; + @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)") + private String billType; + @ApiModelProperty("税率") + private BigDecimal taxRate; + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("采购金额合计") + private BigDecimal amountCount; + @ApiModelProperty("运费") + private BigDecimal freight; + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; + @ApiModelProperty("误差调整金额") + private BigDecimal errorAmount; + @ApiModelProperty("应付金额（=采购金额+运费-优惠金额）") + private BigDecimal payableAmount; + + @ApiModelProperty("采购单商品明细") + private List pmsPurchaseBillDetailList; +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmount.java b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmount.java new file mode 100644 index 0000000..c457ed9 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmount.java @@ -0,0 +1,82 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillamount; + +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; + +@Data +@ApiModel(value = "采购单-费用/预付款", description = "采购单-费用/预付款") +@TableName("purchase_bill_amount") +public class PurchaseBillAmount extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("误差调整金额") + private BigDecimal errorAmount; // 误差调整金额 + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; // 优惠金额 + @ApiModelProperty("应付金额") + private BigDecimal payableAmount; // 应付金额 + @ApiModelProperty("采购运费") + private BigDecimal freight; // 采购运费 + @ApiModelProperty("运费分摊方式Key") + private String freightShareTypeKey; // 运费分摊方式Key + @ApiModelProperty("运费分摊方式Value") + private String freightShareTypeValue; // 运费分摊方式Value + @ApiModelProperty("其它费用") + private BigDecimal otherAmount; // 其它费用 + @ApiModelProperty("其他费用分摊方式Key") + private String otherShareTypeKey; // 其他费用分摊方式Key + @ApiModelProperty("其他费用分摊方式Value") + private String otherShareTypeValue; // 其他费用分摊方式Value + @ApiModelProperty("结算账户") + private String settleAccount; // 结算账户 + @ApiModelProperty("预付金额") + private BigDecimal prepayment; // 预付金额 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("付款期限") + private Date paymentTerm; // 付款期限 + @ApiModelProperty("收款开户行") + private String bankName; // 收款开户行 + @ApiModelProperty("收款账户") + private String bankAccountName; // 收款账户 + @ApiModelProperty("收款银行账号") + private String bankAccount; // 收款银行账号 + @ApiModelProperty("币种") + private String currency; // 币种 + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDetailsVo.java new file mode 100644 index 0000000..ac7039a --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDetailsVo.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillamount; + + +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: caigou(采购)
+ * File: PurchaseBillAmountVo.java
+ * Class: com.yxt.purchase.api.purchasebillamount.PurchaseBillAmountVo
+ * Description: 采购单-费用/预付款 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-03 14:44:55
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单-费用/预付款 视图数据详情", description = "采购单-费用/预付款 视图数据详情") +public class PurchaseBillAmountDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("误差调整金额") + private BigDecimal errorAmount; // 误差调整金额 + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; // 优惠金额 + @ApiModelProperty("应付金额") + private BigDecimal payableAmount; // 应付金额 + @ApiModelProperty("采购运费") + private BigDecimal freight; // 采购运费 + @ApiModelProperty("运费分摊方式Key") + private String freightShareTypeKey; // 运费分摊方式Key + @ApiModelProperty("运费分摊方式Value") + private String freightShareTypeValue; // 运费分摊方式Value + @ApiModelProperty("其它费用") + private BigDecimal otherAmount; // 其它费用 + @ApiModelProperty("其他费用分摊方式Key") + private String otherShareTypeKey; // 其他费用分摊方式Key + @ApiModelProperty("其他费用分摊方式Value") + private String otherShareTypeValue; // 其他费用分摊方式Value + @ApiModelProperty("结算账户") + private String settleAccount; // 结算账户 + @ApiModelProperty("预付金额") + private BigDecimal prepayment; // 预付金额 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("付款期限") + private Date paymentTermStart; // 付款期限 + private Date paymentTermEnd; // 付款期限 + @ApiModelProperty("收款开户行") + private String bankName; // 收款开户行 + @ApiModelProperty("收款账户") + private String bankAccountName; // 收款账户 + @ApiModelProperty("收款银行账号") + private String bankAccount; // 收款银行账号 + @ApiModelProperty("币种") + private String currency; // 币种 + +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDto.java b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDto.java new file mode 100644 index 0000000..dd4935b --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDto.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillamount; + + +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: caigou(采购)
+ * File: PurchaseBillAmountDto.java
+ * Class: com.yxt.purchase.api.purchasebillamount.PurchaseBillAmountDto
+ * Description: 采购单-费用/预付款 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-03 14:44:55
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单-费用/预付款 数据传输对象", description = "采购单-费用/预付款 数据传输对象") +public class PurchaseBillAmountDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("误差调整金额") + private BigDecimal errorAmount; // 误差调整金额 + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; // 优惠金额 + @ApiModelProperty("应付金额") + private BigDecimal payableAmount; // 应付金额 + @ApiModelProperty("采购运费") + private BigDecimal freight; // 采购运费 + @ApiModelProperty("运费分摊方式Key") + private String freightShareTypeKey; // 运费分摊方式Key + @ApiModelProperty("运费分摊方式Value") + private String freightShareTypeValue; // 运费分摊方式Value + @ApiModelProperty("其它费用") + private BigDecimal otherAmount; // 其它费用 + @ApiModelProperty("其他费用分摊方式Key") + private String otherShareTypeKey; // 其他费用分摊方式Key + @ApiModelProperty("其他费用分摊方式Value") + private String otherShareTypeValue; // 其他费用分摊方式Value + @ApiModelProperty("结算账户") + private String settleAccount; // 结算账户 + @ApiModelProperty("预付金额") + private BigDecimal prepayment; // 预付金额 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("付款期限") + private Date paymentTermStart; // 付款期限 + private Date paymentTermEnd; // 付款期限 + @ApiModelProperty("收款开户行") + private String bankName; // 收款开户行 + @ApiModelProperty("收款账户") + private String bankAccountName; // 收款账户 + @ApiModelProperty("收款银行账号") + private String bankAccount; // 收款银行账号 + @ApiModelProperty("币种") + private String currency; // 币种 + +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountMapper.java b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountMapper.java new file mode 100644 index 0000000..9836613 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountMapper.java @@ -0,0 +1,41 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillamount; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +@Mapper +public interface PurchaseBillAmountMapper extends BaseMapper { + + @Delete("delete from purchase_bill_amount where billSid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from purchase_bill_amount where billSid = #{billSid}") + PurchaseBillAmountDetailsVo selByMainSid(String billSid); +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountMapper.xml new file mode 100644 index 0000000..7ade458 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountService.java b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountService.java new file mode 100644 index 0000000..7a92c0f --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountService.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillamount; + +import cn.hutool.core.bean.BeanUtil; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; + +import org.springframework.stereotype.Service; + +@Service +public class PurchaseBillAmountService extends MybatisBaseService { + + public void insertByDto(PurchaseBillAmountDto dto){ + PurchaseBillAmount entity = new PurchaseBillAmount(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public PurchaseBillAmountDetailsVo selByMainSid(String billSid) { + return baseMapper.selByMainSid(billSid); + } +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java new file mode 100644 index 0000000..5525b8d --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebilldetail; + +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.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetail.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetail
+ * 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 = "采购单据明细") +@TableName("purchase_bill_detail") +public class PurchaseBillDetail 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 goodsSN; // 商品条码 + @ApiModelProperty("货号") + private String goodsNum; // 货号 + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("单价") + private BigDecimal cost; // 单价 + @ApiModelProperty("采购数量") + private BigDecimal count; // 采购数量 + @ApiModelProperty("折扣率") + private BigDecimal discountRate; // 折扣率 + @ApiModelProperty("折后单价") + private BigDecimal discountPrice; // 折后单价 + @ApiModelProperty("分摊金额") + private BigDecimal shareAmount; // 分摊金额 + @ApiModelProperty("分配比例") + private BigDecimal shareRate; // 分配比例 + @ApiModelProperty("采购金额") + private BigDecimal amount; // 采购金额 + @ApiModelProperty("采购周期") + private Integer cycle; // 采购周期 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预期到货日期") + private Date deliveryDate; // 预期到货日期 + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("含税价") + private BigDecimal taxPrice; // 含税价 +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java new file mode 100644 index 0000000..89a657d --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebilldetail; + + +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.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailVo.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo
+ * 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 PurchaseBillDetailDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("备注") + private String remarks; + @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 goodsSN; // 商品条码 + @ApiModelProperty("货号") + private String goodsNum; // 货号 + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("单价") + private BigDecimal cost; // 单价 + @ApiModelProperty("采购数量") + private BigDecimal count; // 采购数量 + @ApiModelProperty("折扣率") + private BigDecimal discountRate; // 折扣率 + @ApiModelProperty("折后单价") + private BigDecimal discountPrice; // 折后单价 + @ApiModelProperty("分摊金额") + private BigDecimal shareAmount; // 分摊金额 + @ApiModelProperty("分配比例") + private BigDecimal shareRate; // 分配比例 + @ApiModelProperty("采购金额") + private BigDecimal amount; // 采购金额 + @ApiModelProperty("采购周期") + private Integer cycle; // 采购周期 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预期到货日期") + private Date deliveryDate; // 预期到货日期 + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("含税价") + private BigDecimal taxPrice; // 含税价 +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java new file mode 100644 index 0000000..4f3c6c4 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebilldetail; + + +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: PmsPurchaseBillDetailDto.java
+ * Class: com.yxt.pms.api.purchasebilldetail.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 PurchaseBillDetailDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("备注") + private String remarks; + @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 goodsSN; // 商品条码 + @ApiModelProperty("货号") + private String goodsNum; // 货号 + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("单价") + private BigDecimal cost; // 单价 + @ApiModelProperty("采购数量") + private BigDecimal count; // 采购数量 + @ApiModelProperty("折扣率") + private BigDecimal discountRate; // 折扣率 + @ApiModelProperty("折后单价") + private BigDecimal discountPrice; // 折后单价 + @ApiModelProperty("分摊金额") + private BigDecimal shareAmount; // 分摊金额 + @ApiModelProperty("分配比例") + private BigDecimal shareRate; // 分配比例 + @ApiModelProperty("采购金额") + private BigDecimal amount; // 采购金额 + @ApiModelProperty("采购周期") + private Integer cycle; // 采购周期 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预期到货日期") + private Date deliveryDate; // 预期到货日期 + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("含税价") + private BigDecimal taxPrice; // 含税价 +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.java new file mode 100644 index 0000000..54a6d22 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebilldetail; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailMapper.java
+ * Class: com.yxt.pms.biz.purchasebilldetail.PmsPurchaseBillDetailMapper
+ * 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 + */ +@Mapper +public interface PurchaseBillDetailMapper extends BaseMapper { + + @Delete("delete from purchase_bill_detail where billSid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from purchase_bill_detail where billSid = #{billSid}") + List selByMainSid(String billSid); + + IPage purDetailReForm(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage purSumReForm(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.xml new file mode 100644 index 0000000..efc501a --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailQuery.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailQuery.java new file mode 100644 index 0000000..504fb81 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailQuery.java @@ -0,0 +1,93 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebilldetail; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailQuery.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailQuery
+ * 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 PurchaseBillDetailQuery implements Query { + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @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; // 采购金额 +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailReportQuery.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailReportQuery.java new file mode 100644 index 0000000..51639dd --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailReportQuery.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebilldetail; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailVo.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo
+ * 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 PurchaseBillDetailReportQuery implements Query { + + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; + @ApiModelProperty("商品名称") + private String goodsSpuName; +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailReportVo.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailReportVo.java new file mode 100644 index 0000000..3a87168 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailReportVo.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebilldetail; + + +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: PmsPurchaseBillDetailVo.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo
+ * 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 PurchaseBillDetailReportVo implements Vo { + + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; + @ApiModelProperty("单位成本（进货价）") + private BigDecimal cost; + @ApiModelProperty("总体单位成本（进货价）") + private BigDecimal costCount; + @ApiModelProperty("税额") + private BigDecimal taxAmount; + @ApiModelProperty("税额合计") + private BigDecimal taxAmountCount; + @ApiModelProperty("含税价") + private BigDecimal taxPrice; + @ApiModelProperty("采购数量") + private BigDecimal count; + @ApiModelProperty("退货数量") + private BigDecimal retreatCount; + @ApiModelProperty("采购金额") + private BigDecimal amount; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("单位") + private String unit; +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailService.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailService.java new file mode 100644 index 0000000..3b4f97d --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailService.java @@ -0,0 +1,113 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebilldetail; + +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.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillDetailService.java
+ * Class: com.yxt.pms.biz.purchasebilldetail.PmsPurchaseBillDetailService
+ * 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 + */ +@Service +public class PurchaseBillDetailService extends MybatisBaseService { + + public void insertByDto(PurchaseBillDetailDto dto) { + PurchaseBillDetail entity = new PurchaseBillDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public List selByMainSid(String billSid) { + return baseMapper.selByMainSid(billSid); + } + + public PagerVo purDetailReForm(PagerQuery pq) { + PurchaseBillDetailReportQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getWarehouseName())) { + qw.like("pdd.warehouseName", query.getWarehouseName()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) { + qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec()); + } + if (StringUtils.isNotBlank(query.getGoodsSpuName())) { + qw.like("pdd.goodsSpuName", query.getGoodsSpuName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.purDetailReForm(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo purSumReForm(PagerQuery pq) { + PurchaseBillDetailReportQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getWarehouseName())) { + qw.like("pdd.warehouseName", query.getWarehouseName()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) { + qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec()); + } + if (StringUtils.isNotBlank(query.getGoodsSpuName())) { + qw.like("pdd.goodsSpuName", query.getGoodsSpuName()); + } + qw.eq("pdd.isDelete",0); + qw.groupBy("pdd.goodsSkuCode"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.purSumReForm(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailSumVo.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailSumVo.java new file mode 100644 index 0000000..bf679aa --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailSumVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebilldetail; + + +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: PmsPurchaseBillDetailVo.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo
+ * 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 PurchaseBillDetailSumVo implements Vo { + + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; + @ApiModelProperty("单位") + private String unit; + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; + @ApiModelProperty("采购数量") + private BigDecimal count; + @ApiModelProperty("采购金额") + private BigDecimal amount; + @ApiModelProperty("退货数量") + private BigDecimal retreatCount; + @ApiModelProperty("退货金额") + private BigDecimal backAmount; + @ApiModelProperty("门店") + private String useOrgName; +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailVo.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailVo.java new file mode 100644 index 0000000..233d7e9 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailVo.java @@ -0,0 +1,96 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebilldetail; + + +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: PmsPurchaseBillDetailVo.java
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo
+ * 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 PurchaseBillDetailVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @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; // 采购金额 + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtend.java b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtend.java new file mode 100644 index 0000000..e0d5ffa --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtend.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillextend; + +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: yxt-pms(采购)
+ * File: PmsPurchaseBillExtend.java
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtend
+ * 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 = "采购单扩展") +@TableName("purchase_bill_extend") +public class PurchaseBillExtend extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("物流单号") + private String logisticsNum; // 物流单号 + @ApiModelProperty("生产进度") + private String productProgress; // 生产进度 + @ApiModelProperty("收货状态key") + private String receiveStateKey; // 收货状态 + @ApiModelProperty("收货状态value") + private String receiveStateValue; + @ApiModelProperty("发货状态key") + private String deliveryStateKey; // 发货状态 + @ApiModelProperty("发货状态value") + private String deliveryStateValue; +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDetailsVo.java new file mode 100644 index 0000000..0b9b17b --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDetailsVo.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillextend; + + +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; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtendVo.java
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendVo
+ * 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 PurchaseBillExtendDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("物流单号") + private String logisticsNum; // 物流单号 + @ApiModelProperty("生产进度") + private String productProgress; // 生产进度 + @ApiModelProperty("收货状态key") + private String receiveStateKey; // 收货状态 + @ApiModelProperty("收货状态value") + private String receiveStateValue; + @ApiModelProperty("发货状态key") + private String deliveryStateKey; // 发货状态 + @ApiModelProperty("发货状态value") + private String deliveryStateValue; +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDto.java b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDto.java new file mode 100644 index 0000000..44c90f8 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDto.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillextend; + + +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.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtendDto.java
+ * Class: com.yxt.pms.api.purchasebillextend.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 PurchaseBillExtendDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("物流单号") + private String logisticsNum; // 物流单号 + @ApiModelProperty("生产进度") + private String productProgress; // 生产进度 + @ApiModelProperty("收货状态key") + private String receiveStateKey; // 收货状态 + @ApiModelProperty("收货状态value") + private String receiveStateValue; + @ApiModelProperty("发货状态key") + private String deliveryStateKey; // 发货状态 + @ApiModelProperty("发货状态value") + private String deliveryStateValue; +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendMapper.java b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendMapper.java new file mode 100644 index 0000000..19d14e8 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendMapper.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillextend; + +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.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtendMapper.java
+ * Class: com.yxt.pms.biz.purchasebillextend.PmsPurchaseBillExtendMapper
+ * 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 + */ +@Mapper +public interface PurchaseBillExtendMapper extends BaseMapper { + + @Delete("delete from purchase_bill_extend where billSid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from purchase_bill_extend where billSid = #{billSid}") + PurchaseBillExtendDetailsVo selByMainSid(String billSid); +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendMapper.xml new file mode 100644 index 0000000..3a78cb4 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendQuery.java b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendQuery.java new file mode 100644 index 0000000..77efad5 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendQuery.java @@ -0,0 +1,83 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillextend; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtendQuery.java
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendQuery
+ * 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 PurchaseBillExtendQuery implements Query { + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("采购单sid") + private String purchaseBillSid; // 采购单sid + @ApiModelProperty("加价方式（统一加价率、区间加价率、仓库加价率）") + private String markupType; // 加价方式（统一加价率、区间加价率、仓库加价率） + @ApiModelProperty("进价不同时的价格策略（加权平均、分别计价）") + private String priceStrategy; // 进价不同时的价格策略（加权平均、分别计价） + @ApiModelProperty("临时加价率") + private Integer tempMarkupRate; // 临时加价率 + @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 arrivalDateStart; // 到货日期 + private Date arrivalDateEnd; // 到货日期 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("付款期限") + private Date paymentTermStart; // 付款期限 + private Date paymentTermEnd; // 付款期限 + @ApiModelProperty("仓库sid") + private String wareHouseSid; // 仓库sid + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendService.java b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendService.java new file mode 100644 index 0000000..d6eaad0 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendService.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillextend; + +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.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtendService.java
+ * Class: com.yxt.pms.biz.purchasebillextend.PmsPurchaseBillExtendService
+ * 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 + */ +@Service +public class PurchaseBillExtendService extends MybatisBaseService { + + public void insertByDto(PurchaseBillExtendDto dto){ + PurchaseBillExtend entity = new PurchaseBillExtend(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public PurchaseBillExtendDetailsVo selByMainSid(String billSid) { + return baseMapper.selByMainSid(billSid); + } +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendVo.java b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendVo.java new file mode 100644 index 0000000..15a2903 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendVo.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillextend; + + +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; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillExtendVo.java
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendVo
+ * 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 PurchaseBillExtendVo implements Vo { + + 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 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 arrivalDateStart; // 到货日期 + private Date arrivalDateEnd; // 到货日期 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("付款期限") + private Date paymentTermStart; // 付款期限 + private Date paymentTermEnd; // 付款期限 + @ApiModelProperty("仓库sid") + private String wareHouseSid; // 仓库sid + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoice.java b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoice.java new file mode 100644 index 0000000..cbff21c --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoice.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillinvoice; + +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.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-pms(采购发票)
+ * File: PmsPurchaseBillInvoice.java
+ * Class: com.yxt.pms.api.purchasebillinvoice.PmsPurchaseBillInvoice
+ * Description: 采购单-发票.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单-发票", description = "采购单-发票") +@TableName("purchase_bill_invoice") +public class PurchaseBillInvoice extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("是否需要开发票（是1，否0）") + private Integer isInvoicing; // 是否需要开发票（是1，否0） + @ApiModelProperty("票据类型key") + private String billTypeKey; // 票据类型key + @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)") + private String billType; // 票据类型(不含税、增值税、普通税、已含增值税) + @ApiModelProperty("开票名称") + private String invoicingName; // 开票名称 + @ApiModelProperty("税号") + private String taxpayerNo; // 税号 + @ApiModelProperty("发票代码") + private String invoiceCode; // 发票代码 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("开票日期") + private Date invoiceDate; // 开票日期 + @ApiModelProperty("发票金额") + private BigDecimal invoiceAmount; // 发票金额 + @ApiModelProperty("税率") + private BigDecimal taxRate; // 税率 + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceDetailsVo.java new file mode 100644 index 0000000..9d2ad9f --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceDetailsVo.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillinvoice; + + +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.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-pms(采购发票)
+ * File: PmsPurchaseBillInvoiceVo.java
+ * Class: com.yxt.pms.api.purchasebillinvoice.PmsPurchaseBillInvoiceVo
+ * Description: 采购单-发票 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单-发票 视图数据详情", description = "采购单-发票 视图数据详情") +public class PurchaseBillInvoiceDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; // 是否需要开发票（是1，否0） + @ApiModelProperty("票据类型key") + private String billTypeKey; // 票据类型key + @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)") + private String billType; // 票据类型(不含税、增值税、普通税、已含增值税) + @ApiModelProperty("开票名称") + private String invoicingName; // 开票名称 + @ApiModelProperty("税号") + private String taxpayerNo; // 税号 + @ApiModelProperty("发票代码") + private String invoiceCode; // 发票代码 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("开票日期") + private Date invoiceDate; // 开票日期 + @ApiModelProperty("发票金额") + private BigDecimal invoiceAmount; // 发票金额 + @ApiModelProperty("税率") + private BigDecimal taxRate; // 税率 + +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceDto.java b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceDto.java new file mode 100644 index 0000000..b3c11d8 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceDto.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillinvoice; + + +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: PmsPurchaseBillInvoiceDto.java
+ * Class: com.yxt.pms.api.purchasebillinvoice.PmsPurchaseBillInvoiceDto
+ * Description: 采购单-发票 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单-发票 数据传输对象", description = "采购单-发票 数据传输对象") +public class PurchaseBillInvoiceDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; // 是否需要开发票（是1，否0） + @ApiModelProperty("票据类型key") + private String billTypeKey; // 票据类型key + @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)") + private String billType; // 票据类型(不含税、增值税、普通税、已含增值税) + @ApiModelProperty("开票名称") + private String invoicingName; // 开票名称 + @ApiModelProperty("税号") + private String taxpayerNo; // 税号 + @ApiModelProperty("发票代码") + private String invoiceCode; // 发票代码 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("开票日期") + private Date invoiceDate; // 开票日期 + @ApiModelProperty("发票金额") + private BigDecimal invoiceAmount; // 发票金额 + @ApiModelProperty("税率") + private BigDecimal taxRate; // 税率 + +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceMapper.java b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceMapper.java new file mode 100644 index 0000000..075490c --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceMapper.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillinvoice; + +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.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: yxt-pms(采购发票)
+ * File: PmsPurchaseBillInvoiceMapper.java
+ * Class: com.yxt.pms.biz.purchasebillinvoice.PmsPurchaseBillInvoiceMapper
+ * Description: 采购单-发票.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PurchaseBillInvoiceMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from pms_purchase_bill_invoice") + List selectListVo(); + + @Delete("delete from pms_purchase_bill_invoice where billSid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from pms_purchase_bill_invoice where billSid = #{sid}") + PurchaseBillInvoiceDetailsVo selByMainSid(String sid); +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceMapper.xml new file mode 100644 index 0000000..d96db5e --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceQuery.java b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceQuery.java new file mode 100644 index 0000000..58276b5 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceQuery.java @@ -0,0 +1,80 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillinvoice; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.query.Query; +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: PmsPurchaseBillInvoiceQuery.java
+ * Class: com.yxt.pms.api.purchasebillinvoice.PmsPurchaseBillInvoiceQuery
+ * Description: 采购单-发票 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单-发票 查询条件", description = "采购单-发票 查询条件") +public class PurchaseBillInvoiceQuery implements Query { + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("是否需要开发票（是1，否0）") + private Integer isInvoicing; // 是否需要开发票（是1，否0） + @ApiModelProperty("票据类型key") + private String billTypeKey; // 票据类型key + @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)") + private String billType; // 票据类型(不含税、增值税、普通税、已含增值税) + @ApiModelProperty("开票名称") + private String invoicingName; // 开票名称 + @ApiModelProperty("税号") + private String taxpayerNo; // 税号 + @ApiModelProperty("发票代码") + private String invoiceCode; // 发票代码 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("开票日期") + private Date invoiceDateStart; // 开票日期 + private Date invoiceDateEnd; // 开票日期 + @ApiModelProperty("发票金额") + private BigDecimal invoiceAmount; // 发票金额 + @ApiModelProperty("税率") + private BigDecimal taxRate; // 税率 + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceService.java b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceService.java new file mode 100644 index 0000000..fe958c8 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceService.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillinvoice; + +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.vo.PagerVo; +import org.springframework.stereotype.Service; + + +/** + * Project: yxt-pms(采购发票)
+ * File: PmsPurchaseBillInvoiceService.java
+ * Class: com.yxt.pms.biz.purchasebillinvoice.PmsPurchaseBillInvoiceService
+ * Description: 采购单-发票 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class PurchaseBillInvoiceService extends MybatisBaseService { + + private QueryWrapper createQueryWrapper(PurchaseBillInvoiceQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + PurchaseBillInvoiceQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(PurchaseBillInvoiceDto dto){ + this.insertByDto(dto); + } + + public void insertByDto(PurchaseBillInvoiceDto dto){ + PurchaseBillInvoice entity = new PurchaseBillInvoice(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public PurchaseBillInvoiceDetailsVo fetchDetailsVoBySid(String sid){ + PurchaseBillInvoice entity = fetchBySid(sid); + PurchaseBillInvoiceDetailsVo vo = new PurchaseBillInvoiceDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public PurchaseBillInvoiceDetailsVo selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } +} \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceVo.java b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceVo.java new file mode 100644 index 0000000..f7f7624 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceVo.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebillinvoice; + + +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.math.BigDecimal; +import java.util.Date; + +/** + * Project: yxt-pms(采购发票)
+ * File: PmsPurchaseBillInvoiceVo.java
+ * Class: com.yxt.pms.api.purchasebillinvoice.PmsPurchaseBillInvoiceVo
+ * Description: 采购单-发票 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单-发票 视图数据对象", description = "采购单-发票 视图数据对象") +public class PurchaseBillInvoiceVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("是否需要开发票（是1，否0）") + private Integer isInvoicing; // 是否需要开发票（是1，否0） + @ApiModelProperty("票据类型key") + private String billTypeKey; // 票据类型key + @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)") + private String billType; // 票据类型(不含税、增值税、普通税、已含增值税) + @ApiModelProperty("开票名称") + private String invoicingName; // 开票名称 + @ApiModelProperty("税号") + private String taxpayerNo; // 税号 + @ApiModelProperty("发票代码") + private String invoiceCode; // 发票代码 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("开票日期") + private Date invoiceDate; // 开票日期 + @ApiModelProperty("发票金额") + private BigDecimal invoiceAmount; // 发票金额 + @ApiModelProperty("税率") + private BigDecimal taxRate; // 税率 + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillService.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillService.java index bf74ce5..4c7e0cb 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillService.java +++ b/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillService.java @@ -51,7 +51,6 @@ public class PurchaseReceiptBillService extends MybatisBaseService