增加供应商流水

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -21,6 +21,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 
     public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
 
+    public static String YYYY_MM_DD_HHMMSS = "YYYY-MM-DD-HHmmss";
+
+
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
     
     private static String[] parsePatterns = {
@@ -63,6 +66,10 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return parseDateToStr(format, new Date());
     }
 
+    public static final String randomId() {
+        return dateTimeNow(YYYY_MM_DD_HHMMSS);
+    }
+
     public static final String dateTime(final Date date)
     {
         return parseDateToStr(YYYY_MM_DD, date);

wms/src/main/java/com/cyl/wms/domain/Supplier.java

@@ -6,6 +6,9 @@ import io.swagger.annotations.ApiModelProperty;
 import com.ruoyi.common.core.domain.BaseAudit;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
+
 /**
  * 供应商对象 wms_supplier
  * 
@@ -28,6 +31,18 @@ public class Supplier extends BaseAudit {
     @Excel(name = "供应商名称")
     private String supplierName;
 
+    @ApiModelProperty("开户行")
+    @Excel(name = "开户行")
+    private String bankName;
+
+    @ApiModelProperty("银行卡号")
+    @Excel(name = "银行卡号")
+    private String bankAccount;
+
+    @ApiModelProperty("应付款")
+    @Excel(name = "应付款")
+    private BigDecimal payableAmount;
+
     @ApiModelProperty("供应商地址")
     @Excel(name = "供应商地址")
     private String address;

wms/src/main/java/com/cyl/wms/pojo/dto/SupplierDTO.java

@@ -2,6 +2,9 @@ package com.cyl.wms.pojo.dto;
 
 import com.ruoyi.common.core.domain.BaseAudit;
 import lombok.Data;
+
+import java.math.BigDecimal;
+
 /**
  * 供应商 DTO 对象
  *
@@ -12,6 +15,9 @@ public class SupplierDTO extends BaseAudit {
     private Long id;
     private String supplierNo;
     private String supplierName;
+    private String bankName;
+    private String bankAccount;
+    private BigDecimal payableAmount;
     private String address;
     private String mobileNo;
     private String telNo;

wms/src/main/java/com/cyl/wms/pojo/vo/SupplierVO.java

@@ -4,6 +4,9 @@ import com.ruoyi.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseAudit;
 import lombok.Data;
+
+import java.math.BigDecimal;
+
 /**
  * 供应商 数据视图对象
  * 
@@ -19,6 +22,12 @@ public class SupplierVO extends BaseAudit {
    /** 供应商名称 */
     @Excel(name = "供应商名称")
     private String supplierName;
+    @Excel(name = "开户行")
+    private String bankName;
+    @Excel(name = "银行卡号")
+    private String bankAccount;
+    @Excel(name = "应付款")
+    private BigDecimal payableAmount;
    /** 供应商地址 */
     @Excel(name = "供应商地址")
     private String address;

wms/src/main/java/com/cyl/wms/service/ReceiptOrderService.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.cyl.wms.constant.ReceiptOrderConstant;
 import com.cyl.wms.convert.ReceiptOrderConvert;
 import com.cyl.wms.convert.ReceiptOrderDetailConvert;
-import com.cyl.wms.domain.InventoryHistory;
-import com.cyl.wms.domain.Item;
-import com.cyl.wms.domain.ReceiptOrder;
-import com.cyl.wms.domain.ReceiptOrderDetail;
+import com.cyl.wms.domain.*;
 import com.cyl.wms.mapper.ReceiptOrderDetailMapper;
 import com.cyl.wms.mapper.ReceiptOrderMapper;
 import com.cyl.wms.pojo.query.ItemQuery;
@@ -19,6 +16,7 @@ import com.cyl.wms.pojo.vo.ReceiptOrderDetailVO;
 import com.cyl.wms.pojo.vo.ReceiptOrderVO;
 import com.cyl.wms.pojo.vo.form.ReceiptOrderForm;
 import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -62,6 +60,9 @@ public class ReceiptOrderService {
     @Autowired
     private InventoryService inventoryService;
 
+    @Autowired
+    private SupplierTransactionService supplierTransactionService;
+
     /**
      * 查询入库单
      *
@@ -157,6 +158,8 @@ public class ReceiptOrderService {
             receiptOrder.setCreateTime(LocalDateTime.now());
             res = receiptOrderMapper.insert(receiptOrder);
             saveDetails(receiptOrder.getId(), receiptOrder.getDetails());
+            //保存订单金额到供应商流水表
+            saveOrUpdatePayAmount(receiptOrder);
             return res;
         }
         // 2. 编辑
@@ -212,11 +215,32 @@ public class ReceiptOrderService {
         receiptOrderDetailMapper.delete(qw);
         saveDetails(receiptOrder.getId(), receiptOrder.getDetails());
 
+        //保存订单金额到供应商流水表
+        saveOrUpdatePayAmount(receiptOrder);
+
         // 2.2 更新入库单
         res = receiptOrderMapper.updateById(receiptOrder);
         return res;
     }
 
+    /**
+     * 保存订单金额到供应商流水表
+     *
+     * @param receiptOrder 入库单
+     */
+    private void saveOrUpdatePayAmount(ReceiptOrder receiptOrder) {
+        //todo 更换供应商
+        //todo 删除入库单
+        SupplierTransaction supplierTransaction = new SupplierTransaction();
+        supplierTransaction.setSupplierId(String.valueOf(receiptOrder.getSupplierId()));
+        supplierTransaction.setTransactionType(SupplierTransaction.RECEIPT);
+        supplierTransaction.setTransactionAmount(receiptOrder.getPayableAmount());
+        supplierTransaction.setTransactionAmount(receiptOrder.getPayableAmount());
+        supplierTransaction.setReceiptOrderId(receiptOrder.getId().intValue());
+        supplierTransaction.setTransactionCode("TS-"+ DateUtils.randomId());
+        supplierTransactionService.insert(supplierTransaction);
+    }
+
     private void saveDetails(Long orderId, List<ReceiptOrderDetailVO> details) {
         if (!CollUtil.isEmpty(details)) {
             details.forEach(it -> it.setReceiptOrderId(orderId));