|
@@ -2,6 +2,8 @@ package com.fjhx.mes.service.production.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
+import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fjhx.common.enums.PushBusinessTypeEnum;
|
|
@@ -163,6 +165,7 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
|
|
|
* 任务流转
|
|
|
*/
|
|
|
@Override
|
|
|
+ @DSTransactional
|
|
|
public void circulation(ProductionTaskDetailDto productionTaskDetailDto) {
|
|
|
ProductionTaskDetail productionTaskDetail = this.getById(productionTaskDetailDto.getId());
|
|
|
|
|
@@ -225,6 +228,7 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
|
|
|
* 完工入库
|
|
|
*/
|
|
|
@Override
|
|
|
+ @DSTransactional
|
|
|
public void productStorage(ProductionTaskDetailDto productionTaskDetailDto) {
|
|
|
ProductionTaskDetail productionTaskDetail = getById(productionTaskDetailDto.getId());
|
|
|
if (ObjectUtil.isEmpty(productionTaskDetail)) {
|
|
@@ -283,6 +287,7 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
|
|
|
* 任务接收
|
|
|
*/
|
|
|
@Override
|
|
|
+ @DSTransactional
|
|
|
public void receive(ProductionTaskDetailDto productionTaskDetailDto) {
|
|
|
ProductionTaskDetail productionTaskDetail = getById(productionTaskDetailDto.getId());
|
|
|
|
|
@@ -307,6 +312,7 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
|
|
|
* 任务接收拒绝
|
|
|
*/
|
|
|
@Override
|
|
|
+ @DSTransactional
|
|
|
public void rejection(ProductionTaskDetailDto productionTaskDetailDto) {
|
|
|
ProductionTaskDetail productionTaskDetail = this.getById(productionTaskDetailDto.getId());
|
|
|
//取消流转状态
|
|
@@ -372,6 +378,7 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
|
|
|
* 退回任务(任务回到任务列表可供别人接取)
|
|
|
*/
|
|
|
@Override
|
|
|
+ @DSTransactional
|
|
|
public void revokeTask(ProductionTaskDetailDto dto){
|
|
|
ProductionTaskDetail productionTaskDetail = getById(dto.getId());
|
|
|
Assert.notEmpty(productionTaskDetail,"查询不到该任务信息");
|