计划表更名为分工表

yangys

2025-06-13 e05e9ba362539aacc2194366f6d12af26e345327

计划表更名为分工表

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/ProduceDivisionController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,70 @@
package org.springblade.mdm.basesetting.producedivision.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.basesetting.producedivision.vo.ProduceDivisionVO;
import org.springblade.mdm.basesetting.producedivision.vo.ProduceDivisionViewVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@Slf4j
@RestController
@RequestMapping("/producedivision")
@Tag(name = "主制分工表", description = "主制分工表")
public class ProduceDivisionController {

    @Autowired
    private ProduceDivisionService service;

    /**
     * æ–°å¢ž
     */
    @PostMapping("/save")
    @Operation(summary = "新增", description = "主制计划表")
    public R<Boolean> save(@RequestBody ProduceDivisionVO vo) {

        service.savePlan(vo);
        return R.<Boolean>status(true);
    }

    /**
     * ä¿®æ”¹
     */
    @Operation(summary = "修改", description = "主制计划表")
    @PostMapping("/update")
    public R<Boolean> update(@RequestBody ProduceDivisionVO vo) {

        return R.<Boolean>status(service.updatePlan(vo));
    }

    /**
     * åˆ é™¤
     */
    @Operation(summary = "删除", description = "删除")
    @PostMapping("/remove")
    public R<Void> remove(@RequestParam String ids) {
        try {
            return R.status(service.removeBatchByIds(Func.toLongList(ids)));
        } catch (Exception e) {
            log.error("删除异常",e);
            return R.fail(e.getMessage());
        }
    }

    /**
     * åˆ†é¡µ
     */
    @Operation(summary = "分页查询", description = "姓名")
    @GetMapping("/page")
    public R<IPage<ProduceDivisionViewVO>> page(String name, Query query) {

        IPage<ProduceDivisionViewVO> pages = service.pageQuery(name,query);
        return R.data(pages);
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/ProduceDivision.java

ÎļþÃû´Ó blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/entity/ProducePlan.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.springblade.mdm.basesetting.produceplan.entity;
package org.springblade.mdm.basesetting.producedivision.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
@@ -6,12 +6,12 @@
import org.springblade.core.mp.base.BizEntity;

/**
 * ä¸»åˆ¶è®¡åˆ’表
 * ä¸»åˆ¶åˆ†å·¥è¡¨
 */
@Setter
@Getter
@TableName("mdm_produce_plan")
public class ProducePlan extends BizEntity {
@TableName("mdm_produce_division")
public class ProduceDivision extends BizEntity {
    /**
     * ä¸“业组长id
     */

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package org.springblade.mdm.basesetting.producedivision.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.core.mp.mapper.BladeMapper;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.vo.ProduceDivisionViewVO;

public interface ProduceDivisionMapper extends BladeMapper<ProduceDivision> {

    IPage<ProduceDivisionViewVO> pageQuery(@Param("page")IPage<ProduceDivision> page, @Param("name")String name);
    //pageMachine
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml

ÎļþÃû´Ó blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/mapper/ProducePlanMapper.xml ÐÞ¸Ä
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.mdm.basesetting.produceplan.mapper.ProducePlanMapper">
<mapper namespace="org.springblade.mdm.basesetting.producedivision.mapper.ProduceDivisionMapper">
<!--
    &lt;!&ndash; é€šç”¨æŸ¥è¯¢æ˜ å°„结果 &ndash;&gt;
    <resultMap id="BaseResultMap" type="org.springblade.mdm.basesetting.machine.entity.Machine">
@@ -13,7 +13,7 @@
        <result column="updateTime" property="update_time"/>
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>-->
    <select id="pageQuery" resultType="org.springblade.mdm.basesetting.produceplan.vo.ProducePlanViewVO">
    <select id="pageQuery" resultType="org.springblade.mdm.basesetting.producedivision.vo.ProduceDivisionViewVO">
        select p.id,p.team_leader_id,p.programmer_id,p.checker_id,p.senior_id,l.name team_leader_name,pro.name  programmer_name,c.name checker_name,s.name seniorName
        from mdm_produce_plan p join blade_user l on p.team_leader_id=l.id and l.is_deleted=0
                                join blade_user pro on p.programmer_id=pro.id and pro.is_deleted=0

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,49 @@
package org.springblade.mdm.basesetting.producedivision.service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.mapper.ProduceDivisionMapper;
import org.springblade.mdm.basesetting.producedivision.vo.ProduceDivisionVO;
import org.springblade.mdm.basesetting.producedivision.vo.ProduceDivisionViewVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Service
public class ProduceDivisionService extends BizServiceImpl<ProduceDivisionMapper, ProduceDivision> {

    @Transactional
    public void savePlan(ProduceDivisionVO vo){
        //TODO
        ProduceDivision plan = new ProduceDivision();
        BeanUtil.copyProperties(vo, plan);
        this.save(plan);
    }

    public boolean updatePlan(ProduceDivisionVO vo) {
        ProduceDivision plan = this.getById(vo.getId());

        plan.setTeamLeaderId(vo.getTeamLeaderId());
        plan.setProgrammerId(vo.getProgrammerId());
        plan.setCheckerId(vo.getCheckerId());
        plan.setSeniorId(vo.getSeniorId());
        return this.updateById(plan);
    }
    /**
     * æŸ¥è¯¢åˆ†é¡µ
     * @param query æŸ¥è¯¢å‚æ•°
     * @return åˆ†é¡µæ•°æ®
     */
    public IPage<ProduceDivisionViewVO> pageQuery(String name, Query query) {

        LambdaQueryWrapper<ProduceDivision> queryWrapper = new LambdaQueryWrapper<>();



        return this.getBaseMapper().pageQuery(Condition.getPage(query),name);
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionVO.java

ÎļþÃû´Ó blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/vo/ProducePlanVO.java ÐÞ¸Ä
@@ -1,9 +1,7 @@
package org.springblade.mdm.basesetting.produceplan.vo;
package org.springblade.mdm.basesetting.producedivision.vo;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.Setter;
import org.springblade.core.mp.base.BizEntity;
import org.springblade.mdm.commons.vo.BaseVO;

/**
@@ -11,7 +9,7 @@
 */
@Setter
@Getter
public class ProducePlanVO extends BaseVO {
public class ProduceDivisionVO extends BaseVO {
    /**
     * ä¸“业组长id
     */

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionViewVO.java

ÎļþÃû´Ó blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/vo/ProducePlanViewVO.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.springblade.mdm.basesetting.produceplan.vo;
package org.springblade.mdm.basesetting.producedivision.vo;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
@@ -10,7 +10,7 @@
 */
@Setter
@Getter
public class ProducePlanViewVO extends BaseVO {
public class ProduceDivisionViewVO extends BaseVO {

    @Schema(description = "专业组长id")
    private Long teamLeaderId;

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/controller/ProducePlanController.java

ÎļþÒÑɾ³ý

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/mapper/ProducePlanMapper.java

ÎļþÒÑɾ³ý

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/service/ProducePlanService.java

ÎļþÒÑɾ³ý

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java

@@ -9,7 +9,6 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
import org.springblade.mdm.flow.excution.StartDispatcher;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +29,7 @@
    private StartDispatcher dispatcher;
    @Autowired
    private TaskService taskService;

    /**
     * æ–°å¢ž
     */
@@ -37,11 +37,12 @@
    @Operation(summary = "任务计划(派工流程)", description = "启动派工流程")
    public R<Boolean> save(@RequestBody TaskAssignVO startVO) {
        dispatcher.start(startVO);
        return R.<Boolean>status(true);
        return R.status(true);
    }

    @Operation(summary = "完成任务", description = "流向下一个节点")
    @PostMapping("completeTask")
    public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(name="variables",description = "任务变量")@RequestBody Map<String, Object> variables) {
    public R<Void> completeTask(String taskId, String processInstanceId, String comment, @Parameter(name = "variables", description = "任务变量") @RequestBody Map<String, Object> variables) {
        // å¢žåŠ è¯„论
        if (StringUtil.isNoneBlank(processInstanceId, comment)) {
            taskService.addComment(taskId, processInstanceId, comment);

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/AutoAssignUsersService.java

@@ -1,7 +1,7 @@
package org.springblade.mdm.flow.excution;

import org.springblade.mdm.basesetting.produceplan.entity.ProducePlan;
import org.springblade.mdm.basesetting.produceplan.mapper.ProducePlanMapper;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.mapper.ProduceDivisionMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -14,10 +14,10 @@
@Service
public class AutoAssignUsersService {
    @Autowired
    private ProducePlanMapper planMapper;
    private ProduceDivisionMapper planMapper;

    public Map<String,Object> autoAssignUsers(long producePlanId){
        ProducePlan pplan = planMapper.selectById(producePlanId);
        ProduceDivision pplan = planMapper.selectById(producePlanId);
        Map<String,Object> result = new HashMap<String,Object>();
        result.put("teamLeader",pplan.getTeamLeaderId());
        result.put("programmer",pplan.getProgrammerId());

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java

@@ -54,7 +54,24 @@
        ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);

        int a=1;
        a =2;
        //log.info()
    }

    /**
     * ç”Ÿæˆé›¶ç»„件编号
     * å›¾å·ã€å›¾å·ç‰ˆæ¬¡ã€å·¥åºå·ã€å·¥åºåç§°ã€å·¥è‰ºç‰ˆæ¬¡ã€å·¥åºç‰ˆæ¬¡ ç»„合起来获得零组件号
     * @param startVO
     * @return
     */
    String generatePartNo(TaskAssignVO startVO){
        //TODO è¿™ä¸ªæ ¼å¼æœªç¡®å®šï¼Œéœ€è¦ç¡®è®¤
        return String.format("%s-%s-%s-%s-%s-%s",
            startVO.getDrawingNo(),
            startVO.getDrawingNoEdition(),
            startVO.getProcessNo(),
            startVO.getProcessName(),
            startVO.getCraftEdition(),
            startVO.getProcessEdition());

    }
}

 doc/sql/mdm/mdm.all.create.sql

@@ -41,7 +41,7 @@
  UNIQUE KEY `uniqueCodeIndex` (`code`,`is_deleted`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_general_ci  ROW_FORMAT=DYNAMIC COMMENT='机床';

CREATE TABLE `mdm_produce_plan` (
CREATE TABLE `mdm_produce_division` (
    `id` bigint NOT NULL,
    `team_leader_id` bigint NOT NULL COMMENT '专业组长账号',
    `programmer_id` bigint NOT NULL COMMENT '编制员账号',