|
|
|
|
@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO;
|
|
|
|
|
import cn.iocoder.yudao.module.mes.service.deviceledger.DeviceLedgerService;
|
|
|
|
|
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
|
|
|
|
|
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
|
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
|
@ -25,6 +26,7 @@ import javax.validation.*;
|
|
|
|
|
import javax.servlet.http.*;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
|
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
|
|
|
@ -64,24 +66,41 @@ public class MoldOperateController {
|
|
|
|
|
@Operation(summary = "创建模具上下模")
|
|
|
|
|
@PreAuthorize("@ss.hasPermission('mes:mold-operate:create')")
|
|
|
|
|
public CommonResult<Long> createMoldOperate(@Valid @RequestBody MoldOperateSaveReqVO createReqVO) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (Objects.equals(createReqVO.getOperateType(), "1")) {
|
|
|
|
|
DeviceLedgerDO deviceLedger = deviceLedgerService.getDeviceLedger(createReqVO.getDeviceId());
|
|
|
|
|
MoldDO moldDO = moldService.getMold(createReqVO.getMoldId());
|
|
|
|
|
moldDO.setMachineId(createReqVO.getDeviceId());
|
|
|
|
|
moldDO.setMachineName(deviceLedger.getDeviceName());
|
|
|
|
|
moldDO.setStatus(0); // 在机 0 在库 1
|
|
|
|
|
moldService.updateMold(BeanUtils.toBean(moldDO, MoldSaveReqVO.class));
|
|
|
|
|
deviceLedger.setMoldId(Long.toString(createReqVO.getMoldId()));
|
|
|
|
|
List<Long> idList = Arrays.stream(createReqVO.getMoldId().split(","))
|
|
|
|
|
.map(String::trim) // 去除可能存在的空格
|
|
|
|
|
.map(Long::valueOf)
|
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
for (Long id : idList) {
|
|
|
|
|
MoldDO moldDO = moldService.getMold(id);
|
|
|
|
|
moldDO.setMachineId(createReqVO.getDeviceId());
|
|
|
|
|
moldDO.setMachineName(deviceLedger.getDeviceName());
|
|
|
|
|
moldDO.setStatus(0); // 在机 0 在库 1
|
|
|
|
|
moldService.updateMold(BeanUtils.toBean(moldDO, MoldSaveReqVO.class));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
deviceLedger.setMoldId(createReqVO.getMoldId());
|
|
|
|
|
deviceLedgerService.updateDeviceLedger(BeanUtils.toBean(deviceLedger, DeviceLedgerSaveReqVO.class));
|
|
|
|
|
} else {
|
|
|
|
|
List<Long> lowerMoldId = Arrays.stream(createReqVO.getLowerMoldId().split(","))
|
|
|
|
|
.map(String::trim) // 去除可能存在的空格
|
|
|
|
|
.map(Long::valueOf)
|
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
//下模
|
|
|
|
|
for (Long id : lowerMoldId) {
|
|
|
|
|
MoldDO moldDO = moldService.getMold(id);
|
|
|
|
|
moldDO.setMachineId(0L);
|
|
|
|
|
moldDO.setMachineName("");
|
|
|
|
|
moldDO.setStatus(3); // 在机 0 在途 3
|
|
|
|
|
moldService.updateMold(BeanUtils.toBean(moldDO, MoldSaveReqVO.class));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DeviceLedgerDO deviceLedger = deviceLedgerService.getDeviceLedger(createReqVO.getDeviceId());
|
|
|
|
|
createReqVO.setMoldId(Long.parseLong(deviceLedger.getMoldId()));
|
|
|
|
|
MoldDO moldDO = moldService.getMold(Long.parseLong(deviceLedger.getMoldId()));
|
|
|
|
|
moldDO.setMachineId(0L);
|
|
|
|
|
moldDO.setMachineName("");
|
|
|
|
|
moldDO.setStatus(3); // 在机 0 在库 1
|
|
|
|
|
moldService.updateMold(BeanUtils.toBean(moldDO, MoldSaveReqVO.class));
|
|
|
|
|
deviceLedger.setMoldId("0");
|
|
|
|
|
deviceLedger.setMoldId(createReqVO.getMoldId());
|
|
|
|
|
deviceLedgerService.updateDeviceLedger(BeanUtils.toBean(deviceLedger, DeviceLedgerSaveReqVO.class));
|
|
|
|
|
}
|
|
|
|
|
return success(moldOperateService.createMoldOperate(createReqVO));
|
|
|
|
|
@ -121,17 +140,18 @@ public class MoldOperateController {
|
|
|
|
|
// 管理员信息
|
|
|
|
|
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
|
|
|
|
|
convertSet(pageResult.getList(), admin -> Long.parseLong(admin.getCreator())));
|
|
|
|
|
// 模具信息
|
|
|
|
|
Map<Long, MoldRespVO> moldMap = moldService.getMoldVOMap(
|
|
|
|
|
convertSet(pageResult.getList(), MoldOperateDO::getMoldId));
|
|
|
|
|
|
|
|
|
|
// // 模具信息
|
|
|
|
|
// Map<Long, MoldRespVO> moldMap = moldService.getMoldVOMap(
|
|
|
|
|
// convertSet(pageResult.getList(), MoldOperateDO::getMoldId));
|
|
|
|
|
|
|
|
|
|
// 设备台账
|
|
|
|
|
Map<Long, DeviceLedgerRespVO> deviceLedgerMap = deviceLedgerService.getDeviceLedgerVOMap(
|
|
|
|
|
convertSet(pageResult.getList(), MoldOperateDO::getDeviceId));
|
|
|
|
|
// Map<Long, DeviceLedgerRespVO> deviceLedgerMap = deviceLedgerService.getDeviceLedgerVOMap(
|
|
|
|
|
// convertSet(pageResult.getList(), MoldOperateDO::getDeviceId));
|
|
|
|
|
return success(BeanUtils.toBean(pageResult, MoldOperateRespVO.class,moldOperate -> {
|
|
|
|
|
MapUtils.findAndThen(userMap, Long.parseLong(moldOperate.getCreator()), user -> moldOperate.setCreatorName(user.getNickname()));
|
|
|
|
|
MapUtils.findAndThen(moldMap, moldOperate.getMoldId(), mold -> moldOperate.setMoldName(mold.getName()));
|
|
|
|
|
MapUtils.findAndThen(deviceLedgerMap, moldOperate.getDeviceId(), deviceLedger -> moldOperate.setDeviceName(deviceLedger.getDeviceName()));
|
|
|
|
|
// MapUtils.findAndThen(moldMap, moldOperate.getMoldId(), mold -> moldOperate.setMoldName(mold.getName()));
|
|
|
|
|
// MapUtils.findAndThen(deviceLedgerMap, moldOperate.getDeviceId(), deviceLedger -> moldOperate.setDeviceName(deviceLedger.getDeviceName()));
|
|
|
|
|
}));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -162,4 +182,13 @@ public class MoldOperateController {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@GetMapping("/getLowerMoldList")
|
|
|
|
|
@Operation(summary = "获得模具下模列表")
|
|
|
|
|
@Parameter(name = "id", description = "设备id", required = true, example = "1024")
|
|
|
|
|
@PreAuthorize("@ss.hasPermission('mes:mold-operate:query')")
|
|
|
|
|
public CommonResult<List<MoldDO>> getLowerMoldList(@RequestParam("id") Long id) {
|
|
|
|
|
List<MoldDO> moldDO = moldOperateService.getLowerMoldList(id);
|
|
|
|
|
return success(moldDO);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
HuangHuiKang
kkk-ops
86158