root/xiMenZi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复阻盘修改数据报错问题, 优化物料图片显示

Browse Source
This commit is contained in:
yanps
2024-11-25 08:46:23 +08:00
parent a0011c62cf
commit d3a2ea7b43
6 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
View File

@@ -94,7 +94,7 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
.ne(SchBaseVehiclematerialgroup::getGroup_id, item.getGroup_id()));
if (CollUtil.isNotEmpty(schBaseVehiclematerialgroups)) {
item.setHasChildren(true);
item.setChildren(schBaseVehiclematerialgroups);
/*item.setChildren(schBaseVehiclematerialgroups);*/
}
item.setHas_work(true);
});
@@ -192,6 +192,13 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
List<SchBaseVehiclematerialgroup> schBaseVehiclematerialgroups = vehiclematerialgroupMapper.selectList(Wrappers.lambdaQuery(SchBaseVehiclematerialgroup.class)
.eq(SchBaseVehiclematerialgroup::getVehicle_code, entity.getString("vehicle_code"))
.ne(SchBaseVehiclematerialgroup::getGroup_id, entity.getString("group_id")));
if(ObjectUtil.isNotEmpty(schBaseVehiclematerialgroups)){
schBaseVehiclematerialgroups.forEach(item->{
if(StrUtil.isEmpty(item.getRegion_code())){
item.setRegion_code("未知");
}
});
}
return schBaseVehiclematerialgroups;
}

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
View File

@@ -173,7 +173,9 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
entity.setUpdate_time(now);
// 获取region_name
SchBaseRegion baseRegion = regionMapper.selectById(entity.getRegion_code());
entity.setRegion_name(baseRegion.getRegion_name());
if (ObjectUtil.isNotEmpty(baseRegion)) {
entity.setRegion_name(baseRegion.getRegion_name());
}
String pointStatus = entity.getPoint_status();
String vehicle_code = entity.getVehicle_code();
// 根据点位状态来判断更新内容

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.sch.task.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -86,4 +87,12 @@ public class SchBaseTaskController {
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/upload")
@Log("导出数据")
@ApiOperation("导出数据")
public ResponseEntity<Object> upload(@RequestBody JSONObject json) {
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
}