设备特殊字符管理 工步新增字段

lyh

2025-01-15 833035bc5026f12acb8f7e1428280d0a9f204b08

设备特殊字符管理  工步新增字段

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceCharactersController.java

@@ -3,6 +3,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.dnc.entity.DeviceCharacters;
import org.jeecg.common.system.base.controller.JeecgController;
@@ -32,16 +33,18 @@

    /**
     * 设备特殊字符分页查询
     * @param page
     * @param size
     * @param pageNo
     * @param pageSize
     * @param deviceCharactersRequest
     * @return
     */
    @AutoLog(value = "设备特殊字符-分页列表查询")
    @ApiOperation(value = "设备特殊字符-分页列表查询", notes = "设备特殊字符-分页列表查询")
    @GetMapping("/find/page/{page}/{size}")
    public QueryPageResponseResult<DeviceCharacters> findPageList(@PathVariable("page") int page, @PathVariable("size") int size, DeviceCharactersRequest deviceCharactersRequest) {
        return iDeviceCharactersService.findByPageList(page, size, deviceCharactersRequest);
    @GetMapping("/find/page")
    public Result<?> findPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                  DeviceCharactersRequest deviceCharactersRequest) {
        return iDeviceCharactersService.findByPageList(pageNo, pageSize, deviceCharactersRequest);
    }

    /**
@@ -65,8 +68,8 @@
     */
    @AutoLog(value = "设备特殊字符-编辑设备特殊字符")
    @ApiOperation(value = "设备特殊字符-编辑设备特殊字符", notes = "设备特殊字符-编辑设备特殊字符")
    @PutMapping("/edit/{id}")
    public ResponseResult editDefinition(@PathVariable("id") String id,@RequestBody DeviceCharacters deviceCharacters) {
    @PutMapping("/edit")
    public ResponseResult editDefinition(@RequestBody DeviceCharacters deviceCharacters) {
        boolean b = iDeviceCharactersService.updateById(deviceCharacters);
        if(b) {
            return new ResponseResult(CommonCode.SUCCESS);

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DeviceCharacters.java

@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.jeecg.common.aspect.annotation.Dict;

import java.util.Date;

@@ -23,6 +24,7 @@
    @TableField(value = "device_no")
    private String deviceNo;
    @TableField(value = "depart_id")
    @Dict(dictTable = "sys_department",dicCode = "depart_id",dicText = "depart_name")
    private String departId;
    @TableField(value = "control_system")
    private String controlSystem;

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java

@@ -9,16 +9,18 @@
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.Date;

@Data
@NoArgsConstructor
@TableName(value = "nc_work_step")
@Api(value = "工步")
public class WorkStep {
public class WorkStep implements Serializable {
    private static final long serialVersionUID = 1529244980533421687L;
    //工步id
    @TableField(value = "step_id")
    private String stepId;
    @TableField(value = "id")
    private String id;
    //产品id
    @TableField(value = "product_id")
    private String productId;
@@ -46,6 +48,18 @@
    //工步类型
    @TableField(value = "step_type")
    private Integer stepType;
    //工序描述
    @TableField(value = "description")
    private String description;
    //加工设备编号
    @TableField(value = "device_no")
    private String deviceNo;
    //工装编号
    @TableField(value = "assemble_no")
    private String assembleNo;
    //工装名称
    @TableField(value = "assemble_name")
    private String assembleName;
    @JsonIgnore
    @TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
    private Date createTime;

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.dnc.mapper.WorkStepMapper">
    <select id="getByUserPerms" resultType="org.jeecg.modules.dnc.entity.WorkStep">
        select
               p.step_id
               p.id
             , p.product_id
             , p.component_id
             , p.parts_id
@@ -14,13 +14,17 @@
             , p.craft_version
             , p.step_type
             , p.CREATE_TIME
             , p.create_by
             , p.create_user
             , p.UPDATE_TIME
             , p.update_by
             , p.update_user
             , p.description
             , p.device_no
             , p.assemble_no
             , p.assemble_name
        from nc_work_step p
                 inner join
             (select distinct step_id from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
             on p.step_id = s.step_id
             on p.id = s.step_id
        where p.delete_flag = 0
    </select>
</mapper>

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceCharactersService.java

@@ -1,8 +1,8 @@
package org.jeecg.modules.dnc.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.dnc.entity.DeviceCharacters;
import org.jeecg.modules.dnc.response.QueryPageResponseResult;
import org.jeecg.modules.dnc.request.DeviceCharactersRequest;

public interface IDeviceCharactersService extends IService<DeviceCharacters> {
@@ -14,6 +14,6 @@
     * @param deviceCharactersRequest
     * @return
     */
    QueryPageResponseResult<DeviceCharacters> findByPageList(int page, int size, DeviceCharactersRequest deviceCharactersRequest);
    Result<?> findByPageList(int page, int size, DeviceCharactersRequest deviceCharactersRequest);

}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceCharactersServiceImpl.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.dnc.entity.DeviceCharacters;
import org.jeecg.modules.dnc.exception.ExceptionCast;
import org.jeecg.modules.dnc.mapper.DeviceCharactersMapper;
@@ -17,7 +18,7 @@
@Service
public class DeviceCharactersServiceImpl extends ServiceImpl<DeviceCharactersMapper, DeviceCharacters> implements IDeviceCharactersService {
    @Override
    public QueryPageResponseResult<DeviceCharacters> findByPageList(int page, int size, DeviceCharactersRequest deviceCharactersRequest) {
    public Result<?> findByPageList(int page, int size, DeviceCharactersRequest deviceCharactersRequest) {

        if(page < 1 || size < 1) {
            ExceptionCast.cast(CommonCode.INVALID_PAGE);
@@ -32,7 +33,8 @@
            lambdaQuery.ge(StrUtil.isNotEmpty(deviceCharactersRequest.getStartTime()),DeviceCharacters::getCreateTime,deviceCharactersRequest.getStartTime());
            lambdaQuery.le(StrUtil.isNotEmpty(deviceCharactersRequest.getEndTime()),DeviceCharacters::getCreateTime,deviceCharactersRequest.getEndTime());
        }
        lambdaQuery.orderByDesc(DeviceCharacters::getCreateTime);
        IPage<DeviceCharacters> userIPage = lambdaQuery.page(pageData);
        return new QueryPageResponseResult<>(CommonCode.SUCCESS, userIPage);
        return Result.ok(userIPage);
    }
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java

@@ -105,7 +105,7 @@
            permissionStream.setPartsId(workStep.getPartsId());
        }
        permissionStream.setProcessId(workStep.getProcessId());
        permissionStream.setStepId(workStep.getStepId());
        permissionStream.setStepId(workStep.getId());
        return permissionStreamService.save(permissionStream);
    }


 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/support/ProductTreeWrapper.java

@@ -71,7 +71,7 @@
            processNode.setLabel("[" + processStream.getProcessCode()+ "]" + processStream.getProcessName());
            processNode.setParentId(null);
            processNode.setIconClass("");
            processNode.setType(4);
            processNode.setType(5);
            if (StrUtil.isEmpty(processStream.getPartsId())) {
                //没有partsId，部件下的工序
                processNode.setRField(processStream.getComponentId());
@@ -97,11 +97,11 @@
        //工步存在工序下
        for (WorkStep workStep : workStepList) {
            workStepNode = new CommonGenericTree();
            workStepNode.setId(workStep.getStepId());
            workStepNode.setId(workStep.getId());
            workStepNode.setLabel("[" + workStep.getStepCode() + "]" + workStep.getStepName());
            workStepNode.setParentId(null);
            workStepNode.setIconClass("");
            workStepNode.setType(5);
            workStepNode.setType(6);
            workStepNode.setRField(workStep.getProcessId());
            workStepNode.setEntity(workStep);
            if (processMap.containsKey(workStepNode.getRField())) {