#盘点

zhou zhou

17 小时以前 5315fe106471728406cbd521576c3fc5d9d28791

 src/main/java/com/zy/asrs/controller/CheckOrderController.java

@@ -8,10 +8,12 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CheckTaskListParam;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.service.*;
import com.core.annotations.ManagerAuth;
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -33,22 +35,29 @@
    @Autowired
    private DocTypeService docTypeService;



    @PostMapping(value = "/checkOrder/createTask/auth")
    @ManagerAuth
    public R checkOrderCreateTask(@RequestParam("orderId") Long orderId) {
        CheckOrder checkOrder = checkOrderService.selectById(orderId);
        if (Cools.isEmpty(checkOrder)) {
            throw new CoolException("数据错误");
        }
        checkOrder.setSettle(11L);
        checkOrderService.updateById(checkOrder);
    @PostMapping(value = "/checkOrder/pdaComplete/auth")
    @ManagerAuth(memo = "pda：完成盘点")
    public R checkOrderPdaComplete(@RequestBody CheckTaskListParam checkTaskListParam) {
        checkOrderService.pdaComplete(checkTaskListParam);
        return R.ok();
    }


    @PostMapping(value = "/checkOrder/preview/auth")
    @ManagerAuth(memo = "盘点单出库预览")
    public R checkOrderPreview(@RequestParam("orderId") Long orderId) {
        List<LocDto> locDtos = checkOrderService.preview(orderId);
        return R.ok(locDtos);
    }
    @PostMapping(value = "/checkOrder/getTaskList/auth")
    @ManagerAuth(memo = "pda：获取盘点任务列表")
    public R checkOrderGetTaskList(@RequestBody CheckTaskListParam checkTaskListParam) {
        List<CheckOrderDetl> list = checkOrderService.getTaskList(checkTaskListParam.getBarcode());
        return R.ok(list);
    }

    @PostMapping(value = "/checkOrder/complete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "完成盘点单")
    public R checkOrderComplete(@RequestParam("orderId") Long orderId) {
        CheckOrder checkOrder = checkOrderService.selectById(orderId);
        if (Cools.isEmpty(checkOrder)) {
@@ -112,6 +121,7 @@
        for (LocDetl locDetl : param.getLocDetlList()) {
            CheckOrderDetl checkOrderDetl = new CheckOrderDetl();
            checkOrderDetl.sync(locDetl);
            checkOrderDetl.setLocDetlId(locDetl.getId());
            checkOrderDetl.setOrderId(checkOrder.getId());
            checkOrderDetl.setOrderNo(checkOrder.getOrderNo());
            checkOrderDetl.setMatnr(locDetl.getMatnr());
@@ -157,6 +167,7 @@
        for (CheckOrderDetl checkOrderDetl : param.getCheckOrderDetls()) {
            CheckOrderDetl checkOrderDetl1 = new CheckOrderDetl();
            checkOrderDetl1.sync(checkOrderDetl);
            checkOrderDetl1.setLocDetlId(checkOrderDetl.getLocDetlId()==null?checkOrderDetl.getId():checkOrderDetl.getLocDetlId());
            checkOrderDetl1.setOrderId(checkOrder.getId());
            checkOrderDetl1.setOrderNo(checkOrder.getOrderNo());
            checkOrderDetl1.setMatnr(checkOrderDetl.getMatnr());
@@ -167,7 +178,7 @@
            checkOrderDetl1.setQty(checkOrderDetl.getQty());
            checkOrderDetl1.setWorkQty(checkOrderDetl.getWorkQty());
            checkOrderDetl1.setStatus(checkOrderDetl.getStatus());
            checkOrderDetl.setZpallet(checkOrderDetl.getZpallet());
            checkOrderDetl1.setZpallet(checkOrderDetl.getZpallet());
            if (!checkOrderDetlService.insert(checkOrderDetl1)) {
                throw new CoolException("保存盘点单明细失败");
            }