采购付款

hx-purchase/pom.xml

@@ -38,6 +38,11 @@
             <groupId>com.fjhx</groupId>
             <artifactId>hx-wms</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-account</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

hx-purchase/src/main/java/com/fjhx/purchase/controller/pay/PayDetailController.java

@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * <p>
- * 发票明细 前端控制器
+ * 采购付款明细 前端控制器
  * </p>
  *
  * @author 

hx-purchase/src/main/java/com/fjhx/purchase/entity/pay/dto/PayDetailDto.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 /**
- * 发票明细新增编辑入参实体
+ * 采购付款明细新增编辑入参实体
  *
  * @author 
  * @since 2023-04-13

hx-purchase/src/main/java/com/fjhx/purchase/entity/pay/dto/PayDetailSelectDto.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 /**
- * 发票明细列表查询入参实体
+ * 采购付款明细列表查询入参实体
  *
  * @author 
  * @since 2023-04-13

hx-purchase/src/main/java/com/fjhx/purchase/entity/pay/enums/PayStatusEnum.java

@@ -0,0 +1,52 @@
+package com.fjhx.purchase.entity.pay.enums;
+
+import org.apache.commons.collections4.MapUtils;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 采购付款状态枚举
+ */
+public enum PayStatusEnum {
+    DRAFT(0, "草稿"),
+    UNDER_REVIEW(10, "审批中"),
+    REJECT(20, "驳回"),
+    PASS(30,"已采购"),
+    TERMINATION(99,"终止"),
+    ;
+    private int key;
+
+    private String value;
+
+    private static Map<Integer, String> map = new LinkedHashMap<>();
+
+    PayStatusEnum(int key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    /**
+     * 获取枚举map
+     *
+     * @return
+     */
+    public static Map<Integer, String> getMap() {
+        if (MapUtils.isNotEmpty(map)) {
+            return map;
+        }
+        for (PayStatusEnum ms : values()) {
+            map.put(ms.key, ms.value);
+        }
+        return map;
+    }
+
+    public int getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+}

hx-purchase/src/main/java/com/fjhx/purchase/entity/pay/po/Pay.java

@@ -1,9 +1,13 @@
 package com.fjhx.purchase.entity.pay.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fjhx.file.entity.ObsFile;
 import com.ruoyi.common.core.domain.BasePo;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -55,4 +59,40 @@ public class Pay extends BasePo {
      */
     private Integer payType;
 
+    /**
+     *状态
+     */
+    private Integer status;
+
+    /**
+     * 审核通过时间
+     */
+    private Date approvedDate;
+
+    /**
+     * 流程id
+     */
+    private String processInstanceId;
+
+    /**
+     * 币种
+     */
+    private String currency;
+
+    /**
+     * 付款账户ID
+     */
+    private Long accountManagementId;
+    /**
+     * 付款明细
+     */
+    @TableField(exist = false)
+    private List<PayDetail> payDetailList;
+
+    /**
+     * 附件列表
+     */
+    @TableField(exist = false)
+    private List<ObsFile> fileList;
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/entity/pay/po/PayDetail.java

@@ -9,7 +9,7 @@ import lombok.Setter;
 
 /**
  * <p>
- * 发票明细
+ * 采购付款明细
  * </p>
  *
  * @author 
@@ -35,4 +35,9 @@ public class PayDetail extends BasePo {
      */
     private String remark;
 
+    /**
+     * 付款单ID
+     */
+    private Long payId;
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/entity/pay/vo/PayDetailVo.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 /**
- * 发票明细列表查询返回值实体
+ * 采购付款明细列表查询返回值实体
  *
  * @author 
  * @since 2023-04-13

hx-purchase/src/main/java/com/fjhx/purchase/mapper/pay/PayDetailMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
- * 发票明细 Mapper 接口
+ * 采购付款明细 Mapper 接口
  * </p>
  *
  * @author 

hx-purchase/src/main/java/com/fjhx/purchase/service/pay/PayDetailService.java

@@ -10,7 +10,7 @@ import com.fjhx.purchase.entity.pay.dto.PayDetailDto;
 
 /**
  * <p>
- * 发票明细 服务类
+ * 采购付款明细 服务类
  * </p>
  *
  * @author 

hx-purchase/src/main/java/com/fjhx/purchase/service/pay/impl/PayDetailServiceImpl.java

@@ -15,7 +15,7 @@ import cn.hutool.core.bean.BeanUtil;
 
 /**
  * <p>
- * 发票明细 服务实现类
+ * 采购付款明细 服务实现类
  * </p>
  *
  * @author