diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillRest.java index b1a50a1..22c3175 100644 --- a/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillRest.java +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillRest.java @@ -50,6 +50,14 @@ public class PurchaseBillRest { return rb.success().setData(pv); } + @ApiOperation("采购订单审核管理") + @PostMapping("/exlistPage") + public ResultBean> exlistPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = purchaseBillService.exlistPage(pq); + return rb.success().setData(pv); + } + @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody PurchaseBillDto dto){ @@ -58,6 +66,22 @@ public class PurchaseBillRest { return rb.success().setData(sid); } + @ApiOperation("采购单提交") + @PostMapping("/submit") + public ResultBean submit(@RequestBody PurchaseBillDto dto){ + ResultBean rb = ResultBean.fireFail(); + purchaseBillService.submit(dto); + return rb.success(); + } + + @ApiOperation("采购单审核") + @PostMapping("/examine") + public ResultBean examine(@RequestParam("sid") String sid,@RequestParam("state") String state,@RequestParam("remarks") String remarks){ + ResultBean rb = ResultBean.fireFail(); + purchaseBillService.examine(sid,state,remarks); + return rb.success(); + } + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchaseFlowNodeRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseFlowNodeRest.java index de6d9dc..676e97f 100644 --- a/src/main/java/com/yxt/purchase/apiadmin/PurchaseFlowNodeRest.java +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchaseFlowNodeRest.java @@ -55,19 +55,11 @@ public class PurchaseFlowNodeRest { @Autowired private PurchaseFlowNodeService purchaseFlowNodeService; - @ApiOperation("根据sid批量删除") - @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - purchaseFlowNodeService.delBySids(sids); - return rb.success(); - } - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - PurchaseFlowNodeDetailsVo vo = purchaseFlowNodeService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); + PagerVo pv = purchaseFlowNodeService.listPageVo(pq); + return rb.success().setData(pv); } } diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java new file mode 100644 index 0000000..00ebb67 --- /dev/null +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillExVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.purchase.biz.purchasebill; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@ApiModel(value = "采购单 视图数据对象", description = "采购单 视图数据对象") +public class PurchaseBillExVo implements Vo { + + private String sid; // sid + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("业务日期") + private Date createTime; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("采购员姓名") + private String purchaserName; + @ApiModelProperty("仓库名称") + private String wareHouseName; + @ApiModelProperty("审核状态") + private String state; + @ApiModelProperty("商品总额") + private String amountTotal; + @ApiModelProperty("本次付款") + private BigDecimal thisPayAmount; + @ApiModelProperty("税额汇总") + private BigDecimal taxAmount; + @ApiModelProperty("总采购数量") + private String countTotal; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人姓名") + private String createByName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("最后修改时间") + private Date modifyTime; +} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.java index e91ff5e..317cb54 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.java @@ -26,11 +26,13 @@ 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 org.apache.ibatis.annotations.Update; @Mapper public interface PurchaseBillMapper extends BaseMapper { @@ -38,4 +40,9 @@ public interface PurchaseBillMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); String selectNum(String billNo); + + @Update("update purchase_bill set state = #{state} where sid = #{sid}") + void updateState(@Param("sid") String sid,@Param("state") String state); + + IPage exlistPage(IPage page, @Param(Constants.WRAPPER) Wrapper qw); } \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml index 924312a..797c648 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml @@ -37,6 +37,36 @@ ${ew.sqlSegment} + + + SELECT * FROM purchase_flow_node + + ${ew.sqlSegment} + + \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeQuery.java b/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeQuery.java index d4c9efd..65bc8f1 100644 --- a/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeQuery.java +++ b/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeQuery.java @@ -49,15 +49,5 @@ import lombok.Data; @ApiModel(value = "工单-环节 查询条件", description = "工单-环节 查询条件") public class PurchaseFlowNodeQuery implements Query { - @ApiModelProperty("操作人姓名") - private String createByName; // 操作人姓名 - @ApiModelProperty("busSid") - private String billSid; // busSid - @ApiModelProperty("环节编码") - private String nodeCode; // 环节编码 - @ApiModelProperty("环节名称") - private String nodeName; // 环节名称 - @ApiModelProperty("结果（通过/不通过）") - private String result; // 结果（通过/不通过） - + private String billSid; } diff --git a/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeService.java b/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeService.java index 72e09e9..ed47f7b 100644 --- a/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeService.java +++ b/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeService.java @@ -51,17 +51,20 @@ import org.springframework.stereotype.Service; */ @Service public class PurchaseFlowNodeService extends MybatisBaseService { - - public void insertByDto(PurchaseFlowNodeDto dto){ - PurchaseFlowNode entity = new PurchaseFlowNode(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public PurchaseFlowNodeDetailsVo fetchDetailsVoBySid(String sid){ - PurchaseFlowNode entity = fetchBySid(sid); - PurchaseFlowNodeDetailsVo vo = new PurchaseFlowNodeDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + + public PagerVo listPageVo(PagerQuery pq) { + PurchaseFlowNodeQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("billSid", query.getBillSid()); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void insertByDto(PurchaseFlowNodeDto dto) { + PurchaseFlowNode entity = new PurchaseFlowNode(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } } \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeVo.java b/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeVo.java index 058f7d4..2fdf6e5 100644 --- a/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchaseflownode/PurchaseFlowNodeVo.java @@ -26,12 +26,15 @@ package com.yxt.purchase.biz.purchaseflownode; +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: ss-purchase(采购单)
* File: PurchaseFlowNodeVo.java
@@ -51,12 +54,13 @@ public class PurchaseFlowNodeVo implements Vo { private String sid; // sid + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("创建时间") + private Date createTime; + @ApiModelProperty("意见") + private String remarks; @ApiModelProperty("操作人姓名") private String createByName; // 操作人姓名 - @ApiModelProperty("busSid") - private String billSid; // busSid - @ApiModelProperty("环节编码") - private String nodeCode; // 环节编码 @ApiModelProperty("环节名称") private String nodeName; // 环节名称 @ApiModelProperty("结果（通过/不通过）")