Browse Source

oms系统管理迁移构建启动

master
God 11 months ago
parent
commit
617caf9e54
  1. 15
      src/main/java/com/yxt/purchase/apiadmin/PurchaseBillInvoiceRest.java
  2. 64
      src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillDetailRest.java
  3. 62
      src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillRest.java
  4. 20
      src/main/java/com/yxt/purchase/apiadmin/PurchasebackDetailRest.java
  5. 17
      src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.java
  6. 29
      src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.xml
  7. 14
      src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillQuery.java
  8. 9
      src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillService.java
  9. 14
      src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillVo.java
  10. 13
      src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetail.java
  11. 14
      src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDetailsVo.java
  12. 13
      src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDto.java
  13. 18
      src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.java
  14. 6
      src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.xml
  15. 14
      src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailQuery.java
  16. 31
      src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailService.java
  17. 14
      src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailVo.java
  18. 14
      src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBill.java
  19. 18
      src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.java
  20. 32
      src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml
  21. 14
      src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java
  22. 14
      src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillVo.java
  23. 14
      src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillDetailsVo.java
  24. 14
      src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseChoiceBillQuery.java
  25. 13
      src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetail.java
  26. 14
      src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDetailsVo.java
  27. 13
      src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailDto.java
  28. 14
      src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.java
  29. 1
      src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.xml
  30. 14
      src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailQuery.java
  31. 14
      src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailReportQuery.java
  32. 14
      src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailReportVo.java
  33. 13
      src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailService.java
  34. 14
      src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailSumVo.java
  35. 14
      src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailVo.java
  36. 16
      src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtend.java
  37. 17
      src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDetailsVo.java
  38. 16
      src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDto.java
  39. 19
      src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendMapper.java
  40. 14
      src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendQuery.java
  41. 19
      src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendService.java
  42. 14
      src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendVo.java
  43. 13
      src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoice.java
  44. 14
      src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceDetailsVo.java
  45. 14
      src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceDto.java
  46. 26
      src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceMapper.java
  47. 9
      src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceMapper.xml
  48. 14
      src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceQuery.java
  49. 46
      src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceService.java
  50. 14
      src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceVo.java
  51. 40
      src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBill.java
  52. 51
      src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillDto.java
  53. 22
      src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillMapper.java
  54. 29
      src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillMapper.xml
  55. 13
      src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillQuery.java
  56. 77
      src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillService.java
  57. 52
      src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillVo.java
  58. 34
      src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetail.java
  59. 39
      src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailDto.java
  60. 22
      src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailMapper.java
  61. 29
      src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailMapper.xml
  62. 13
      src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailQuery.java
  63. 75
      src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailService.java
  64. 44
      src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailVo.java

15
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<PurchaseBillInvoiceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
PurchaseBillInvoiceDetailsVo vo = purchaseBillInvoiceService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

64
src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillDetailRest.java

@ -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<PagerVo<PurchaseReceiptBillDetailVo>> listPage(@RequestBody PagerQuery<PurchaseReceiptBillDetailQuery> pq) {
ResultBean<PagerVo<PurchaseReceiptBillDetailVo>> rb = ResultBean.fireFail();
PagerVo<PurchaseReceiptBillDetailVo> pv = baseBrandInfoService.listPage(pq);
return rb.success().setData(pv);
}
@ApiOperation("保存修改")
@PostMapping("/saveOrUpdate")
public ResultBean<String> saveOrUpdate(@RequestBody PurchaseReceiptBillDetailDto dto) {
return baseBrandInfoService.saveOrUpdate(dto);
}
@ApiOperation("初始化")
@GetMapping("/initialization/{sid}")
public ResultBean<PurchaseReceiptBillDetailVo> 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();
}
}

62
src/main/java/com/yxt/purchase/apiadmin/PurchaseReceiptBillRest.java

@ -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<PagerVo<PurchaseReceiptBillVo>> listPage(@RequestBody PagerQuery<PurchaseReceiptBillQuery> pq) {
ResultBean<PagerVo<PurchaseReceiptBillVo>> rb = ResultBean.fireFail();
PagerVo<PurchaseReceiptBillVo> pv = baseBrandInfoService.listPage(pq);
return rb.success().setData(pv);
}
@ApiOperation("保存修改")
@PostMapping("/saveOrUpdate")
public ResultBean<String> saveOrUpdate(@RequestBody PurchaseReceiptBillDto dto) {
return baseBrandInfoService.saveOrUpdate(dto);
}
@ApiOperation("初始化")
@GetMapping("/initialization/{sid}")
public ResultBean<PurchaseReceiptBillVo> 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();
}
}

20
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<PurchasebackDetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
PurchasebackDetailDetailsVo vo = purchasebackDetailService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

17
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(采购) <br/>
* File: PmsPurchasebackBillMapper.java <br/>
* Class: com.yxt.pms.biz.purchasebackbill.PmsPurchasebackBillMapper <br/>
* Description: 采购退货单据. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface PurchasebackBillMapper extends BaseMapper<PurchasebackBill> {
@ -55,11 +42,7 @@ public interface PurchasebackBillMapper extends BaseMapper<PurchasebackBill> {
String selectNum(String billNo);
int updateFlowFiled(Map<String, Object> map);
int checkNodeStateBySourceBillSid(String sourceBillSid);
BigDecimal checkPayableAmountBySourceBillSid(String sourceBillSid);
int selectBySid(String join);
}

29
src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillMapper.xml

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillMapper">
<mapper namespace="com.yxt.purchase.biz.purchasebackbill.PurchasebackBillMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillVo">
<select id="selectPageVo" resultType="com.yxt.purchase.biz.purchasebackbill.PurchasebackBillVo">
SELECT
ppb.sid,
ppb.`nodeState`,
@ -39,24 +39,6 @@
limit 1
</select>
<update id="updateFlowFiled">
UPDATE pms_purchaseback_bill
SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
<if test="nodeState == '已办结' or nodeState == '终止'">
, finishTime = NOW()
</if>
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
<if test="procInsId != null and procInsId != ''">
, procInstId=#{procInsId}
</if>
<if test="taskId != null and taskId != ''">
, taskId=#{taskId}
</if>
WHERE sid=#{sid}
</update>
<select id="checkNodeStateBySourceBillSid" resultType="int">
SELECT COUNT(*)
FROM pms_purchaseback_bill
@ -73,11 +55,4 @@
ORDER BY createTime DESC
LIMIT 1
</select>
<select id="selectBySid" resultType="int">
SELECT COUNT(*)
FROM pms_purchaseback_bill
WHERE nodeState != '待提交'
and find_in_set(sid, #{list})
</select>
</mapper>

14
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(采购) <br/>
* File: PmsPurchasebackBillQuery.java <br/>
* Class: com.yxt.pms.api.purchasebackbill.PmsPurchasebackBillQuery <br/>
* Description: 采购退货单据 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 16:16:12 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购退货单据 查询条件", description = "采购退货单据 查询条件")
public class PurchasebackBillQuery implements Query {

9
src/main/java/com/yxt/purchase/biz/purchasebackbill/PurchasebackBillService.java

@ -142,7 +142,7 @@ public class PurchasebackBillService extends MybatisBaseService<PurchasebackBill
String sid = this.insertByDto(dto);
for (PurchasebackDetailDto purchasebackDetailDto : purchasebackDetailList) {
purchasebackDetailDto.setBillSid(sid);
purchasebackDetailService.saveOrUpdateDto(purchasebackDetailDto);
purchasebackDetailService.insertByDto(purchasebackDetailDto);
}
return rb.success().setData(sid);
}
@ -150,7 +150,7 @@ public class PurchasebackBillService extends MybatisBaseService<PurchasebackBill
purchasebackDetailService.delByMainSid(dtoSid);
for (PurchasebackDetailDto purchasebackDetailDto : purchasebackDetailList) {
purchasebackDetailDto.setBillSid(dtoSid);
purchasebackDetailService.saveOrUpdateDto(purchasebackDetailDto);
purchasebackDetailService.insertByDto(purchasebackDetailDto);
}
return rb.success().setData(dtoSid);
}
@ -190,11 +190,6 @@ public class PurchasebackBillService extends MybatisBaseService<PurchasebackBill
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);

14
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(采购) <br/>
* File: PmsPurchasebackBillVo.java <br/>
* Class: com.yxt.pms.api.purchasebackbill.PmsPurchasebackBillVo <br/>
* Description: 采购退货单据 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 16:16:12 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购退货单据 视图数据对象", description = "采购退货单据 视图数据对象")
public class PurchasebackBillVo implements Vo {

13
src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetail.java

@ -33,19 +33,6 @@ import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasebackDetail.java <br/>
* Class: com.yxt.pms.api.purchasebackdetail.PmsPurchasebackDetail <br/>
* Description: 采购退货单据明细. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 16:16:12 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购退货单据明细", description = "采购退货单据明细")
@TableName("purchaseback_detail")

14
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(采购) <br/>
* File: PmsPurchasebackDetailVo.java <br/>
* Class: com.yxt.pms.api.purchasebackdetail.PmsPurchasebackDetailVo <br/>
* Description: 采购退货单据明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 16:16:12 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购退货单据明细 视图数据详情", description = "采购退货单据明细 视图数据详情")
public class PurchasebackDetailDetailsVo implements Vo {

13
src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailDto.java

@ -33,19 +33,6 @@ import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasebackDetailDto.java <br/>
* Class: com.yxt.pms.api.purchasebackdetail.PmsPurchasebackDetailDto <br/>
* Description: 采购退货单据明细 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 16:16:12 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购退货单据明细 数据传输对象", description = "采购退货单据明细 数据传输对象")
public class PurchasebackDetailDto implements Dto {

18
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(采购) <br/>
* File: PmsPurchasebackDetailMapper.java <br/>
* Class: com.yxt.pms.biz.purchasebackdetail.PmsPurchasebackDetailMapper <br/>
* Description: 采购退货单据明细. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface PurchasebackDetailMapper extends BaseMapper<PurchasebackDetail> {
IPage<PurchasebackDetailVo> selectPageVo(IPage<PurchasebackDetail> page, @Param(Constants.WRAPPER) Wrapper<PurchasebackDetail> qw);
@Delete("delete from pms_purchaseback_detail where billSid = #{dtoSid}")
void delByMainSid(String dtoSid);

6
src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailMapper.xml

@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailMapper">
<mapper namespace="com.yxt.purchase.biz.purchasebackdetail.PurchasebackDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailVo">
SELECT * FROM pms_purchaseback_detail <where> ${ew.sqlSegment} </where>
</select>
<select id="checkReturnedCount" resultType="java.math.BigDecimal">
SELECT
IFNULL(SUM(ppd.backCount), 0)

14
src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailQuery.java

@ -25,24 +25,10 @@
*********************************************************/
package com.yxt.purchase.biz.purchasebackdetail;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasebackDetailQuery.java <br/>
* Class: com.yxt.pms.api.purchasebackdetail.PmsPurchasebackDetailQuery <br/>
* Description: 采购退货单据明细 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 16:16:12 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购退货单据明细 查询条件", description = "采购退货单据明细 查询条件")
public class PurchasebackDetailQuery implements Query {

31
src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailService.java

@ -26,45 +26,14 @@
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(采购) <br/>
* File: PmsPurchasebackDetailService.java <br/>
* Class: com.yxt.pms.biz.purchasebackdetail.PmsPurchasebackDetailService <br/>
* Description: 采购退货单据明细 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:47 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class PurchasebackDetailService extends MybatisBaseService<PurchasebackDetailMapper, PurchasebackDetail> {
public PagerVo<PurchasebackDetailVo> listPageVo(PagerQuery<PurchasebackDetailQuery> pq) {
PurchasebackDetailQuery query = pq.getParams();
QueryWrapper<PurchasebackDetail> qw = new QueryWrapper<>();
IPage<PurchasebackDetail> page = PagerUtil.queryToPage(pq);
IPage<PurchasebackDetailVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<PurchasebackDetailVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(PurchasebackDetailDto dto){
this.insertByDto(dto);
}
public void insertByDto(PurchasebackDetailDto dto){
PurchasebackDetail entity = new PurchasebackDetail();

14
src/main/java/com/yxt/purchase/biz/purchasebackdetail/PurchasebackDetailVo.java

@ -25,24 +25,10 @@
*********************************************************/
package com.yxt.purchase.biz.purchasebackdetail;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchasebackDetailVo.java <br/>
* Class: com.yxt.pms.api.purchasebackdetail.PmsPurchasebackDetailVo <br/>
* Description: 采购退货单据明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 16:16:12 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购退货单据明细 视图数据对象", description = "采购退货单据明细 视图数据对象")
public class PurchasebackDetailVo implements Vo {

14
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBill.java

@ -32,22 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchaseBill.java <br/>
* Class: com.yxt.pms.api.purchasebill.PmsPurchaseBill <br/>
* Description: 采购单. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:45 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单", description = "采购单")
@TableName("purchase_bill")

18
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.java

@ -26,34 +26,16 @@
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(采购) <br/>
* File: PmsPurchaseBillMapper.java <br/>
* Class: com.yxt.pms.biz.purchasebill.PmsPurchaseBillMapper <br/>
* Description: 采购单. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface PurchaseBillMapper extends BaseMapper<PurchaseBill> {
IPage<PurchaseBillVo> selectPageVo(IPage<PurchaseBill> page, @Param(Constants.WRAPPER) Wrapper<PurchaseBill> qw);
IPage<PurchaseChoiceBillVo> choiceBillListPage(IPage<PurchaseBill> page, @Param(Constants.WRAPPER) QueryWrapper<PurchaseBill> qw);
String selectNum(String billNo);
}

32
src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml

@ -34,37 +34,6 @@
<where> ${ew.sqlSegment} </where>
</select>
<select id="choiceBillListPage" resultType="com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseChoiceBillVo">
SELECT
ppb.`sid`,
ppb.`createOrgName`,
ppb.`deptName`,
ppb.`finishTime`,
ppb.billNo,
ppb.`createTime`,
ppb.`purchaserName`,
ppb.`purchaseTypeValue`,
ppb.`purchaseReasonValue`,
ppb.`payTypeValue`,
ppb.`supplierName`,
IF(ppbi.`isInvoicing` = 1, '是','否') AS isInvoicing,
ppbi.billType,
ppbi.taxRate,
ppb.`remarks`,
SUM(ppbd.`amount`) AS amountCount,
ppb.freight,
ppb.discountAmount,
ppb.errorAmount,
ppb.`payableAmount`
FROM
pms_purchase_bill ppb
LEFT JOIN pms_purchase_bill_invoice ppbi
ON ppbi.`billSid` = ppb.`sid`
LEFT JOIN pms_purchase_bill_detail ppbd
ON ppbd.`billSid` = ppb.`sid`
<where> ${ew.sqlSegment} </where>
</select>
<select id="selectNum" resultType="java.lang.String">
select RIGHT (billNo, 4)
from pms_purchase_bill
@ -72,5 +41,4 @@
order by billNo desc
limit 1
</select>
</mapper>

14
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(采购) <br/>
* File: PmsPurchaseBillQuery.java <br/>
* Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillQuery <br/>
* Description: 采购单 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:45 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单 查询条件", description = "采购单 查询条件")
public class PurchaseBillQuery implements Query {

14
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(采购) <br/>
* File: PmsPurchaseBillVo.java <br/>
* Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo <br/>
* Description: 采购单 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单 视图数据对象", description = "采购单 视图数据对象")
public class PurchaseBillVo implements Vo {

14
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(采购) <br/>
* File: PmsPurchaseBillVo.java <br/>
* Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo <br/>
* Description: 采购单 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单 视图数据对象", description = "采购单 视图数据对象")
public class PurchaseChoiceBillDetailsVo implements Vo {

14
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(采购) <br/>
* File: PmsPurchaseBillQuery.java <br/>
* Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillQuery <br/>
* Description: 采购单 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:45 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单原单 查询条件", description = "采购单 查询条件")
public class PurchaseChoiceBillQuery implements Query {

13
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(采购) <br/>
* File: PmsPurchaseBillDetail.java <br/>
* Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetail <br/>
* Description: 采购单据明细. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单据明细", description = "采购单据明细")
@TableName("purchase_bill_detail")

14
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(采购) <br/>
* File: PmsPurchaseBillDetailVo.java <br/>
* Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo <br/>
* Description: 采购单据明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单据明细 视图数据详情", description = "采购单据明细 视图数据详情")
public class PurchaseBillDetailDetailsVo implements Vo {

13
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(采购) <br/>
* File: PmsPurchaseBillDetailDto.java <br/>
* Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailDto <br/>
* Description: 采购单据明细 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单据明细 数据传输对象", description = "采购单据明细 数据传输对象")
public class PurchaseBillDetailDto implements Dto {

14
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(采购) <br/>
* File: PmsPurchaseBillDetailMapper.java <br/>
* Class: com.yxt.pms.biz.purchasebilldetail.PmsPurchaseBillDetailMapper <br/>
* Description: 采购单据明细. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface PurchaseBillDetailMapper extends BaseMapper<PurchaseBillDetail> {

1
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailMapper.xml

@ -3,7 +3,6 @@
<mapper namespace="com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="purDetailReForm" resultType="com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailReportVo">
SELECT
pdd.goodsSpuName,

14
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailQuery.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.purchase.biz.purchasebilldetail;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -33,19 +32,6 @@ import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchaseBillDetailQuery.java <br/>
* Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailQuery <br/>
* Description: 采购单据明细 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单据明细 查询条件", description = "采购单据明细 查询条件")
public class PurchaseBillDetailQuery implements Query {

14
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailReportQuery.java

@ -25,25 +25,11 @@
*********************************************************/
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(采购) <br/>
* File: PmsPurchaseBillDetailVo.java <br/>
* Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo <br/>
* Description: 采购单据明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单据明细 视图数据对象", description = "采购单据明细 视图数据对象")
public class PurchaseBillDetailReportQuery implements Query {

14
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailReportVo.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.purchase.biz.purchasebilldetail;
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(采购) <br/>
* File: PmsPurchaseBillDetailVo.java <br/>
* Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo <br/>
* Description: 采购单据明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单据明细 视图数据对象", description = "采购单据明细 视图数据对象")
public class PurchaseBillDetailReportVo implements Vo {

13
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailService.java

@ -37,19 +37,6 @@ import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchaseBillDetailService.java <br/>
* Class: com.yxt.pms.biz.purchasebilldetail.PmsPurchaseBillDetailService <br/>
* Description: 采购单据明细 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class PurchaseBillDetailService extends MybatisBaseService<PurchaseBillDetailMapper, PurchaseBillDetail> {

14
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailSumVo.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.purchase.biz.purchasebilldetail;
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(采购) <br/>
* File: PmsPurchaseBillDetailVo.java <br/>
* Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo <br/>
* Description: 采购单据明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单据明细 视图数据对象", description = "采购单据明细 视图数据对象")
public class PurchaseBillDetailSumVo implements Vo {

14
src/main/java/com/yxt/purchase/biz/purchasebilldetail/PurchaseBillDetailVo.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.purchase.biz.purchasebilldetail;
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(采购) <br/>
* File: PmsPurchaseBillDetailVo.java <br/>
* Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo <br/>
* Description: 采购单据明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单据明细 视图数据对象", description = "采购单据明细 视图数据对象")
public class PurchaseBillDetailVo implements Vo {

16
src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtend.java

@ -26,27 +26,11 @@
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(采购) <br/>
* File: PmsPurchaseBillExtend.java <br/>
* Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtend <br/>
* Description: 采购单扩展. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单扩展", description = "采购单扩展")
@TableName("purchase_bill_extend")

17
src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDetailsVo.java

@ -25,28 +25,11 @@
*********************************************************/
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(采购) <br/>
* File: PmsPurchaseBillExtendVo.java <br/>
* Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendVo <br/>
* Description: 采购单扩展 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单扩展 视图数据详情", description = "采购单扩展 视图数据详情")
public class PurchaseBillExtendDetailsVo implements Vo {

16
src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendDto.java

@ -26,27 +26,11 @@
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(采购) <br/>
* File: PmsPurchaseBillExtendDto.java <br/>
* Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendDto <br/>
* Description: 采购单扩展 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单扩展 数据传输对象", description = "采购单扩展 数据传输对象")
public class PurchaseBillExtendDto implements Dto {

19
src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendMapper.java

@ -25,30 +25,11 @@
*********************************************************/
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(采购) <br/>
* File: PmsPurchaseBillExtendMapper.java <br/>
* Class: com.yxt.pms.biz.purchasebillextend.PmsPurchaseBillExtendMapper <br/>
* Description: 采购单扩展. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface PurchaseBillExtendMapper extends BaseMapper<PurchaseBillExtend> {

14
src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendQuery.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.purchase.biz.purchasebillextend;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
@ -34,19 +33,6 @@ import lombok.Data;
import java.util.Date;
/**
* Project: yxt-pms(采购) <br/>
* File: PmsPurchaseBillExtendQuery.java <br/>
* Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendQuery <br/>
* Description: 采购单扩展 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单扩展 查询条件", description = "采购单扩展 查询条件")
public class PurchaseBillExtendQuery implements Query {

19
src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendService.java

@ -26,28 +26,9 @@
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(采购) <br/>
* File: PmsPurchaseBillExtendService.java <br/>
* Class: com.yxt.pms.biz.purchasebillextend.PmsPurchaseBillExtendService <br/>
* Description: 采购单扩展 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class PurchaseBillExtendService extends MybatisBaseService<PurchaseBillExtendMapper, PurchaseBillExtend> {

14
src/main/java/com/yxt/purchase/biz/purchasebillextend/PurchaseBillExtendVo.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.purchase.biz.purchasebillextend;
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(采购) <br/>
* File: PmsPurchaseBillExtendVo.java <br/>
* Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendVo <br/>
* Description: 采购单扩展 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 13:51:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单扩展 视图数据对象", description = "采购单扩展 视图数据对象")
public class PurchaseBillExtendVo implements Vo {

13
src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoice.java

@ -35,19 +35,6 @@ import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoice.java <br/>
* Class: com.yxt.pms.api.purchasebillinvoice.PmsPurchaseBillInvoice <br/>
* Description: 采购单-发票. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票", description = "采购单-发票")
@TableName("purchase_bill_invoice")

14
src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceDetailsVo.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.purchase.biz.purchasebillinvoice;
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(采购发票) <br/>
* File: PmsPurchaseBillInvoiceVo.java <br/>
* Class: com.yxt.pms.api.purchasebillinvoice.PmsPurchaseBillInvoiceVo <br/>
* Description: 采购单-发票 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票 视图数据详情", description = "采购单-发票 视图数据详情")
public class PurchaseBillInvoiceDetailsVo implements Vo {

14
src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceDto.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.purchase.biz.purchasebillinvoice;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
@ -35,19 +34,6 @@ import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: yxt-pms(采购发票) <br/>
* File: PmsPurchaseBillInvoiceDto.java <br/>
* Class: com.yxt.pms.api.purchasebillinvoice.PmsPurchaseBillInvoiceDto <br/>
* Description: 采购单-发票 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票 数据传输对象", description = "采购单-发票 数据传输对象")
public class PurchaseBillInvoiceDto implements Dto {

26
src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceMapper.java

@ -25,40 +25,14 @@
*********************************************************/
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(采购发票) <br/>
* File: PmsPurchaseBillInvoiceMapper.java <br/>
* Class: com.yxt.pms.biz.purchasebillinvoice.PmsPurchaseBillInvoiceMapper <br/>
* Description: 采购单-发票. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface PurchaseBillInvoiceMapper extends BaseMapper<PurchaseBillInvoice> {
IPage<PurchaseBillInvoiceVo> selectPageVo(IPage<PurchaseBillInvoice> page, @Param(Constants.WRAPPER) Wrapper<PurchaseBillInvoice> qw);
List<PurchaseBillInvoiceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<PurchaseBillInvoice> qw);
@Select("select * from pms_purchase_bill_invoice")
List<PurchaseBillInvoiceVo> selectListVo();
@Delete("delete from pms_purchase_bill_invoice where billSid = #{dtoSid}")
void delByMainSid(String dtoSid);

9
src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceMapper.xml

@ -1,13 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceMapper">
<mapper namespace="com.yxt.purchase.biz.purchasebillinvoice.PurchaseBillInvoiceMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo">
SELECT * FROM pms_purchase_bill_invoice <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo">
SELECT * FROM pms_purchase_bill_invoice <where> ${ew.sqlSegment} </where>
</select>
</mapper>

14
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(采购发票) <br/>
* File: PmsPurchaseBillInvoiceQuery.java <br/>
* Class: com.yxt.pms.api.purchasebillinvoice.PmsPurchaseBillInvoiceQuery <br/>
* Description: 采购单-发票 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票 查询条件", description = "采购单-发票 查询条件")
public class PurchaseBillInvoiceQuery implements Query {

46
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(采购发票) <br/>
* File: PmsPurchaseBillInvoiceService.java <br/>
* Class: com.yxt.pms.biz.purchasebillinvoice.PmsPurchaseBillInvoiceService <br/>
* Description: 采购单-发票 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class PurchaseBillInvoiceService extends MybatisBaseService<PurchaseBillInvoiceMapper, PurchaseBillInvoice> {
private QueryWrapper<PurchaseBillInvoice> createQueryWrapper(PurchaseBillInvoiceQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<PurchaseBillInvoice> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<PurchaseBillInvoiceVo> listPageVo(PagerQuery<PurchaseBillInvoiceQuery> pq) {
PurchaseBillInvoiceQuery query = pq.getParams();
QueryWrapper<PurchaseBillInvoice> qw = createQueryWrapper(query);
IPage<PurchaseBillInvoice> page = PagerUtil.queryToPage(pq);
IPage<PurchaseBillInvoiceVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<PurchaseBillInvoiceVo> 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<PurchaseBillI
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);
}

14
src/main/java/com/yxt/purchase/biz/purchasebillinvoice/PurchaseBillInvoiceVo.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.purchase.biz.purchasebillinvoice;
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(采购发票) <br/>
* File: PmsPurchaseBillInvoiceVo.java <br/>
* Class: com.yxt.pms.api.purchasebillinvoice.PmsPurchaseBillInvoiceVo <br/>
* Description: 采购单-发票 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-05-08 09:51:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购单-发票 视图数据对象", description = "采购单-发票 视图数据对象")
public class PurchaseBillInvoiceVo implements Vo {

40
src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBill.java

@ -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
}

51
src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillDto.java

@ -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<PurchaseReceiptBillDetailDto> purchaseReceiptBillDetail=new ArrayList<>();
}

22
src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillMapper.java

@ -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<PurchaseReceiptBill> {
IPage<PurchaseReceiptBillVo> listPage(IPage<PurchaseReceiptBill> page, @Param(Constants.WRAPPER) QueryWrapper<PurchaseReceiptBill> qw);
PurchaseReceiptBillVo initialization (@Param("sid") String sid);
int updateBySidIsDelete(List<String> list);
}

29
src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillMapper.xml

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.purchase.biz.purchasereceiptbill.PurchaseReceiptBillMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="listPage" resultType="com.yxt.purchase.biz.purchasereceiptbill.PurchaseReceiptBillVo">
select
*
from purchase_receipt_bill
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.purchase.biz.purchasereceiptbill.PurchaseReceiptBillVo">
select
a.*
from purchase_receipt_bill a
where a.sid =#{sid}
</select>
<update id="updateBySidIsDelete">
UPDATE purchase_receipt_bill
SET isDelete=1
where sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</update>
</mapper>

13
src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillQuery.java

@ -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;
}

77
src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillService.java

@ -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<PurchaseReceiptBillMapper, PurchaseReceiptBill> {
@Autowired
private FileUploadComponent fileUploadComponent;
public PagerVo<PurchaseReceiptBillVo> listPage(PagerQuery<PurchaseReceiptBillQuery> pq) {
PurchaseReceiptBillQuery query = pq.getParams();
QueryWrapper<PurchaseReceiptBill> qw = new QueryWrapper<>();
IPage<PurchaseReceiptBill> page = PagerUtil.queryToPage(pq);
IPage<PurchaseReceiptBillVo> pagging = baseMapper.listPage(page, qw);
PagerVo<PurchaseReceiptBillVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<String> saveOrUpdate(PurchaseReceiptBillDto dto) {
ResultBean<String> 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<PurchaseReceiptBillVo> 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()));
}
}

52
src/main/java/com/yxt/purchase/biz/purchasereceiptbill/PurchaseReceiptBillVo.java

@ -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
}

34
src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetail.java

@ -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
}

39
src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailDto.java

@ -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
}

22
src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailMapper.java

@ -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<PurchaseReceiptBillDetail> {
IPage<PurchaseReceiptBillDetailVo> listPage(IPage<PurchaseReceiptBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<PurchaseReceiptBillDetail> qw);
PurchaseReceiptBillDetailVo initialization (@Param("sid") String sid);
int updateBySidIsDelete(List<String> list);
}

29
src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailMapper.xml

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.purchase.biz.purchasereceiptbilldetail.PurchaseReceiptBillDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="listPage" resultType="com.yxt.purchase.biz.purchasereceiptbilldetail.PurchaseReceiptBillDetailVo">
select
*
from purchase_receipt_bill_detail
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.purchase.biz.purchasereceiptbilldetail.PurchaseReceiptBillDetailVo">
select
a.*
from purchase_receipt_bill_detail a
where a.sid =#{sid}
</select>
<update id="updateBySidIsDelete">
UPDATE purchase_receipt_bill_detail
SET isDelete=1
where sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</update>
</mapper>

13
src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailQuery.java

@ -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;
}

75
src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailService.java

@ -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<PurchaseReceiptBillDetailMapper, PurchaseReceiptBillDetail> {
@Autowired
private FileUploadComponent fileUploadComponent;
public PagerVo<PurchaseReceiptBillDetailVo> listPage(PagerQuery<PurchaseReceiptBillDetailQuery> pq) {
PurchaseReceiptBillDetailQuery query = pq.getParams();
QueryWrapper<PurchaseReceiptBillDetail> qw = new QueryWrapper<>();
IPage<PurchaseReceiptBillDetail> page = PagerUtil.queryToPage(pq);
IPage<PurchaseReceiptBillDetailVo> pagging = baseMapper.listPage(page, qw);
PagerVo<PurchaseReceiptBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<String> saveOrUpdate(PurchaseReceiptBillDetailDto dto) {
ResultBean<String> 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<PurchaseReceiptBillDetailVo> 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()));
}
}

44
src/main/java/com/yxt/purchase/biz/purchasereceiptbilldetail/PurchaseReceiptBillDetailVo.java

@ -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
}
Loading…
Cancel
Save