采购---采购模块

hx-purchase/src/main/java/com/fjhx/purchase/controller/purchase/PurchaseController.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 com.fjhx.purchase.entity.purchase.po.Purchase;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author 
  * @since 2023-04-06
  */
+@DS(SourceConstant.PURCHASE)
 @RestController
 @RequestMapping("/purchase")
 public class PurchaseController {

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

@@ -1,5 +1,6 @@
 package com.fjhx.purchase.entity.purchase.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
 import java.util.Date;
@@ -22,22 +23,17 @@ import lombok.Setter;
 public class Purchase extends BasePo {
 
     /**
-     * 申购明细单ID
-     */
-    private Long subscribeDetailId;
-
-    /**
      * 部门名称
      */
     private String deptName;
 
     /**
-     * 申购人名称
+     * 采购人名称
      */
     private String purchaseName;
 
     /**
-     * 申购时间
+     * 采购时间
      */
     private Date purchaseTime;
 
@@ -71,5 +67,9 @@ public class Purchase extends BasePo {
      */
     private String processInstanceId;
 
+    /**
+     * 采购明细列表
+     */
+    @TableField(exist = false)
     private List<PurchaseDetail> purchaseDetailList;
 }

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

@@ -2,6 +2,8 @@ package com.fjhx.purchase.entity.purchase.po;
 
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
@@ -24,20 +26,23 @@ public class PurchaseDetail extends BasePo {
      */
     private Long bussinessId;
 
-    private Integer subscribeDetailId;
+    /**
+     * 申购明细ID
+     */
+    private Long subscribeDetailId;
 
     /**
-     * 申购单ID
+     * 采购单ID
      */
     private Long purchaseId;
 
     /**
-     * 申购数量
+     * 采购数量
      */
-    private Integer count;
+    private BigDecimal count;
 
     /**
-     * 申购事由
+     * 采购事由
      */
     private String content;
 

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

@@ -3,6 +3,8 @@ package com.fjhx.purchase.entity.subscribe.po;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
@@ -33,7 +35,7 @@ public class SubscribeDetail extends BasePo {
     /**
      * 申购数量
      */
-    private Integer count;
+    private BigDecimal count;
 
     /**
      * 申购事由
@@ -84,4 +86,10 @@ public class SubscribeDetail extends BasePo {
      */
     @TableField(exist = false)
     private String productUnit;
+
+    /**
+     * 货品规格型号
+     */
+    @TableField(exist = false)
+    private String productSpec;
 }

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

@@ -20,6 +20,7 @@ import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.purchase.service.subscribe.SubscribeService;
 import com.fjhx.purchase.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -45,6 +46,7 @@ public class PurchaseFlow extends FlowDelegate {
      * @param submitData 申购数据
      * @return
      */
+    @GlobalTransactional
     @Override
     public Long start(Long flowId, JSONObject submitData) {
         PurchaseService purchaseService = SpringUtil.getBean(PurchaseService.class);
@@ -68,6 +70,7 @@ public class PurchaseFlow extends FlowDelegate {
      * @param businessId 业务ID
      * @param submitData 数据
      */
+    @GlobalTransactional
     @Override
     public void end(Long flowId, Long businessId, JSONObject submitData) {
         PurchaseService purchaseService = SpringUtil.getBean(PurchaseService.class);

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

@@ -14,6 +14,7 @@ import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.purchase.service.subscribe.SubscribeService;
 import com.fjhx.purchase.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -38,6 +39,7 @@ public class SubscribeFlow extends FlowDelegate {
      * @param submitData 申购数据
      * @return
      */
+    @GlobalTransactional
     @Override
     public Long start(Long flowId, JSONObject submitData) {
         SubscribeService subscribeService = SpringUtil.getBean(SubscribeService.class);
@@ -62,6 +64,7 @@ public class SubscribeFlow extends FlowDelegate {
      * @param businessId 业务ID
      * @param submitData 数据
      */
+    @GlobalTransactional
     @Override
     public void end(Long flowId, Long businessId, JSONObject submitData) {
         SubscribeService subscribeService = SpringUtil.getBean(SubscribeService.class);

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

@@ -4,6 +4,7 @@ import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.fjhx.purchase.mapper.purchase.PurchaseDetailMapper;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
@@ -44,6 +45,11 @@ public class PurchaseDetailServiceImpl extends ServiceImpl<PurchaseDetailMapper,
         this.save(purchaseDetailDto);
     }
 
+    /**
+     * 编辑
+     * @param purchaseDetailDto
+     */
+    @GlobalTransactional
     @Override
     public void edit(PurchaseDetailDto purchaseDetailDto) {
         this.updateById(purchaseDetailDto);

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

@@ -10,6 +10,7 @@ import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.purchase.util.code.CodeEnum;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
@@ -55,6 +56,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
      * @param purchase
      */
     @Override
+    @GlobalTransactional
     public void add(Purchase purchase) {
         PurchaseService purchaseService = SpringUtil.getBean(PurchaseService.class);
         PurchaseDetailService purchaseDetailService = SpringUtil.getBean(PurchaseDetailService.class);

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -111,6 +111,7 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
                     s.setProductUnit(p.getUnit());
                     s.setProductType(p.getType());
                     s.setProductName(p.getName());
+                    s.setProductSpec(p.getSpec());
                 }
             }
         }

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeServiceImpl.java

@@ -14,6 +14,7 @@ import com.fjhx.purchase.service.subscribe.SubscribeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.purchase.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,6 +23,7 @@ import com.fjhx.purchase.entity.subscribe.vo.SubscribeVo;
 import com.fjhx.purchase.entity.subscribe.dto.SubscribeSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.purchase.entity.subscribe.dto.SubscribeDto;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -91,6 +93,7 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
         return subscribe;
     }
 
+    @GlobalTransactional
     @Override
     public void add(Subscribe subscribe) {
         SubscribeService subscribeService = SpringUtil.getBean(SubscribeService.class);
@@ -106,6 +109,11 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
         }
     }
 
+    /**
+     * 编辑
+     * @param subscribeDto
+     */
+    @GlobalTransactional
     @Override
     public void edit(SubscribeDto subscribeDto) {
         this.updateById(subscribeDto);