FeiDaBaoKai/wms_server_kate_suzhou
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 间接物料入库时bug修复；

Browse Source 
2. 拣选任务记录报表对非装载机且非平地机的记录作了区分。
This commit is contained in:
梁州 2026-02-04 20:47:18 +08:00
parent 755e6b4b95
commit 64546c8c6f
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/wms/controller/TaskController.java
View File

@ -2052,6 +2052,7 @@ public class TaskController {
.eq(Vehicle::getVehicleStatus, VehicleStatus.ON.getCode()) .eq(Vehicle::getVehicleStatus, VehicleStatus.ON.getCode())
.orderByAsc(Vehicle::getLastInTime) .orderByAsc(Vehicle::getLastInTime)
.last("limit " + needNum); .last("limit " + needNum);
if (Objects.equals(callEmptyVehicleRequest.getVehicleType2(), "间接物料")) { if (Objects.equals(callEmptyVehicleRequest.getVehicleType2(), "间接物料")) {
if (StringUtils.isEmpty(callEmptyVehicleRequest.getGoodsId())) { if (StringUtils.isEmpty(callEmptyVehicleRequest.getGoodsId())) {
logger.error("间接物料必须输入物料号"); logger.error("间接物料必须输入物料号");
@ -2094,7 +2095,11 @@ public class TaskController {
emptyVehicleTask.setVehicleSize(1); emptyVehicleTask.setVehicleSize(1);
emptyVehicleTask.setCreateTime(LocalDateTime.now()); emptyVehicleTask.setCreateTime(LocalDateTime.now());
emptyVehicleTask.setUserName(callEmptyVehicleRequest.getUserName()); emptyVehicleTask.setUserName(callEmptyVehicleRequest.getUserName());
if (Objects.equals(callEmptyVehicleRequest.getVehicleType2(), "间接物料")) {
emptyVehicleTask.setIsPicking(1);
} else {
emptyVehicleTask.setIsPicking(0); emptyVehicleTask.setIsPicking(0);
}
vehicleOutTasks.add(emptyVehicleTask); vehicleOutTasks.add(emptyVehicleTask);
// 出库料箱表 // 出库料箱表
outVehicleIds.add(emptyVehicle.getVehicleId()); outVehicleIds.add(emptyVehicle.getVehicleId());

6
src/main/java/com/wms/utils/excel/vo/PickTaskRecordExcelVo.java
View File

@ -1,7 +1,5 @@
package com.wms.utils.excel.vo; package com.wms.utils.excel.vo;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.wms.constants.enums.PickTaskStatusEnum; import com.wms.constants.enums.PickTaskStatusEnum;
@ -85,8 +83,12 @@ public class PickTaskRecordExcelVo {
pickTaskRecordExcelVo.setPickStatus(PickTaskStatusEnum.getValueByCode(pickTaskRecord.getPickStatus())); pickTaskRecordExcelVo.setPickStatus(PickTaskStatusEnum.getValueByCode(pickTaskRecord.getPickStatus()));
pickTaskRecordExcelVo.setLastUpdateTime(pickTaskRecord.getLastUpdateTime()); pickTaskRecordExcelVo.setLastUpdateTime(pickTaskRecord.getLastUpdateTime());
pickTaskRecordExcelVo.setArriveTime(pickTaskRecord.getArriveTime()); pickTaskRecordExcelVo.setArriveTime(pickTaskRecord.getArriveTime());
if (pickTaskRecord.getMachineType() != null) {
pickTaskRecordExcelVo.setMachineType(Objects.equals(pickTaskRecord.getMachineType(), 1) ? "装载机" : "平地机"); pickTaskRecordExcelVo.setMachineType(Objects.equals(pickTaskRecord.getMachineType(), 1) ? "装载机" : "平地机");
}
if (pickTaskRecord.getAreaType() != null) {
pickTaskRecordExcelVo.setAreaType(Objects.equals(pickTaskRecord.getAreaType(), 1) ? "前" : "后"); pickTaskRecordExcelVo.setAreaType(Objects.equals(pickTaskRecord.getAreaType(), 1) ? "前" : "后");
}
if (pickTaskRecord.getArriveTime() != null && pickTaskRecord.getLastUpdateTime() != null) { if (pickTaskRecord.getArriveTime() != null && pickTaskRecord.getLastUpdateTime() != null) {
pickTaskRecordExcelVo.setUseTime(StringUtils.durationFormat(pickTaskRecord.getArriveTime().until(pickTaskRecord.getLastUpdateTime(), ChronoUnit.SECONDS))); pickTaskRecordExcelVo.setUseTime(StringUtils.durationFormat(pickTaskRecord.getArriveTime().until(pickTaskRecord.getLastUpdateTime(), ChronoUnit.SECONDS)));
} else { } else {