[update] 查询上次判断结束时间接口变更为查询上次仓库定期盘点的时间

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverGoodsLossIntervalMainMapper.java

@@ -21,10 +21,10 @@ public interface DriverGoodsLossIntervalMainMapper extends BaseMapper<DriverGood
 
     /**
      * 查询运营商对应的区间货损最后统计时间
-     * @param operatorId
+     * @param warehouseId 仓库id
      * @return
      */
-    LocalDateTime searchLastTotalTime(@Param("operatorId") Long operatorId, @Param("warehouseId") Long warehouseId);
+    LocalDateTime searchLastTotalTime(@Param("warehouseId") Long warehouseId);
 
     /**
      * 分页查询区间生成统计记录

warehouse-admin-data/src/main/resources/mapper/driver/DriverGoodsLossIntervalMainMapper.xml

@@ -36,7 +36,7 @@
         id, intervalStartTime, intervalEndTime, operatorId, operatorChain, warehouseId, stockTakingType, pickingOrderCreateNum, wholeOrderCreateNum, replenishNum, returnWarehouseNum, onRouteInventoryNum, unshippedCancelNum, shippedCancelNum, unReplenishedNum, driverProfitLossNum, equipmentProfitLossNum, totalProfitLossNum, createTime, createUid, createName, modifyTime, modifyUid, modifyName, isDelete
     </sql>
     <select id="searchLastTotalTime" resultType="java.time.LocalDateTime">
-        select MAX(intervalEndTime) from yr_driver_goods_loss_interval_main where operatorId = #{operatorId} and warehouseId = #{warehouseId} and stockTakingType = 'REGULAR'
+        select MAX(endTime) from yr_warehouse_stock_taking_info where warehouseId = #{warehouseId} and stockTakingType = 'REGULAR'
     </select>
     <select id="searchForPage" resultType="com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageVo">
         select

warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverGoodsLossIntervalMainService.java

@@ -20,10 +20,9 @@ public interface DriverGoodsLossIntervalMainService extends IService<DriverGoods
 
     /**
      * 查询运营商对应的区间货损最后统计时间
-     * @param operatorId 运营商id
      * @param warehouseId 仓库id
      */
-    LocalDateTime searchLastTotalTime(Long operatorId, Long warehouseId);
+    LocalDateTime searchLastTotalTime(Long warehouseId);
 
     /**
      * 生成区间统计记录

warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverGoodsLossIntervalMainServiceImpl.java

@@ -24,8 +24,8 @@ import java.time.LocalDateTime;
 public class DriverGoodsLossIntervalMainServiceImpl extends ServiceImpl<DriverGoodsLossIntervalMainMapper, DriverGoodsLossIntervalMain> implements DriverGoodsLossIntervalMainService {
 
     @Override
-    public LocalDateTime searchLastTotalTime(Long operatorId, Long warehouseId) {
-        LocalDateTime intervalEndTime = baseMapper.searchLastTotalTime(operatorId, warehouseId);
+    public LocalDateTime searchLastTotalTime(Long warehouseId) {
+        LocalDateTime intervalEndTime = baseMapper.searchLastTotalTime(warehouseId);
 
         // 如果 intervalEndTime 为 null，则返回上月1号 00:00:00
         if (intervalEndTime == null) {

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/controller/DriverIntervalCargoDamageController.java

@@ -85,7 +85,7 @@ public class DriverIntervalCargoDamageController extends BaseController {
     @GetMapping("/searchLastTotalTime")
     @ResponseBody
     public Result<String> searchLastTotalTime(@RequestParam("operatorId") Long operatorId, @RequestParam("warehouseId") Long warehouseId) {
-        LocalDateTime localDateTime = driverGoodsLossIntervalMainService.searchLastTotalTime(operatorId, warehouseId);
+        LocalDateTime localDateTime = driverGoodsLossIntervalMainService.searchLastTotalTime(warehouseId);
         return Result.success(localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
     }