#

Administrator

1 天以前 02e43fa1bb0f899e554d54eeb4c32b0b79759dcd

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

@@ -3,12 +3,19 @@

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.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.asrs.service.WrkDetlService;
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDetlDto;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +42,12 @@

    @Autowired
    private OpenService openService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private WrkDetlService wrkDetlService;

//    @PostMapping("/order/matSync/default/v1")
////    @AppAuth(memo = "商品信息同步接口")
@@ -101,29 +114,21 @@
        return R.ok().add(openService.pakinOrderComplete(param));
    }



    /**
     * 添加出库单
     * pause out order
     */
    @PostMapping("/order/pakout/default/v1")
    @AppAuth(memo = "添加订单出库")
    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakoutParam param,
                                            HttpServletRequest request) {
    @PostMapping("/order/pakout/pause/default/v1")
    @AppAuth(memo = "pause out order")
    public synchronized R pakoutOrderPause(@RequestHeader(required = false) String appkey,
                                           @RequestBody OpenOrderPakoutPauseParam param,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderNo())) {
            return R.error("orderNo is empty");
        }
        if (Cools.isEmpty(param.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
        }
        if (Cools.isEmpty(param.getOrderType())) {
            return R.error("单据类型[orderType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        openService.pakoutOrderCreate(param);
        return R.ok();
        return openService.pakoutOrderPause(param);
    }

    /**
@@ -316,7 +321,7 @@
     * 托盘就绪状态查询
     */
    @PostMapping("/arm/task/loc_status")
    @AppAuth(memo = "托盘就绪状态查询")
//    @AppAuth(memo = "托盘就绪状态查询")
    public synchronized R TaskArmLocStatus(@RequestHeader(required = false) String appkey,
                                                 @RequestBody ArmOKParam param,
                                                 HttpServletRequest request) {
@@ -343,7 +348,7 @@
     * 异常上报
     */
    @PostMapping("/armAbnormalOperation")
    @AppAuth(memo = "异常上报")
//    @AppAuth(memo = "异常上报")
    public synchronized R ArmAbnormalOperation(@RequestHeader(required = false) String appkey,
                                                 @RequestBody TaskArmErrorParam param,
                                                 HttpServletRequest request) {
@@ -363,7 +368,7 @@
     * 订单完成上报
     */
    @PostMapping("/arm/task/order_result")
    @AppAuth(memo = "订单完成上报")
//    @AppAuth(memo = "订单完成上报")
    public synchronized R TaskArmWorkOrderStatus(@RequestHeader(required = false) String appkey,
                                                 @RequestBody OrderArmEndParam param,
                                                 HttpServletRequest request) {
@@ -398,14 +403,17 @@
    public synchronized R syncMatInfoV2(@RequestBody(required = false) List<MatSyncParam.MatParam> param){

        System.out.println(param);
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        MatSyncParam matSyncParam = new MatSyncParam();
//        List<MatSyncParam.MatParam> objects = new ArrayList<>();
//        objects.add(param);
//        matSyncParam.matDetails = objects;
//        openService.syncMat(matSyncParam);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        MatSyncParam matSyncParam = new MatSyncParam();
        List<MatSyncParam.MatParam> objects = new ArrayList<>();
        for (MatSyncParam.MatParam matParam : param) {
            objects.add(matParam);
        }

        matSyncParam.matDetails = objects;
        openService.syncMat(matSyncParam);
        return R.ok();
    }

@@ -419,41 +427,7 @@
     */
    @PostMapping("/station/all")
    public synchronized R stationAll(){
        List<LinkedHashMap<String,Object>> list =new ArrayList<>();
        LinkedHashMap<String,Object> map = new LinkedHashMap<>();
        map.put("stationId","101");
        map.put("stationType","3");
        map.put("stationName","101");
        list.add(map);
        System.out.println();
//        try {
//            //获取Cookie值
//            HashMap<String, Object> headers = new HashMap<>();
//            headers.put("accesstoken", erpSecret.getAccessToken());
//            headers.put("x-acgw-identity", xAcfwIdentity);  // 自定义请求头
//            response = new HttpHandler.Builder()
//                    .setHeaders(headers)
//                    .setUri(URL)
//                    .setPath(path)
//                    .setJson(add)
//                    .build()
//                    .doPost();
//            JSONObject jsonResponse = JSON.parseObject(response);
//            if (jsonResponse.getString("errorCode").equals("401")) {
//
//            }
//        }catch (Exception e){
//            e.printStackTrace();
//        }
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        MatSyncParam matSyncParam = new MatSyncParam();
//        List<MatSyncParam.MatParam> objects = new ArrayList<>();
//        objects.add(param);
//        matSyncParam.matDetails = objects;
//        openService.syncMat(matSyncParam);
        return R.ok().add(list);
        return openService.stationAll();
    }

    /**
@@ -461,16 +435,32 @@
     * return
     */
    @PostMapping("/comb/auth")
    public synchronized R comb(@RequestBody ArrayList<HashMap<String,Object>> param){
        System.out.println(param);
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
    public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param){
        for (MesToCombParam mesToCombParam : param) {
            // 判断是否有相同条码的数据
            if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                    eq("zpallet", mesToCombParam.getPalletId()).eq("io_status", "N")) > 0) {
                waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", mesToCombParam.getPalletId()));
            }

            if (mesToCombParam.getPalletId().length() != 8) {
                return R.error(mesToCombParam.getPalletId()+"-该托盘码不为8位");
            }
//        if (param.getCombMats().size()>1){
//            throw new CoolException("不允许混料===>>" + param.getBarcode());
//        }
//        MatSyncParam matSyncParam = new MatSyncParam();
//        List<MatSyncParam.MatParam> objects = new ArrayList<>();
//        objects.add(param);
//        matSyncParam.matDetails = objects;
//        openService.syncMat(matSyncParam);

            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", mesToCombParam.getPalletId()));
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", mesToCombParam.getPalletId()));
//        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPalletId()));
            if (countLoc > 0 || countWrk > 0) {
                return R.error(mesToCombParam.getPalletId()+"-工作档/库存条码数据已存在");
            }
        }
        for (MesToCombParam mesToCombParam : param) {
            openService.mesToComb(mesToCombParam);
        }

        return R.ok();
    }

@@ -479,11 +469,36 @@
     */

    @PostMapping("/outOrder")
    public synchronized R outOrder (@RequestBody ArrayList<HashMap<String,Object>> param){
        System.out.println(param);
    public synchronized R outOrder (@RequestBody ArrayList<OutTaskParam> params){
        for (OutTaskParam outTaskParam : params) {
            openService.outOrder(outTaskParam);
        }
        return R.ok();
    }



    /**
     * 添加出库单
     */
    @PostMapping("/order/pakout/default/v1")
//    @AppAuth(memo = "添加订单出库")
    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakoutParam param,
                                            HttpServletRequest request) {
//        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
        }
        if (Cools.isEmpty(param.getOrderType())) {
            return R.error("单据类型[orderType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        openService.pakoutOrderCreate(param);
        return R.ok();
    }
}