diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillInvoiceRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillInvoiceRest.java index 9ec767c..fc1a4f8 100644 --- a/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillInvoiceRest.java +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillInvoiceRest.java @@ -40,19 +40,4 @@ 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/PurchaseReceiptBillDetailRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillDetailRest.java deleted file mode 100644 index 0bd723a..0000000 --- a/src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillDetailRest.java +++ /dev/null @@ -1,64 +0,0 @@ -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 deleted file mode 100644 index e045ece..0000000 --- a/src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillRest.java +++ /dev/null @@ -1,62 +0,0 @@ -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.purchasereceiptbill.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/2/26 15:49 - */ -@Api(tags = "采购入库预约单") -@RestController -@RequestMapping("/apiadmin/purchasereceiptbill") -public class PurchaseReceiptBillRest { - - @Autowired - PurchaseReceiptBillService 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 PurchaseReceiptBillDto 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/PurchasebackDetailRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchasebackDetailRest.java index 9a20a60..000cd5f 100644 --- a/src/main/java/com/yxt/purchase/apiadmin/PurchasebackDetailRest.java +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchasebackDetailRest.java @@ -25,12 +25,8 @@ *********************************************************/ 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.*; @@ -41,20 +37,4 @@ 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/PurchasebackBillMapper.java b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.java index fcf6a46..047636c 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.java @@ -35,19 +35,6 @@ 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 { @@ -55,11 +42,7 @@ public interface PurchasebackBillMapper extends BaseMapper { 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 index f7cd3cd..826f43b 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.xml +++ b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.xml @@ -1,9 +1,9 @@ - + - SELECT ppb.sid, ppb.`nodeState`, @@ -39,24 +39,6 @@ limit 1 - - 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 index c547c07..171253b 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillQuery.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillQuery.java @@ -25,25 +25,11 @@ *********************************************************/ 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 { diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillService.java b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillService.java index 47270da..d956251 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillService.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillService.java @@ -142,7 +142,7 @@ public class PurchasebackBillService extends MybatisBaseService 0) { - return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); - } delBySids(sids); for (String sid : sids) { purchasebackDetailService.delByMainSid(sid); diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillVo.java b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillVo.java index 693b741..38d1031 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.purchase.biz.purchasebackbill; - import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -34,19 +33,6 @@ 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 { diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetail.java b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetail.java index f1fff76..0d707d0 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetail.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetail.java @@ -33,19 +33,6 @@ 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") diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDetailsVo.java index 9a71d53..9b74531 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDetailsVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDetailsVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.purchase.biz.purchasebackdetail; - import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -33,19 +32,6 @@ 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 { diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDto.java b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDto.java index 1a304e2..2b94979 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDto.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDto.java @@ -33,19 +33,6 @@ 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 { diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.java b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.java index 8995917..7e5433d 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.java @@ -25,10 +25,7 @@ *********************************************************/ 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; @@ -37,24 +34,9 @@ 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); diff --git a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.xml index 49007bb..dde72be 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.xml +++ b/src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.xml @@ -1,12 +1,8 @@ - + - - - - - \ 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 index 1bb78b9..e1b1a78 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java @@ -25,25 +25,11 @@ *********************************************************/ 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 { diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillVo.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillVo.java index 189096a..3e9811f 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.purchase.biz.purchasebill; - import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -35,19 +34,6 @@ 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 { diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillDetailsVo.java index 5ab164e..3b237e9 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillDetailsVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillDetailsVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.purchase.biz.purchasebill; - import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -35,19 +34,6 @@ 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 { diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillQuery.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillQuery.java index fcdde1d..ba27172 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillQuery.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillQuery.java @@ -25,25 +25,11 @@ *********************************************************/ 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 { diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java index 5525b8d..b848b54 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java @@ -35,19 +35,6 @@ 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") diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java index 89a657d..73c91c0 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.purchase.biz.purchasebilldetail; - import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -35,19 +34,6 @@ 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 { diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java index 4f3c6c4..187b197 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java @@ -35,19 +35,6 @@ 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 { diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.java b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.java index 54a6d22..3972f6f 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.java @@ -25,7 +25,6 @@ *********************************************************/ 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; @@ -37,19 +36,6 @@ 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 { diff --git a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.xml index efc501a..8a2645d 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.xml +++ b/src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.xml @@ -3,7 +3,6 @@ - - SELECT * FROM pms_purchase_bill_invoice ${ew.sqlSegment} - - - \ 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 index 58276b5..379ed73 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceQuery.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceQuery.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.purchase.biz.purchasebillinvoice; - import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModel; @@ -35,19 +34,6 @@ 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 { diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceService.java b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceService.java index fe958c8..23873c9 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceService.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceService.java @@ -26,50 +26,11 @@ 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(); @@ -77,13 +38,6 @@ public class PurchaseBillInvoiceService extends MybatisBaseService - * 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 { diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBill.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBill.java deleted file mode 100644 index 0a777db..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBill.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.yxt.purchase.biz.purchasereceiptbill; - -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:36 - */ -@Data -public class PurchaseReceiptBill extends BaseEntity { - - - private String sourceBillSid;//来源单sid（工单sid） - private String sourceBillNo;//来源单编号 - private String billNo;//单据编号 - private String createDate;//单据日期 - private String createUserSid;//制单人sid - private String createByName;//制单人姓名 - private String purchaseType;//采购类型（厂家采购、外采） - private String supplierSid;//供应商sid - private String supplierName;//供应商名称 - private String supplierPhone;//供应商联系电话 - private String billType;//票据类型(不含税、增值税、普通税、已含增值税) - private String markupType;//加价方式（统一加价率、区间加价率、仓库加价率） - private String priceStrategy;//进价不同时的价格策略（加权平均、分别计价） - private String isInvoicing;//是否需要开发票（是1，否0） - private String invoiceCode;//发票号码 - private String tempMarkupRate;//临时加价率 - private String purchaserSid;//采购员sid（单选） - private String purchaserName;// - private String storekeeperSid;//库管员sid（单选） - private String storekeeperName;// - private String errorAmount;//误差调整金额 - private String freight;//运费 - private String discountAmount;//优惠金额 - 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 deleted file mode 100644 index 1c96105..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillDto.java +++ /dev/null @@ -1,51 +0,0 @@ -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 - * @date 2024/2/26 13:38 - */ -@Data -public class PurchaseReceiptBillDto implements Dto { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - private String sourceBillSid;//来源单sid（工单sid） - private String sourceBillNo;//来源单编号 - private String billNo;//单据编号 - private String createDate;//单据日期 - private String createUserSid;//制单人sid - private String createByName;//制单人姓名 - private String purchaseType;//采购类型（厂家采购、外采） - private String supplierSid;//供应商sid - private String supplierName;//供应商名称 - private String supplierPhone;//供应商联系电话 - private String billType;//票据类型(不含税、增值税、普通税、已含增值税) - private String markupType;//加价方式（统一加价率、区间加价率、仓库加价率） - private String priceStrategy;//进价不同时的价格策略（加权平均、分别计价） - private String isInvoicing;//是否需要开发票（是1，否0） - private String invoiceCode;//发票号码 - private String tempMarkupRate;//临时加价率 - private String purchaserSid;//采购员sid（单选） - private String purchaserName;// - private String storekeeperSid;//库管员sid（单选） - private String storekeeperName;// - private String errorAmount;//误差调整金额 - private String freight;//运费 - private String discountAmount;//优惠金额 - 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/PurchaseReceiptBillMapper.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillMapper.java deleted file mode 100644 index 74e441e..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yxt.purchase.biz.purchasereceiptbill; - -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.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface PurchaseReceiptBillMapper extends BaseMapper { - - IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - PurchaseReceiptBillVo initialization (@Param("sid") String sid); - int updateBySidIsDelete(List list); -} diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillMapper.xml deleted file mode 100644 index 9846008..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - UPDATE purchase_receipt_bill - SET isDelete=1 - where sid in - - #{item} - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillQuery.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillQuery.java deleted file mode 100644 index 3bda734..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.purchase.biz.purchasereceiptbill; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:37 - */ -@Data -public class PurchaseReceiptBillQuery implements Query { - private String name; -} diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillService.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillService.java deleted file mode 100644 index 4c7e0cb..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillService.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.yxt.purchase.biz.purchasereceiptbill; - -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.Collections; -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Service -public class PurchaseReceiptBillService extends MybatisBaseService { - @Autowired - private FileUploadComponent fileUploadComponent; - - public PagerVo listPage(PagerQuery pq) { - PurchaseReceiptBillQuery 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(PurchaseReceiptBillDto dto) { - ResultBean rb = ResultBean.fireFail(); - String sid = dto.getSid(); - if (StringUtils.isBlank(sid)) { - PurchaseReceiptBill PurchaseReceiptBill = new PurchaseReceiptBill(); - BeanUtil.copyProperties(dto, PurchaseReceiptBill, "sid"); - sid = PurchaseReceiptBill.getSid(); - baseMapper.insert(PurchaseReceiptBill); - - } else { - PurchaseReceiptBill 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(); - PurchaseReceiptBillVo 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/purchasereceiptbill/PurchaseReceiptBillVo.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillVo.java deleted file mode 100644 index 4cc4dcc..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillVo.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.yxt.purchase.biz.purchasereceiptbill; - -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 PurchaseReceiptBillVo 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 sourceBillSid;//来源单sid（工单sid） - private String sourceBillNo;//来源单编号 - private String billNo;//单据编号 - private String createDate;//单据日期 - private String createUserSid;//制单人sid - private String createByName;//制单人姓名 - private String purchaseType;//采购类型（厂家采购、外采） - private String supplierSid;//供应商sid - private String supplierName;//供应商名称 - private String supplierPhone;//供应商联系电话 - private String billType;//票据类型(不含税、增值税、普通税、已含增值税) - private String markupType;//加价方式（统一加价率、区间加价率、仓库加价率） - private String priceStrategy;//进价不同时的价格策略（加权平均、分别计价） - private String isInvoicing;//是否需要开发票（是1，否0） - private String invoiceCode;//发票号码 - private String tempMarkupRate;//临时加价率 - private String purchaserSid;//采购员sid（单选） - private String purchaserName;// - private String storekeeperSid;//库管员sid（单选） - private String storekeeperName;// - private String errorAmount;//误差调整金额 - private String freight;//运费 - private String discountAmount;//优惠金额 - private String payableAmount;//应付金额（=采购金额+运费-优惠金额） - private String useOrgSid;//使用组织sid - private String createOrgSid;//创建组织sid -} diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetail.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetail.java deleted file mode 100644 index 5560969..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetail.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.yxt.purchase.biz.purchasereceiptbilldetail; - -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2024/2/26 13:36 - */ -@Data -public class PurchaseReceiptBillDetail extends BaseEntity { - - - 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 - - -} diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailDto.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailDto.java deleted file mode 100644 index c3ec37e..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailDto.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.yxt.purchase.biz.purchasereceiptbilldetail; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.dto.Dto; -import lombok.Data; - -import java.util.Date; - -/** - * @author wangpengfei - * @date 2024/2/26 13:38 - */ -@Data -public class PurchaseReceiptBillDetailDto implements Dto { - private String id; - private String sid; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String remarks; - private String isEnable; - 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 -} diff --git a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailMapper.java b/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailMapper.java deleted file mode 100644 index ea0ca54..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yxt.purchase.biz.purchasereceiptbilldetail; - -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.List; - -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ -@Mapper -public interface PurchaseReceiptBillDetailMapper extends BaseMapper { - - 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 deleted file mode 100644 index 45f5966..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - 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 deleted file mode 100644 index 3959ad0..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 05c791b..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailService.java +++ /dev/null @@ -1,75 +0,0 @@ -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 deleted file mode 100644 index eb6bd17..0000000 --- a/src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailVo.java +++ /dev/null @@ -1,44 +0,0 @@ -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 -}