From 9171db8f5ddd91b4619bf6a928dcbe98b82f33a0 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 09 九月 2026 15:34:14 +0800
Subject: [PATCH] feat:工业泵收款推送 bip收款单与收款确认分离 开票前校验产品是否维护税收分类信息
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java | 67 +++++++++++++++++++++++++++------
1 files changed, 55 insertions(+), 12 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
index d3c0ffa..a19180b 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java
@@ -8,8 +8,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.admin.api.vo.DeptExcelVO;
+import com.by4cloud.platformx.business.dto.ProductAddDTO;
+import com.by4cloud.platformx.business.dto.ProductQueryDTO;
+import com.by4cloud.platformx.business.dto.SyncProductDTO;
+import com.by4cloud.platformx.business.vo.ProductExcelVO;
import com.by4cloud.platformx.business.vo.ProductTreeVo;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.excel.annotation.RequestExcel;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.entity.Product;
import com.by4cloud.platformx.business.service.ProductService;
@@ -22,8 +28,10 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
+import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -80,25 +88,28 @@
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/list" )
@PreAuthorize("@pms.hasPermission('business_product_view')" )
- @Inner(value = false)
public R getProductList(@ParameterObject Product product) {
return R.ok(productService.getProductList(product));
}
/**
* 鍒嗛〉鏌ヨ
- * @param product 浜у搧淇℃伅
+ * @param queryDTO 浜у搧淇℃伅
* @return
*/
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/listByParentId" )
- @PreAuthorize("@pms.hasPermission('business_product_view')" )
- //@Inner(value = false)
- public R getProductListByParentId(@ParameterObject Product product) {
- LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
- wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
- wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
- return R.ok(BeanUtil.copyToList(productService.listByScope(wrapper), ProductTreeVo.class));
+ public R getProductListByParentId(@ParameterObject ProductQueryDTO queryDTO) {
+// LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
+// wrapper.like(StrUtil.isNotEmpty(queryDTO.getProductName()),Product::getProductName,queryDTO.getProductName());
+// wrapper.eq(StrUtil.isNotEmpty(queryDTO.getParentId()),Product::getParentId,queryDTO.getParentId());
+// if (StrUtil.isNotEmpty(queryDTO.getContractCategory())&&StrUtil.equals(queryDTO.getContractCategory(), "water_house")){
+// String[] erpCodes = new String[]{"鎴跨绉熻祦","dianli","water"};
+// wrapper.in(Product::getErpCode,erpCodes);
+// return R.ok(BeanUtil.copyToList(productService.listByScope(wrapper), ProductTreeVo.class));
+// }
+// return R.ok(BeanUtil.copyToList(productService.listByScope(wrapper), ProductTreeVo.class));
+ return productService.getProductListByParentId(queryDTO);
}
/**
@@ -108,10 +119,9 @@
*/
@Operation(summary = "灞傜骇鏌ヨ" , description = "灞傜骇鏌ヨ" )
@GetMapping("/treeList" )
- //@PreAuthorize("@pms.hasPermission('business_product_view')" )
@Inner(value = false)
public R getNewsCategoryTree(@ParameterObject Product product) {
- return R.ok(productService.treeList(product.getParentId(), product.getProductName()));
+ return R.ok(productService.treeList());
}
@@ -137,7 +147,7 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('business_product_add')" )
public R save(@RequestBody Product product) {
- if (ArrayUtil.isNotEmpty(productService.listByScope(Wrappers.lambdaQuery(product).eq(Product::getErpCode,product.getErpCode())).toArray())){
+ if (CollUtil.isNotEmpty(productService.listByScope(Wrappers.lambdaQuery(product).eq(Product::getErpCode,product.getErpCode())))){
return R.failed("浜у搧Erp缂栫爜宸插瓨鍦�");
}
return R.ok(productService.save(product));
@@ -182,4 +192,37 @@
public List<Product> export(Product product,Long[] ids) {
return productService.list(Wrappers.lambdaQuery(product).in(ArrayUtil.isNotEmpty(ids), Product::getId, ids));
}
+
+ /**
+ * 鏂板浜у搧淇℃伅
+ * @param addDTOS 浜у搧淇℃伅
+ * @return R
+ */
+ @Operation(summary = "鍚勫叕鍙告柊澧炰骇鍝佷俊鎭�" , description = "鍚勫叕鍙告柊澧炰骇鍝佷俊鎭�" )
+ @SysLog("鍚勫叕鍙告柊澧炰骇鍝佷俊鎭�" )
+ @PostMapping("/saveErpProduct")
+ public R saveErpProduct(@RequestBody List<ProductAddDTO> addDTOS) {
+ return productService.saveErpProduct(addDTOS);
+ }
+
+ /**
+ * 瀵煎叆閮ㄩ棬
+ * @param excelVOList
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping("/importProduct")
+ public R importProduct(@RequestExcel List<ProductExcelVO> excelVOList, BindingResult bindingResult) {
+ return productService.importProduct(excelVOList, bindingResult);
+ }
+
+ /**
+ * 鐭崇叅鏈轰骇鍝佸悓姝�
+ * @return
+ */
+ @Inner(value = false)
+ @GetMapping("/syncSMJByDate")
+ public R syncSMJByDate(@ParameterObject SyncProductDTO dto) {
+ return productService.syncSMJByDate(dto);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1