添加临时盘点功能

skyouc

1 天以前 2ec3cec7c35fbe8316cc3d1c7ebfb6a4ae7c8ba6

添加临时盘点功能

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java

@@ -10,7 +10,9 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;
import java.util.Objects;

@RestController
@RequestMapping("/pda")
@@ -44,6 +46,15 @@
        return pdaCheckOrderService.getCheckTaskItemList2(map.get("barcode"));
    }

    @ApiOperation("希日无单据临时盘点")
    @PostMapping("/check/temp/items")
    public R  tempCheckItem(@RequestBody Map<String, String> map) {
        if (Objects.isNull(map)) {
            return R.error("参数不能为空！！");
        }
        return pdaCheckOrderService.tempCheckItem(map.get("barcode"));
    }

    @PreAuthorize("hasAuthority('manager:task:list')")
    @GetMapping("/getCheckDiffReasonList")
    @ApiOperation("查询盘点差异原因")
@@ -67,4 +78,13 @@
        return pdaCheckOrderService.selectAddMatnr(map);
    }

    @ApiOperation("确认新增盘点物料")
    @PostMapping("/select/matnr/confirm")
    public R confirmMatnr(@RequestBody Map<String, Object> params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        return pdaCheckOrderService.confirmMatnr(params);
    }

}

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java

@@ -3,6 +3,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;

import java.util.List;
import java.util.Map;

public interface PdaCheckOrderService {
@@ -17,4 +18,8 @@
    R selectAddMatnr(Map<String, String> map);

    R getCheckTaskItemList2(String barcode);

    R tempCheckItem(String barcode);

    R confirmMatnr(Map<String, Object> map);
}

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java

@@ -1,5 +1,7 @@
package com.vincent.rsf.server.api.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.Cools;
@@ -7,6 +9,7 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;
import com.vincent.rsf.server.api.service.PdaCheckOrderService;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.CheckDiffExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -246,4 +249,85 @@

        return R.ok(Cools.add("checkDiffItems",checkDiffItems).add("checkDiff",checkDiff));
    }

    /**
     * @author Ryan
     * @date 2025/11/5
     * @description: 希日无单据临时盘点
     * @version 1.0
     */
    @Override
    public R tempCheckItem(String barcode) {
        if (Objects.isNull(barcode)) {
            throw new CoolException("搬盘码不能为空！！");
        }
        LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(Task::getBarcode, barcode);
        Task task = taskService.getOne(lambdaQueryWrapper);
        if (null == task) {
            throw new CoolException("未找到容器号对应任务");
        }
        if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
            return R.error("任务状态不是等待确认");
        }
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
        if (Cools.isEmpty(taskItems)){
            throw new CoolException("未找到该容器码对应的任务明细");
        }
        taskItems.forEach(taskItem -> {
            if (!Objects.isNull(taskItem.getFieldsIndex())) {
                Map<String, String> fields = FieldsUtils.getFields(taskItem.getFieldsIndex());
                taskItem.setExtendFields(fields);
            }
        });

        return R.ok().add(taskItems);
    }

    /**
     * @author Ryan
     * @date 2025/11/5
     * @description: 盘点添加新物料
     * @version 1.0
     */
    @Override
    public R confirmMatnr(Map<String, Object> map) {
        if (Objects.isNull(map)) {
            throw new CoolException("参数不能为空！！");
        }
        if (Objects.isNull(map.get("barcode"))) {
            throw new CoolException("托盘码不能为空！！");
        }
        if (Objects.isNull(map.get("matnrs"))) {
            throw new CoolException("新增物料不能为空！！");
        }
        String barcode = map.get("barcode").toString();
        LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(Task::getBarcode, barcode);
        Task task = taskService.getOne(lambdaQueryWrapper);
        if (null == task) {
            throw new CoolException("未找到容器号对应任务");
        }
        if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
            return R.error("任务状态不是等待确认");
        }

        List<Matnr> items = JSONArray.parseArray(JSONArray.toJSONString(map.get("matnrs")), Map<String, Object>.class);



//        if (Objects.isNull(map.get("taskId"))) {
//            throw new CoolException("任务ID不能为空！！");
//        }
//        if (Objects.isNull(map.get("matnr"))) {
//            throw new CoolException("物料编码不能为空！！");
//        }
//        if (Objects.isNull(map.get("batch"))) {
//            throw new CoolException("批次不能为空！！");
//        }


        return null;
    }

}