#

LSH

2023-02-13 30155d34eade43e1713ee1022a9af4d4744acda1

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

@@ -1,25 +1,36 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.AppAuth;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.Review;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.model.WrkDto;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import com.zy.common.web.param.SearchLocParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.*;

/**
@@ -50,8 +61,16 @@
    private BasDevpService basDevpService;
    @Autowired
    private PackService packService;
    @Autowired
    private  WorkService workService;


    // 商品上架
    @RequestMapping("/mat/onSale/auth")
    //@ManagerAuth
    public R matOnSale(@RequestBody CombParam combParam){
        mobileService.onSale(combParam);
        return R.ok("上架成功");
    }
    // 商品下架

    // 组托 ----------------------------------------------------------------------------------------------------

@@ -299,58 +318,36 @@
        return R.ok("盘点成功");
    }

    @PostMapping("/out/pakout/auth")
//    @ManagerAuth(memo = "根据订单出库")
    @PostMapping("/order/out/pakout/auth")
    @ManagerAuth(memo = "订单出库")
    public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
        if(!param.containsKey("staNo") || !param.containsKey("orderNo")){
            return R.parse(BaseRes.PARAM);
        }
        Integer staNo = param.containsKey("staNo") ? Integer.parseInt(param.get("staNo").toString()) : 0;
        String orderNo = param.containsKey("orderNo") ? param.get("orderNo").toString() : "";
        mobileService.pakoutByOrder(param,getUserId());
        return R.ok("出库成功");
    }

        BasDevp sta = basDevpService.checkSiteStatus(staNo);
        //根据订单号生成出库任务工作档,待实现
        List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
        for(OrderDetl orderDetl : orderDetls){

    /*...........................赣州新增..............以下.............赣州新增...........................*/
    @PostMapping("/test/startUp/auth")
    @ManagerAuth(memo = "申请PACK测试")
    public synchronized R startUpTestPACK(@RequestBody TestMast testMast) {
        if (Cools.isEmpty(testMast)) {
            return R.parse(BaseRes.PARAM);
        }


//        if (Cools.isEmpty(locDtos)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        boolean lack = true;
//        for (LocDto locDto : locDtos) {
//            if (!locDto.isLack()) {
//                lack = false;
//                break;
//            }
//        }
//        if (lack) {
//            return R.error("库存不足");
//        }
//
//        Thread.sleep(1000L);
//
//        List<TaskDto> taskDtos = new ArrayList<>();
//        // 根据 （库位 & 出库站） 分组； 理想状态：一组为一次出库任务
//        for (LocDto locDto : locDtos) {
//            if (locDto.isLack()) { continue; }
//            TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
//            if (TaskDto.has(taskDtos, taskDto)) {
//                TaskDto dto = TaskDto.find(taskDtos, taskDto);
//                assert dto != null;
//                dto.getLocDtos().addAll(taskDto.getLocDtos());
//            } else {
//                taskDtos.add(taskDto);
//            }
//        }
//        // -----------------------------------------------------------------------------------------------
//        for (TaskDto taskDto : taskDtos) {
//            BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
//            workService.stockOut(staNo, taskDto, getUserId());
//        }
        mobileService.startUpTestPACK(testMast); //提交测试系统
        return R.ok();
    }
    @PostMapping("/test/suspend/auth")
//    @ManagerAuth(memo = "暂停测试")
    @ResponseBody
    public synchronized R suspendTestPACK(@RequestBody SearchLocParam param) {

        mobileService.suspendTestPACK(param.getBarcode());  //请求暂停测试
        return R.ok();
    }
    /*...........................赣州新增..............以上.............赣州新增...........................*/


}