diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java index 25e1500..81f80bd 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java @@ -48,6 +48,12 @@ public class PurchaseBillRest { return purchaseBillService.listPageVo(pq); } + @ApiOperation("采购订单审核管理") + @PostMapping("/exlistPage") + public ResultBean> exlistPage(@RequestBody PagerQuery pq){ + return purchaseBillService.exlistPage(pq); + } + @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody PurchaseBillDto dto){ @@ -71,4 +77,16 @@ public class PurchaseBillRest { public ResultBean> purGoodsListPage(@RequestBody PagerQuery pq) { return purchaseBillService.purGoodsListPage(pq); } + + @ApiOperation("采购单提交") + @PostMapping("/submit") + public ResultBean submit(@RequestBody PurchaseBillDto dto){ + return purchaseBillService.submit(dto); + } + + @ApiOperation("采购单审核") + @PostMapping("/examine") + public ResultBean examine(@RequestParam("sid") String sid,@RequestParam("state") String state,@RequestParam("remarks") String remarks){ + return purchaseBillService.examine(sid,state,remarks); + } } diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java new file mode 100644 index 0000000..3008d97 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeQuery; +import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeService; +import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * Project: ss-purchase(采购单)
+ * File: PurchaseFlowNodeFeignFallback.java
+ * Class: com.yxt.purchase.biz.purchaseflownode.PurchaseFlowNodeRest
+ * Description: 工单-环节.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 10:44:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "工单-环节") +@RestController +@RequestMapping("/apiadmin/purchaseflownode") +public class PurchaseFlowNodeRest { + + @Autowired + private PurchaseFlowNodeService purchaseFlowNodeService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return purchaseFlowNodeService.listPageVo(pq); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java index 3a2c765..8c1bc5b 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java @@ -2,6 +2,8 @@ package com.yxt.oms.biz.func.purchasebill; import lombok.Data; +import java.math.BigDecimal; + /** * @description: * @author: dimengzhe @@ -20,4 +22,18 @@ public class GoodsSkuPurSelectList { private String barCode; //规格名称 private String goodsSkuOwnSpec; + //单位 + private String unit; + //数量 + private BigDecimal count; + //数量1 + private BigDecimal count1; + //数量 + private BigDecimal pcsNum; + //吊牌价 + private BigDecimal tagPrice; + //单价 + private BigDecimal cost; + //单价1 + private BigDecimal cost1; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillExVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillExVo.java new file mode 100644 index 0000000..a0acd35 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillExVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.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/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java index 61738ce..8139646 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java @@ -159,7 +159,6 @@ public class PurchaseBillService extends MybatisBaseService> purGoodsListPage(PagerQuery pq) { return goodsSkuFeign.purGoodsListPage(pq); } + + public ResultBean submit(PurchaseBillDto dto) { + return purchaseBillFeign.submit(dto); + } + + public ResultBean> exlistPage(PagerQuery pq) { + return purchaseBillFeign.exlistPage(pq); + } + + public ResultBean examine(String sid, String state, String remarks) { + return purchaseBillFeign.examine(sid,state,remarks); + } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java index a76ec48..6431850 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java @@ -64,14 +64,28 @@ public class PurchaseBillDetailDetailsVo implements Vo { private String unit; // 计量单位 @ApiModelProperty("单价") private BigDecimal cost; // 单价 - @ApiModelProperty("采购数量") - private BigDecimal count; // 采购数量 + @ApiModelProperty("数量") + private BigDecimal count; + @ApiModelProperty("数量1") + private BigDecimal count1; + @ApiModelProperty("已入库数量") + private BigDecimal inCount; + @ApiModelProperty("已发货数量") + private BigDecimal outCount; + @ApiModelProperty("已入库数量1") + private BigDecimal inCount1; + @ApiModelProperty("待入库数量") + private BigDecimal notInCount; + @ApiModelProperty("待入库数量1") + private BigDecimal notInCount1; @ApiModelProperty("折扣率") private BigDecimal discountRate; // 折扣率 @ApiModelProperty("折后单价") private BigDecimal discountPrice; // 折后单价 @ApiModelProperty("分摊金额") private BigDecimal shareAmount; // 分摊金额 + @ApiModelProperty("总价") + private BigDecimal costTotal; @ApiModelProperty("分配比例") private BigDecimal shareRate; // 分配比例 @ApiModelProperty("采购金额") @@ -81,8 +95,19 @@ public class PurchaseBillDetailDetailsVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("预期到货日期") private Date deliveryDate; // 预期到货日期 - @ApiModelProperty("税额") - private BigDecimal taxAmount; // 税额 - @ApiModelProperty("含税价") - private BigDecimal taxPrice; // 含税价 + + @ApiModelProperty("总税额") + private BigDecimal taxAmount; + @ApiModelProperty("商品图片") + private String goodsImgUrl; + @ApiModelProperty("数量(pcs)") + private BigDecimal pcsCount; + @ApiModelProperty("吊牌价") + private BigDecimal tagPrice; + @ApiModelProperty("税率") + private BigDecimal taxRate; + @ApiModelProperty("未含税价") + private BigDecimal unTaxPrice; + @ApiModelProperty("未含税总价(未含税价*采购数量)") + private BigDecimal unTaxTotalAmount; } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java index 663dab8..82cafe8 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java @@ -64,25 +64,50 @@ public class PurchaseBillDetailDto implements Dto { private String unit; // 计量单位 @ApiModelProperty("单价") private BigDecimal cost; // 单价 - @ApiModelProperty("采购数量") - private BigDecimal count; // 采购数量 + @ApiModelProperty("数量") + private BigDecimal count; + @ApiModelProperty("数量1") + private BigDecimal count1; + @ApiModelProperty("已入库数量") + private BigDecimal inCount; + @ApiModelProperty("已发货数量") + private BigDecimal outCount; + @ApiModelProperty("已入库数量1") + private BigDecimal inCount1; + @ApiModelProperty("待入库数量") + private BigDecimal notInCount; + @ApiModelProperty("待入库数量1") + private BigDecimal notInCount1; @ApiModelProperty("折扣率") private BigDecimal discountRate; // 折扣率 @ApiModelProperty("折后单价") private BigDecimal discountPrice; // 折后单价 @ApiModelProperty("分摊金额") private BigDecimal shareAmount; // 分摊金额 + @ApiModelProperty("总价") + private BigDecimal costTotal; @ApiModelProperty("分配比例") private BigDecimal shareRate; // 分配比例 @ApiModelProperty("采购金额") private BigDecimal amount; // 采购金额 @ApiModelProperty("采购周期") private Integer cycle; // 采购周期 - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("预期到货日期") private Date deliveryDate; // 预期到货日期 - @ApiModelProperty("税额") - private BigDecimal taxAmount; // 税额 - @ApiModelProperty("含税价") - private BigDecimal taxPrice; // 含税价 + + @ApiModelProperty("总税额") + private BigDecimal taxAmount; + @ApiModelProperty("商品图片") + private String goodsImgUrl; + @ApiModelProperty("数量(pcs)") + private BigDecimal pcsCount; + @ApiModelProperty("吊牌价") + private BigDecimal tagPrice; + @ApiModelProperty("税率") + private BigDecimal taxRate; + @ApiModelProperty("未含税价") + private BigDecimal unTaxPrice; + @ApiModelProperty("未含税总价(未含税价*采购数量)") + private BigDecimal unTaxTotalAmount; } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNode.java b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNode.java new file mode 100644 index 0000000..e6c16fb --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNode.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchaseflownode; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: ss-purchase(采购单)
+ * File: PurchaseFlowNode.java
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNode
+ * Description: 工单-环节.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 10:44:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "工单-环节", description = "工单-环节") +@TableName("purchase_flow_node") +public class PurchaseFlowNode extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("操作人姓名") + private String createByName; // 操作人姓名 + @ApiModelProperty("busSid") + private String billSid; // busSid + @ApiModelProperty("环节编码") + private String nodeCode; // 环节编码 + @ApiModelProperty("环节名称") + private String nodeName; // 环节名称 + @ApiModelProperty("结果(通过/不通过)") + private String result; // 结果(通过/不通过) + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeQuery.java new file mode 100644 index 0000000..b773bc5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeQuery.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchaseflownode; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * Project: ss-purchase(采购单)
+ * File: PurchaseFlowNodeQuery.java
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNodeQuery
+ * Description: 工单-环节 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 10:44:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "工单-环节 查询条件", description = "工单-环节 查询条件") +public class PurchaseFlowNodeQuery implements Query { + + private String billSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeService.java new file mode 100644 index 0000000..403e40a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeService.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchaseflownode; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.feign.purchase.purchaseflownode.PurchaseFlowNodeFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * Project: ss-purchase(采购单)
+ * File: PurchaseFlowNodeService.java
+ * Class: com.yxt.purchase.biz.purchaseflownode.PurchaseFlowNodeService
+ * Description: 工单-环节 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 10:44:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class PurchaseFlowNodeService{ + + @Autowired + private PurchaseFlowNodeFeign purchaseFlowNodeFeign; + + public ResultBean> listPageVo(PagerQuery pq) { + return purchaseFlowNodeFeign.listPage(pq); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeVo.java new file mode 100644 index 0000000..83cf15a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeVo.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.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
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNodeVo
+ * Description: 工单-环节 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 10:44:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "工单-环节 视图数据对象", description = "工单-环节 视图数据对象") +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("环节名称") + private String nodeName; // 环节名称 + @ApiModelProperty("结果(通过/不通过)") + private String result; // 结果(通过/不通过) + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebill/PurchaseBillFeign.java b/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebill/PurchaseBillFeign.java index 4233000..1d9919d 100644 --- a/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebill/PurchaseBillFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebill/PurchaseBillFeign.java @@ -3,10 +3,7 @@ package com.yxt.oms.feign.purchase.purchasebill; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.oms.biz.func.purchasebill.PurchaseBillDetailsVo; -import com.yxt.oms.biz.func.purchasebill.PurchaseBillDto; -import com.yxt.oms.biz.func.purchasebill.PurchaseBillQuery; -import com.yxt.oms.biz.func.purchasebill.PurchaseBillVo; +import com.yxt.oms.biz.func.purchasebill.*; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -21,6 +18,10 @@ public interface PurchaseBillFeign { @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("采购订单审核管理") + @PostMapping("/exlistPage") + public ResultBean> exlistPage(@RequestBody PagerQuery pq); + @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody PurchaseBillDto dto); @@ -32,4 +33,12 @@ public interface PurchaseBillFeign { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("采购单提交") + @PostMapping("/submit") + public ResultBean submit(@RequestBody PurchaseBillDto dto); + + @ApiOperation("采购单审核") + @PostMapping("/examine") + public ResultBean examine(@RequestParam("sid") String sid,@RequestParam("state") String state,@RequestParam("remarks") String remarks); } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/purchase/purchaseflownode/PurchaseFlowNodeFeign.java b/oms/src/main/java/com/yxt/oms/feign/purchase/purchaseflownode/PurchaseFlowNodeFeign.java new file mode 100644 index 0000000..0c271df --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/purchase/purchaseflownode/PurchaseFlowNodeFeign.java @@ -0,0 +1,22 @@ +package com.yxt.oms.feign.purchase.purchaseflownode; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.purchasebill.*; +import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeQuery; +import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +@FeignClient( + contextId = "ss-common-purchase-PurchaseFlowNode", + name = "ss-common-purchase", + path = "/apiadmin/purchaseflownode") +public interface PurchaseFlowNodeFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); +} \ No newline at end of file