#

yxFwq

2024-12-09 9c98d630866b80627ae21ca539a8c3776baa7e73

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

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.AppAuth;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -19,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.List;

@@ -54,6 +56,8 @@
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private RgvOneSignService rgvOneSignService;


    // 商品上架
@@ -72,10 +76,14 @@
    }

    @RequestMapping("/search/sign/auth/v2")
//    @ManagerAuth(memo = "拆叠盘模式切换")
    @ManagerAuth(memo = "拆叠盘模式切换")
    public R orderSearchByBarcodeV2(@RequestParam boolean sign){
        Integer signRu = 1;
        return R.ok(signRu);
        RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
        if (sign){
            rgvOneSign.setRgvOneSign(1-rgvOneSign.getRgvOneSign());
            rgvOneSignService.updateById(rgvOneSign);
        }
        return R.ok(rgvOneSign.getRgvOneSign());
    }


@@ -84,7 +92,7 @@

    /**
     * 根据单号检索单据数据
     * http://localhost:8081/jtwms/mobile/order/serach/orderNo/auth?orderNo=123123
     * http://localhost:8081/yxwms/mobile/order/serach/orderNo/auth?orderNo=123123
     */
//    @RequestMapping("/order/search/orderNo/auth")
//    @ManagerAuth
@@ -107,7 +115,7 @@
//        return R.ok().add(orderDetls);
//    }
    @RequestMapping("/order/search/orderNo/auth")
    @ManagerAuth
    @ManagerAuth(memo = "入库组托获取单据信息")
    public R orderSearchByBarcode(@RequestParam String orderNo){
        if (Cools.isEmpty(orderNo)){
            orderNo=null;
@@ -188,6 +196,7 @@
                        combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
                        combMat.setMaktx(orderDetl.getMaktx());
                        combMat.setSpecs(orderDetl.getSpecs());
                        combMat.setWeight(orderDetl.getWeight());
                        combMats.add(combMat);
                    }
                    if (combMats.size()==0){
@@ -257,12 +266,12 @@
        return R.ok();
    }

    @RequestMapping("/truss/auth")
    @ManagerAuth(memo = "退库，1楼桁架退库")
    public R trussComb(@RequestBody TrussCombParam combParam){
        mobileService.trussComb(combParam, getUserId());
        return R.ok("组托成功");
    }
//    @RequestMapping("/truss/auth")
//    @ManagerAuth(memo = "退库，1楼桁架退库")
//    public R trussComb(@RequestBody TrussCombParam combParam){
//        mobileService.trussComb(combParam, getUserId());
//        return R.ok("组托成功");
//    }

    @RequestMapping("/truss/order/auth")
    @ManagerAuth(memo = "退库，1楼桁架退库，退库单退库")
@@ -271,12 +280,33 @@
        return R.ok("组托成功");
    }

//    @RequestMapping("/truss/comd/auth")
//    @ManagerAuth(memo = "手动入库，2楼无需桁架手动入库")
//    public R trussComb2(@RequestBody PalletizingCompleteParam combParam){
//        mobileService.trussComb2(combParam, getUserId());
//        return R.ok("组托成功");
//    }
    @RequestMapping("/truss/comd/auth")
//    @ManagerAuth(memo = "手动入库，2楼无需桁架手动入库 wms入库")
    public R PalletizingCompleteTwoFloorParam(@RequestBody PalletizingCompleteTwoFloorParam combParam){
        mobileService.PalletizingCompleteTwoFloorParam(combParam);
        return R.ok("组托成功");
    }

    /**
     * 中控：2楼212叫托盘
     */
    @PostMapping("/balcony/complete/car/auth/v1")
//    @AppAuth(memo = "中控：2楼212叫托盘")
    public synchronized R balconyCompleteCar() {
        mobileService.trussComb2Car(212);
        return R.ok();
    }

    /**
     * 中控：获取箱型编号
     */
    @PostMapping("/box/type/complete/auth/v1")
//    @AppAuth(memo = "中控：获取箱型编号")
    public synchronized R boxTypeCompleteCar() {
        List<Map<String, Object>> maps = mobileService.boxTypeComb();
        return R.ok().add(maps);
    }


    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")