提交暂存

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -176,7 +176,7 @@ public class GoodsDescController extends BladeController {
 	@DeleteMapping("delete")
 	public R delete(@RequestParam(name = "id", required = true) String id)
 	{
-		 goodsDescService.removeById(id);
+		 goodsDescService.removeByIds(Func.toLongList(id));
 		return R.success("操作成功");
 	}
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsTypeController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.client.goods.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -24,8 +25,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.entity.GoodsType;
+import org.springblade.client.entity.GoodsTypeDesc;
 import org.springblade.client.goods.enums.GoodsTypeEnum;
+import org.springblade.client.goods.service.IGoodsTypeDescService;
 import org.springblade.client.goods.service.IGoodsTypeService;
 import org.springblade.client.vo.GoodsTypeVO;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -54,6 +58,8 @@ public class GoodsTypeController extends BladeController {
 
 	private final IGoodsTypeService goodsTypeService;
 
+	private final IGoodsTypeDescService iGoodsTypeDescService;
+
 	/**
 	 * 详情
 	 */
@@ -119,6 +125,12 @@ public class GoodsTypeController extends BladeController {
 		if (count != null && count > 0) {
 			return R.fail(500, "存在下级类别不能删除");
 		}
+		LambdaQueryWrapper<GoodsTypeDesc> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(GoodsTypeDesc::getGoodsTypeId,goodsType.getId());
+		if(iGoodsTypeDescService.count(lambdaQueryWrapper)>0)
+		{
+			return R.fail(500, "存在绑定商品无法删除");
+		}
 		goodsType.setIsDeleted(1);
 		return R.status(goodsTypeService.updateById(goodsType));
 	}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -247,10 +247,15 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					iDeliveryItemsService.receiving(delivery.getTradeType(),stock.getId(),e);
 				}
                 //更新item已发数量
-				iOrderItemsClient.updateActualQuantity(e.getSrcId(),inventoryNumber,1);
+				R r = iOrderItemsClient.updateActualQuantity(e.getSrcId(), inventoryNumber, 1);
+				if(!r.isSuccess())
+				{
+					throw new SecurityException("更新采购明细失败");
+				}
 			});
-
-
+		//更改收货主表状态
+		delivery.setDeliveryStatus("已收货");
+		baseMapper.updateById(delivery);
 
 	}