初始化

dubin

1 天以前 dd76858f35bb4fdd76d5976465e9bd96267b0f0b

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

@@ -2,7 +2,6 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -10,6 +9,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
@@ -22,7 +22,6 @@
import org.springframework.web.bind.annotation.*;

import java.util.*;
import java.util.List;

/**
 * 移动端接口控制器
@@ -54,6 +53,20 @@
    private PackService packService;
    @Autowired
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;

    @PostMapping("/inbound/auth")
    @ManagerAuth
    public R pdaInbound(@RequestBody JSONObject param){ //pda入库
        return R.ok();
    }

    @PostMapping("/outbound/auth")
    @ManagerAuth(memo = "pda出库")
    public R pdaOutbound(@RequestBody JSONObject param){ //pda出库
        return mobileService.pdaOutbound(param,getUserId());
    }


    // 商品上架
@@ -69,6 +82,16 @@
    public R matOffSale(@RequestBody OffSaleParam offSaleParam){
        mobileService.offSale(offSaleParam);
        return R.ok("下架成功");
    }

    @PostMapping("/manualCallEmptyTray")
    @ManagerAuth(memo = "pda呼叫空托盘")
    public R manualCallEmptyTray(@RequestBody Map<String, Object> param){
        if (Cools.isEmpty(param.get("stnNo"))){
            throw new CoolException("空托盘出库站点不能为空");
        }

        return mobileService.manualCallEmptyTray((Integer) param.get("stnNo"),getUserId());
    }


@@ -130,7 +153,9 @@
                        CombParam.CombMat combMat = new CombParam.CombMat();
                        combMat.setMatnr(orderDetl.getMatnr());
                        combMat.setBatch(orderDetl.getBatch());
                        combMat.setAnfme(orderDetl.getAnfme());
                        combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
                        combMat.setMaktx(orderDetl.getMaktx());
                        combMat.setSpecs(orderDetl.getSpecs());
                        combMats.add(combMat);
                    }
                    combParam.setCombMats(combMats);
@@ -143,7 +168,7 @@
    }

    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
    @ManagerAuth(memo = "pda组托")
    public R comb(@RequestBody CombParam combParam){
        mobileService.comb(combParam, getUserId());
        return R.ok("组托成功");
@@ -215,6 +240,31 @@
        return R.ok();
    }

    /**
     * 出库确认 - 扫货物  广德宜科版
     * 1.全板 返回 101
     * 2.拣料 返回 103
     */
    @RequestMapping("/pakout/confirm/goods/auth")       //待完善  原因（客户未给出详细信息）
    @ManagerAuth
    public R pakoutQueryByGoods(@RequestBody GDYKConfirmGoodsParam combParam){
        if (Cools.isEmpty(combParam)) {
            return R.ok();
        }
//        List<Order> orders = orderService.selectorderNoL(batch);
        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no",combParam.getOrderNo()));
        if (Cools.isEmpty(orderDetl)){
            return R.error("未查到数据");
        }
        if (!orderDetl.getQty$().equals("已完成")){
            return R.error("任务未完成");
        }
        //复核数
        orderDetl.setSource(1);
        orderDetlService.updateById(orderDetl);
        return R.ok();
    }

    // 根据库位码和商品码搜索商品
    @RequestMapping("/mat/find/auth")
    public R find(@RequestParam(required = false) String locNo