no message

skyouc

5 天以前 234abd2b44e7c9e401f0d2db033c7b4db4ae387d

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

@@ -11,8 +11,10 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CheckTaskListParam;
import com.zy.asrs.entity.param.OpenAdjustmentOrderParam;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.CheckOrderExportDTO;
import com.zy.asrs.enums.CheckStatusEnum;
import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.*;
import com.core.annotations.ManagerAuth;
@@ -41,11 +43,13 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private DocTypeService docTypeService;
    @Autowired
    private OpenService openService;

    @PostMapping(value = "/checkOrder/pdaComplete/auth")
    @ManagerAuth(memo = "pda：完成盘点")
    public R checkOrderPdaComplete(@RequestBody CheckTaskListParam checkTaskListParam) {
        checkOrderService.pdaComplete(checkTaskListParam);
        checkOrderService.pdaComplete(checkTaskListParam,getUserId());
        return R.ok();
    }

@@ -56,6 +60,7 @@
        List<LocDto> locDtos = checkOrderService.preview(orderId);
        return R.ok(locDtos);
    }

    @PostMapping(value = "/checkOrder/getTaskList/auth")
    @ManagerAuth(memo = "pda：获取盘点任务列表")
    public R checkOrderGetTaskList(@RequestBody CheckTaskListParam checkTaskListParam) {
@@ -141,9 +146,9 @@
            checkOrderDetl.setStatus(1);
            checkOrderDetl.setZpallet(locDetl.getZpallet());
            checkOrderDetl.setCreateBy(getUserId());
            checkOrderDetl.setCreateTime(now);
//            checkOrderDetl.setCreateTime(now);
            checkOrderDetl.setUpdateBy(getUserId());
            checkOrderDetl.setUpdateTime(now);
//            checkOrderDetl.setUpdateTime(now);
            if (!checkOrderDetlService.insert(checkOrderDetl)) {
                throw new CoolException("保存盘点单明细失败");
            }
@@ -191,9 +196,9 @@
            checkOrderDetl1.setStatus(checkOrderDetl.getStatus());
            checkOrderDetl1.setZpallet(checkOrderDetl.getZpallet());
            checkOrderDetl1.setCreateBy(getUserId());
            checkOrderDetl1.setCreateTime(checkOrderDetl.getCreateTime() == null?now:checkOrderDetl.getCreateTime());
//            checkOrderDetl1.setCreateTime(checkOrderDetl.getCreateTime() == null?now:checkOrderDetl.getCreateTime());
            checkOrderDetl1.setUpdateBy(getUserId());
            checkOrderDetl1.setUpdateTime(now);
//            checkOrderDetl1.setUpdateTime(now);
            if (!checkOrderDetlService.insert(checkOrderDetl1)) {
                throw new CoolException("保存盘点单明细失败");
            }
@@ -342,4 +347,29 @@
        return R.ok();
    }


    @PostMapping(value = "/adjustOrder/create/test")
    @ManagerAuth(memo = "内部测试：生成调整单")
    public R adjustOrderCreateTest(@RequestParam("orderId") Long orderId) {
        CheckOrder checkOrder = checkOrderService.selectById(orderId);
        List<CheckOrderDetl> checkOrderDetls = checkOrderDetlService.selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", orderId));
        checkOrderDetls.forEach(checkOrderDetl -> { checkOrderDetl.setStatus(1);});
        OpenAdjustmentOrderParam openAdjustmentOrderParam = new OpenAdjustmentOrderParam();
        openAdjustmentOrderParam.setOrderTime(DateUtils.convert(new Date()));
        openAdjustmentOrderParam.setOrderDetails(checkOrderDetls);

        openService.adjustmentOrderCreate(openAdjustmentOrderParam);

        return R.ok();

    }

    @PostMapping(value = "/adjustOrder/complete/auth")
    @ManagerAuth(memo = "完成调整单")
    public R adjustOrderComplete(@RequestParam("orderId") Long orderId) {
        checkOrderService.adjustOrderComplete(orderId,getUserId());
        return R.ok();
    }


}