物流修改bug

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

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;
 	/**
 	 * 成型厚度
 	 */

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;
 	/**
 	 * 成型厚度
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartBasicsMapper.xml

@@ -4,7 +4,7 @@
 
 
     <select id="selectPartCode" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartBasicsEntity">
-        select id, part_code, part_name, product_type, is_sintering, is_class_cake, create_time, create_user, create_dept, update_time, update_user, remarks, status, is_deleted
+        select id, part_code, part_name, product_type, is_sintering, is_glass_cake, create_time, create_user, create_dept, update_time, update_user, remarks, status, is_deleted
         from DS_PART_BASICS where PART_CODE = #{partCode}
     </select>
 </mapper>

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> {
 
 
-    StationCenter selectByStation(@Param("stationId") Long stationId);
+    List<StationCenter> selectByStation(@Param("stationId") Long stationId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/StationCenterMapper.xml

@@ -6,7 +6,7 @@
 
 
     <select id="selectByStation" resultType="org.springblade.desk.logistics.pojo.entity.StationCenter">
-        select id, station_id, wc_id, create_user, create_time, create_dept, update_user, update_time, is_deleted, remark, status from LM_STATION_CENTER
+         select id, station_id, wc_id, create_user, create_time, create_dept, update_user, update_time, is_deleted, remark, status from LM_STATION_CENTER
         where station_id = #{stationId} and is_deleted = 0
     </select>
 </mapper>

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> {
 
-    StationCenter selectByStationId(Long id);
+    List<StationCenter> selectByStationId(Long id);
 }

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<StationCenter> 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());
             }
         }
 

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<StationCenterMappe
     StationCenterMapper stationCenterMapper;
 
     @Override
-    public StationCenter selectByStationId(Long stationId) {
+    public List<StationCenter> selectByStationId(Long stationId) {
         return stationCenterMapper.selectByStation(stationId);
     }
 }

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;
 	/**
 	 * 成型厚度
 	 */