物流页面提交

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -12,9 +12,9 @@ public interface LauncherConstant {
     /**
      * nacos 命名空间
      */
-//	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
+	String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e";
 	// 生产环境
-	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
+//	String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401";
 	// 测试环境
 //	String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8";
 

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/vo/LocationVO.java

@@ -0,0 +1,12 @@
+package org.springblade.desk.logistics.pojo.vo;
+
+import lombok.Data;
+import org.springblade.desk.logistics.pojo.entity.Location;
+
+/**
+ * @author: liweidong
+ * @create: 2026-03-27
+ */
+@Data
+public class LocationVO extends Location {
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/vo/StationVO.java

@@ -0,0 +1,20 @@
+package org.springblade.desk.logistics.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springblade.desk.logistics.pojo.entity.Station;
+
+/**
+ * @author: liweidong
+ * @create: 2026-03-27
+ */
+@Data
+public class StationVO extends Station {
+
+    /**
+     * 作业中心名称
+     */
+    @Schema(description = "作业中心名称")
+    private String wcName;
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/LocationController.java

@@ -0,0 +1,48 @@
+package org.springblade.desk.logistics.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import org.checkerframework.checker.units.qual.A;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.desk.logistics.pojo.vo.LocationVO;
+import org.springblade.desk.logistics.pojo.vo.StationVO;
+import org.springblade.desk.logistics.service.ILocationService;
+import org.springblade.desk.logistics.service.IOrderBoxService;
+import org.springblade.desk.logistics.service.IStationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/location")
+@Tag(name = "库位", description = "库位相关接口")
+public class LocationController {
+
+
+    @Autowired
+    ILocationService locationService;
+
+    /**
+     * 获取库位列表
+     */
+    @GetMapping("/getLocationList")
+    @ApiOperationSupport(order = 1)
+    @Operation(summary = "分页", description = "获取站点列表")
+    public R<IPage<LocationVO>> getLocationList(LocationVO locationVO, Query query) {
+
+        IPage<LocationVO> pages = locationService.getLocationList(Condition.getPage(query), locationVO);
+
+        return R.data(pages);
+    }
+
+
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/StationController.java

@@ -1,16 +1,25 @@
 package org.springblade.desk.logistics.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
+import oracle.jdbc.proxy.annotation.Post;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.dashboard.pojo.vo.DsTaskingVO;
+import org.springblade.desk.logistics.pojo.entity.Station;
+import org.springblade.desk.logistics.pojo.vo.StationVO;
 import org.springblade.desk.logistics.service.IOrderBoxService;
 import org.springblade.desk.logistics.service.IStationService;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springblade.desk.order.pojo.entity.YieldOrder;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springblade.desk.order.pojo.vo.YieldOrderVo;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springblade.desk.order.wrapper.YieldOrderWrapper;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
 
 @RestController
 @AllArgsConstructor
@@ -37,4 +46,21 @@ public class StationController {
     public R getStationNameBoxBarcode(@RequestParam String stationCode) {
         return iOrderBoxService.getStationNameBoxBarcode(stationCode);
     }
+
+
+    /**
+     * 获取站点列表
+     */
+    @GetMapping("/getStationList")
+    @ApiOperationSupport(order = 1)
+    @Operation(summary = "分页", description = "获取站点列表")
+    public R<IPage<StationVO>> getStationList(StationVO station, Query query) {
+
+        IPage<StationVO> pages = stationService.getStationList(Condition.getPage(query), station);
+
+        return R.data(pages);
+    }
+
+
+
 }

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

@@ -1,9 +1,11 @@
 package org.springblade.desk.logistics.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.desk.logistics.pojo.entity.Location;
 import org.springblade.desk.logistics.pojo.entity.OrderBind;
+import org.springblade.desk.logistics.pojo.vo.LocationVO;
 
 import java.util.List;
 
@@ -15,4 +17,6 @@ public interface LocationMapper extends BaseMapper<Location> {
     List<Location> selectByStatus(@Param("status") Integer status);
 
     Location selectByLocationCode(@Param("locationCode") String locationCode, @Param("status")int status);
+
+    List<LocationVO> selectLocationList(IPage<LocationVO> page,@Param("location") LocationVO locationVO);
 }

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

@@ -17,4 +17,14 @@
         select id, location_name, location_code, location_status, status, create_user, create_time, create_dept, update_user, update_time, is_deleted, remark
         from LM_LOCATION where IS_DELETED = 0 and status = #{status} and LOCATION_CODE = #{locationCode};
     </select>
+    <select id="selectLocationList" resultType="org.springblade.desk.logistics.pojo.vo.LocationVO">
+        select id, location_name, location_code, location_status, status, create_user, create_time, create_dept, update_user, update_time, is_deleted, remark
+        from LM_LOCATION where IS_DELETED = 0
+        <if test="location.locationCode != null and location.locationCode !=''">
+            and LOCATION_CODE = #{location.locationCode}
+        </if>
+        <if test="location.locationStatus != null and location.locationStatus !=''">
+            and LOCATION_STATUS = #{location.locationStatus}
+        </if>
+    </select>
 </mapper>

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

@@ -1,9 +1,12 @@
 package org.springblade.desk.logistics.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.desk.dashboard.pojo.vo.DsTaskingVO;
 import org.springblade.desk.logistics.pojo.entity.OrderBind;
 import org.springblade.desk.logistics.pojo.entity.Station;
+import org.springblade.desk.logistics.pojo.vo.StationVO;
 
 import java.util.List;
 
@@ -12,4 +15,6 @@ public interface StationMapper extends BaseMapper<Station> {
     List<Station> selectByWcId(@Param("wcId") Long wcId);
 
     Station selectByStationCode(@Param("StationCode") String StationCode);
+
+    List<StationVO> selectStationList(IPage<StationVO> page, @Param("station") Station station);
 }

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

@@ -14,4 +14,24 @@
         select id, station_name, station_code, station_status, status, create_user, create_time, create_dept, update_user, update_time, is_deleted, remark, station_position, wc_id
         from LM_STATION where IS_DELETED = 0 and  STATION_CODE = #{StationCode}
     </select>
+
+    <select id="selectStationList" resultType="org.springblade.desk.logistics.pojo.vo.StationVO">
+        select id, station_name, station_code, station_status, status, create_user, create_time, create_dept, update_user, update_time, is_deleted, remark, station_position, wc_id
+        from LM_STATION where IS_DELETED = 0
+        <if test="station.stationName != null and station.stationName != ''">
+            and STATION_NAME = #{station.stationName}
+        </if>
+        <if test="station.stationCode != null and station.stationCode != ''">
+            and STATION_CODE = #{station.stationCode}
+        </if>
+        <if test="station.stationStatus != null and station.stationStatus != ''">
+            and STATION_STATUS = #{station.stationStatus}
+        </if>
+        <if test="station.stationPosition != null and station.stationPosition != ''">
+            and STATION_POSITION = #{station.stationPosition}
+        </if>
+        <if test="station.wcId != null and station.wcId != ''">
+            and WC_ID = #{station.wcId}
+        </if>
+    </select>
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/ILocationService.java

@@ -25,9 +25,11 @@
  */
 package org.springblade.desk.logistics.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.desk.logistics.pojo.entity.Location;
 import org.springblade.desk.logistics.pojo.entity.WeighData;
+import org.springblade.desk.logistics.pojo.vo.LocationVO;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -60,4 +62,12 @@ public interface ILocationService extends BaseService<Location> {
      * @return
      */
     Location selectByLocationCode(String locationCode, int status);
+
+    /**
+     * 获取库位
+     * @param page
+     * @param locationVO
+     * @return
+     */
+    IPage<LocationVO> getLocationList(IPage<LocationVO> page, LocationVO locationVO);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IStationService.java

@@ -25,10 +25,13 @@
  */
 package org.springblade.desk.logistics.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.dashboard.pojo.vo.DsTaskingVO;
 import org.springblade.desk.logistics.pojo.entity.Location;
 import org.springblade.desk.logistics.pojo.entity.Station;
+import org.springblade.desk.logistics.pojo.vo.StationVO;
 
 import java.util.List;
 
@@ -56,5 +59,11 @@ public interface IStationService extends BaseService<Station> {
 
     R getStationName(String stationCode);
 
-
+    /**
+     * 站点列表
+     * @param page
+     * @param station
+     * @return
+     */
+    IPage<StationVO> getStationList(IPage<StationVO> page, Station station);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/LocationServiceImpl.java

@@ -25,11 +25,14 @@
  */
 package org.springblade.desk.logistics.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.A;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.desk.logistics.mapper.LocationMapper;
 import org.springblade.desk.logistics.pojo.entity.Location;
+import org.springblade.desk.logistics.pojo.vo.LocationVO;
+import org.springblade.desk.logistics.pojo.vo.StationVO;
 import org.springblade.desk.logistics.service.ILocationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -64,4 +67,11 @@ public class LocationServiceImpl extends BaseServiceImpl<LocationMapper, Locatio
     public Location selectByLocationCode(String locationCode, int status) {
         return baseMapper.selectByLocationCode(locationCode,status);
     }
+
+    @Override
+    public IPage<LocationVO> getLocationList(IPage<LocationVO> page, LocationVO locationVO) {
+        List<LocationVO> locationList = baseMapper.selectLocationList(page, locationVO);
+
+        return page.setRecords(locationList);
+    }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationServiceImpl.java

@@ -26,14 +26,21 @@
 package org.springblade.desk.logistics.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.basic.pojo.entity.WorkCenter;
+import org.springblade.desk.basic.service.IWorkCenterService;
+import org.springblade.desk.dashboard.pojo.vo.DsTaskingVO;
 import org.springblade.desk.logistics.mapper.StationMapper;
 import org.springblade.desk.logistics.pojo.entity.Station;
+import org.springblade.desk.logistics.pojo.vo.StationVO;
 import org.springblade.desk.logistics.service.IStationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -48,6 +55,8 @@ import java.util.List;
 public class StationServiceImpl extends BaseServiceImpl<StationMapper, Station> implements IStationService {
 
 
+    @Autowired
+    IWorkCenterService workCenterService;
 
     @Override
     public List<Station> selectByWcId(Long wcId) {
@@ -70,4 +79,26 @@ public class StationServiceImpl extends BaseServiceImpl<StationMapper, Station>
         }
         return R.data(list.get(0));
     }
+
+    @Override
+    public IPage<StationVO> getStationList(IPage<StationVO> page, Station station) {
+
+        List<StationVO> stationList = baseMapper.selectStationList(page, station);
+        if(CollectionUtils.isEmpty(stationList)){
+            return page.setRecords(stationList);
+        }
+
+        for (StationVO stationVO : stationList) {
+            if(null != stationVO && null != stationVO.getWcId()){
+                WorkCenter workCenter = workCenterService.getById(stationVO.getWcId());
+                if(null != workCenter && !StringUtils.isEmpty(workCenter.getWcName())){
+                    stationVO.setWcName(workCenter.getWcName());
+                }
+            }
+
+        }
+
+        return page.setRecords(stationList);
+    }
+
 }