Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

zjj

2024-11-04 4c2ac1e9f5fee2eeb7f1c97ccd7b0532ca144232

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

@@ -1,11 +1,14 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -16,6 +19,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * Created by vincent on 2022/4/8
@@ -32,8 +36,77 @@

    @Autowired
    private OpenService openService;
    @Autowired
    private WrkMastService wrkMastService;

    @PostMapping("/order/matSync/default/v1")

    @PostMapping("/tagSync/v1")
    @AppAuth(memo = "物料分类同步")
    public synchronized R tagSync(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) List<Map<String,String>> param,
                                        HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        ArrayList<TagParam> params = new ArrayList<>();
        for (Map<String,String> map : param) {
            TagParam tagParam  = new TagParam(map);
            params.add(tagParam);
        }

        openService.syncTag(params);
        return R.ok();

    }


    @PostMapping("/wrkMast/finish/v1")
    @AppAuth(memo = "四向车任务完成")
    public synchronized R wrkMastFinish(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) ShuttleFinishParam param,
                                        HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        try {
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getTaskNo()).eq("crn_no",7));
            if (Cools.isEmpty(wrkMast)) {
                throw new CoolException("四向库任务未找到");
            }
            if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) {
                wrkMast.setWrkSts(4L);
            }else {
                wrkMast.setWrkSts(14L);
            }
            if (!wrkMastService.updateById(wrkMast)){
                return R.error();
            }
        }catch (Exception e) {
            throw new CoolException(e);
        }


        return R.ok();
    }



    @PostMapping("/locDetl/select/time/v1")
    @AppAuth(memo = "时间获取库存信息")
    public synchronized R locDetlSelect(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) TimeSelectParam param,
                                        HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        List<LocDetlByTimeDTO> locDetlByTimeDTOS = openService.selectTimeLocDetl(param);
        return R.ok(locDetlByTimeDTOS);
    }

    @PostMapping("/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
    public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) MatSyncParam param,
@@ -45,6 +118,21 @@
        openService.syncMat(param);
        return R.ok();
    }

    @PostMapping("/orderSync/default/v1")
    @AppAuth(memo = "订单信息同步接口")
    public synchronized R syncOrderInfo(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) GTOrderParam param,
                                      HttpServletRequest request){
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

        return R.ok();
    }



    /****************************************************************************/
    /********************************* 打包上线 **********************************/
@@ -67,6 +155,7 @@
     * 添加入库单
     */
    @PostMapping("/order/pakin/default/v1")
    @AppAuth(memo = "入库单据下发")
    public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
                                           @RequestBody OpenOrderPakinParam param,
                                           HttpServletRequest request) {
@@ -151,57 +240,32 @@
        return R.ok().add(openService.queryStock());
    }

    private void auth(String appkey, Object obj, HttpServletRequest request) {
        log.info("{}接口被访问；appkey:{}；请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
        request.setAttribute("cache", obj);
        if (!auth) {
            return;
        private void auth(String appkey, Object obj, HttpServletRequest request) {
            log.info("{}接口被访问；appkey:{}；请求数据：{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
            request.setAttribute("cache", obj);
            if (!auth) {
                return;
            }
            if (Cools.isEmpty(appkey)) {
                throw new CoolException("认证失败，请确认appkey无误！");
            }
            if (!APP_KEY_LIST.contains(appkey)) {
                throw new CoolException("认证失败，请确认appkey无误！");
            }
        }
        if (Cools.isEmpty(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }
        if (!APP_KEY_LIST.contains(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }




    /**
     * 库存统计
     */
    @RequestMapping("/agv/haikang/complete/v1")
    public R agvHaiKang(@RequestHeader(required = false) String wrkNo,
                        HttpServletRequest request) {
//        auth(wrkNo, null, request);
        return R.ok().add(openService.agvHaiKang(wrkNo));
    }

    public static void main(String[] args) {
        // 1
        System.out.println("======================================");
        OpenOrderPakinParam param = new OpenOrderPakinParam();
        param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
        param.setOrderType("打包上线单");
        param.setOrderTime(DateUtils.convert(new Date()));
        List<DetlDto> orderDetails = new ArrayList<>();
        param.setOrderDetails(orderDetails);
        for (int i = 0; i < 3; i++) {
            DetlDto detlDto = new DetlDto();
            switch (i) {
                case 0:
                    detlDto.setMatnr("MDH020030530");
                    detlDto.setBatch("500");
                    detlDto.setAnfme(18.0);
                    break;
                case 1:
                    detlDto.setMatnr("MDH020016416");
                    detlDto.setBatch("500");
                    detlDto.setAnfme(32.0);
                    break;
                case 2:
                    detlDto.setMatnr("LSH90152025");
                    detlDto.setAnfme(50.0);
                    break;
                default:
                    break;
            }
            orderDetails.add(detlDto);
        }
        System.out.println(JSON.toJSONString(param));
        // 2
        System.out.println("======================================");
        OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
        param1.setOrderNo("963001846497017856");
        System.out.println(JSON.toJSONString(param1));
    }

}