{{ titleText }}
@@ -53,7 +53,7 @@
收款总额
- {{ receiptData.totalAmount }}
+ {{ receiptData.totalPriceWithTax }}
备注
@@ -93,15 +93,8 @@
-
-
-
-
+
+
@@ -119,8 +112,11 @@
支持上传PNG、JPG、PDF文件格式
@@ -207,15 +216,19 @@ import { addDateRange } from "@/utils/ruoyi";
import DetailDrawer from "./components/DetailDrawer.vue";
import AddForm from "./components/AddForm.vue";
import ReceiveDialog from "./components/ReceiveDialog.vue";
+import ApplyPaymentDialog from "./components/ApplyPaymentDialog.vue";
+import ApplyRefundDialog from "./components/ApplyRefundDialog.vue";
export default {
name: "Receive",
components: {
DetailDrawer,
AddForm,
- ReceiveDialog
+ ReceiveDialog,
+ ApplyPaymentDialog,
+ ApplyRefundDialog
},
- dicts:['receipt_bill_type','approve_status','receipt_bill_status'],
+ dicts:['receipt_bill_type','approve_status','receipt_bill_status', 'payment_method'],
data() {
return {
// 遮罩层
@@ -251,7 +264,11 @@ export default {
addOpen: false,
// 收款附件弹窗
receiptOpen: false,
- currentRow: {}
+ currentRow: {},
+ // 申请付款弹窗
+ applyPaymentOpen: false,
+ // 申请退款弹窗
+ applyRefundOpen: false,
};
},
created() {
@@ -319,6 +336,16 @@ export default {
this.detailOpen = true;
});
},
+ /** 申请付款按钮操作 */
+ handleApplyPayment(row) {
+ this.currentRow = row;
+ this.applyPaymentOpen = true;
+ },
+ /** 申请退款按钮操作 */
+ handleApplyRefund(row) {
+ this.currentRow = row;
+ this.applyRefundOpen = true;
+ },
/** 收款附件按钮操作 */
handleReceipt(row) {
this.currentRow = row;
@@ -334,7 +361,7 @@ export default {
}).catch(() => {});
},
handleReturn(row) {
- this.$modal.confirm('是否确认退回收款单编号为"' + row.receiptBillCode + '"的数据项？').then(function() {
+ this.$modal.confirm('是否将该笔销售-应收单的：销售-收款单与销售-发票单同时退回至销售-应收单表').then(function() {
return returnReceive(row.id);
}).then(() => {
this.getList();
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsReceiptBillController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsReceiptBillController.java
index 2822ac22..2b16455a 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsReceiptBillController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsReceiptBillController.java
@@ -5,13 +5,19 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.sip.domain.OmsFinAttachment;
+import com.ruoyi.sip.domain.OmsPaymentBill;
import com.ruoyi.sip.domain.OmsReceiptBill;
+import com.ruoyi.sip.service.IOmsFinAttachmentService;
import com.ruoyi.sip.service.IOmsReceiptBillService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.util.Collections;
import java.util.List;
/**
@@ -26,6 +32,8 @@ public class OmsReceiptBillController extends BaseController {
@Autowired
private IOmsReceiptBillService omsReceiptBillService;
+ @Autowired
+ private IOmsFinAttachmentService omsFinAttachmentService;
@GetMapping("/list")
@@ -91,4 +99,56 @@ public class OmsReceiptBillController extends BaseController {
return AjaxResult.error("操作失败：" + e.getMessage());
}
}
+ @GetMapping("/attachment/{id}")
+ @ResponseBody
+ public AjaxResult viewReceipt(@PathVariable("id") Long id, @RequestParam("type") String type)
+ {
+
+ return AjaxResult.success( omsFinAttachmentService.list(Collections.singletonList(id),type));
+ }
+ /**
+ * 上传回执单
+ */
+ @RequiresPermissions("finance:receipt:uploadReceipt")
+ @Log(title = "上传回执单", businessType = BusinessType.UPDATE)
+ @PostMapping("/uploadReceipt")
+ @ResponseBody
+ public AjaxResult uploadReceipt(OmsFinAttachment attachment, @RequestParam("file") MultipartFile file)
+ {
+ try
+ {
+ attachment.setRelatedBillType(OmsFinAttachment.RelatedBillTypeEnum.RECEIPT.getCode());
+ return omsReceiptBillService.uploadReceipt(attachment, file);
+ }
+ catch (Exception e)
+ {
+ logger.error("上传回执单失败", e);
+ return AjaxResult.error("操作失败：" + e.getMessage());
+ }
+ }
+ @RequiresPermissions("finance:receipt:apply")
+ @Log(title = "申请收款", businessType = BusinessType.UPDATE)
+ @PostMapping("/applyReceipt")
+ @ResponseBody
+ public AjaxResult applyReceipt(OmsReceiptBill omsReceiptBill, @RequestParam("file") MultipartFile file) {
+ try {
+ omsReceiptBillService.applyReceipt(omsReceiptBill, file);
+ } catch (IOException e) {
+ return AjaxResult.error("操作失败：" + e.getMessage());
+ }
+ return AjaxResult.success();
+ }
+ /**
+ * 申请退款
+ */
+ @PostMapping("/applyRefund")
+ @ResponseBody
+ public AjaxResult applyRefund(@RequestBody OmsReceiptBill omsReceiptBill) {
+ try {
+ return omsReceiptBillService.applyRefund(omsReceiptBill);
+ } catch (Exception e) {
+ logger.error("申请退款失败", e);
+ return AjaxResult.error("操作失败：" + e.getMessage());
+ }
+ }
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsReceiptBill.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsReceiptBill.java
index ee8e540c..3f6b35c8 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsReceiptBill.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsReceiptBill.java
@@ -160,6 +160,8 @@ public class OmsReceiptBill {
* 是否已申请退款 0:未退款 1:已申请退款
*/
private String refundStatus;
+ private Long originalBillId;
+ private OmsFinAttachment attachment;
private List
detailDTOList;
@Getter
public enum ReceiptBillTypeEnum {
@@ -182,6 +184,25 @@ public class OmsReceiptBill {
}
}
@Getter
+ public enum RefundStatusEnum {
+
+ /** 应付单生成 */
+ REFUNDED("REFUND_APPLIED", "已申请退款"),
+ WAIT_REFUNDED("WAIT_REFUNDED", "未退款")
+
+ ;
+
+
+
+ ;
+ private final String code;
+ private final String desc;
+ RefundStatusEnum(String code, String desc) {
+ this.code = code;
+ this.desc = desc;
+ }
+ }
+ @Getter
public enum ReceiptStatusEnum {
/** 应付单生成 */
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsReceivableReceiptDetailMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsReceivableReceiptDetailMapper.java
index 136cda09..15a10f61 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsReceivableReceiptDetailMapper.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsReceivableReceiptDetailMapper.java
@@ -65,4 +65,6 @@ public interface OmsReceivableReceiptDetailMapper
List selectByPaymentPlanIds(List allReceiptPlanIds);
List listReceivableByReceiptBillCode(List receiptBillCode);
+
+ void insertBatch(List addList);
}
\ No newline at end of file
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsReceiptBillService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsReceiptBillService.java
index d4a862ee..24966521 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsReceiptBillService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsReceiptBillService.java
@@ -1,8 +1,11 @@
package com.ruoyi.sip.service;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.sip.domain.OmsFinAttachment;
import com.ruoyi.sip.domain.OmsReceiptBill;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.util.List;
/**
@@ -46,6 +49,12 @@ public interface IOmsReceiptBillService {
List listRemainingAmountByPartnerCodeList(List collect);
AjaxResult returnPaymentBill(Long id);
+
+ void applyReceipt(OmsReceiptBill omsReceiptBill, MultipartFile file) throws IOException;
+
+ AjaxResult applyRefund(OmsReceiptBill omsReceiptBill);
+
+ AjaxResult uploadReceipt(OmsFinAttachment attachment, MultipartFile file) throws IOException;
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsReceivableReceiptDetailService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsReceivableReceiptDetailService.java
index b10adad0..be71aab9 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsReceivableReceiptDetailService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsReceivableReceiptDetailService.java
@@ -71,4 +71,6 @@ public interface IOmsReceivableReceiptDetailService
List listReceivableByReceiptBillCode(String receiptBillCode);
List listByReceiptBillCode(String receiptBillCode);
+
+ void applyRefund(String originalReceiptBillCode, String targetReceiptBillCode);
}
\ No newline at end of file
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsReceiptBillServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsReceiptBillServiceImpl.java
index c69175a6..8d43c0a4 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsReceiptBillServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsReceiptBillServiceImpl.java
@@ -3,25 +3,32 @@ package com.ruoyi.sip.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.ApproveStatusEnum;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
-import com.ruoyi.sip.domain.OmsPayablePaymentDetail;
-import com.ruoyi.sip.domain.OmsPaymentBill;
-import com.ruoyi.sip.domain.OmsReceiptBill;
-import com.ruoyi.sip.domain.OmsReceivableReceiptDetail;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.sip.domain.*;
import com.ruoyi.sip.domain.dto.ReceiptDetailDTO;
+import com.ruoyi.sip.dto.WriteOffRequestDto;
import com.ruoyi.sip.mapper.OmsReceiptBillMapper;
+import com.ruoyi.sip.service.IOmsFinAttachmentService;
import com.ruoyi.sip.service.IOmsReceiptBillService;
import com.ruoyi.sip.service.IOmsReceivableBillService;
import com.ruoyi.sip.service.IOmsReceivableReceiptDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.io.IOException;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -39,6 +46,8 @@ public class OmsReceiptBillServiceImpl implements IOmsReceiptBillService {
private IOmsReceivableReceiptDetailService omsReceivableReceiptDetailService;
@Autowired
private IOmsReceivableBillService receivableBillService;
+ @Autowired
+ private IOmsFinAttachmentService attachmentService;
/**
* 查询列表数据
@@ -55,8 +64,14 @@ public class OmsReceiptBillServiceImpl implements IOmsReceiptBillService {
@Override
public OmsReceiptBill queryById(Long id) {
OmsReceiptBill receiptBill = omsReceiptBillMapper.queryById(id);
+ if (receiptBill == null){
+ return null;
+ }
List receiptDetailDTOS = omsReceivableReceiptDetailService.listReceivableByReceiptBillCode(receiptBill.getReceiptBillCode());
receiptBill.setDetailDTOList(receiptDetailDTOS);
+ List list = attachmentService.list(Collections.singletonList(receiptBill.getId()), OmsFinAttachment.RelatedBillTypeEnum.RECEIPT.getCode());
+ Optional first = list.stream().filter(item -> !"2".equals(item.getDelFlag())).max((o1, o2) -> o2.getCreateTime().compareTo(o1.getCreateTime()));
+ receiptBill.setAttachment(first.orElse(null));
return receiptBill;
}
@@ -144,6 +159,143 @@ public class OmsReceiptBillServiceImpl implements IOmsReceiptBillService {
}
}
+ @Override
+ public void applyReceipt(OmsReceiptBill omsReceiptBill, MultipartFile file) throws IOException {
+ omsReceiptBill.setApproveStatus(ApproveStatusEnum.WAIT_APPROVE.getCode());
+
+
+ omsReceiptBillMapper.update(omsReceiptBill);
+
+ // 上传文件路径
+ String filePath = RuoYiConfig.getUploadPath();
+ // 上传并返回新文件名称
+ String fileName = FileUploadUtils.upload(filePath, file);
+
+ SysUser loginUser = ShiroUtils.getSysUser();
+
+ OmsFinAttachment attachment = new OmsFinAttachment();
+ attachment.setRelatedBillType(OmsFinAttachment.RelatedBillTypeEnum.RECEIPT.getCode());
+ attachment.setRelatedBillId(omsReceiptBill.getId());
+ attachment.setFileName(file.getOriginalFilename());
+ attachment.setFilePath(fileName);
+ attachment.setFileSize(file.getSize());
+ attachment.setFileType(file.getContentType());
+ attachment.setCreateBy(loginUser.getUserId().toString());
+ attachmentService.insertOmsFinAttachment(attachment);
+ }
+
+ @Override
+ public AjaxResult applyRefund(OmsReceiptBill omsReceiptBill) {
+ // 1. 验证原始付款单
+ OmsReceiptBill receiptBill = queryById(omsReceiptBill.getId());
+
+ if (receiptBill == null) {
+ return AjaxResult.error("原始收款单不存在");
+ }
+
+ if (OmsReceiptBill.ReceiptBillTypeEnum.REFUND.getCode().equals(receiptBill.getReceiptBillType())) {
+ if (!ApproveStatusEnum.WAIT_APPROVE.getCode().equals(receiptBill.getApproveStatus()) ||
+ !ApproveStatusEnum.APPROVE_REJECT.getCode().equals(receiptBill.getApproveStatus())){
+ return AjaxResult.error("当前订单已提交审批,请刷新后重试");
+ }
+ receiptBill.setApproveStatus(ApproveStatusEnum.WAIT_APPROVE.getCode());
+ //todo 开启流程
+ update(receiptBill);
+ return AjaxResult.success("退款申请成功！");
+ }
+
+
+ if (!OmsReceiptBill.ReceiptStatusEnum.PAYMENT.getCode().equals(receiptBill.getReceiptStatus())) {
+ return AjaxResult.error("只有已付款的订单才能申请退款");
+ }
+ if (OmsReceiptBill.RefundStatusEnum.REFUNDED.getCode().equals(receiptBill.getRefundStatus())) {
+ return AjaxResult.error("该付款单已申请过退款，请勿重复操作");
+ }
+
+ // 2. 创建新的退款单
+ OmsReceiptBill refundBill = new OmsReceiptBill();
+
+ // 复制属性并取反金额
+ refundBill.setTotalPriceWithTax(receiptBill.getTotalPriceWithTax().negate());
+ refundBill.setTotalPriceWithoutTax(receiptBill.getTotalPriceWithoutTax().negate());
+ refundBill.setTaxAmount(receiptBill.getTaxAmount().negate());
+
+ refundBill.setPartnerCode(receiptBill.getPartnerCode());
+ refundBill.setOrderCode(receiptBill.getOrderCode());
+ refundBill.setReceiptAccountName(omsReceiptBill.getReceiptAccountName());
+ refundBill.setReceiptBankNumber(omsReceiptBill.getReceiptBankNumber());
+ refundBill.setReceiptBankOpenAddress(omsReceiptBill.getReceiptBankOpenAddress());
+ refundBill.setBankNumber(omsReceiptBill.getBankNumber());
+ refundBill.setReceiptBillCode(generateReceiptBillCode());
+ // 设置新属性
+ refundBill.setReceiptBillType(OmsReceiptBill.ReceiptBillTypeEnum.REFUND.getCode());
+ refundBill.setReceiptStatus(OmsReceiptBill.ReceiptStatusEnum.WAIT_PAYMENT.getCode());
+ refundBill.setApproveStatus(ApproveStatusEnum.WAIT_APPROVE.getCode());
+ refundBill.setOriginalBillId(receiptBill.getId());
+ refundBill.setReceiptTime(null);
+ refundBill.setReceiptMethod(omsReceiptBill.getReceiptMethod());
+ refundBill.setRemark("退款-关联原付款单:" + omsReceiptBill.getReceiptBillCode());
+
+ insert(refundBill);
+
+ // 3. 更新原始付款单状态
+ receiptBill.setRefundStatus(OmsReceiptBill.RefundStatusEnum.REFUNDED.getCode());
+ update(receiptBill);
+ //4 创建付款明细
+ omsReceivableReceiptDetailService.applyRefund(receiptBill.getReceiptBillCode(), refundBill.getReceiptBillCode());
+ //5. 开始退款审批流程
+// todoService.startProcessDeleteBefore(originalBill.getPaymentBillCode(), originalBill.getPaymentBillCode(),
+// new HashMap() {{
+// put("applyUserName", ShiroUtils.getSysUser().getUserName());
+// put("applyUser", ShiroUtils.getUserId());
+// }}
+// , processConfig.getDefinition().getFinanceRefund());
+ return AjaxResult.success("退款申请已提交，新的退款单号为:" + refundBill.getReceiptBillCode());
+ }
+
+ @Override
+ public AjaxResult uploadReceipt(OmsFinAttachment attachment, MultipartFile file) throws IOException {
+ OmsReceiptBill receiptBill = queryById(attachment.getRelatedBillId());
+ if (receiptBill == null) {
+ return AjaxResult.error("收款单不存在");
+ }
+
+ if (file.isEmpty())
+ {
+ return AjaxResult.error("上传文件不能为空");
+ }
+ // 上传文件路径
+ String filePath = RuoYiConfig.getUploadPath();
+ // 上传并返回新文件名称
+ String fileName = FileUploadUtils.upload(filePath, file);
+
+ SysUser loginUser = ShiroUtils.getSysUser();
+
+
+ attachment.setFileName(file.getOriginalFilename());
+ attachment.setFilePath(fileName);
+ attachment.setFileSize(file.getSize());
+ attachment.setFileType(file.getContentType());
+ attachment.setCreateBy(loginUser.getUserId().toString());
+ attachmentService.insertOmsFinAttachment(attachment);
+ receiptBill.setActualReceiptTime(DateUtils.getNowDate());
+ receiptBill.setReceiptStatus(OmsReceiptBill.ReceiptStatusEnum.PAYMENT.getCode());
+ update(receiptBill);
+ if (!receiptBill.getReceiptBillType().equals(OmsReceiptBill.ReceiptBillTypeEnum.PRE_RECEIPT.getCode())) {
+ //todo 自动核销
+ // List omsPayablePaymentDetails = omsReceivableReceiptDetailService.listByReceiptCode(receiptBill.getReceiptBillCode());
+
+
+// WriteOffRequestDto writeOffRequestDto = new WriteOffRequestDto();
+// writeOffRequestDto.setReceiptBillId(receiptBill.getId());
+// writeOffRequestDto.setDetailList(omsPayablePaymentDetails);
+// writeOffRequestDto.setVendorCode(paymentBill.getVendorCode());
+// writeOffRequestDto.setRemark(StrUtil.format("{}自动核销数据:{}", DateUtils.getTime(), paymentBill.getPaymentBillCode()));
+// // 新增核销记录
+// writeOffService.autoWriteOff(writeOffRequestDto);
+ }
+ return AjaxResult.success(attachment);
+ }
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsReceivableReceiptDetailServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsReceivableReceiptDetailServiceImpl.java
index 464a0847..89ff3b43 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsReceivableReceiptDetailServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsReceivableReceiptDetailServiceImpl.java
@@ -1,13 +1,16 @@
package com.ruoyi.sip.service.impl;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
+import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.sip.domain.OmsFinAttachment;
import com.ruoyi.sip.domain.OmsPayablePaymentDetail;
import com.ruoyi.sip.domain.dto.PaymentBillPayableDetailDTO;
@@ -156,4 +159,28 @@ public class OmsReceivableReceiptDetailServiceImpl implements IOmsReceivableRece
omsReceivableReceiptDetail.setReceiptBillCode(receiptBillCode);
return omsReceivableReceiptDetailMapper.list(omsReceivableReceiptDetail);
}
+
+ @Override
+ public void applyRefund(String originalReceiptBillCode, String targetReceiptBillCode) {
+ OmsReceivableReceiptDetail detail = new OmsReceivableReceiptDetail();
+ detail.setReceiptBillCode(originalReceiptBillCode);
+ List list = omsReceivableReceiptDetailMapper.list(detail);
+ if (CollUtil.isNotEmpty(list)){
+ List addList=new ArrayList<>();
+ for (OmsReceivableReceiptDetail existDetail : list) {
+ OmsReceivableReceiptDetail temp = new OmsReceivableReceiptDetail();
+ BeanUtil.copyProperties(existDetail,temp);
+ temp.setId(null);
+ temp.setReceivableDetailType(OmsReceivableReceiptDetail.ReceivableDetailTypeEnum.REFUND.getCode());
+ temp.setReceiptBillCode(targetReceiptBillCode);
+ temp.setCreateBy(ShiroUtils.getUserId().toString());
+ temp.setReceiptAmount(existDetail.getReceiptAmount().negate());
+ temp.setReceiptRate(existDetail.getReceiptRate().negate());
+ temp.setReceiptBillCode(targetReceiptBillCode);
+ temp.setRemark("退款");
+ addList.add( temp);
+ }
+ omsReceivableReceiptDetailMapper.insertBatch(addList);
+ }
+ }
}
\ No newline at end of file
diff --git a/ruoyi-sip/src/main/resources/mapper/OmsReceiptBill/OmsReceiptBillMapper.xml b/ruoyi-sip/src/main/resources/mapper/OmsReceiptBill/OmsReceiptBillMapper.xml
index 68871264..2ab0f182 100644
--- a/ruoyi-sip/src/main/resources/mapper/OmsReceiptBill/OmsReceiptBillMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/OmsReceiptBill/OmsReceiptBillMapper.xml
@@ -32,6 +32,7 @@
+
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsReceivableReceiptDetailMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsReceivableReceiptDetailMapper.xml
index 99ca470d..9b47763c 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/OmsReceivableReceiptDetailMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsReceivableReceiptDetailMapper.xml
@@ -131,6 +131,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{paymentAmountTax},
+
+ insert into oms_receivable_receipt_detail
+ (receipt_plan_id,receivable_bill_id,receipt_time,receipt_amount,receipt_rate,receipt_bill_code,receivable_detail_type
+ ,remark,create_time,create_by,update_time,update_by,payment_amount_without_tax,payment_amount_tax)
+ values
+
+
+ (#{item.receiptPlanId},#{item.receivableBillId},#{item.receiptTime},#{item.receiptAmount},#{item.receiptRate},#{item.receiptBillCode},#{item.receivableDetailType}
+ ,#{item.remark},#{item.createTime},#{item.createBy},#{item.updateTime},#{item.updateBy},#{item.paymentAmountWithoutTax},#{item.paymentAmountTax})
+
+
+
+
update oms_receivable_receipt_detail