From 68e26bbbb29ef6437151e259d462aa5ef04fe626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=ABUmbrella?= <2539020564@qq.com> Date: Tue, 31 Mar 2026 16:01:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E6=94=B9=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 4 ++-- .../desk/logistics/pojo/entity/PrWorkOrder.java | 12 ++++++------ .../desk/logistics/pojo/entity/PrWorkPlan.java | 14 +++++++------- .../logistics/service/IPrWorkOrderService.java | 4 +++- .../desk/logistics/service/IPrWorkPlanService.java | 3 ++- .../service/impl/IOrderBoxServiceImpl.java | 6 +++--- .../service/impl/PrWorkOrderServiceImpl.java | 3 ++- .../service/impl/PrWorkPlanServiceImpl.java | 3 ++- 8 files changed, 27 insertions(+), 22 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 bc322eab..4dec1f26 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 @@ -31,8 +31,8 @@ public interface LauncherConstant { /** * nacos dev 地址 */ - String NACOS_DEV_ADDR = "192.168.249.27:8848"; -// String NACOS_DEV_ADDR = "127.0.0.1:8848"; +// String NACOS_DEV_ADDR = "192.168.249.27:8848"; + String NACOS_DEV_ADDR = "127.0.0.1:8848"; /**R * nacos prod 地址 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/PrWorkOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/PrWorkOrder.java index 72199d5a..9ea54a86 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/PrWorkOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/PrWorkOrder.java @@ -20,16 +20,16 @@ import java.util.Date; @Data @TableName("PR_WORK_ORDER") @Schema(description = "车间订单->视图") -public class PrWorkOrder implements Serializable { +public class PrWorkOrder implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * ID主键 - */ - @Schema(description = "ID主键") - private Long id; +// /** +// * ID主键 +// */ +// @Schema(description = "ID主键") +// private Long id; @Schema(description = "工单ID") diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/PrWorkPlan.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/PrWorkPlan.java index ab9cfaa0..6e2a2525 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/PrWorkPlan.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/PrWorkPlan.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -19,17 +20,16 @@ import java.util.Date; @Data @TableName("PR_WORK_PLAN") @Schema(description = "车间订单序号->视图") -@EqualsAndHashCode(callSuper = true) -public class PrWorkPlan extends BaseEntity { +public class PrWorkPlan implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * ID主键 - */ - @Schema(description = "ID主键") - private Long id; +// /** +// * ID主键 +// */ +// @Schema(description = "ID主键") +// private Long id; @Schema(description = "工单计划ID") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IPrWorkOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IPrWorkOrderService.java index b1fbf8f7..86975e93 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IPrWorkOrderService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IPrWorkOrderService.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.logistics.service; +import com.baomidou.mybatisplus.extension.service.IService; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.logistics.pojo.entity.PrWorkOrder; import org.springblade.desk.logistics.pojo.entity.WeighData; @@ -37,5 +38,6 @@ import java.math.BigDecimal; * @author BladeX * @since 2025-11-12 */ -public interface IPrWorkOrderService extends BaseService { +public interface IPrWorkOrderService extends IService { + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IPrWorkPlanService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IPrWorkPlanService.java index f9a439a5..bf50bef0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IPrWorkPlanService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IPrWorkPlanService.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.logistics.service; +import com.baomidou.mybatisplus.extension.service.IService; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.logistics.pojo.entity.PrWorkOrder; import org.springblade.desk.logistics.pojo.entity.PrWorkPlan; @@ -35,5 +36,5 @@ import org.springblade.desk.logistics.pojo.entity.PrWorkPlan; * @author BladeX * @since 2025-11-12 */ -public interface IPrWorkPlanService extends BaseService { +public interface IPrWorkPlanService extends IService { } 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 284ba777..c12551ef 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 @@ -1260,7 +1260,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { if (prWorkOrderList != null && !prWorkOrderList.isEmpty()) { PrWorkOrder prWorkOrder = prWorkOrderList.get(0); List workPlanList = prWorkPlanService.lambdaQuery() - .eq(PrWorkPlan::getWpId, prWorkOrder.getId()) + .eq(PrWorkPlan::getWpId, prWorkOrder.getWpId()) .list(); if (workPlanList == null || workPlanList.isEmpty()) { @@ -1270,11 +1270,11 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { PrWorkPlan workPlan = workPlanList.get(0); Long workCenterId; - if (workPlan.getStatus() > 3) { + if (workPlan.getCurStatus() > 3) { workCenterId = workPlan.getWcId(); } else { List nextWorkPlanList = prWorkPlanService.lambdaQuery() - .eq(PrWorkPlan::getId, workPlan.getNextWpId()) + .eq(PrWorkPlan::getWpId, workPlan.getNextWpId()) .list(); if (nextWorkPlanList == null || nextWorkPlanList.isEmpty()) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PrWorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PrWorkOrderServiceImpl.java index e7b280f7..1700adcd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PrWorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PrWorkOrderServiceImpl.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.logistics.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.logistics.mapper.PrWorkOrderMapper; @@ -45,7 +46,7 @@ import java.math.BigDecimal; */ @Service @Slf4j -public class PrWorkOrderServiceImpl extends BaseServiceImpl implements IPrWorkOrderService { +public class PrWorkOrderServiceImpl extends ServiceImpl implements IPrWorkOrderService { } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PrWorkPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PrWorkPlanServiceImpl.java index e73ee95c..055de183 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PrWorkPlanServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PrWorkPlanServiceImpl.java @@ -25,6 +25,7 @@ package org.springblade.desk.logistics.service.impl; /** */ +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.logistics.mapper.PrWorkPlanMapper; @@ -40,7 +41,7 @@ import org.springframework.stereotype.Service; */ @Service @Slf4j -public class PrWorkPlanServiceImpl extends BaseServiceImpl implements IPrWorkPlanService { +public class PrWorkPlanServiceImpl extends ServiceImpl implements IPrWorkPlanService { }