采购---采购模块

hx-admin/src/main/resources/application-prod.yml

@@ -34,7 +34,10 @@ spring:
                     url: jdbc:mysql://127.0.0.1:28643/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: IzJshF_dk9NNFpNm_IK
-
+                purchase:
+                    url: jdbc:mysql://127.0.0.1:28643/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: IzJshF_dk9NNFpNm_IK
                 customer:
                     url: jdbc:mysql://36.134.91.96:17330/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql

hx-admin/src/main/resources/application-test.yml

@@ -46,7 +46,10 @@ spring:
                     url: jdbc:mysql://127.0.0.1:17330/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
-
+                purchase:
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
     # redis 配置
     redis:
         # 地址

hx-purchase/src/main/java/com/fjhx/purchase/controller/purchase/PurchaseDetailController.java

@@ -1,5 +1,7 @@
 package com.fjhx.purchase.controller.purchase;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
@@ -18,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author 
  * @since 2023-04-06
  */
+@DS(SourceConstant.PURCHASE)
 @RestController
 @RequestMapping("/purchaseDetail")
 public class PurchaseDetailController {

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

@@ -58,6 +58,17 @@ public class Purchase extends BasePo {
     private Integer purchaseStatus;
 
     /**
+     * 付款状态 0未付款  10部分付款  20已付款
+     */
+    private Integer payStatus;
+
+    /**
+     * 到货状态 0未到货  10 部分到货  20已到货
+     */
+    private Integer arrivalStatus;
+
+
+    /**
      * 审核通过时间
      */
     private Date approvedDate;

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

@@ -42,6 +42,16 @@ public class PurchaseDetail extends BasePo {
     private BigDecimal count;
 
     /**
+     * 单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 总价
+     */
+    private BigDecimal amount;
+
+    /**
      * 采购事由
      */
     private String content;

hx-purchase/src/main/java/com/fjhx/purchase/flow/PurchaseFlow.java

@@ -2,9 +2,11 @@ package com.fjhx.purchase.flow;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDetailStatusEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
@@ -31,6 +33,7 @@ import java.util.List;
  * @Author:caozj
  * @DATE:2023/4/3 17:38
  */
+@DS(SourceConstant.PURCHASE)
 @Component
 public class PurchaseFlow extends FlowDelegate {
 

hx-purchase/src/main/java/com/fjhx/purchase/flow/SubscribeFlow.java

@@ -2,9 +2,11 @@ package com.fjhx.purchase.flow;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.purchase.entity.subscribe.enums.SubscribeDetailStatusEnum;
 import com.fjhx.purchase.entity.subscribe.enums.SubscribeStatusEnum;
@@ -24,6 +26,7 @@ import java.util.List;
  * @Author:caozj
  * @DATE:2023/4/3 17:38
  */
+@DS(SourceConstant.PURCHASE)
 @Component
 public class SubscribeFlow extends FlowDelegate {