采购单选择商品接口开发完成

采购审核商品明细接口开发完成
采购订单审核管理接口开发完成
采购单提交接口开发完成
操作日期保存接口开发完成
采购单审核接口开发完成
操作日志列表接口开发完成

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<PagerVo<PurchaseBillExVo>> exlistPage(@RequestBody PagerQuery<PurchaseBillQuery> pq){
+		return purchaseBillService.exlistPage(pq);
+	}
+
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
 	public ResultBean<String> save(@RequestBody PurchaseBillDto dto){
@@ -71,4 +77,16 @@ public class PurchaseBillRest {
 	public ResultBean<PagerVo<GoodsSkuPurSelectList>> purGoodsListPage(@RequestBody PagerQuery<GoodsSkuPurSelectQuery> 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);
+	}
 }

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(采购单) <br/>
+ * File: PurchaseFlowNodeFeignFallback.java <br/>
+ * Class: com.yxt.purchase.biz.purchaseflownode.PurchaseFlowNodeRest <br/>
+ * Description: 工单-环节. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-23 10:44:59 <br/>
+ *
+ * @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<PagerVo<PurchaseFlowNodeVo>> listPage(@RequestBody PagerQuery<PurchaseFlowNodeQuery> pq){
+		return purchaseFlowNodeService.listPageVo(pq);
+	}
+}

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

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

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java

@@ -159,7 +159,6 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
                 if (null != purchaseBillDetailDto.getTaxAmount()) {
                     wmsAnsBillDetailDto.setTaxAmount(purchaseBillDetailDto.getTaxAmount().doubleValue());
                 }
-                wmsAnsBillDetailDto.setTaxPrice(purchaseBillDetailDto.getTaxPrice().doubleValue());
                 wmsAnsBillDetailDto.setAmount(purchaseBillDetailDto.getAmount().doubleValue());
                 wmsAnsBillDetailDtos.add(wmsAnsBillDetailDto);
             }
@@ -182,4 +181,16 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
     public ResultBean<PagerVo<GoodsSkuPurSelectList>> purGoodsListPage(PagerQuery<GoodsSkuPurSelectQuery> pq) {
         return goodsSkuFeign.purGoodsListPage(pq);
     }
+
+    public ResultBean submit(PurchaseBillDto dto) {
+        return purchaseBillFeign.submit(dto);
+    }
+
+    public ResultBean<PagerVo<PurchaseBillExVo>> exlistPage(PagerQuery<PurchaseBillQuery> pq) {
+        return purchaseBillFeign.exlistPage(pq);
+    }
+
+    public ResultBean examine(String sid, String state, String remarks) {
+        return purchaseBillFeign.examine(sid,state,remarks);
+    }
 }

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("采购数量")
+    @ApiModelProperty("数量")
-    private BigDecimal count; // 采购数量
+    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("总税额")
-    @ApiModelProperty("含税价")
+    private BigDecimal taxAmount;
-    private BigDecimal taxPrice; // 含税价
+    @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;
 }

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("采购数量")
+    @ApiModelProperty("数量")
-    private BigDecimal count; // 采购数量
+    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("总税额")
-    @ApiModelProperty("含税价")
+    private BigDecimal taxAmount;
-    private BigDecimal taxPrice; // 含税价
+    @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;
 }

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(采购单) <br/>
+ * File: PurchaseFlowNode.java <br/>
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNode <br/>
+ * Description: 工单-环节. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-23 10:44:59 <br/>
+ *
+ * @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; // 结果（通过/不通过）
+
+}

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(采购单) <br/>
+ * File: PurchaseFlowNodeQuery.java <br/>
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNodeQuery <br/>
+ * Description: 工单-环节 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-23 10:44:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "工单-环节 查询条件", description = "工单-环节 查询条件")
+public class PurchaseFlowNodeQuery implements Query {
+
+    private String billSid;
+}

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(采购单) <br/>
+ * File: PurchaseFlowNodeService.java <br/>
+ * Class: com.yxt.purchase.biz.purchaseflownode.PurchaseFlowNodeService <br/>
+ * Description: 工单-环节 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-23 10:44:59 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class PurchaseFlowNodeService{
+
+    @Autowired
+    private PurchaseFlowNodeFeign purchaseFlowNodeFeign;
+
+    public ResultBean<PagerVo<PurchaseFlowNodeVo>> listPageVo(PagerQuery<PurchaseFlowNodeQuery> pq) {
+        return purchaseFlowNodeFeign.listPage(pq);
+    }
+}

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(采购单) <br/>
+ * File: PurchaseFlowNodeVo.java <br/>
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNodeVo <br/>
+ * Description: 工单-环节 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-23 10:44:59 <br/>
+ *
+ * @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; // 结果（通过/不通过）
+
+}

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.*;
-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 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<PagerVo<PurchaseBillVo>> listPage(@RequestBody PagerQuery<PurchaseBillQuery> pq);
 
+	@ApiOperation("采购订单审核管理")
+	@PostMapping("/exlistPage")
+	public ResultBean<PagerVo<PurchaseBillExVo>> exlistPage(@RequestBody PagerQuery<PurchaseBillQuery> pq);
+
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
 	public ResultBean<String> save(@RequestBody PurchaseBillDto dto);
@@ -32,4 +33,12 @@ public interface PurchaseBillFeign {
 	@ApiOperation("根据SID获取一条记录")
 	@GetMapping("/fetchDetailsBySid/{sid}")
 	public ResultBean<PurchaseBillDetailsVo> 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);
 }

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<PagerVo<PurchaseFlowNodeVo>> listPage(@RequestBody PagerQuery<PurchaseFlowNodeQuery> pq);
+}