Merge branch 'test' into dev

# Conflicts:
#	hx-purchase/src/main/java/com/fjhx/purchase/flow/PayFlow.java
#	hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/SalePurchaseServiceImpl.java

hx-account/src/main/java/com/fjhx/account/flow/AccountRequestFundsFlow.java

@@ -141,6 +141,9 @@ public class AccountRequestFundsFlow extends FlowDelegate {
         if ("3".equals(accountRequestFunds.getType())) {
             BigDecimal subtract = accountRequestFunds.getTotal().subtract(accountRequestFunds.getAdvanceAmounts());
             accountPayment.setAmount(subtract);
+            if(subtract.compareTo(BigDecimal.ZERO)==0){//不生成打款数据
+                return;
+            }
         } else {
             accountPayment.setAmount(accountRequestFunds.getTotal());
         }

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

@@ -107,6 +107,7 @@ public class PayFlow extends FlowDelegate {
         payment.setDepartmentId(SecurityUtils.getDeptId());
         // todo 暂时写死人民币
         payment.setCurrency(pay.getCurrency());
+        payment.setCurrency(pay.getCurrency());
         payment.setPaymentRemark(pay.getRemark());
         payment.setType(PaymentTypeEnum.REJECT.getKey());
         payment.setStatus(PaymentStatusEnum.UNDER_REVIEW.getKey());
@@ -114,6 +115,7 @@ public class PayFlow extends FlowDelegate {
         payment.setAmount(pay.getAmount());
         payment.setIncomeAmount(pay.getAmount());
         payment.setName(pay.getName());
+        payment.setCreateUser(pay.getCreateUser());
         payment.setBusinessManagementId(pay.getAccountManagementId());
         payment.setOpeningBank(pay.getOpeningBank());
         payment.setBusinessCurrency(pay.getCurrency());

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

@@ -1,10 +1,7 @@
 package com.fjhx.sale.service.purchase.impl;
 
-import cn.hutool.core.bean.BeanUtil;
+
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.extra.spring.SpringUtil;
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.JSONWriter;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
@@ -12,61 +9,27 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.common.entity.documentary.bo.DocumentaryData;
-import com.fjhx.common.enums.CodingRuleEnum;
-import com.fjhx.common.service.coding.CodingRuleService;
-import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
-import com.fjhx.item.entity.product.vo.ProductInfoVo;
-import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.purchase.entity.invoice.vo.InvoiceDetailsVo;
-import com.fjhx.purchase.entity.pay.vo.PayDetailVo;
-import com.fjhx.purchase.entity.purchase.bo.PurchaseDocumentaryBo;
 import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
-import com.fjhx.purchase.entity.purchase.dto.PurchaseSelectDto;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
-import com.fjhx.purchase.entity.purchase.po.PurchasePayRecordDetail;
-import com.fjhx.purchase.entity.purchase.vo.PurchaseDocumentaryVo;
-import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
-import com.fjhx.purchase.entity.subscribe.po.Subscribe;
-import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
 import com.fjhx.purchase.mapper.purchase.PurchaseMapper;
-import com.fjhx.purchase.service.arrival.ArrivalDetailService;
-import com.fjhx.purchase.service.invoice.InvoiceDetailsService;
-import com.fjhx.purchase.service.pay.PayDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
-import com.fjhx.purchase.service.purchase.PurchasePayRecordDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
-import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
-import com.fjhx.purchase.service.subscribe.SubscribeService;
-import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.sample.po.SampleProduct;
 import com.fjhx.sale.service.contract.ContractProductService;
-import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.purchase.SalePurchaseService;
 import com.fjhx.sale.service.sample.SampleProductService;
-import com.fjhx.supply.entity.supplier.po.SupplierInfo;
-import com.fjhx.supply.service.supplier.SupplierInfoService;
-import com.fjhx.wms.entity.warehouse.po.Warehouse;
-import com.fjhx.wms.service.warehouse.WarehouseService;
-import com.ruoyi.common.core.domain.BaseIdPo;
-import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
 
 
 /**

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/stock/impl/StockTransferServiceImpl.java

@@ -291,12 +291,10 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         stockJournal.setType(JournalType.ADJUSTING_OUT.getDetailType());//调仓入库
         stockJournal.setWarehouseId(stockTransferDto.getOutWarehouseId());
         stockJournal.setBusinessId(stockTransferDto.getId());
-        //        stockJournal.setToWarehouseId(stockDto.getToWarehouseId());
-        //保存出入库记录
         stockJournalService.save(stockJournal);
         List<StockJournalDetails> stockJournalDetailsList = new ArrayList<>();
         for (StockTransferDetails stockTransferDetails : stockTransferDetailsList) {
-            //创建出入库明细
+            //创建出库明细
             StockJournalDetails stockJournalDetails = new StockJournalDetailsDto();
             stockJournalDetails.setStockJournalId(stockJournal.getId());
             stockJournalDetails.setProductId(stockTransferDetails.getProductId());
@@ -306,23 +304,26 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         }
         //操作库存
         stockService.ModifyInventory(2, stockList, stockTransferDto.getOutWarehouseId());
-        //保存出入库明细
+        //保存出库记录明细
         stockJournalDetailsService.saveBatch(stockJournalDetailsList);
 
         //创建入库记录
         StockJournal stockJournal1 = new StockJournal();
         stockJournal1.setCode(stockTransferDto.getCode());
-        stockJournal.setBusinessId(stockTransferDto.getId());
+        stockJournal1.setBusinessId(stockTransferDto.getId());
         stockJournal1.setOpType(1);//入库
         stockJournal1.setType(JournalType.ADJUSTING_IN.getDetailType());//调仓出库
         stockJournal1.setWarehouseId(stockTransferDto.getInWarehouseId());
-//        stockJournal1.setToWarehouseId(stockDto.getToWarehouseId());
-        //保存出入库记录
         stockJournalService.save(stockJournal1);
-
         //入库操作
         stockService.ModifyInventory(1, stockList, stockTransferDto.getInWarehouseId());
-        //保存出入库明细
+        //保存入库记录明细
+        for (StockJournalDetails stockJournalDetails : stockJournalDetailsList) {
+            //清空id再插入一份入库记录
+            stockJournalDetails.setId(null);
+            //赋值入库流水主表id
+            stockJournalDetails.setStockJournalId(stockJournal1.getId());
+        }
         stockJournalDetailsService.saveBatch(stockJournalDetailsList);
     }