From 55c2b3912f393207ec5c51a860ad8bbb91e8752a Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 28 Jun 2024 16:49:36 +0800 Subject: [PATCH] 6-28 --- .../PurchaseReceiptBillDetailRest.java | 64 ++++++++++++++++ .../apiadmin/PurchaseReceiptBillRest.java | 4 +- .../PurchaseReceiptBill.java | 2 - .../PurchaseReceiptBillDto.java | 4 + .../PurchaseReceiptBillService.java | 1 + .../PurchaseReceiptBillDetail.java | 34 +++++++++ .../PurchaseReceiptBillDetailDto.java | 39 ++++++++++ .../PurchaseReceiptBillDetailMapper.java | 22 ++++++ .../PurchaseReceiptBillDetailMapper.xml | 29 +++++++ .../PurchaseReceiptBillDetailQuery.java | 13 ++++ .../PurchaseReceiptBillDetailService.java | 75 +++++++++++++++++++ .../PurchaseReceiptBillDetailVo.java | 44 +++++++++++ 12 files changed, 327 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillDetailRest.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetail.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailDto.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailMapper.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailMapper.xml create mode 100644 src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailQuery.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailService.java create mode 100644 src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailVo.java diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillDetailRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillDetailRest.java new file mode 100644 index 0000000..0bd723a --- /dev/null +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillDetailRest.java @@ -0,0 +1,64 @@ +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.purchasereceiptbilldetail.PurchaseReceiptBillDetailDto; +import com.yxt.purchase.biz.purchasereceiptbilldetail.PurchaseReceiptBillDetailQuery; +import com.yxt.purchase.biz.purchasereceiptbilldetail.PurchaseReceiptBillDetailService; +import com.yxt.purchase.biz.purchasereceiptbilldetail.PurchaseReceiptBillDetailVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2024/2/26 15:49 + */ +@Api(tags = "采购入库预约单") +@RestController +@RequestMapping("/apiadmin/purchasereceiptbilldetail") +public class PurchaseReceiptBillDetailRest { + + @Autowired + PurchaseReceiptBillDetailService baseBrandInfoService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = baseBrandInfoService.listPage(pq); + return rb.success().setData(pv); + } + + + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody PurchaseReceiptBillDetailDto dto) { + return baseBrandInfoService.saveOrUpdate(dto); + } + + @ApiOperation("初始化") + @GetMapping("/initialization/{sid}") + public ResultBean initialization(@PathVariable("sid") String sid) { + return baseBrandInfoService.initialization(sid); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable("sid") String sid) { + return baseBrandInfoService.delete(sid); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + baseBrandInfoService.delAll(sids); + return rb.success(); + } + +} diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillRest.java index 6838af9..e045ece 100644 --- a/src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillRest.java +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillRest.java @@ -15,9 +15,9 @@ import java.util.List; * @author wangpengfei * @date 2024/2/26 15:49 */ -@Api(tags = "商品品牌") +@Api(tags = "采购入库预约单") @RestController -@RequestMapping("/apiadmin/base/basegoodsbrand") +@RequestMapping("/apiadmin/purchasereceiptbill") public class PurchaseReceiptBillRest { @Autowired diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBill.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBill.java index 7c38d8e..0a777db 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBill.java +++ b/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBill.java @@ -37,6 +37,4 @@ public class PurchaseReceiptBill extends BaseEntity { private String payableAmount;//应付金额（=采购金额+运费-优惠金额） private String useOrgSid;//使用组织sid private String createOrgSid;//创建组织sid - - } diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillDto.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillDto.java index 7417601..1c96105 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillDto.java +++ b/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillDto.java @@ -2,9 +2,12 @@ package com.yxt.purchase.biz.purchasereceiptbill; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; +import com.yxt.purchase.biz.purchasereceiptbilldetail.PurchaseReceiptBillDetailDto; import lombok.Data; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * @author wangpengfei @@ -44,4 +47,5 @@ public class PurchaseReceiptBillDto implements Dto { private String payableAmount;//应付金额（=采购金额+运费-优惠金额） private String useOrgSid;//使用组织sid private String createOrgSid;//创建组织sid + private List purchaseReceiptBillDetail=new ArrayList<>(); } 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 4c7e0cb..bf74ce5 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillService.java +++ b/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillService.java @@ -51,6 +51,7 @@ public class PurchaseReceiptBillService extends MybatisBaseService { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + PurchaseReceiptBillDetailVo initialization (@Param("sid") String sid); + int updateBySidIsDelete(List list); +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailMapper.xml new file mode 100644 index 0000000..45f5966 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + UPDATE purchase_receipt_bill_detail + SET isDelete=1 + where sid in + + #{item} + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailQuery.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailQuery.java new file mode 100644 index 0000000..3959ad0 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailQuery.java @@ -0,0 +1,13 @@ +package com.yxt.purchase.biz.purchasereceiptbilldetail; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class PurchaseReceiptBillDetailQuery implements Query { + private String name; +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailService.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailService.java new file mode 100644 index 0000000..05c791b --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailService.java @@ -0,0 +1,75 @@ +package com.yxt.purchase.biz.purchasereceiptbilldetail; + +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.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.stream.Collectors; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class PurchaseReceiptBillDetailService extends MybatisBaseService { + @Autowired + private FileUploadComponent fileUploadComponent; + + public PagerVo listPage(PagerQuery pq) { + PurchaseReceiptBillDetailQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdate(PurchaseReceiptBillDetailDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + if (StringUtils.isBlank(sid)) { + PurchaseReceiptBillDetail PurchaseReceiptBill = new PurchaseReceiptBillDetail(); + BeanUtil.copyProperties(dto, PurchaseReceiptBill, "sid"); + sid = PurchaseReceiptBill.getSid(); + baseMapper.insert(PurchaseReceiptBill); + + } else { + PurchaseReceiptBillDetail PurchaseReceiptBill = fetchBySid(sid); + if (PurchaseReceiptBill == null) { + return rb.setMsg("该单据不存在"); + } + BeanUtil.copyProperties(dto, PurchaseReceiptBill, "sid"); + baseMapper.updateById(PurchaseReceiptBill); + + } + return rb.success(); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + PurchaseReceiptBillDetailVo vo = baseMapper.initialization(sid); + return rb.success().setData(vo); + } + + + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.success().setMsg("成功"); + } + public void delAll(String[] sids) { + baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList())); + } + + +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailVo.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailVo.java new file mode 100644 index 0000000..eb6bd17 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailVo.java @@ -0,0 +1,44 @@ +package com.yxt.purchase.biz.purchasereceiptbilldetail; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class PurchaseReceiptBillDetailVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String billSid;//单据sid + private String goodsSid;//商品sid + private String goodsName;//商品名称 + private String goodsCode;//商品编码（图号） + private String specification;//规格 + private String goodsModel;//型号 + private double currentCount;//当前库存数量 + private String unit;//计量单位 + private String warehouseSid;//仓库sid + private String warehouseName;//仓库名称 + private String position;//货位 + private double cost;//单位成本（进货价） + private double count;//采购数量 + private double taxAmount;//税额（ + private double taxPrice;//含税价 + private double amount;//采购金额 + private double price1;//销售价1 + private double price2;//销售价2 +}