From 118e2075d4cbe821e2b5b3d3b612fb83291f6ade Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Thu, 16 Apr 2026 16:18:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/common/constant/LauncherConstant.java | 2 +- .../springblade/scheduling/pojo/entity/PartEntity.java | 2 +- .../springblade/desk/dashboard/excel/DsPartExcel.java | 2 +- .../desk/dashboard/mapper/PartBasicsMapper.xml | 2 +- .../desk/logistics/mapper/StationCenterMapper.java | 4 +++- .../desk/logistics/mapper/StationCenterMapper.xml | 2 +- .../desk/logistics/service/IStationCenterService.java | 4 +++- .../logistics/service/impl/IOrderBoxServiceImpl.java | 10 +++++----- .../service/impl/StationCenterServiceImpl.java | 4 +++- .../scheduling/scheduling/excel/PartExcel.java | 2 +- 10 files changed, 20 insertions(+), 14 deletions(-) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 5f0c25d4..3ef40cfd 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -32,7 +32,7 @@ public interface LauncherConstant { * nacos dev 地址 */ - //String NACOS_DEV_ADDR = "192.168.249.27:8848"; +// String NACOS_DEV_ADDR = "192.168.249.27:8848"; String NACOS_DEV_ADDR = "127.0.0.1:8848"; /**R diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartEntity.java index 5f423f43..2f7b14cb 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartEntity.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartEntity.java @@ -264,7 +264,7 @@ public class PartEntity extends BaseEntity { * 是否玻璃饼 */ @Schema(description = "是否玻璃饼") - private String isClassCake; + private String isGlassCake; /** * 成型厚度 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/excel/DsPartExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/excel/DsPartExcel.java index 0806dfbf..04d1d0ae 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/excel/DsPartExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/excel/DsPartExcel.java @@ -214,7 +214,7 @@ public class DsPartExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("是否玻璃饼") - private String isClassCake; + private String isGlassCake; /** * 成型厚度 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartBasicsMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartBasicsMapper.xml index ed740816..d249af37 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartBasicsMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartBasicsMapper.xml @@ -4,7 +4,7 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationCenterMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationCenterMapper.java index 1073cd52..fcd427d1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationCenterMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationCenterMapper.java @@ -30,6 +30,8 @@ import org.apache.ibatis.annotations.Param; import org.springblade.desk.logistics.pojo.entity.PrWorkOrder; import org.springblade.desk.logistics.pojo.entity.StationCenter; +import java.util.List; + /** * 任务分派表 Mapper 接口 * @@ -39,5 +41,5 @@ import org.springblade.desk.logistics.pojo.entity.StationCenter; public interface StationCenterMapper extends BaseMapper { - StationCenter selectByStation(@Param("stationId") Long stationId); + List selectByStation(@Param("stationId") Long stationId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationCenterMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationCenterMapper.xml index c897a99d..b32e1e7b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationCenterMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationCenterMapper.xml @@ -6,7 +6,7 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IStationCenterService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IStationCenterService.java index 7d9c3a91..80313193 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IStationCenterService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IStationCenterService.java @@ -29,6 +29,8 @@ import org.springblade.core.mp.base.BaseService; import org.springblade.desk.logistics.pojo.entity.PrWorkOrder; import org.springblade.desk.logistics.pojo.entity.StationCenter; +import java.util.List; + /** * 车间订单 服务类 * @@ -37,5 +39,5 @@ import org.springblade.desk.logistics.pojo.entity.StationCenter; */ public interface IStationCenterService extends BaseService { - StationCenter selectByStationId(Long id); + List selectByStationId(Long id); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java index cebb60bd..821eef14 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java @@ -907,17 +907,17 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { task.setStartStationRegion(station.getStationRegion()); // 查询站台中心（可能为null） - StationCenter stationCenter = stationCenterService.selectByStationId(station.getId()); - if (stationCenter == null) { + List stationCenterList = stationCenterService.selectByStationId(station.getId()); + if (CollectionUtils.isEmpty(stationCenterList)) { log.warn("未找到站台中心信息, stationId: {}", station.getId()); return task; } // 安全设置工作中心ID - if (stationCenter.getWcId() != null) { - task.setStartWcId(stationCenter.getWcId()); + if (stationCenterList.size() == 1) { + task.setStartWcId(stationCenterList.get(0).getWcId()); } else { - log.warn("站台中心的工作中心ID为空, stationCenterId: {}", stationCenter.getId()); + log.warn("站台中心的工作中心ID为空, stationCenterId: {}", stationCenterList.get(0).getStationId()); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationCenterServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationCenterServiceImpl.java index f949d138..33b70a26 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationCenterServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationCenterServiceImpl.java @@ -36,6 +36,8 @@ import org.springblade.desk.logistics.service.IStationCenterService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * 车间订单、 服务实现类 * @@ -50,7 +52,7 @@ public class StationCenterServiceImpl extends BaseServiceImpl selectByStationId(Long stationId) { return stationCenterMapper.selectByStation(stationId); } } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/PartExcel.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/PartExcel.java index a025432d..611aec0e 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/PartExcel.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/PartExcel.java @@ -322,7 +322,7 @@ public class PartExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("是否玻璃饼") - private String isClassCake; + private String isGlassCake; /** * 成型厚度 */