From 6bbed1ea6b36af4eb0b234bec9d6e42d56f0cd00 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 30 九月 2026 16:12:49 +0800
Subject: [PATCH] feat:合同新增关联单位 开票可根据甲方或关联单位选择开票单位 收款去掉强制确认 收款只关联合同甲方或关联单位
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ProductController.java | 128 +++++++++++++++++++++++++++++++-----------
1 files changed, 94 insertions(+), 34 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 d6c38af..f4fdbac 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
@@ -1,16 +1,31 @@
package com.by4cloud.platformx.business.controller;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
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.entity.BusinessCustomer;
+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;
import com.by4cloud.platformx.common.security.annotation.Inner;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import com.github.yulichang.query.MPJLambdaQueryWrapper;
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -19,8 +34,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;
@@ -49,24 +66,33 @@
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('business_product_view')" )
public R getProductPage(@ParameterObject Page page, @ParameterObject Product product) {
- LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(product.getParentId()!=null,Product::getParentId,product.getParentId());
- wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
- wrapper.like(StrUtil.isNotEmpty(product.getMainCode()),Product::getMainCode,product.getMainCode());
- wrapper.like(StrUtil.isNotEmpty(product.getErpCode()),Product::getErpCode,product.getErpCode());
- wrapper.orderByDesc(Product::getCreateTime);
- Page<Product> page1 = productService.pageByScope(page, wrapper);
- List<Product> list = page1.getRecords();
- for(Product product1 : list){
- Product parent = productService.getById(product1.getParentId());
- if(parent==null){
- product1.setParentName("鏍圭骇浜у搧");
- }else {
- product1.setParentName(parent.getProductName());
- }
- }
- page1.setRecords(list);
- return R.ok(page1);
+// if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+// MPJLambdaWrapper<Product> wrapper =new MPJLambdaWrapper<Product>()
+// .selectAll(Product.class)
+// .selectAs("ifnull((select product_name from product t1 where t1.id = t.parent_id),'鏍圭骇浜у搧')",Product::getParentName)
+// .eq(product.getParentId()!=null,Product::getParentId,product.getParentId())
+// .like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName())
+// .like(StrUtil.isNotEmpty(product.getMainCode()),Product::getMainCode,product.getMainCode())
+// .like(StrUtil.isNotEmpty(product.getErpCode()),Product::getErpCode,product.getErpCode());
+// List<String> smjList = new ArrayList<>();
+// smjList.add(smj);
+//// smjList.add(smjsc);
+//// smjList.add(smjzt);
+// smjList.add(smjhw);
+// wrapper.in(Product::getCompId, smjList);
+// wrapper.orderByDesc(Product::getCreateTime);
+// return R.ok(productService.page(page, wrapper));
+// }
+// MPJLambdaWrapper<Product> wrapper =new MPJLambdaWrapper<Product>()
+// .selectAll(Product.class)
+// .selectAs("ifnull((select product_name from product t1 where t1.id = parent_id),'鏍圭骇浜у搧')",Product::getParentName)
+// .eq(product.getParentId()!=null,Product::getParentId,product.getParentId())
+// .like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName())
+// .like(StrUtil.isNotEmpty(product.getMainCode()),Product::getMainCode,product.getMainCode())
+// .like(StrUtil.isNotEmpty(product.getErpCode()),Product::getErpCode,product.getErpCode());
+//// .eq(Product::getCompId,SecurityUtils.getUser().getCompId());
+// return R.ok(productService.pageByScope(page, wrapper));
+ return R.ok(productService.pageScope(page,product));
}
/**
@@ -77,29 +103,28 @@
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/list" )
@PreAuthorize("@pms.hasPermission('business_product_view')" )
- @Inner(value = false)
public R getProductList(@ParameterObject Product product) {
- LambdaQueryWrapper<Product> wrapper = Wrappers.lambdaQuery();
- wrapper.like(StrUtil.isNotEmpty(product.getProductName()),Product::getProductName,product.getProductName());
- wrapper.last("limit 20");
- return R.ok(productService.listByScope(wrapper));
+ 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());
- wrapper.last("limit 30");
- return R.ok(productService.listByScope(wrapper));
+ 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);
}
/**
@@ -109,10 +134,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());
}
@@ -138,6 +162,9 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('business_product_add')" )
public R save(@RequestBody Product product) {
+ if (CollUtil.isNotEmpty(productService.listByScope(Wrappers.lambdaQuery(product).eq(Product::getErpCode,product.getErpCode())))){
+ return R.failed("浜у搧Erp缂栫爜宸插瓨鍦�");
+ }
return R.ok(productService.save(product));
}
@@ -180,4 +207,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