From bc0193e94c96c7ea60be17d250e00408dc787a87 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 18 十一月 2025 17:44:07 +0800
Subject: [PATCH] yys 1.销售、采购关于发票的改成不必填 2.回款类型字典改-下 3.销售台账、采购台账可能不开票直接回款 4.销售台账要直接查产品名字 5.指标维护-内控值为非必填 6.所有税率都自己填，有时候可能不含税
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 10 +
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 9 +
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 28 +++-
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 5
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 28 ++++
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 21 +++
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 3
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 5
src/main/resources/application-hsxnyCopy.yml | 219 ++++++++++++++++++++++++++++++++++++
src/main/resources/application.yml | 2
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 5
11 files changed, 321 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index 7d1e9e5..44877b3 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -20,6 +20,11 @@
private String entryDateStart;
private String entryDateEnd;
+ /**
+ * 鏄惁寮�绁� 1-鏄� 2-鍚�
+ */
+ private Integer isInvoice;
+
private Long id;
/**
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index 7b7ad72..2697d3c 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -27,6 +27,11 @@
private Long id;
/**
+ * 鏄惁寮�绁� 1-鏄� 2-鍚�
+ */
+ private Integer isInvoice;
+
+ /**
* 閲囪喘鍚堝悓鍙�
*/
@Excel(name = "閲囪喘鍚堝悓鍙�")
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index e5a64fd..a55e55f 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -27,6 +27,7 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
+import com.ruoyi.purchase.dto.TicketRegistrationDto;
import com.ruoyi.purchase.mapper.ProductRecordMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
@@ -34,6 +35,7 @@
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
+import com.ruoyi.purchase.service.ITicketRegistrationService;
import com.ruoyi.sales.mapper.*;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
@@ -172,7 +174,7 @@
// 4. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productList = purchaseLedgerDto.getProductData();
if (productList != null && !productList.isEmpty()) {
- handleSalesLedgerProducts(purchaseLedger.getId(), productList, purchaseLedgerDto.getType());
+ handleSalesLedgerProducts(purchaseLedgerDto,purchaseLedger.getId(), productList, purchaseLedgerDto.getType());
}
// 5. 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
@@ -183,7 +185,9 @@
return 1;
}
- private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) {
+ private final ITicketRegistrationService ticketRegistrationService;
+
+ private void handleSalesLedgerProducts(PurchaseLedgerDto purchaseLedgerDto,Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) throws IOException {
if (products == null || products.isEmpty()) {
throw new BaseException("浜у搧淇℃伅涓嶅瓨鍦�");
}
@@ -252,6 +256,26 @@
salesLedgerProduct.setRegisterDate(localDateTime);
salesLedgerProductMapper.insert(salesLedgerProduct);
}
+ if (purchaseLedgerDto.getIsInvoice().equals(2)) {
+ // 鏃犻渶寮�绁紝鎻愮ず绯荤粺鐢熸垚鍙戠エ
+
+ for (SalesLedgerProduct productDatum : insertList) {
+ productDatum.setTicketsAmount(productDatum.getTaxInclusiveTotalPrice());
+ productDatum.setTicketsNum(productDatum.getQuantity());
+ }
+ BigDecimal invoiceAmount = insertList.stream()
+ .map(SalesLedgerProduct::getTicketsAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ TicketRegistrationDto ticketRegistrationDto = new TicketRegistrationDto();
+ BeanUtils.copyProperties(purchaseLedgerDto, ticketRegistrationDto);
+ ticketRegistrationDto.setInvoiceAmount(invoiceAmount);
+ ticketRegistrationDto.setProductData(insertList);
+ ticketRegistrationDto.setPurchaseLedgerId(salesLedgerId);
+ ticketRegistrationDto.setIssUer("绯荤粺鑷姩鐢熸垚");
+ ticketRegistrationDto.setIssueDate(LocalDate.now());
+ ticketRegistrationDto.setInvoiceNumber("姝ゅ彴璐︽棤闇�鎵嬪姩寮�绁紝绯荤粺灏嗘墍鏈変骇鍝佽嚜鍔ㄧ敓鎴愭潵绁ㄥ彴璐�");
+ ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto);
+ }
}
// 璁＄畻鎬诲惈绋庨噾棰�
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index c384520..a6f33b1 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -15,23 +16,19 @@
import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
-import com.ruoyi.sales.pojo.InvoiceLedger;
-import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
-import com.ruoyi.sales.pojo.ReceiptPayment;
-import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.*;
import com.ruoyi.sales.service.ICommonFileService;
+import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -46,6 +43,9 @@
public class SalesLedgerController extends BaseController {
private ISalesLedgerService salesLedgerService;
+
+ @Autowired
+ private ISalesLedgerProductService salesLedgerProductService;
private ICommonFileService commonFileService;
@@ -198,6 +198,18 @@
*/
@GetMapping("/listPage")
public IPage<SalesLedger> listPage(Page page, SalesLedgerDto salesLedgerDto) {
+ Set<Long> ids = new HashSet<>();
+ if(!StringUtils.isEmpty(salesLedgerDto.getProductCategory())){
+ List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductService.getBaseMapper().selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getType, 1)
+ .like(SalesLedgerProduct::getProductCategory, salesLedgerDto.getProductCategory())
+ .select(SalesLedgerProduct::getSalesLedgerId));
+ ids = salesLedgerProducts.stream().map(SalesLedgerProduct::getSalesLedgerId).collect(Collectors.toSet());
+ if(CollectionUtils.isEmpty(ids)){
+ throw new BaseException("鏆傛棤鏌ュ埌姝や骇鍝佸ぇ绫绘垨姝や骇鍝佸ぇ绫绘棤閿�鍞暟鎹紝璇蜂粩缁嗘鏌ワ紒");
+ }
+ }
+ salesLedgerDto.setIds(ids);
IPage<SalesLedger> iPage = salesLedgerService.selectSalesLedgerListPage(page,salesLedgerDto);
// 璁＄畻宸插紑绁ㄩ噾棰�/鏈紑绁ㄩ噾棰�(宸插～鍐欏彂绁ㄩ噾棰濅负鍑�)
if(CollectionUtils.isEmpty(iPage.getRecords())){
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 486ffcb..0874b3e 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -9,7 +9,9 @@
import java.time.LocalDate;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
@Data
public class SalesLedgerDto {
@@ -17,6 +19,12 @@
private String salesContractNo;
private String customerContractNo;
private String projectName;
+ private String productCategory;
+ private Set<Long> ids; //
+ /**
+ * 鏄惁寮�绁� 1-鍚� 2-鏄�
+ */
+ private Integer isInvoice;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date entryDate;
@@ -46,7 +54,7 @@
private List<String> tempFileIds;
private List<CommonFile> SalesLedgerFiles;
- private Integer Type;
+ private Integer type;
@ApiModelProperty(value = "绛捐鏃ユ湡")
private LocalDate executionDate;
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 4ffdb03..3bc98c7 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -35,6 +35,11 @@
private String salesContractNo;
/**
+ * 鏄惁寮�绁� 1-鏄� 2-鍚�
+ */
+ private Integer isInvoice;
+
+ /**
* 瀹㈡埛鍚堝悓鍙�
*/
@Excel(name = "瀹㈡埛鍚堝悓鍙�")
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 6493d46..e79c836 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.sales.service.impl;
+import com.alibaba.druid.util.DaemonThreadFactory;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -28,6 +29,7 @@
import com.ruoyi.sales.mapper.*;
import com.ruoyi.sales.pojo.*;
import com.ruoyi.sales.service.ISalesLedgerService;
+import com.ruoyi.sales.service.InvoiceRegistrationService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
@@ -365,6 +367,9 @@
return salesLedgerMapper.deleteBatchIds(idList);
}
+ @Autowired
+ private InvoiceRegistrationService invoiceRegistrationService;
+
@Override
@Transactional(rollbackFor = Exception.class)
public int addOrUpdateSalesLedger(SalesLedgerDto salesLedgerDto) {
@@ -417,7 +422,7 @@
// 4. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productList = salesLedgerDto.getProductData();
if (productList != null && !productList.isEmpty()) {
- handleSalesLedgerProducts(salesLedger.getId(), productList, salesLedgerDto.getType());
+ handleSalesLedgerProducts(salesLedgerDto,salesLedger.getId(), productList, salesLedgerDto.getType());
updateMainContractAmount(
salesLedger.getId(),
productList,
@@ -515,7 +520,7 @@
}
- private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) {
+ private void handleSalesLedgerProducts(SalesLedgerDto salesLedgerDto,Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) {
// 鎸塈D鍒嗙粍锛屽尯鍒嗘柊澧炲拰鏇存柊鐨勮褰�
Map<Boolean, List<SalesLedgerProduct>> partitionedProducts = products.stream()
.peek(p -> p.setSalesLedgerId(salesLedgerId))
@@ -539,6 +544,18 @@
salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
salesLedgerProductMapper.insert(salesLedgerProduct);
}
+ if (salesLedgerDto.getIsInvoice().equals(2)) {
+ // 鏃犻渶寮�绁紝鎻愮ず绯荤粺鐢熸垚鍙戠エ
+ for (SalesLedgerProduct productDatum : insertList) {
+ productDatum.setCurrentInvoiceAmount(productDatum.getTaxInclusiveTotalPrice());
+ productDatum.setCurrentInvoiceNum(productDatum.getQuantity());
+ }
+ salesLedgerDto.setId(salesLedgerId);
+ salesLedgerDto.setIssueDate(LocalDate.now());
+ salesLedgerDto.setInvoiceNo("姝ゅ彴璐︽棤闇�鎵嬪姩寮�绁紝绯荤粺灏嗘墍鏈変骇鍝佽嚜鍔ㄧ敓鎴愬紑绁ㄥ彴璐�");
+ salesLedgerDto.setCreateUser(SecurityUtils.getLoginUser().getNickName());
+ invoiceRegistrationService.invoiceRegistrationSave(salesLedgerDto);
+ }
}
}
diff --git a/src/main/resources/application-hsxnyCopy.yml b/src/main/resources/application-hsxnyCopy.yml
new file mode 100644
index 0000000..70337b1
--- /dev/null
+++ b/src/main/resources/application-hsxnyCopy.yml
@@ -0,0 +1,219 @@
+# 椤圭洰鐩稿叧閰嶇疆
+ruoyi:
+ # 鍚嶇О
+ name: RuoYi
+ # 鐗堟湰
+ version: 3.8.9
+ # 鐗堟潈骞翠唤
+ copyrightYear: 2025
+ # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
+ profile: /javaWork/product-inventory-management/file
+
+ # 鑾峰彇ip鍦板潃寮�鍏�
+ addressEnabled: false
+ # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
+ captchaType: math
+
+# 寮�鍙戠幆澧冮厤缃�
+server:
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+ port: 8080
+ servlet:
+ # 搴旂敤鐨勮闂矾寰�
+ context-path: /
+ tomcat:
+ # tomcat鐨刄RI缂栫爜
+ uri-encoding: UTF-8
+ # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
+ accept-count: 1000
+ threads:
+ # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
+ max: 800
+ # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
+ min-spare: 100
+
+# 鏃ュ織閰嶇疆
+logging:
+ level:
+ com.ruoyi: warn
+ org.springframework: warn
+
+minio:
+ endpoint: http://114.132.189.42/
+ port: 7019
+ secure: false
+ accessKey: admin
+ secretKey: 12345678
+ preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
+ default-bucket: uploadPath
+# 鐢ㄦ埛閰嶇疆
+user:
+ password:
+ # 瀵嗙爜鏈�澶ч敊璇鏁�
+ maxRetryCount: 5
+ # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
+ lockTime: 10
+
+# Spring閰嶇疆
+spring:
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+ druid:
+ # 涓诲簱鏁版嵁婧�
+ master:
+ url: jdbc:mysql://localhost:3306/product-inventory-management-hsxny?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: root
+ password: 123456
+ # 浠庡簱鏁版嵁婧�
+ slave:
+ # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
+ enabled: false
+ url:
+ username:
+ password:
+ # 鍒濆杩炴帴鏁�
+ initialSize: 5
+ # 鏈�灏忚繛鎺ユ睜鏁伴噺
+ minIdle: 10
+ # 鏈�澶ц繛鎺ユ睜鏁伴噺
+ maxActive: 20
+ # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
+ maxWait: 60000
+ # 閰嶇疆杩炴帴瓒呮椂鏃堕棿
+ connectTimeout: 30000
+ # 閰嶇疆缃戠粶瓒呮椂鏃堕棿
+ socketTimeout: 60000
+ # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+ timeBetweenEvictionRunsMillis: 60000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ minEvictableIdleTimeMillis: 300000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ maxEvictableIdleTimeMillis: 900000
+ # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: true
+ # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
+ allow:
+ url-pattern: /druid/*
+ # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
+ login-username: ruoyi
+ login-password: 123456
+ filter:
+ stat:
+ enabled: true
+ # 鎱QL璁板綍
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
+ # 璧勬簮淇℃伅
+ messages:
+ # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
+ basename: i18n/messages
+ # 鏂囦欢涓婁紶
+ servlet:
+ multipart:
+ # 鍗曚釜鏂囦欢澶у皬
+ max-file-size: 1GB
+ # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
+ max-request-size: 2GB
+ # 鏈嶅姟妯″潡
+ devtools:
+ restart:
+ # 鐑儴缃插紑鍏�
+ enabled: false
+ # redis 閰嶇疆
+ redis:
+ # 鍦板潃
+# host: 127.0.0.1
+ host: 192.168.1.185
+ # 绔彛锛岄粯璁や负6379
+ port: 6379
+ # 鏁版嵁搴撶储寮�
+ database: 12
+ # 瀵嗙爜
+# password: root2022!
+ password:
+
+ # 杩炴帴瓒呮椂鏃堕棿
+ timeout: 10s
+ lettuce:
+ pool:
+ # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ min-idle: 0
+ # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ max-idle: 8
+ # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ max-active: 8
+ # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ max-wait: -1ms
+
+# token閰嶇疆
+token:
+ # 浠ょ墝鑷畾涔夋爣璇�
+ header: Authorization
+ # 浠ょ墝瀵嗛挜
+ secret: abcdefghijklmnopqrstuvwxyz
+ # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
+ expireTime: 450
+
+# MyBatis Plus閰嶇疆
+mybatis-plus:
+ # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
+ typeAliasesPackage: com.ruoyi.**.pojo
+ # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
+ mapperLocations: classpath*:mapper/**/*Mapper.xml
+ # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
+ configLocation: classpath:mybatis/mybatis-config.xml
+ global-config:
+ enable-sql-runner: true
+ db-config:
+ id-type: auto
+
+# PageHelper鍒嗛〉鎻掍欢
+pagehelper:
+ helperDialect: mysql
+ supportMethodsArguments: true
+ params: count=countSql
+
+# Swagger閰嶇疆
+swagger:
+ # 鏄惁寮�鍚痵wagger
+ enabled: true
+ # 璇锋眰鍓嶇紑
+ pathMapping: /dev-api
+
+# 闃叉XSS鏀诲嚮
+xss:
+ # 杩囨护寮�鍏�
+ enabled: true
+ # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
+ excludes: /system/notice
+ # 鍖归厤閾炬帴
+ urlPatterns: /system/*,/monitor/*,/tool/*
+
+# 浠ｇ爜鐢熸垚
+gen:
+ # 浣滆��
+ author: ruoyi
+ # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
+ packageName: com.ruoyi.project.system
+ # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
+ autoRemovePre: false
+ # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
+ tablePrefix: sys_
+ # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
+ allowOverwrite: false
+
+file:
+ temp-dir: /javaWork/product-inventory-management/file/temp/uploads
+ upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 33d6165..52cd801 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
# Spring閰嶇疆
spring:
profiles:
- active: demo
+ active: hsxnyCopy
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index bc6c38a..8c23d7c 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -26,6 +26,9 @@
left join product_record pr on pl.id = pr.purchase_ledger_id
<where>
1 = 1
+ <if test="c.isInvoice != null and c.isInvoice != '' ">
+ AND pl.is_invoice = #{c.isInvoice}
+ </if>
<if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
and pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
</if>
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 7ce76a8..cb3d713 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -63,6 +63,9 @@
sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
<where>
+ <if test="salesLedgerDto.isInvoice != null and salesLedgerDto.isInvoice != '' ">
+ AND T1.is_invoice = #{salesLedgerDto.isInvoice}
+ </if>
<if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
</if>
@@ -81,6 +84,12 @@
<if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
</if>
+ <if test="salesLedgerDto.ids != null and salesLedgerDto.ids.size() > 0">
+ AND T1.id IN
+ <foreach item="item" collection="salesLedgerDto.ids" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
</where>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3