1.出库口补空板 2.组托时调用agv 3.新增agv调用程序

lsh

2025-05-26 d61d4384e19580a32becb54e8e7f2287bed5469a

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

@@ -4,6 +4,7 @@
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;
@@ -13,8 +14,12 @@
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.RCSParam;
import com.zy.asrs.entity.param.Review;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.MobileServiceImpl;
import com.zy.asrs.task.WorkMastScheduler;
import com.zy.asrs.task.handler.WorkLogHandler;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.LocDto;
@@ -22,11 +27,19 @@
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
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.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;

/**
@@ -36,7 +49,7 @@
@RestController
@RequestMapping("mobile")
public class MobileController extends BaseController  {

    private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
    @Autowired
    private MobileService mobileService;
    @Autowired
@@ -57,6 +70,12 @@
    private BasDevpService basDevpService;
    @Autowired
    private PackService packService;
    @Autowired
    private ApiLogService apiLogService;
    @Value("${rcs.address.url}")
    private String url;
    @Value("${rcs.address.attrcs}")
    private String attrcs;


    // 商品上架
@@ -326,22 +345,189 @@


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

    @PostMapping("/test/suspend/auth")
    @ManagerAuth(memo = "暂停测试")
    public synchronized R suspendTestPACK() {
        mobileService.suspendTestPACK();  //请求暂停测试
        return R.ok();
//    @ManagerAuth(memo = "暂停测试")
    @ResponseBody
    public synchronized R suspendTestPACK(@RequestBody SearchLocParam param) {
        if (mobileService.suspendTestPACK(param.getBarcode())){  //请求暂停测试
            return R.ok();
        }else {
            return R.error("暂停失败");
        }
    }
    /**
     * 测试库基本信息
     */
    @RequestMapping("/pack/basic/information")
//    @ManagerAuth(memo = "测试库基本信息")
    public R packTestBasicInformation(){
        return R.ok().add(mobileService.packTestBasicInformation());
    }
    /**
     * 测试库使用情况
     */
    @RequestMapping("/pack/usage/rate")
//    @ManagerAuth(memo = "测试库使用情况")
    public R packUsageRate(){
        return R.ok().add(mobileService.packUsageRate());
    }
    /**
     * 测试库合格数
     */
    @RequestMapping("/pack/qualified")
//    @ManagerAuth(memo = "测试库合格数")
    public R packQualified(){
        return R.ok().add(mobileService.packQualified());
    }
    /**
     * 早8-晚20
     */
    @RequestMapping("/pack/morning")
//    @ManagerAuth(memo = "测试库合格数")
    public R chartAxisMorning(){
        return R.ok().add(mobileService.chartAxisMorning());
    }
    /**
     * 晚20-第二天早8
     */
    @RequestMapping("/pack/evening")
//    @ManagerAuth(memo = "测试库合格数")
    public R chartAxisEvening(){
        return R.ok().add(mobileService.chartAxisEvening());
    }

    @RequestMapping("/pack/morning/v2")
//    @ManagerAuth(memo = "测试库合格数")
    public R chartAxisMorningV2(){
        Map<String,Object> map=new HashMap<String, Object>();
        List<AxisBean> list = new ArrayList<AxisBean>();

        List<WorkChartAxis> listChart = mobileService.chartAxisMorning();

        if(listChart!=null) {
            ArrayList<Integer> data1 = new ArrayList<Integer>();
            ArrayList<Integer> data2 = new ArrayList<Integer>();

            SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
            Calendar calendar = Calendar.getInstance();
            calendar.add(Calendar.DATE, -12);
            for(int i=0;i<12;i++) {
                boolean flag = true;
                calendar.add(Calendar.DATE, 1);
                String str = sf.format(calendar.getTime());
                for(WorkChartAxis workChart : listChart) {
                    if(str.equals(workChart.getYmd())) {
                        data1.add(workChart.getInqty());
                        data2.add(workChart.getOutqty());
                        flag = false;
                        break;
                    }
                }
                if(flag) {
                    data1.add(0);
                    data2.add(0);
                }
            }
            AxisBean inqty = new AxisBean();
            inqty.setName("入库数量");
            Integer[] array1 = new Integer[data1.size()];
            inqty.setData(data1.toArray(array1));
            list.add(inqty);
            AxisBean outqty = new AxisBean();
            outqty.setName("出库数量");
            Integer[] array2 = new Integer[data2.size()];
            outqty.setData(data2.toArray(array2));
            list.add(outqty);
        }
        map.put("rows",list);
        return R.ok(map);
    }


    /*...........................赣州新增..............以上.............赣州新增...........................*/

    /**
     * 执行移库任务
     * @param sourceStaNo
     * @param staNo
     * @return
     */
    @RequestMapping("/AGVMove")
    public R AGVMove(@RequestParam(required = false) String sourceStaNo
            ,@RequestParam(required = false) String staNo){
        RCSParam rcsParam = new RCSParam();
        LocalDateTime now = LocalDateTime.now();
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH:mm:ss");
        String formattedDate = now.format(formatter); // 格式化日期时间
        //网络流水号
        rcsParam.setReqId(now.toString());
        //应用标识
        rcsParam.setClientId("WMS");
        //通知时间
        rcsParam.setReqTime(formattedDate);
        RCSParam.DataBody dataBody=new RCSParam.DataBody();
        //任务号
        dataBody.setId(formattedDate);

        List<RCSParam.TaskBody> taskBodyList=new ArrayList<>();
        RCSParam.TaskBody taskBody=new RCSParam.TaskBody();
        //取货类型
        taskBody.setType("load");
        taskBody.setStation(sourceStaNo);
        taskBodyList.add(taskBody);

        RCSParam.TaskBody taskBody1=new RCSParam.TaskBody();
        //放货类型
        taskBody1.setType("unload");
        taskBody1.setStation(staNo);
        taskBodyList.add(taskBody1);

        dataBody.setTasks(taskBodyList);
        rcsParam.setData(dataBody);
        String response ="";
        Boolean bool =false;

        try {
            log.info("wms派发搬运任务给AGV搬运={}", rcsParam);
            response = new HttpHandler.Builder()
                    // .setHeaders(headParam)
                    .setUri(url)
                    .setPath(attrcs)
                    .setJson(JSON.toJSONString(rcsParam))
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            if(jsonObject.getBoolean("IsSuccess")){
                bool = true;
            }
        } catch (Exception e) {
            log.error("wms派发搬运任务给AGV搬运失败返回值={}", response);
        } finally {
            apiLogService.save("wms派发搬运任务给AGV搬运"
                    , url + attrcs
                    , null
                    , "127.0.0.1"
                    , JSON.toJSONString(rcsParam)
                    , response
                    , bool
            );
        }
        if(bool){
            return R.ok();
        }else {
            return R.error("下发任务失败");
        }

    }

}