Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

生产单新增

Browse Source
This commit is contained in:
lym
2024-03-22 10:34:21 +08:00
parent 141b6cfe28
commit 2148065876
66 changed files with 1663 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/user/AdminUserApi.java
+9
View File
@@ -4,6 +4,7 @@ import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.util.collection.CollectionUtils;
import com.cf.imes.module.system.api.user.dto.AdminUserRespDTO;
import com.cf.imes.module.system.enums.ApiConstants;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
@@ -58,4 +59,12 @@ public interface AdminUserApi {
@Parameter(name = "ids", description = "用户编号数组", example = "3,5", required = true)
CommonResult<Boolean> validateUserList(@RequestParam("ids") Set<Long> ids);
@GetMapping(PREFIX + "/valid")
@Operation(summary = "通过用户名称获取用户信息")
@Parameters({
@Parameter(name = "name", description = "用户名称", example = "1", required = true),
@Parameter(name = "organId", description = "组织编号", example = "晨丰科技", required = true)
})
CommonResult<AdminUserRespDTO> validateUser(@RequestParam("name") String name, @RequestParam("organId") Long organId);
}
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+14
View File
@@ -206,4 +206,18 @@ public interface ErrorCodeConstants {
ErrorCode PROCESS_USER_NOT_EXISTS = new ErrorCode(1_002_032_002, "工序用户不存在");
ErrorCode PROCESS_USER_EXISTS = new ErrorCode(1_002_032_002, "工序用户存在");
//=========== 板材信息 1-002-035-000 ============
ErrorCode RAW_GOODS_NOT_EXISTS = new ErrorCode(1_002_033_001, "设计板材不存再");
ErrorCode RAW_GOODS_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_002_033_002, "生产板材导入数据不可以为空");
//=========== 配件信息 1-002-035-000 ============
ErrorCode ORDER_PARTS_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_002_034_001, "生产配件导入数据不可以为空");
//=========== 柜体信息 1-002-035-000 ============
ErrorCode ORDER_BODY_NOT_EXISTS = new ErrorCode(1_002_035_001, "柜体信息不存在");
//=========== 柜体信息 1-002-035-000 ============
ErrorCode ORDER_GROUP_NOT_EXISTS = new ErrorCode(1_002_036_001, "加工组信息不存在");
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/user/AdminUserApiImpl.java
+7
View File
@@ -52,4 +52,11 @@ public class AdminUserApiImpl implements AdminUserApi {
return success(true);
}
@Override
public CommonResult<AdminUserRespDTO> validateUser(String name, Long organId) {
AdminUserDO user = userService.getUserByUsername(name, organId);
return success(BeanUtils.toBean(user, AdminUserRespDTO.class));
}
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java
+3 -2
View File
@@ -5,6 +5,7 @@ import javax.validation.Valid;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.collection.CollUtil;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
@@ -78,8 +79,8 @@ public class ProcessController {
@Operation(summary = "获得工序信息分页")
@PreAuthorize("@ss.hasPermission('system:process:query')")
public CommonResult<PageResult<ProcessRespVO>> getProcessPage(@Valid ProcessPageReqVO pageReqVO) {
PageResult<ProcessDO> pageResult = processService.getProcessPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ProcessRespVO.class));
PageResult<ProcessRespVO> pageResult = processService.getProcessPageAll(pageReqVO);
return success(pageResult);
}
@GetMapping("/export-excel")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessPageReqVO.java
+6
View File
@@ -55,4 +55,10 @@ public class ProcessPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "用户id查询")
private String userId;
@Schema(description = "组织id")
private Long organId;
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/process/ProcessRespVO.java
+3
View File
@@ -67,4 +67,7 @@ public class ProcessRespVO {
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "工序中的用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12,13")
private String users;
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/process/ProcessMapper.java
+18
View File
@@ -35,6 +35,24 @@ public interface ProcessMapper extends BaseMapperX<ProcessDO> {
.orderByDesc(ProcessDO::getId));
}
// default PageResult<ProcessPageReqVO> selectPage(ProcessPageReqVO reqVO) {
// return selectPage(reqVO, new LambdaQueryWrapperX<ProcessPageReqVO>()
// .likeIfPresent(ProcessPageReqVO::getName, reqVO.getName())
// .eqIfPresent(ProcessPageReqVO::getPieceRate, reqVO.getPieceRate())
// .eqIfPresent(ProcessPageReqVO::getPieceType, reqVO.getPieceType())
// .eqIfPresent(ProcessPageReqVO::getType, reqVO.getType())
// .eqIfPresent(ProcessPageReqVO::getIsCustom, reqVO.getIsCustom())
// .eqIfPresent(ProcessPageReqVO::getIsDealer, reqVO.getIsDealer())
// .eqIfPresent(ProcessPageReqVO::getSort, reqVO.getSort())
// .eqIfPresent(ProcessPageReqVO::getHourCapacity, reqVO.getHourCapacity())
// .eqIfPresent(ProcessPageReqVO::getUnit, reqVO.getUnit())
// .eqIfPresent(ProcessPageReqVO::getIsEnabled, reqVO.getIsEnabled())
// .betweenIfPresent(ProcessPageReqVO::getPrepareTime, reqVO.getPrepareTime())
// .eqIfPresent(ProcessPageReqVO::getDescription, reqVO.getDescription())
// .betweenIfPresent(ProcessPageReqVO::getCreateTime, reqVO.getCreateTime())
// .orderByDesc(ProcessPageReqVO::getId));
// }
default List<ProcessDO> selectAll() {
return selectList(new LambdaQueryWrapperX<ProcessDO>()
.orderByDesc(ProcessDO::getId));
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupServiceImpl.java
+2 -3
View File
@@ -88,10 +88,9 @@ public class ProcessGroupServiceImpl implements ProcessGroupService {
String[] items = processGroup.getItems().split(",");
List<ProcessRespVO> lists = new ArrayList<>();
for (int i = 0; i < items.length; i++) {
lists.add(BeanUtils.toBean(processMapper.selectById(items[i]), ProcessRespVO.class));
System.out.println("each List " + BeanUtils.toBean(processMapper.selectById(items[i]), ProcessRespVO.class));
if (processMapper.selectById(items[i]) != null)
lists.add(BeanUtils.toBean(processMapper.selectById(items[i]), ProcessRespVO.class));
}
System.out.println("processGroupSaveReqVO = " + processListSaveReqVO);
processListSaveReqVO.setLists(lists);
return processListSaveReqVO;
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessService.java
+8 -4
View File
@@ -1,9 +1,6 @@
package com.cf.imes.module.system.service.process;
import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessPageReqVO;
import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessSaveReqVO;
import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessUserRespVO;
import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessUserSaveReqVO;
import com.cf.imes.module.system.controller.admin.process.vo.process.*;
import com.cf.imes.module.system.dal.dataobject.process.ProcessDO;
import com.cf.imes.framework.common.pojo.PageResult;
@@ -55,6 +52,13 @@ public interface ProcessService {
*/
PageResult<ProcessDO> getProcessPage(ProcessPageReqVO pageReqVO);
/**
* 获得工序信息表 process分页
*
* @param pageReqVO 分页查询
* @return 工序信息表 process分页
*/
PageResult<ProcessRespVO> getProcessPageAll(ProcessPageReqVO pageReqVO);
/**
* 获得所有工序信息表 process
*
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java
+32 -4
View File
@@ -1,9 +1,8 @@
package com.cf.imes.module.system.service.process;
import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessPageReqVO;
import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessSaveReqVO;
import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessUserRespVO;
import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessUserSaveReqVO;
import cn.hutool.core.util.StrUtil;
import com.cf.imes.framework.common.util.pinyin.PinYinUtils;
import com.cf.imes.module.system.controller.admin.process.vo.process.*;
import com.cf.imes.module.system.controller.admin.process.vo.processUser.ProcessAndUserSaveReqVO;
import com.cf.imes.module.system.dal.dataobject.process.ProcessUserDO;
import com.cf.imes.module.system.dal.mysql.process.ProcessUserMapper;
@@ -141,6 +140,35 @@ public class ProcessServiceImpl implements ProcessService {
return processMapper.selectPage(pageReqVO);
}
@Override
public PageResult<ProcessRespVO> getProcessPageAll(ProcessPageReqVO pageReqVO) {
PageResult<ProcessDO> processList = processMapper.selectPage(pageReqVO);
PageResult<ProcessRespVO> processRespVOPageResult = new PageResult<ProcessRespVO>();
processRespVOPageResult.setTotal(processList.getTotal());
processList.getList().forEach(processDO -> {
ProcessRespVO processRespVO = BeanUtils.toBean(processDO, ProcessRespVO.class);
StringBuilder userIdBuilder = new StringBuilder();
List<ProcessUserDO> userIdListsByProcessId = processUserService.getProcessUser(processDO.getId());
if (userIdListsByProcessId != null) {
for (ProcessUserDO processUser : userIdListsByProcessId) {
if (processUser != null && processUser.getUserId() != null) {
if (adminUserService.getUser(processUser.getUserId()) != null) {
userIdBuilder.append(",").append(processUser.getUserId());
}
if (pageReqVO.getUserId() != null && pageReqVO.getUserId().equals("")) {
if (processUser.getUserId().equals(pageReqVO.getUserId()))
break;
}
}
}
}
processRespVO.setUsers(userIdBuilder.length() > 0 ? userIdBuilder.substring(1) : "");
processRespVOPageResult.getList().add(processRespVO);
});
return processRespVOPageResult;
}
@Override
public List<ProcessDO> getAllProcess() {
List<ProcessDO> processDOList = processMapper.selectAll();