suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

基础数据工艺能力查询修改，班组查询修改，作业槽

Browse Source
liweidong
pangyang 2 months ago
parent 53fa7aa3f8
commit 36597fe4bf
7 changed files with 104 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java
  2. 2
      blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java
  3. 5
      blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java
  4. 14
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java
  5. 72
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java
  6. 7
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java
  7. 8
      blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java

3
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java
Unescape View File

@ -104,6 +104,9 @@ public class TeamSet extends BaseEntity {
*/
@Schema(description = "调度员")
private Long dispatcher;
// @TableField(exist = false)
private String dispatcherRealName;
/**
* 班组长;外键（人员）
*/

2
blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java
Unescape View File

@ -80,7 +80,7 @@ public class CraftAbilityEntity extends BaseEntity {
private BigDecimal area;
@Schema(description = "数量")
private int quality;
private Integer quality;
@Schema(description = "批次")
private String batch;
@Schema(description = "饱和度")

5
blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java
Unescape View File

@ -64,7 +64,7 @@ public interface IUserClient {
String REMOVE_USER = API_PREFIX + "/remove-user";
String USER_LIST = API_PREFIX + "/user-list";
String UN_SELECTUSER_LIST = API_PREFIX + "/unuser-list";
String SELECTUSER_LIST = API_PREFIX + "/unuser-listByName";
@GetMapping(USER_LIST)
List<User> userListByIds(@RequestParam("userIds") String userIds);
@ -72,6 +72,9 @@ public interface IUserClient {
@GetMapping(UN_SELECTUSER_LIST)
List<User> userUNListByIds(@RequestParam("userIds") String userIds);
@GetMapping(SELECTUSER_LIST)
List<User> userListByName(@RequestParam("name") String name);
/**
* 获取用户信息

14
blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java
Unescape View File

@ -56,6 +56,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -114,6 +115,12 @@ public class CraftAbilityController extends BladeController {
@ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入CraftAbility")
public R<IPage<CraftAbilityVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> craftAbility, Query query) {
Date startTime = null;
Date endTime = null;
if(craftAbility.containsKey("startTime")){
startTime = DateUtil.parse(Func.toStr(craftAbility.get("startTime")),"yyyy-MM-dd HH:mm:ss");
endTime = DateUtil.parse(Func.toStr(craftAbility.get("endTime")),"yyyy-MM-dd HH:mm:ss");
}
QueryWrapper<CraftAbilityEntity> qw = Condition.getQueryWrapper(craftAbility, CraftAbilityEntity.class);
@ -121,9 +128,10 @@ public class CraftAbilityController extends BladeController {
qw.like(craftAbility.containsKey("caName"), "CA_NAME", Func.toStr(craftAbility.get("caName")));
qw.eq(craftAbility.containsKey("caCode"), "CA_CODE", Func.toStr(craftAbility.get("caCode")));
qw.eq(craftAbility.containsKey("wtId"), "WT_ID", Func.toInt(craftAbility.get("wtId")));
qw.eq(craftAbility.containsKey("platingSmall"), "plating_small", Func.toStr(craftAbility.get("platingSmall")));
// qw.eq(craftAbility.containsKey("platingSmall"), "plating_small", Func.toStr(craftAbility.get("platingSmall")));
if(null != startTime && null != endTime){
qw.between("UPDATE_TIME", startTime,endTime);
}
IPage<CraftAbilityEntity> pages = craftAbilityService.page(Condition.getPage(query), qw);
IPage<CraftAbilityVO> pagesVO = CraftAbilityWrapper.build().pageVO(pages);
pagesVO.getRecords()

72
blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java
Unescape View File

@ -192,11 +192,28 @@ public class TeamSetController extends BladeController {
@Operation(summary = "list分页", description = "传入TeamSet Obj")
public R<IPage<TeamSetVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> map,
Query query) {
// List<Long> ids = new ArrayList<>();
// if(map.containsKey("dispatcherRealName")){
// List<User> users = iUserClient.userListByName(Func.toStr(map.get("dispatcherRealName")));
// if(null != users){
// ids = users.stream().map(User::getId).collect(Collectors.toList());
// }
// }
// build QueryWrapper
QueryWrapper<TeamSet> qw = Condition.getQueryWrapper(map, TeamSet.class);
qw.like(map.containsKey(TeamSet.COL_TS_CODE), TeamSet.COL_TS_CODE, (Func.toStr(map.get(TeamSet.COL_TS_CODE))));
qw.like(map.containsKey(TeamSet.COL_TS_NAME), TeamSet.COL_TS_NAME, (Func.toStr(map.get(TeamSet.COL_TS_NAME))));
qw.like(map.containsKey("dispatcherRealName"), "DISPATCHER_REAL_NAME", (Func.toStr(map.get("dispatcherRealName"))));
// if(null != ids && ids.size() > 0){
// qw.in(TeamSet.COL_DISPATCHER, ids);
// }
qw.eq(map.containsKey(TeamSet.COL_DISPATCHER), TeamSet.COL_DISPATCHER, (Func.toLong(map.get(TeamSet.COL_DISPATCHER))));
// page
IPage<TeamSet> pages = service.page(Condition.getPage(query), qw);
IPage<TeamSetVO> pagesVO = TeamSetWrapper.build().pageVO(pages);
@ -214,6 +231,50 @@ public class TeamSetController extends BladeController {
if(null != userleader && null != userleader.getData()){
teamSetVO.setTeamLeaderRealName(userleader.getData().getRealName());
}
List<String> dayPutDueTimes = new ArrayList<>();
QueryWrapper<TeamTime> queryWrapper = new QueryWrapper<>();
queryWrapper.in("ts_id",teamSetVO.getId());
queryWrapper.in("special",0);
List<TeamTime> teamTimes = teamTimeService.list(queryWrapper);
for(TeamTime teamTime:teamTimes){
dayPutDueTimes.add(teamTime.getStartTime()+"~"+teamTime.getEndTime());
}
String dayPutDueTime = dayPutDueTimes.stream()
.map(Object::toString) // 或者直接使用String::valueOf，效果相同
.collect(Collectors.joining(","));
teamSetVO.setDayPutDueTime(dayPutDueTime);
List<String> specDayPutDueTimes = new ArrayList<>();
QueryWrapper<TeamTime> queryWrapperspec = new QueryWrapper<>();
queryWrapperspec.in("ts_id",teamSetVO.getId());
queryWrapperspec.in("special",1);
List<TeamTime> teamTimespecs = teamTimeService.list(queryWrapperspec);
for(TeamTime teamTime:teamTimespecs){
specDayPutDueTimes.add(teamTime.getStartTime()+"~"+teamTime.getEndTime());
}
String specDayPutDueTime = specDayPutDueTimes.stream()
.map(Object::toString) // 或者直接使用String::valueOf，效果相同
.collect(Collectors.joining(","));
teamSetVO.setSpecDayPutDueTime(specDayPutDueTime);
List<String> exChangeTimes = new ArrayList<>();
QueryWrapper<TeamTime> queryWrapperchange = new QueryWrapper<>();
queryWrapperchange.in("ts_id",teamSetVO.getId());
queryWrapperchange.in("special",2);
List<TeamTime> teamTimeexchanges = teamTimeService.list(queryWrapperchange);
for(TeamTime teamTime:teamTimeexchanges){
exChangeTimes.add(teamTime.getStartTime()+"~"+teamTime.getEndTime());
}
String changeDayPutDueTime = exChangeTimes.stream()
.map(Object::toString) // 或者直接使用String::valueOf，效果相同
.collect(Collectors.joining(","));
teamSetVO.setExChangeTime(changeDayPutDueTime);
}
return R.data(pagesVO);
}
@ -295,6 +356,8 @@ public class TeamSetController extends BladeController {
@Operation(summary = "新增一条", description = "传入TeamSet Obj")
public R save(@Valid @RequestBody TeamSet addOne) {
addOne.setId(null);
R<User> user= iUserClient.userInfoById(addOne.getDispatcher());
addOne.setDispatcherRealName(user.getData().getRealName());
return R.status(service.save(addOne));
}
@ -307,6 +370,8 @@ public class TeamSetController extends BladeController {
public R saveBat(@Valid @RequestBody List<TeamSet> addList) {
addList.forEach(one -> {
one.setId(null);
R<User> user= iUserClient.userInfoById(one.getDispatcher());
one.setDispatcherRealName(user.getData().getRealName());
});
return R.status(service.saveBatch(addList));
}
@ -318,6 +383,8 @@ public class TeamSetController extends BladeController {
@ApiOperationSupport(order = 40)
@Operation(summary = "修改一条", description = "传入TeamSet Obj")
public R update(@Valid @RequestBody TeamSet updateOne) {
R<User> user= iUserClient.userInfoById(updateOne.getDispatcher());
updateOne.setDispatcherRealName(user.getData().getRealName());
return R.status(service.updateById(updateOne));
}
@ -328,6 +395,11 @@ public class TeamSetController extends BladeController {
@ApiOperationSupport(order = 41)
@Operation(summary = "修改批量", description = "传入TeamSet List")
public R updateBat(@Valid @RequestBody List<TeamSet> updateList) {
for(TeamSet updateOne:updateList){
R<User> user= iUserClient.userInfoById(updateOne.getDispatcher());
updateOne.setDispatcherRealName(user.getData().getRealName());
}
return R.status(service.updateBatchById(updateList));
}

7
blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java
Unescape View File

@ -89,8 +89,11 @@ public class WorkTankController extends BladeController {
IPage<WorkTankVO> pagesVO = WorkTankWrapper.build().pageVO(pages);
List<WorkTankVO> listVO = pagesVO.getRecords();
for(WorkTankVO one : listVO){
R<User> userplan= iUserClient.userInfoById(one.getOpUserId());
one.setOpUserRealName(userplan.getData().getRealName());
if(null != one.getOpUserId()){
R<User> userplan= iUserClient.userInfoById(one.getOpUserId());
one.setOpUserRealName(userplan.getData().getRealName());
}
}
return R.data(pagesVO);
}

8
blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java
Unescape View File

@ -78,6 +78,14 @@ public class UserClient implements IUserClient {
}
}
@Override
public List<User> userListByName(String name) {
QueryWrapper<User> queryWrapper = new QueryWrapper<>();
queryWrapper.like("real_name",name);
List<User> users = service.list(queryWrapper);
return users;
}
@Override
@GetMapping(USER_BY_ID)
public R<User> userInfoById(Long userId) {

Write Preview
Loading…
Cancel
Save