*

L

昨天 66c991b89f3f22f04dd5d56f852938c31dd16798

*

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

@@ -434,7 +434,11 @@
//    @ManagerAuth(memo = "手动入库，2楼无需桁架手动入库 wms入库")
    public R PalletizingCompleteTwoFloorParam(@RequestBody PalletizingCompleteTwoFloorParam combParam){
        try{
            mobileService.PalletizingCompleteTwoFloorParam(combParam);
            if (combParam.getBoxType().equals("999")){
                mobileService.PalletizingCompleteTwoFloorParam212(combParam);
            } else {
                mobileService.PalletizingCompleteTwoFloorParam(combParam);
            }
        } catch (Exception e){
            return R.error(e.getMessage()).add(e.getMessage());
        }

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -426,6 +426,11 @@
    @Override
    @Transactional
    public void PalletizingCompleteTwoFloorParam(PalletizingCompleteTwoFloorParam param) {
        EntityWrapper<BasBoxType> wrapper = new EntityWrapper<>();
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true).eq("box_specs",param.getBoxType()));



        Long userId = 7777L;//中控
        param.setPalletizingNo(212);

@@ -1567,7 +1572,15 @@
    @Transactional
    public List<Map<String, Object>> boxTypeComb() {
        EntityWrapper<BasBoxType> wrapper = new EntityWrapper<>();
        EntityWrapper<BasBoxType> wrapper2 = new EntityWrapper<>();
        List<Map<String, Object>> result = new ArrayList<>();
        List<BasBoxType> basBoxTypes999 = basBoxTypeService.selectList(wrapper2.orderBy("id",true).eq("arm_type",999));
        for (BasBoxType basBoxType : basBoxTypes999){
            Map<String, Object> map = new HashMap<>();
            map.put("boxType", basBoxType.getBoxType());
            map.put("boxSpecs", basBoxType.getBoxSpecs());
            result.add(map);
        }
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true).eq("arm_type",1));
        for (BasBoxType basBoxType : basBoxTypes){
            Map<String, Object> map = new HashMap<>();