From 3870cf443bf0dfd9394bc545c8e90ac0d6dacaeb Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 08 九月 2025 17:55:05 +0800
Subject: [PATCH] 上料实体类调整、物料消耗明细基础代码、报工接口适配调整(适配上料表结构调整、并记录物料消耗明细)

---
 src/main/java/org/jeecg/modules/base/controller/FactoryController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/base/controller/FactoryController.java b/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
index cfb5a5a..ed9c6b6 100644
--- a/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
+++ b/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
@@ -222,11 +222,11 @@
 	 }
 
 	 @ApiOperation(value = "鑾峰彇鎵�鏈変骇绾垮垪琛�", notes = "鑾峰彇鎵�鏈変骇绾垮垪琛�")
-	 @GetMapping(value = "/queryProductionLineList")
-	 public Result<List<FactoryModel>> queryProductionLineList() {
-		 List<Factory> factoryList = factoryService.queryProductionLineList();
+	 @GetMapping(value = "/queryUserProductionLineList")
+	 public Result<List<FactoryModel>> queryUserProductionLineList() {
+		 List<Factory> factoryList = factoryService.queryUserProductionLineList();
 		 List<FactoryModel> factoryModels = factoryList.stream()
-				 .map(factory -> new FactoryModel(factory.getId(), factory.getFactoryName()))
+				 .map(factory -> new FactoryModel(factory.getId(), factory.getFactoryName(), factory.getProductionType()))
 				 .collect(Collectors.toList());
 		 return Result.ok(factoryModels);
 	 }

--
Gitblit v1.9.3