Merge remote-tracking branch 'origin/dev' 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/service/write/impl/WriteOffRecordsServiceImpl.java

@@ -19,6 +19,7 @@ import com.fjhx.account.service.account.AccountRunningWaterService;
 import com.fjhx.account.service.write.WriteOffRecordsService;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.file.utils.ObsFileUtil;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
@@ -73,6 +74,8 @@ public class WriteOffRecordsServiceImpl extends ServiceImpl<WriteOffRecordsMappe
         //修改打款状态为未打款
         accountPayment.setStatus("20");
         accountPaymentService.updateById(accountPayment);
+        //清理历史附件
+        ObsFileUtil.removeFile(accountPayment.getId());
         //赋值之前的打款时间
         writeOffRecordsDto.setAccountPaymentDate(accountPayment.getExpensesTime());
         this.save(writeOffRecordsDto);

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

@@ -107,7 +107,6 @@ public class PayFlow extends FlowDelegate {
         payment.setCurrency(pay.getCurrency());
         payment.setDepartmentId(SecurityUtils.getDeptId());
         // todo 暂时写死人民币
-        payment.setCurrency(pay.getCurrency());
         payment.setPaymentRemark(pay.getRemark());
         payment.setType(PaymentTypeEnum.REJECT.getKey());
         payment.setStatus(PaymentStatusEnum.UNDER_REVIEW.getKey());

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

@@ -3,13 +3,10 @@ package com.fjhx.sale.service.purchase.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-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.service.impl.ServiceImpl;
-
 import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
 import com.fjhx.purchase.entity.purchase.po.Purchase;

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);
     }