物流优化

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 = "192.168.249.27:8848";
-//    String NACOS_DEV_ADDR = "127.0.0.1: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/vo/LocationVO.java

@@ -9,4 +9,14 @@ import org.springblade.desk.logistics.pojo.entity.Location;
  */
 @Data
 public class LocationVO extends Location {
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
 }

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

@@ -4,21 +4,21 @@ 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 jakarta.validation.Valid;
 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.entity.Location;
+import org.springblade.desk.logistics.pojo.entity.Station;
 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.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @AllArgsConstructor
@@ -43,6 +43,16 @@ public class LocationController {
         return R.data(pages);
     }
 
+    /**
+     * 库位 修改
+     */
+    @PostMapping("/update")
+    @ApiOperationSupport(order = 2)
+    @Operation(summary = "修改", description  = "传入location")
+    public R update(@Valid @RequestBody Location location) {
+        return R.status(locationService.updateLocation(location));
+    }
+
 
 
 }

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

@@ -23,8 +23,15 @@
         <if test="location.locationCode != null and location.locationCode !=''">
             and LOCATION_CODE = #{location.locationCode}
         </if>
-        <if test="location.locationStatus != null and location.locationStatus !=''">
+        <if test="location.locationStatus != null ">
             and LOCATION_STATUS = #{location.locationStatus}
         </if>
+        <if test="location.startTime != null and location.startTime != '' and
+                  location.endTime !=null and location.endTime !=''">
+            AND update_time BETWEEN
+            TO_DATE(#{location.startTime}, 'YYYY-MM-DD HH24:MI:SS')
+            AND
+            TO_DATE(#{location.endTime}, 'YYYY-MM-DD HH24:MI:SS')
+        </if>
     </select>
 </mapper>

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

@@ -70,4 +70,11 @@ public interface ILocationService extends BaseService<Location> {
      * @return
      */
     IPage<LocationVO> getLocationList(IPage<LocationVO> page, LocationVO locationVO);
+
+    /**
+     * 库位修改 状态
+     * @param location
+     * @return
+     */
+    boolean updateLocation(Location location);
 }

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

@@ -1332,10 +1332,11 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
         }
 
         // 5. 校验订单是否已被绑定
-        R<?> orderBindCheckResult = checkOrderIdBoundStatus(orderCardNoList);
+        // 取消校验 一个订单可以绑定多个箱子 260410
-        if (!orderBindCheckResult.isSuccess()) {
+//        R<?> orderBindCheckResult = checkOrderIdBoundStatus(orderCardNoList);
-            return orderBindCheckResult;
+//        if (!orderBindCheckResult.isSuccess()) {
-        }
+//            return orderBindCheckResult;
+//        }
 
         // 6. 校验总重量是否超限
         BigDecimal totalWeight = calculateOrderCardNoTotalWeight(cardNoList);

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

@@ -28,9 +28,11 @@ 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.log.exception.ServiceException;
 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.entity.Station;
 import org.springblade.desk.logistics.pojo.vo.LocationVO;
 import org.springblade.desk.logistics.pojo.vo.StationVO;
 import org.springblade.desk.logistics.service.ILocationService;
@@ -74,4 +76,19 @@ public class LocationServiceImpl extends BaseServiceImpl<LocationMapper, Locatio
 
         return page.setRecords(locationList);
     }
+
+    @Override
+    public boolean updateLocation(Location location) {
+        Location locationVO = this.getById(location.getId());
+        if(null == locationVO){
+            throw new ServiceException("库位不存在");
+        }
+
+        boolean update = this.updateById(location);
+        if(!update){
+            throw new ServiceException("库位修改失败");
+        }
+
+        return true;
+    }
 }