1

zhang

16 小时以前 ea92b2e7bb48c55f7ec2cf52dfdb2497f30b49ce

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

@@ -5,11 +5,15 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.OutLocInfoParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
@@ -32,6 +36,9 @@

    @Autowired
    private OpenService openService;

    @Autowired
    private LocDetlMapper locDetlMapper;

    @PostMapping("/scrk")
    @AppAuth(memo = "GWMS调用生成入库工作档")
@@ -159,8 +166,7 @@
                                    @RequestBody List<ProdCheckParam> param,
                                        HttpServletRequest request) {
        auth(appkey, param, request);
        openService.prodCheck(param);
        return R.ok();
        return openService.prodCheck(param);
    }

    @PostMapping("/xhd")
@@ -191,6 +197,26 @@
                                   HttpServletRequest request) {
        auth(appkey, null, request);
        return openService.getUnfulfilledOrders();
    }

    @PostMapping("/getCrnLaneWayInfo")
    @AppAuth(memo = "获取堆垛机状态及所属巷道库位统计信息")
    public synchronized R getCrnLaneWayInfo(@RequestHeader(required = false) String appkey,
                                               HttpServletRequest request) {
        auth(appkey, null, request);
        return openService.getCrnLaneWayInfo();
    }

    @PostMapping("/getOutLocInfoByBarcode")
    @AppAuth(memo = "根据托盘码，获取出库物料信息进行大屏显示")
    public synchronized R getOutLocInfoByBarcode(@RequestHeader(required = false) String appkey,
                                            @RequestBody OutLocInfoParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode())) {
            return R.parse("托盘码不能为空");
        }
        return openService.getOutLocInfoByBarcode(param.getBarcode());
    }


@@ -297,7 +323,7 @@
    }*/

    private void auth(String appkey, Object obj, HttpServletRequest request) {
        log.info("{}接口被访问；appkey:{}；请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
        log.info("OpenController类:【{}】接口被访问;appkey:【{}】;请求数据：【{}】", request.getRequestURI(), appkey, JSON.toJSONString(obj));
        request.setAttribute("cache", obj);
        if (!auth) {
            return;
@@ -456,6 +482,64 @@
        return R.ok(param);
    }

    /**
     * 计划组货单
     */
    @PostMapping("/groupOrderConfirm/auth/v1")
    @AppAuth(memo = "计划单据下发")
    public synchronized R groupOrderConfirm(@RequestHeader(required = false) String appkey,
                                                        @RequestBody GroupOrderConfirmParam param,
                                                        HttpServletRequest request) {
        auth(appkey, param, request);
        openService.groupOrderConfirm(param);
        return R.ok(param);
    }

    /**
     * 退库单（出库）
     */
    @PostMapping("/returnOrder/auth/v1")
    @AppAuth(memo = "正常退库单单据下发")
    public synchronized R returnOrder(@RequestHeader(required = false) String appkey,
                                            @RequestBody ReturnOrderConfirmParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        openService.returnOrder(param);
        return R.ok(param);
    }

    /**
     * 是否合格
     */
    @PostMapping("/check/auth/v1")
    @AppAuth(memo = "检验是否合格")
    @Transactional
    public synchronized R check(@RequestHeader(required = false) String appkey,
                                      @RequestBody UnQualifiedOrderConfirmParam param,
                                      HttpServletRequest request) {
        auth(appkey, param, request);
        List<UnQualifiedOrderConfirmParam.VolumeNumber> volumeNumbers = param.getVolumeNumbers();
        for (UnQualifiedOrderConfirmParam.VolumeNumber v :volumeNumbers){
            if (!Cools.isEmpty(v.getVolumeNumber())&&!Cools.isEmpty(param.getQualified())){
                locDetlMapper.updateQualifiedByBrand(v.getVolumeNumber(), param.getQualified());
            }
        }
        return R.ok(param);
    }

    /**
     * 退库单（出库）
     */
    @PostMapping("/unQualifiedOrder/auth/v1")
    @AppAuth(memo = "不合格品退库单单据下发")
    public synchronized R unqualifiedOrder(@RequestHeader(required = false) String appkey,
                                           @RequestBody UnQualifiedOrderConfirmParam param,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        openService.unQualifiedOrder(param);
        return R.ok(param);
    }

    /*...........................上饶江铜..............以上.............徐工汉云...........................*/

}