2024年7月10日17:34:29

blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/controller/BCntrTypesController.java

@@ -101,6 +101,7 @@ public class BCntrTypesController extends BladeController {
 				.like(BCntrTypes::getEnName, bCntrTypes.getEnName()).or().like(BCntrTypes::getCode, bCntrTypes.getCode())
 				.or().like(BCntrTypes::getCntrType, bCntrTypes.getCode()))*/
 			.like(ObjectUtils.isNotNull(bCntrTypes.getCode()), BCntrTypes::getCntrType, bCntrTypes.getCode())
+			.like(ObjectUtils.isNotNull(bCntrTypes.getCntrType()), BCntrTypes::getCntrType, bCntrTypes.getCntrType())
 			.like(ObjectUtils.isNotNull(bCntrTypes.getCustomsCode()), BCntrTypes::getCustomsCode, bCntrTypes.getCustomsCode())
 			.eq(ObjectUtils.isNotNull(bCntrTypes.getCntrSize()), BCntrTypes::getCntrSize, bCntrTypes.getCntrSize())
 			.like(ObjectUtils.isNotNull(bCntrTypes.getCnName()), BCntrTypes::getCnName, bCntrTypes.getCnName())

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/controller/FinAccBillsController.java

@@ -356,18 +356,18 @@ public class FinAccBillsController extends BladeController {
 			if ("2".equals(type)) {
 				//收
 				if ("D".equals(listAccBillVO.getDc())) {
-					if (new BigDecimal("0.00").compareTo(item.getAmount().subtract(item.getStlTtlAmount())) != 0) {
+					if (new BigDecimal("0.00").compareTo(item.getAppliedInvoiceCurrentStlAmount()) != 0) {
 						finAccBillsVOList.add(item);
 					}
 				} else if ("C".equals(listAccBillVO.getDc())) {
-					if (new BigDecimal("0.00").compareTo(item.getAmount().subtract(amount).subtract(item.getStlTtlAmount())) != 0) {
+					if (new BigDecimal("0.00").compareTo(item.getAppliedCurrentStlAmount()) != 0) {
 						finAccBillsVOList.add(item);
 					}
 				} else {
 					finAccBillsVOList.add(item);
 				}
 			} else if ("3".equals(type)) {
-				if (new BigDecimal("0.00").compareTo(item.getAmount().subtract(item.getUninvoicedAmount())) != 0) {
+				if (new BigDecimal("0.00").compareTo(item.getAppliedInvoiceCurrentAmount()) != 0) {
 					finAccBillsVOList.add(item);
 				}
 			} else if ("1".equals(type)) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -2998,6 +2998,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 
 			// 保存订单明细
 			if (CollectionUtils.isNotEmpty(order.getOrderItemsList())) {
+				List<Long> goodsId = order.getOrderItemsList().stream().map(PjOrderItems::getGoodsId).distinct().collect(Collectors.toList());
+				List<String> goodsNames = order.getOrderItemsList().stream().map(PjOrderItems::getGoodsName).distinct().collect(Collectors.toList());
+				for (PjOrderItems item : order.getOrderItemsList()) {
+					item.setBillKey(item.getGoodsId() + item.getDot());
+				}
+				List<PjOrderItems> reducelList = order.getOrderItemsList().stream().filter(distinctByKey(PjOrderItems::getBillKey)).collect(Collectors.toList());
+				if (reducelList.size() != order.getOrderItemsList().size()) {
+					throw new RuntimeException("明细数据存在重复商品，请先处理后再保存");
+				}
+				if (goodsId.size() != goodsNames.size()) {
+					throw new RuntimeException("明细数据存在改名并重名商品，请联系管理员处理");
+				}
 				StringBuilder goodsName = new StringBuilder();
 				for (PjOrderItems item : order.getOrderItemsList()) {
 					item.setBizType(order.getBsType());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/service/impl/ProductLaunchServiceImpl.java

@@ -259,8 +259,8 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 		if (!pjGoodsDescsList.isEmpty()) {
 			List<Long> goodsId = pjGoodsDescsList.stream().map(PjGoodsDesc::getId).collect(Collectors.toList());
 			pjGoodsFilesList = goodsFilesMapper.selectList(new LambdaQueryWrapper<PjGoodsFiles>()
-				.in(PjGoodsFiles::getPid, goodsId)
-				.eq(PjGoodsFiles::getMainImage, 0));
+				.in(PjGoodsFiles::getPid, goodsId));
+			//.eq(PjGoodsFiles::getMainImage, 0)
 			//获得库存
 			LambdaQueryWrapper<PjStockDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.eq(PjStockDesc::getTenantId, AuthUtil.getTenantId())
@@ -437,14 +437,20 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 		this.saveOrUpdateBatch(pjProductLaunchList);
 		List<PjProductLaunchFiles> filesList = new ArrayList<>();
 		for (PjProductLaunch item : pjProductLaunchList) {
-			PjProductLaunchFiles files = new PjProductLaunchFiles();
 			List<PjGoodsFiles> pjGoodsFilesList1 = pjGoodsFilesList.stream()
 				.filter(e -> e.getPid().equals(item.getGoodsId())).collect(Collectors.toList());
 			if (!pjGoodsFilesList1.isEmpty()) {
-				BeanUtil.copyProperties(pjGoodsFilesList1.get(0), files);
-				files.setPid(item.getId());
-				files.setVersion("0");
-				filesList.add(files);
+				for (PjGoodsFiles file:pjGoodsFilesList1){
+					PjProductLaunchFiles files = new PjProductLaunchFiles();
+					BeanUtil.copyProperties(file, files);
+					files.setPid(item.getId());
+					if (0 == file.getMainImage()){
+						files.setVersion("0");
+					}else{
+						files.setVersion("1");
+					}
+					filesList.add(files);
+				}
 			}
 		}
 		productLaunchFilesService.saveOrUpdateBatch(filesList);
@@ -744,8 +750,8 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 		if (!pjGoodsDescsList.isEmpty()) {
 			List<Long> goodsId = pjGoodsDescsList.stream().map(PjGoodsDesc::getId).collect(Collectors.toList());
 			pjGoodsFilesList = goodsFilesMapper.selectList(new LambdaQueryWrapper<PjGoodsFiles>()
-				.in(PjGoodsFiles::getPid, goodsId)
-				.eq(PjGoodsFiles::getMainImage, 0));
+				.in(PjGoodsFiles::getPid, goodsId));
+			//.eq(PjGoodsFiles::getMainImage, 0)
 			//获得库存
 			LambdaQueryWrapper<PjStockDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.eq(PjStockDesc::getTenantId, AuthUtil.getTenantId())
@@ -898,14 +904,20 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 		this.updateBatchById(pjProductLaunchList1);
 		List<PjProductLaunchFiles> filesList = new ArrayList<>();
 		for (PjProductLaunch item : pjProductLaunchList) {
-			PjProductLaunchFiles files = new PjProductLaunchFiles();
 			List<PjGoodsFiles> pjGoodsFilesList1 = pjGoodsFilesList.stream()
 				.filter(e -> e.getPid().equals(item.getGoodsId())).collect(Collectors.toList());
 			if (!pjGoodsFilesList1.isEmpty()) {
-				BeanUtil.copyProperties(pjGoodsFilesList1.get(0), files);
-				files.setPid(item.getId());
-				files.setVersion("0");
-				filesList.add(files);
+				for (PjGoodsFiles file:pjGoodsFilesList1){
+					PjProductLaunchFiles files = new PjProductLaunchFiles();
+					BeanUtil.copyProperties(file, files);
+					files.setPid(item.getId());
+					if (0 == file.getMainImage()){
+						files.setVersion("0");
+					}else{
+						files.setVersion("1");
+					}
+					filesList.add(files);
+				}
 			}
 		}
 		productLaunchFilesService.saveOrUpdateBatch(filesList);
@@ -960,8 +972,8 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 		if (!pjGoodsDescsList.isEmpty()) {
 			List<Long> goodsId = pjGoodsDescsList.stream().map(PjGoodsDesc::getId).collect(Collectors.toList());
 			pjGoodsFilesList = goodsFilesMapper.selectList(new LambdaQueryWrapper<PjGoodsFiles>()
-				.in(PjGoodsFiles::getPid, goodsId)
-				.eq(PjGoodsFiles::getMainImage, 0));
+				.in(PjGoodsFiles::getPid, goodsId));
+			//.eq(PjGoodsFiles::getMainImage, 0)
 			//获得库存
 			LambdaQueryWrapper<PjStockDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.eq(PjStockDesc::getTenantId, AuthUtil.getTenantId())
@@ -1138,14 +1150,20 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 		this.saveOrUpdateBatch(pjProductLaunchList);
 		List<PjProductLaunchFiles> filesList = new ArrayList<>();
 		for (PjProductLaunch item : pjProductLaunchList) {
-			PjProductLaunchFiles files = new PjProductLaunchFiles();
 			List<PjGoodsFiles> pjGoodsFilesList1 = pjGoodsFilesList.stream()
 				.filter(e -> e.getPid().equals(item.getGoodsId())).collect(Collectors.toList());
 			if (!pjGoodsFilesList1.isEmpty()) {
-				BeanUtil.copyProperties(pjGoodsFilesList1.get(0), files);
-				files.setPid(item.getId());
-				files.setVersion("0");
-				filesList.add(files);
+				for (PjGoodsFiles file:pjGoodsFilesList1){
+					PjProductLaunchFiles files = new PjProductLaunchFiles();
+					BeanUtil.copyProperties(file, files);
+					files.setPid(item.getId());
+					if (0 == file.getMainImage()){
+						files.setVersion("0");
+					}else{
+						files.setVersion("1");
+					}
+					filesList.add(files);
+				}
 			}
 		}
 		productLaunchFilesService.saveOrUpdateBatch(filesList);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -329,8 +329,13 @@ public class StockDescController extends BladeController {
 			stockDesc.setGoodsIds(ids);
 		}
 		stockDesc.setSalesCompanyIds(AuthUtil.getDeptId());
-		IPage<PjStockDesc> pages = stockDescService.selectStockDescPageZero(Condition.getPage(query), stockDesc);
-		return R.data(pages);
+		if ("0".equals(stockDesc.getWhether())){
+			IPage<PjStockDesc> pages = stockDescService.selectStockDescPage(Condition.getPage(query), stockDesc);
+			return R.data(pages);
+		}else{
+			IPage<PjStockDesc> pages = stockDescService.selectStockDescPageZero(Condition.getPage(query), stockDesc);
+			return R.data(pages);
+		}
 	}
 
 	/**

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/mapper/StockDescMapper.xml

@@ -158,29 +158,19 @@
         goods.brand_item AS brandItem,
         goods.goods_description AS productDescription,
         goods.goods_type_id AS goodsTypeId,
-        SUM( IF ( stock.balance_quantity, stock.balance_quantity, 0 ) ) AS balanceQuantity,
+        0 AS balanceQuantity,
         goods.sales_company_id AS salesCompanyId,
         goods.sales_company_name AS salesCompanyName,
-        stock.dot AS dot,
-        IF
-        ( stock.store_inventory, stock.store_inventory, 0 ) AS storeInventory,
-        IF
-        ( stock.inventory_amount, stock.inventory_amount, 0 ) AS inventoryAmount,
-        IF
-        ( stock.inventory_cost_price, stock.inventory_cost_price, 0 ) AS inventoryCostPrice,
-        IF
-        ( stock.inventory_alert, stock.inventory_alert, 0 ) AS inventoryAlert,
-        IF
-        ( stock.version, stock.version, 0 ) AS version
+        null AS dot,
+        0 AS storeInventory,
+        0 AS inventoryAmount,
+        0 AS inventoryCostPrice,
+        0 AS inventoryAlert,
+        null AS version
         FROM
         pjpf_goods_desc goods
-        LEFT JOIN pjpf_stock_desc stock ON goods.id = stock.goods_id
         <where>
             goods.is_deleted = 0
-            AND stock.is_deleted = 0
-            <if test='stockDesc.whether != null and stockDesc.whether != "" and stockDesc.whether == "0"'>
-                and stock.balance_quantity != 0
-            </if>
             <if test='stockDesc.cname != null and stockDesc.cname != ""'>
                 and (goods.cname like CONCAT(CONCAT('%', #{stockDesc.cname}), '%') or goods.cname_int like CONCAT(CONCAT('%', #{stockDesc.cname}), '%'))
             </if>