#新增 1. 新增生成任务明细功能

skyouc

2025-03-31 0af9765f0760d50394f723d1b5423fb3ebe1b0e1

#新增
1. 新增生成任务明细功能

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/OrderType.java

@@ -11,6 +11,8 @@
    //订单类型
    ORDER_PURCHASE_IN("purchase", "采购入库单"),
    ORDER_OUT("out", "采购出库单"),
    ORDER_RECEIPT("receipt", "收货")

    ;

    OrderType(String type, String desc) {

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;

import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -22,6 +24,7 @@
import java.util.Date;

@Data
@Accessors(chain = true)
@TableName("man_task_item")
public class TaskItem implements Serializable {

@@ -52,6 +55,18 @@
    @ApiModelProperty(value= "物料名称")
    private String maktx;


    @ApiModelProperty("源编码")
    private String sourceCode;

    @ApiModelProperty("单据ID")
    private Long orderId;

    @ApiModelProperty("单据类型")
    private String orderType;

    @ApiModelProperty("单据明细ID")
    private Long orderItemId;
    /**
     * 物料编码
     */

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -2,22 +2,21 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.server.api.entity.enums.OrderType;
import com.vincent.rsf.server.api.entity.enums.TaskStsType;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.enums.TaskType;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.mapper.TaskMapper;
import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.manager.service.TaskService;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.service.WaitPakinItemService;
import com.vincent.rsf.server.manager.service.WaitPakinService;
import com.vincent.rsf.server.manager.utils.LocManageUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.enums.LocStsType;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -31,6 +30,9 @@

    @Autowired
    private WaitPakinService waitPakinService;

    @Autowired
    private TaskItemService taskItemService;

    @Autowired
    private WaitPakinItemService waitPakinItemService;
@@ -64,7 +66,6 @@
        }

        List<Task> tasks = new ArrayList<>();
        List<TaskItem> taskItems = new ArrayList<>();
        waitPakins.forEach(pakin -> {
            Task task = new Task();
            task.setTaskCode(ruleCode)
@@ -79,15 +80,28 @@
        if (!this.saveBatch(tasks)) {
            throw new CoolException("任务保存失败！！");
        }

        //TODO  保存任务档明细
        waitPakinItems.forEach(item -> {
            TaskItem taskItem = new TaskItem();

            taskItems.add(taskItem);
        });

        return null;
        List<Long> orderIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
        List<Task> taskList = this.list(new LambdaQueryWrapper<Task>().in(Task::getId, orderIds));
        if (taskList.isEmpty()) {
            throw new CoolException("数据错误：订单ID不能为空！！");
        }
        for (Task task : taskList) {
            List<TaskItem> taskItems = new ArrayList<>();
            waitPakinItems.forEach(item -> {
                TaskItem taskItem = new TaskItem();
                BeanUtils.copyProperties(item, taskItem);
                taskItem.setTaskId(task.getId())
                        .setOrderType(OrderType.ORDER_RECEIPT.type)
                        .setSourceCode(item.getAsnCode())
                        .setOrderId(item.getAsnId())
                        .setOrderItemId(item.getAsnItemId());
                taskItems.add(taskItem);
            });
            if (!taskItemService.saveBatch(taskItems)) {
                throw new CoolException("任务明细保存失败！！");
            }
        }
        return R.ok("任务生成完毕！");
    }