From 5efdaadaec275e34e9a59b1b6d036e065fd35a92 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Sat, 12 Nov 2022 16:30:33 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../base/api/busvehicleapply/BusApplyVo.java | 1 +
.../BaseManufacturerBankMapper.xml | 2 +-
.../BaseOutsourcingApplicationService.java | 4 +
.../BusVehicleApplyService.java | 2 +
.../finpaymentrecord/FinPaymentrecord.java | 2 +
.../finpaymentrecord/FinPaymentrecordDto.java | 5 +-
.../finpaymentrecord/FinPaymentrecordVo.java | 2 +
.../FinPaymentrecordMapper.xml | 1 +
.../FinPaymentrecordService.java | 111 +++++++++++++++++-
.../main/resources/ftl/prePaymentApply.ftl | 5 +-
10 files changed, 127 insertions(+), 8 deletions(-)
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java
index b3b61ceb87..74d9042543 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java
@@ -14,4 +14,5 @@ public class BusApplyVo implements Vo {
private String name;
private String num;
private String code;
+ private String bankName;
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
index 7d514c452b..b6d53e1a01 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
@@ -64,7 +64,7 @@
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index df94dda8a3..050f3e66c1 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -2075,8 +2075,8 @@ public class BusSalesOrderService extends MybatisBaseService qw = new QueryWrapper<>();
qw.eq("bo.staffSid", sysUserVo.getStaffSid());
IPage page = PagerUtil.queryToPage(pagerQuery);
- IPage iPage = baseMapper.getApprovalContractList(page, qw);
+ IPage iPage = baseMapper.getApprovalContractList(page, qw, params.getName());
for (AppRovalContractPageVo record : iPage.getRecords()) {
String busSid = record.getBusSid();
CommonContractVo commonContract = commonContractFeign.getContractBySalesOrderSid(busSid).getData();
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AddInvoicedApplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AddInvoicedApplyDto.java
new file mode 100644
index 0000000000..f1fd6c70f9
--- /dev/null
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AddInvoicedApplyDto.java
@@ -0,0 +1,37 @@
+package com.yxt.anrui.fin.api.finbillapplication;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AddInvoicedApplyDto implements Dto {
+ private static final long serialVersionUID = -2942692578331132685L;
+
+ @ApiModelProperty("合同编号")
+ private String contractNo;
+
+ @ApiModelProperty("客户名称")
+ private String customerName;
+
+ @ApiModelProperty("申请日期")
+ private String applyDate;
+
+ @ApiModelProperty("开票类型key")
+ private String billTypeKey;
+
+ @ApiModelProperty("开票类型value")
+ private String billTypeValue;
+
+ @ApiModelProperty("分公司sid")
+ private String useOrgSid;
+
+ @ApiModelProperty("创建人sid")
+ private String createBySid;
+
+ @ApiModelProperty("车辆集合")
+ private List vinList;
+
+}
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java
index 64b4863ab1..69478f319a 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java
@@ -54,6 +54,8 @@ public class FinBillApplication extends BaseEntity {
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
+ @ApiModelProperty("创建人sid")
+ private String createBySid;
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("合同sid")
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java
index 9e38190af5..28bae3ab83 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java
@@ -156,4 +156,9 @@ public interface FinBillApplicationFeign {
@ResponseBody
public ResultBean saveInvoicedApplyInfo(@Valid @RequestBody AppBillApplicationIInfoDto dto);
+ @ApiOperation("提前开票推送接口")
+ @PostMapping("/addInvoicedApply")
+ @ResponseBody
+ public ResultBean addInvoicedApply(@Valid @RequestBody AddInvoicedApplyDto dto);
+
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java
index de84953e1f..ae64c0e854 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java
@@ -125,4 +125,9 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign
public ResultBean saveInvoicedApplyInfo(AppBillApplicationIInfoDto dto) {
return null;
}
+
+ @Override
+ public ResultBean addInvoicedApply(AddInvoicedApplyDto dto) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java
index 0d274848a8..5a2372bd2b 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java
@@ -155,4 +155,9 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
public ResultBean saveInvoicedApplyInfo(AppBillApplicationIInfoDto dto) {
return finBillApplicationService.saveInvoicedApplyInfo(dto);
}
+
+ @Override
+ public ResultBean addInvoicedApply(AddInvoicedApplyDto dto) {
+ return finBillApplicationService.addInvoicedApply(dto);
+ }
}
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
index 749a0babbd..7cd332b246 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@@ -78,6 +78,7 @@ import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -968,8 +969,8 @@ public class FinBillApplicationService extends MybatisBaseService iPage = baseMapper.getInvoicedApplyList(page, qw);
List records = iPage.getRecords();
for (AppBillApplicationPageVo record : records) {
- String contractSid = record.getContractSid();
- SysUserVo data = sysUserFeign.fetchBySid(contractSid).getData();
+ String createBySid = record.getCreateBySid();
+ SysUserVo data = sysUserFeign.fetchBySid(createBySid).getData();
record.setApplyName(data.getName());
}
return iPage;
@@ -1118,6 +1119,22 @@ public class FinBillApplicationService extends MybatisBaseService vinList = dto.getVinList();
+ for (AppVinListDto appVinListDto : vinList) {
+ FinBillVehicle finBillVehicle = new FinBillVehicle();
+ BeanUtil.copyProperties(appVinListDto, finBillVehicle, "sid");
+ finBillVehicle.setBillAppSid(finBillApplication.getSid());
+ finBillVehicleService.save(finBillVehicle);
+ }
+ finBillApplication.setNum(vinList.size());
+ save(finBillApplication);
+ return rb.success();
+ }
+
/* public ResultBean submitFinBillApplicationPageList(SubmitFinBillApplicationPageListDto dto) {
ResultBean rb = ResultBean.fireFail();
From 48d6613c66ea3ddba0c14e87d596909893b0a42b Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 14 Nov 2022 11:39:07 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java
index d69e07b19b..5fc2617bd8 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java
@@ -92,6 +92,7 @@ public class STKInStockService extends FinKingDeeService {
log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData());
if(responseStatus!=null){//不存在该物料
//新增物料
+ f.setFLot("");
bdMaterial(stkInStock, f);
}else{ //存在该物料
//分配物料
From b515902fc42628c6ed0b8202269a78c3b066777b Mon Sep 17 00:00:00 2001
From: yxt_djz
Date: Mon, 14 Nov 2022 15:43:41 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7pdf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FinPaymentrecordService.java | 20 +++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index 9098abaed7..d9d66e1e6a 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -28,6 +28,7 @@ package com.yxt.anrui.fin.biz.finpaymentrecord;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto;
@@ -59,9 +60,11 @@ import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.WordConvertUtils;
+import com.yxt.common.base.utils.WordUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -91,6 +94,7 @@ import static cn.hutool.core.util.ClassLoaderUtil.getClassLoader;
* @version 1.0
* @since 1.0
*/
+@Slf4j
@Service
public class FinPaymentrecordService extends MybatisBaseService {
@@ -423,19 +427,27 @@ public class FinPaymentrecordService extends MybatisBaseService