2024年4月7日17:36:30

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/controller/GoodsDescController.java

@@ -225,13 +225,19 @@ public class GoodsDescController extends BladeController {
 				.eq(PjOrderItems::getTenantId, AuthUtil.getTenantId())
 				.eq(PjOrderItems::getIsDeleted, 0)
 				.in(PjOrderItems::getGoodsId, list)) > 0) {
-				throw new RuntimeException("产品已创建业务数据，删除失败");
+				throw new RuntimeException("商品已创建业务数据，删除失败");
 			}
 			if (shipItemsService.count(new LambdaQueryWrapper<PjShipItems>()
 				.eq(PjShipItems::getTenantId, AuthUtil.getTenantId())
 				.eq(PjShipItems::getIsDeleted, 0)
 				.in(PjShipItems::getGoodsId, list)) > 0) {
-				throw new RuntimeException("产品已创建业务数据，删除失败");
+				throw new RuntimeException("商品已创建业务数据，删除失败");
+			}
+			if (stockDescService.count(new LambdaQueryWrapper<PjStockDesc>()
+				.eq(PjStockDesc::getTenantId, AuthUtil.getTenantId())
+				.eq(PjStockDesc::getIsDeleted, 0)
+				.in(PjStockDesc::getGoodsId, list)) > 0) {
+				throw new RuntimeException("商品已存在库存数据，删除失败");
 			}
 		}
 		return R.status(goodsDescService.removeByIds(list));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/controller/ProductLaunchController.java

@@ -141,6 +141,12 @@ public class ProductLaunchController extends BladeController {
 						.or().like(PjProductLaunch::getSpecificationAndModel, cname)
 					);
 					lambdaQueryWrapper.like(PjProductLaunch::getBrandName, chineseWords[0]);
+				}else{
+					lambdaQueryWrapper.and(i -> i.like(PjProductLaunch::getCname, productLaunch.getCname())
+						.or().like(PjProductLaunch::getCnameInt, productLaunch.getCname())
+						.or().like(PjProductLaunch::getBrandItem, productLaunch.getCname())
+						.or().like(PjProductLaunch::getSpecificationAndModel, productLaunch.getCname())
+					);
 				}
 			}
 //			lambdaQueryWrapper.and(ObjectUtils.isNotNull(productLaunch.getCname()), i -> i.like(PjProductLaunch::getCname, productLaunch.getCname()).or().like(PjProductLaunch::getCnameInt, productLaunch.getCname()));
@@ -542,6 +548,12 @@ public class ProductLaunchController extends BladeController {
 						.or().like(PjProductLaunch::getSpecificationAndModel, cname)
 					);
 					lambdaQueryWrapper.like(PjProductLaunch::getBrandName, chineseWords[0]);
+				}else{
+					lambdaQueryWrapper.and(i -> i.like(PjProductLaunch::getCname, productLaunch.getCname())
+						.or().like(PjProductLaunch::getCnameInt, productLaunch.getCname())
+						.or().like(PjProductLaunch::getBrandItem, productLaunch.getCname())
+						.or().like(PjProductLaunch::getSpecificationAndModel, productLaunch.getCname())
+					);
 				}
 			}
 		}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -1112,7 +1112,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			if (!pjStockDescArrayListSave.isEmpty()) {
 				iStockDescService.saveBatch(pjStockDescArrayListSave);
 			}
-			if (!pjStockDescArrayListSave.isEmpty()) {
+			if (!pjStockDescArrayListUpdate.isEmpty()) {
 				iStockDescService.updateBatchById(pjStockDescArrayListUpdate);
 			}
 			orderItemsService.updateBatchById(pjOrderItemsList);