增加库存信息

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldDemandVo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import org.springblade.desk.order.pojo.entity.MoldDemand;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
+import org.springblade.wms.pojo.vo.StockKitGoodsDetailVO;
 
 import java.io.Serial;
 import java.util.List;
@@ -65,4 +66,14 @@ public class MoldDemandVo extends MoldDemand {
 	 * 关联订单数量
 	 */
 	Integer linkOrderNum;
+
+	/**
+	 * 齐套数量
+	 */
+	Integer completeQuantity;
+
+	/**
+	 库存信息
+	 */
+	List<StockKitGoodsDetailVO> stockKitGoodsDetailList;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java

@@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
 import org.springblade.desk.dashboard.service.IDsPartService;
 import org.springblade.desk.order.mapper.MoldDemandMapper;
@@ -24,10 +25,15 @@ import org.springblade.desk.order.service.IYieldOrderService;
 import org.springblade.desk.order.service.IYieldPlanService;
 import org.springblade.desk.order.wrapper.MoldApplyWrapper;
 import org.springblade.desk.order.wrapper.MoldDemandWrapper;
+import org.springblade.wms.feign.WmsTaskClient;
+import org.springblade.wms.pojo.vo.GraphiteStockKitVO;
+import org.springblade.wms.pojo.vo.StockKitGoodsDetailVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -45,6 +51,9 @@ public class MoldDemandServiceImpl extends BaseServiceImpl<MoldDemandMapper, Mol
 	private final IYieldOrderService orderService;
 	private final IMoldApplyService moldApplyService;
 
+	@Autowired
+	private WmsTaskClient wmsTaskClient;
+
 	@Override
 	public IPage<MoldDemand> selectPage(IPage<MoldDemand> page, MoldDemand entity) {
 		entity.setMafStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode());
@@ -137,6 +146,23 @@ public class MoldDemandServiceImpl extends BaseServiceImpl<MoldDemandMapper, Mol
 			vo.setToolUseList(null);
 			vo.setNearlyApplyList(moldApplyList);
 		}
+
+		R<GraphiteStockKitVO> stockAndKit = wmsTaskClient.getStockAndKit(vo.getToolCode(), 1);
+		if (stockAndKit == null || !stockAndKit.isSuccess() || stockAndKit.getData() == null) {
+			vo.setCompleteQuantity(0);
+			vo.setStockKitGoodsDetailList(Collections.emptyList());
+			return vo;
+		}
+
+		GraphiteStockKitVO data = stockAndKit.getData();
+		Integer completeQuantity = data.getCompleteQuantity();
+		List<StockKitGoodsDetailVO> stockKitGoodsDetailList = data.getStockKitGoodsDetailList();
+
+		vo.setCompleteQuantity(completeQuantity != null ? completeQuantity : 0);
+
+		if (stockKitGoodsDetailList != null && !stockKitGoodsDetailList.isEmpty()) {
+			vo.setStockKitGoodsDetailList(stockKitGoodsDetailList);
+		}
 		return vo;
 	}
 
@@ -183,6 +209,7 @@ public class MoldDemandServiceImpl extends BaseServiceImpl<MoldDemandMapper, Mol
 			}else {
 				moldDemand.setDemandSource(targetName);
 			}
+			this.updateById(moldDemand);
 			return true;
 		}