From e05e9ba362539aacc2194366f6d12af26e345327 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 13 六月 2025 13:11:29 +0800
Subject: [PATCH] 计划表更名为分工表
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java | 49 +++++++++
/dev/null | 58 -----------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 7
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.java | 13 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/ProduceDivisionController.java | 70 ++++++++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/AutoAssignUsersService.java | 8
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 19 +++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionViewVO.java | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml | 4
doc/sql/mdm/mdm.all.create.sql | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/ProduceDivision.java | 8
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionVO.java | 6
12 files changed, 169 insertions(+), 79 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/ProduceDivisionController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/ProduceDivisionController.java
new file mode 100644
index 0000000..b0a92f2
--- /dev/null
+++ b/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);
+ }
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/entity/ProducePlan.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/ProduceDivision.java
similarity index 69%
rename from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/entity/ProducePlan.java
rename to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/ProduceDivision.java
index 93f5ba1..e98c260 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/entity/ProducePlan.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/ProduceDivision.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
*/
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.java
new file mode 100644
index 0000000..7042ce1
--- /dev/null
+++ b/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
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/mapper/ProducePlanMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml
similarity index 92%
rename from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/mapper/ProducePlanMapper.xml
rename to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml
index 47a7af4..c3ef778 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/mapper/ProducePlanMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.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">
<!--
<!– 閫氱敤鏌ヨ鏄犲皠缁撴灉 –>
<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
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java
new file mode 100644
index 0000000..38b9c52
--- /dev/null
+++ b/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);
+ }
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/vo/ProducePlanVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionVO.java
similarity index 64%
rename from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/vo/ProducePlanVO.java
rename to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionVO.java
index 28a6a53..e5028df 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/vo/ProducePlanVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionVO.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
*/
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/vo/ProducePlanViewVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionViewVO.java
similarity index 85%
rename from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/vo/ProducePlanViewVO.java
rename to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionViewVO.java
index c61f6c1..64eb4ef 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/vo/ProducePlanViewVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionViewVO.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;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/controller/ProducePlanController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/controller/ProducePlanController.java
deleted file mode 100644
index 8dd488d..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/controller/ProducePlanController.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.springblade.mdm.basesetting.produceplan.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.machine.MachineService;
-import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
-import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
-import org.springblade.mdm.basesetting.machine.vo.MachineVO;
-import org.springblade.mdm.basesetting.produceplan.service.ProducePlanService;
-import org.springblade.mdm.basesetting.produceplan.vo.ProducePlanVO;
-import org.springblade.mdm.basesetting.produceplan.vo.ProducePlanViewVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@Slf4j
-@RestController
-@RequestMapping("/produceplan")
-@Tag(name = "涓诲埗璁″垝琛�", description = "涓诲埗璁″垝琛�")
-public class ProducePlanController {
-
- @Autowired
- private ProducePlanService service;
-
- /**
- * 鏂板
- */
- @PostMapping("/save")
- @Operation(summary = "鏂板", description = "涓诲埗璁″垝琛�")
- public R<Boolean> save(@RequestBody ProducePlanVO vo) {
-
- service.savePlan(vo);
- return R.<Boolean>status(true);
- }
-
- /**
- * 淇敼
- */
- @Operation(summary = "淇敼", description = "涓诲埗璁″垝琛�")
- @PostMapping("/update")
- public R<Boolean> update(@RequestBody ProducePlanVO 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<ProducePlanViewVO>> page(String name, Query query) {
-
-
- IPage<ProducePlanViewVO> pages = service.pageQuery(name,query);
- return R.data(pages);
- }
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/mapper/ProducePlanMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/mapper/ProducePlanMapper.java
deleted file mode 100644
index df73c08..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/mapper/ProducePlanMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.springblade.mdm.basesetting.produceplan.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.core.mp.mapper.BladeMapper;
-import org.springblade.mdm.basesetting.produceplan.entity.ProducePlan;
-import org.springblade.mdm.basesetting.produceplan.vo.ProducePlanVO;
-import org.springblade.mdm.basesetting.produceplan.vo.ProducePlanViewVO;
-
-public interface ProducePlanMapper extends BladeMapper<ProducePlan> {
-
- IPage<ProducePlanViewVO> pageQuery(@Param("page")IPage<ProducePlan> page,@Param("name")String name);
- //pageMachine
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/service/ProducePlanService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/service/ProducePlanService.java
deleted file mode 100644
index abf5fe7..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/produceplan/service/ProducePlanService.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.springblade.mdm.basesetting.produceplan.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.commons.lang3.StringUtils;
-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.machine.entity.Machine;
-import org.springblade.mdm.basesetting.machine.entity.MachineSpec;
-import org.springblade.mdm.basesetting.machine.mapper.MachineMapper;
-import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
-import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
-import org.springblade.mdm.basesetting.machine.vo.MachineVO;
-import org.springblade.mdm.basesetting.produceplan.entity.ProducePlan;
-import org.springblade.mdm.basesetting.produceplan.mapper.ProducePlanMapper;
-import org.springblade.mdm.basesetting.produceplan.vo.ProducePlanVO;
-import org.springblade.mdm.basesetting.produceplan.vo.ProducePlanViewVO;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-public class ProducePlanService extends BizServiceImpl<ProducePlanMapper, ProducePlan> {
-
- @Transactional
- public void savePlan(ProducePlanVO vo){
- //TODO
- ProducePlan plan = new ProducePlan();
- BeanUtil.copyProperties(vo, plan);
- this.save(plan);
- }
-
- public boolean updatePlan(ProducePlanVO vo) {
- ProducePlan 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<ProducePlanViewVO> pageQuery(String name, Query query) {
-
- LambdaQueryWrapper<ProducePlan> queryWrapper = new LambdaQueryWrapper<>();
-
- /* queryWrapper.or(StringUtils.isNotEmpty(name),qw ->{
- qw.like(ProducePlan::getTeamLeaderId,name).or().like(ProducePlan::getProgrammer,name).or().like(ProducePlan::getChecker,name);
- });*/
- //queryWrapper.eq(StringUtils.isNotEmpty(name), ProducePlan::getTeamLeader, query.getMachineGroupId());
- return this.getBaseMapper().pageQuery(Condition.getPage(query),name);
- }
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
index b141fa6..a389a2b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
+++ b/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);
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/AutoAssignUsersService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/AutoAssignUsersService.java
index e991055..ee9d6bf 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/AutoAssignUsersService.java
+++ b/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());
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
index a035595..20600ed 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
+++ b/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());
+
+ }
}
diff --git a/doc/sql/mdm/mdm.all.create.sql b/doc/sql/mdm/mdm.all.create.sql
index d4e995c..47e0a57 100644
--- a/doc/sql/mdm/mdm.all.create.sql
+++ b/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 '缂栧埗鍛樿处鍙�',
--
Gitblit v1.9.3