完善

cp

2024-10-30 431f88fdade07a22b636714f1690cee3a55668d0

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

@@ -68,37 +68,108 @@

    @RequestMapping("/pda/WarehouseIn")
    @ManagerAuth
    public R WarehouseIn(@RequestParam String locNo,@RequestParam String barcode){
        return mobileService.WarehouseIn(locNo,barcode,getHostId());
    public R WarehouseIn(@RequestParam String locNo, @RequestParam String barcode) {
        return mobileService.WarehouseIn(locNo, barcode, getHostId());
    }

    @RequestMapping("/pda/WarehouseOut")
    @ManagerAuth
    public R WarehouseOut(@RequestBody CombParam combParam){
        return mobileService.WarehouseOut(combParam,getHostId());
    public R WarehouseOut(@RequestBody CombParam combParam) {
        return mobileService.WarehouseOut(combParam, getHostId());
    }

    @RequestMapping("/outBound/mat/list")
    @ManagerAuth
    public R WarehouseMat(@RequestParam String matnr, @RequestParam String orderNo) {
        if (Cools.isEmpty(matnr)) {
            R.error("品号不能为空");
        }
        ArrayList<PickMatParam> maps = new ArrayList<>();
        if (Cools.isEmpty(orderNo)) {
            List<OrderDetl> list = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
                    .eq(OrderDetl::getMatnr, matnr)
                    .orderByDesc(OrderDetl::getCreateTime));
            List<OrderDetl> orderDetls = new ArrayList<OrderDetl>();
            for (OrderDetl orderDetl : list
            ) {
                Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, orderDetl.getOrderNo()));
                if (!Cools.isEmpty(order)) {
                    DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, order.getDocType()));
                    if (!Cools.isEmpty(docType) && docType.getPakout() == 1) {
                        double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
                        PickMatParam matParam = new PickMatParam();
                        matParam.setMatnr(orderDetl.getMatnr());
                        matParam.setBatch(orderDetl.getBatch());
                        matParam.setOrderNo(orderDetl.getOrderNo());
                        matParam.setOrderId(orderDetl.getOrderId());
                        matParam.setCount(count);
                        matParam.setUseCount(count);
                        maps.add(matParam);
                    }


                }
            }
            return R.ok(maps);
        } else {
            List<OrderDetl> list = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
                    .eq(OrderDetl::getMatnr, matnr)
                    .like(OrderDetl::getOrderNo, orderNo)
                    .orderByDesc(OrderDetl::getCreateTime));
            for (OrderDetl orderDetl:list
                 ) {
                double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
                PickMatParam matParam = new PickMatParam();
                matParam.setMatnr(orderDetl.getMatnr());
                matParam.setBatch(orderDetl.getBatch());
                matParam.setOrderNo(orderDetl.getOrderNo());
                matParam.setOrderId(orderDetl.getOrderId());
                matParam.setCount(count);
                matParam.setUseCount(count);
                maps.add(matParam);
            }
            return R.ok(maps);
        }
    }

    /**
     * 并板途中拣料
     *
     * @param combParam
     * @return
     */
    @RequestMapping("/pda/WarehouseOut/v1")
    @ManagerAuth
    public R WarehouseOutV1(@RequestBody CombParam combParam){
        return mobileService.WarehouseOutV1(combParam,getHostId());
    public R WarehouseOutV1(@RequestBody CombParam combParam) {
        return mobileService.WarehouseOutV1(combParam, getHostId(), getUserId());
    }

    /**
     * 拣料途中并板
     *
     * @param param
     * @return
     */
    @RequestMapping("/pda/WarehouseOutPickMerge/v1")
    @ManagerAuth
    public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param){
        return mobileService.WarehouseOutPickMergeV1(param, getHostId());
    public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) {
        return mobileService.WarehouseOutPickMergeV1(param, getHostId(),getUserId());
    }

    /**
     * 多次并板
     * @param param
     * @return
     */
    @RequestMapping("/pda/WarehouseOutMergeBoardMany/v1")
    @ManagerAuth
    public R WarehouseOutMergeBoardManyV1(@RequestBody WarehouseOutMergeBoardManyParam param){
        return mobileService.WarehouseOutMergeBoardMany(param, getHostId());
    public R WarehouseOutMergeBoardManyV1(@RequestBody WarehouseOutMergeBoardManyParam param) {
        return mobileService.WarehouseOutMergeBoardMany(param, getHostId(),getUserId());
    }

    @RequestMapping("/menu/pda/auth")
    @ManagerAuth
    public R menuPda(){
    public R menuPda() {
        List<RolePermission> rolePermissions;
        Long roleId = getUser().getRoleId();
        rolePermissions = rolePermissionService.list(new LambdaQueryWrapper<RolePermission>().eq(RolePermission::getRoleId, getHostId()));
@@ -119,7 +190,7 @@
     */
    @RequestMapping("/pda/decrees/check")
    @ManagerAuth
    public R pdaDecreesCheck(@RequestParam String decrees){
    public R pdaDecreesCheck(@RequestParam String decrees) {
        if (Cools.isEmpty(decrees)) {
            return R.error("制令不能为空");
        }
@@ -129,7 +200,7 @@
        //查询是否有正在工作的工作档
        List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getBatch, decrees));
        HashMap<String, Object> map = new HashMap<>();
        if(list.isEmpty() && wrkDetls.isEmpty()){
        if (list.isEmpty() && wrkDetls.isEmpty()) {
            map.put("status", 1);//可正常入库
        } else if (!wrkDetls.isEmpty()) {
            map.put("status", 3);//存在工作档，拒绝入库
@@ -155,7 +226,7 @@
     */
    @RequestMapping("/order/search/orderNo/auth")
    @ManagerAuth
    public R orderSearchByBarcode(@RequestParam String orderNo){
    public R orderSearchByBarcode(@RequestParam String orderNo) {
        Order order = orderService.selectByNo(orderNo, getHostId());
        if (order == null) {
            return R.ok();
@@ -176,7 +247,7 @@

    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam){
    public R comb(@RequestBody CombParam combParam) {
        mobileService.comb(combParam, getUserId(), getHostId());
        return R.ok("组托成功");
    }
@@ -186,7 +257,7 @@
    @Deprecated
    public R pakoutQuery(@RequestParam(required = false) String barcode,
                         @RequestParam(required = false) Integer staNo,
                         @RequestParam(required = false) String matnr){
                         @RequestParam(required = false) String matnr) {
        if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
            return R.ok();
        }
@@ -211,7 +282,7 @@
     */
    @RequestMapping("/pakout/confirm/barcode/auth")
    @ManagerAuth
    public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode){
    public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode) {
        if (Cools.isEmpty(barcode)) {
            return R.ok();
        }
@@ -232,7 +303,7 @@
    @RequestMapping("/pakout/confirm/pick/auth")
    @ManagerAuth
    public R pakoutQueryByBarcode(@RequestParam(required = false) Integer wrkNo
            , @RequestParam(required = false) String matnr){
            , @RequestParam(required = false) String matnr) {
        if (Cools.isEmpty(wrkNo)) {
            return R.ok();
        }
@@ -368,14 +439,14 @@

    @RequestMapping("/adjust/auth")
    @ManagerAuth(memo = "盘点")
    public R adjust(@RequestBody MobileAdjustParam combParam){
    public R adjust(@RequestBody MobileAdjustParam combParam) {
        mobileService.adjust(combParam, getUserId(), getHostId());
        return R.ok("盘点成功");
    }

    @RequestMapping("/loc/f/list")
    @ManagerAuth(memo = "获取在库库位")
    public R locNoF(@RequestParam(required = false) String locNo){
    public R locNoF(@RequestParam(required = false) String locNo) {
        LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<LocMast>()
                .eq(LocMast::getLocSts, "F")
                .eq(LocMast::getHostId, getHostId());
@@ -388,7 +459,7 @@

    @RequestMapping("/pick/sta/list")
    @ManagerAuth(memo = "获取并板站")
    public R pickSta(){
    public R pickSta() {
        List<StaDesc> list = staDescService.list(new LambdaQueryWrapper<StaDesc>()
                .eq(StaDesc::getTypeNo, 104)
                .eq(StaDesc::getHostId, getHostId()));
@@ -397,7 +468,7 @@

    @RequestMapping("/pick/mat/list")
    @ManagerAuth(memo = "获取并板物料")
    public R pickMats(@RequestParam(required = false) String matnr){
    public R pickMats(@RequestParam(required = false) String matnr, @RequestParam(required = false) String orderNo) {
        List<DocType> docTypes = docTypeService.list(new LambdaQueryWrapper<DocType>().like(DocType::getPakin, 1));
        ArrayList<Long> typeList = new ArrayList<>();
        for (DocType docType : docTypes) {
@@ -420,10 +491,13 @@
        wrapper1.eq(OrderDetl::getStatus, 1);
        wrapper1.eq(OrderDetl::getHostId, getHostId());
        wrapper1.in(OrderDetl::getOrderId, orderIds);
        wrapper1.orderByDesc(OrderDetl::getCreateTime);
        if (!Cools.isEmpty(matnr)) {
            wrapper1.like(OrderDetl::getMatnr, matnr);
        }

        if (!Cools.isEmpty(orderNo)) {
            wrapper1.like(OrderDetl::getOrderNo, orderNo);
        }
        List<OrderDetl> list = orderDetlService.list(wrapper1);

        ArrayList<PickMatParam> maps = new ArrayList<>();
@@ -449,7 +523,7 @@
    @RequestMapping("/pick/in")
    @ManagerAuth(memo = "并板入库")
    @Transactional
    public R pickConfirm(@RequestBody PickConfirmParam param){
    public R pickConfirm(@RequestBody PickConfirmParam param) {
        LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
                .eq(LocMast::getLocNo, param.getLocNo())
                .eq(LocMast::getHostId, getHostId()));
@@ -570,20 +644,30 @@
    @Transactional
    public R orderOutListOrder(@RequestBody String barcode) {
        ArrayList<WrkMast> wrkMastArrayList = new ArrayList<>();
        if (Cools.isEmpty(barcode) || barcode.isEmpty()){
        if (Cools.isEmpty(barcode) || barcode.isEmpty()) {
            List<WrkMast> wrkMasts = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
                    .eq(WrkMast::getHostId, getHostId())
                    .eq(WrkMast::getWrkSts, 199L)
                    .eq(WrkMast::getIoType, 104));
            wrkMastArrayList.addAll(wrkMasts);
            List<WrkMast> wrkMasts1 = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
                    .eq(WrkMast::getHostId, getHostId())
                    .eq(WrkMast::getWrkSts, 199L)
                    .eq(WrkMast::getIoType, 107));
            wrkMastArrayList.addAll(wrkMasts1);
        } else {
            List<WrkMast> wrkMasts = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
                    .like(WrkMast::getBarcode, barcode)
                    .eq(WrkMast::getHostId, getHostId())
                    .eq(WrkMast::getWrkSts, 199L)
                    .eq(WrkMast::getIoType, 104)
            );
                    .eq(WrkMast::getIoType, 104));
            wrkMastArrayList.addAll(wrkMasts);
            List<WrkMast> wrkMasts1 = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
                    .like(WrkMast::getBarcode, barcode)
                    .eq(WrkMast::getHostId, getHostId())
                    .eq(WrkMast::getWrkSts, 199L)
                    .eq(WrkMast::getIoType, 107));
            wrkMastArrayList.addAll(wrkMasts1);
        }

        return R.ok().add(wrkMastArrayList);
@@ -594,12 +678,17 @@
    @Transactional
    public R orderOutListOrderPick(@RequestBody String barcode) {
        ArrayList<WrkMast> wrkMastArrayList = new ArrayList<>();
        if (Cools.isEmpty(barcode) || barcode.isEmpty()){
        if (Cools.isEmpty(barcode) || barcode.isEmpty()) {
            List<WrkMast> wrkMasts = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
                    .eq(WrkMast::getHostId, getHostId())
                    .eq(WrkMast::getWrkSts, 199L)
                    .eq(WrkMast::getIoType, 103));
            wrkMastArrayList.addAll(wrkMasts);
            List<WrkMast> wrkMasts1 = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
                    .eq(WrkMast::getHostId, getHostId())
                    .eq(WrkMast::getWrkSts, 199L)
                    .eq(WrkMast::getIoType, 107));
            wrkMastArrayList.addAll(wrkMasts1);
        } else {
            List<WrkMast> wrkMasts = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
                    .like(WrkMast::getBarcode, barcode)
@@ -608,6 +697,12 @@
                    .eq(WrkMast::getIoType, 103)
            );
            wrkMastArrayList.addAll(wrkMasts);
            List<WrkMast> wrkMasts1 = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
                    .like(WrkMast::getBarcode, barcode)
                    .eq(WrkMast::getHostId, getHostId())
                    .eq(WrkMast::getWrkSts, 199L)
                    .eq(WrkMast::getIoType, 107));
            wrkMastArrayList.addAll(wrkMasts1);
        }

        return R.ok().add(wrkMastArrayList);