From b967d23ae6c1f7761feb3c5328e3b591df6a735d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 26 八月 2026 10:51:41 +0800
Subject: [PATCH] feat:进行中合同导入
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 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 bcea39f..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,9 +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;
@@ -23,6 +28,7 @@
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;
@@ -141,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));
@@ -186,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