物流改写

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 地址

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/PrWorkOrder.java

@@ -25,11 +25,11 @@ 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")

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")

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<PrWorkOrder> {
+public interface IPrWorkOrderService extends IService<PrWorkOrder> {
+
 }

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<PrWorkPlan> {
+public interface IPrWorkPlanService extends IService<PrWorkPlan> {
 }

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<PrWorkPlan> 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<PrWorkPlan> nextWorkPlanList = prWorkPlanService.lambdaQuery()
-                        .eq(PrWorkPlan::getId, workPlan.getNextWpId())
+                        .eq(PrWorkPlan::getWpId, workPlan.getNextWpId())
                         .list();
 
                 if (nextWorkPlanList == null || nextWorkPlanList.isEmpty()) {

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<PrWorkOrderMapper, PrWorkOrder> implements IPrWorkOrderService {
+public class PrWorkOrderServiceImpl extends ServiceImpl<PrWorkOrderMapper, PrWorkOrder> implements IPrWorkOrderService {
 
 
 }

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<PrWorkPlanMapper, PrWorkPlan> implements IPrWorkPlanService {
+public class PrWorkPlanServiceImpl extends ServiceImpl<PrWorkPlanMapper, PrWorkPlan> implements IPrWorkPlanService {
 
 
 }