#1

lsh

19 小时以前 809f49807ce5f587fe881cfe4cc3d38d9c1a46a3

#1

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

@@ -423,24 +423,32 @@
//        return R.ok("组托成功");
//    }

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

    @RequestMapping("/truss/comd/auth")
//    @ManagerAuth(memo = "手动入库，2楼无需桁架手动入库 wms入库")
    public R PalletizingCompleteTwoFloorParam(@RequestBody PalletizingCompleteTwoFloorParam combParam){
        try{
        mobileService.PalletizingCompleteTwoFloorParam(combParam);
        } catch (Exception e){
            return R.error(e.getMessage()).add(e.getMessage());
        }
        return R.ok("组托成功");
    }

    @RequestMapping("/truss/comd/auth/v2")
//    @ManagerAuth(memo = "手动入库，1楼无需桁架手动入库 wms入库")
    public R PalletizingCompleteTwoFloorParamV2(@RequestBody PalletizingCompleteTwoFloorParam combParam){
        try{
        mobileService.PalletizingCompleteTwoFloorParam2(combParam);
        } catch (Exception e){
            return R.error(e.getMessage()).add(e.getMessage());
        }
        return R.ok("组托成功");
    }


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

@@ -75,6 +75,16 @@
            }
            LocDto locDto = new LocDto(orderDetl.getManu(), orderDetl.getMatnr(), orderDetl.getMaktx(),orderDetl.getModel(),orderDetl.getSpecs(),
                    orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getBarcode(), orderDetl.getOrderNo(),orderDetl.getAnfme());
            LocDetl one = locDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch());
            if (one == null) {
                LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", locDto.getBatch()));
                if (locDetl == null) {
                    locDto.setLocNo(null);
                } else {
                    locDto.setLocNo(locDetl.getLocNo());
                }
            }

            locDto.setOrderDetlId(orderDetl.getId());
            locDto.setTkType(orderDetl.getTkType());
            locDtos.add(locDto);
@@ -145,6 +155,7 @@
            Order order = orderService.selectByNo(locDto.getOrderNo());

            DocType docType = docTypeService.selectById(order.getDocType());

            if (docType.getDocName().equals("不合格品出库")){
                staNoOrder = 212;
            }

 src/main/java/com/zy/asrs/entity/LocDetl.java

@@ -247,6 +247,15 @@
        return this.brand;
    }

    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        }
        return 999;
    }

    public String getModiTime$(){
        if (Cools.isEmpty(this.modiTime)){
            return "";

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

@@ -742,7 +742,15 @@
        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1((short)1);

        StartupDto dto = commonService.getLocNo(1, 1, 1901, matnr,null,null, locTypeDto);
        StartupDto dto = null;
        try{
            commonService.getLocNo(1, 1, 1901, matnr,null,null, locTypeDto);
        } catch (Exception e){
            throw new CoolException(e.getMessage());
        }
        if (dto == null) {
            throw new CoolException("未找到库位");
        }

        int workNo = dto.getWorkNo();
        // 生成工作档

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

@@ -180,9 +180,14 @@
        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
                if (null != one) {
                one.setMemo(paramLocDetl.getMemo());
                one.setColor(paramLocDetl.getColor());
                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
                    if (param.getOutSite()!=212 && param.getOutSite()!=1901 && one.getBrandArmType$()==999){
                        staNo = basDevpService.checkSiteStatus(1901);
                    }
                    locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
                }
            }
        }
        if (!locDetlDtos.isEmpty()) {
@@ -632,14 +637,46 @@
        for (OutLocDto dto : dtos) {
            // 判断入出库类型：101.全板出库 or 103.拣料出库
            if (ioWorkType == null) {
                ioType = dto.isAll() ? 101 : 103;
                boolean dtoAll = dto.isAll();
                if (!dtoAll){
                    for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
                        LocDetl locDetl = detlDto.getLocDetl();
                        LocDetl one = locDetlService.selectItem(dto.getLocNo(), locDetl.getMatnr(), locDetl.getBatch());
                        if (null != one) {
                            if (one.getBrandArmType$()==999){
                                dtoAll = true;
                            }
                        } else {
                            log.error("出库但未找到明细！！！"+locDetl.getMatnr());
                            dtoAll = true;
                        }
                    }
                    if (dtoAll) {
                        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", dto.getLocNo()));
                        for (LocDetl locDetl : locDetlList) {
                            boolean signAddAll = true;
                            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
                                if (detlDto.getLocDetl().getBatch().equals(locDetl.getBatch())) {
                                    signAddAll = false;
                                }
                            }
                            if (signAddAll) {
                                LocDetl one = locDetlService.selectItem(dto.getLocNo(), locDetl.getMatnr(), locDetl.getBatch());
                                dto.getLocDetlDtos().add(new LocDetlDto(one, one.getAnfme(), "affiliated"));
                            }
                        }
                    }
                    if (staNo.getDevNo() == 1901 && !dtoAll){//紧急出库需修改
                        staNo.setDevNo(118);
                    }
                }
                ioType = dtoAll ? 101 : 103;
            } else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
                ioType = 107;
            }
            assert ioType != null;
            // 获取库位
            LocMast locMast = locMastService.selectById(dto.getLocNo());

            Integer outSta = staNo.getDevNo();
//            //2号堆垛机全板出库站指定为204站，拣料站指定为202
//            if(locMast.getCrnNo()==2){

 src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java

@@ -253,7 +253,7 @@

            int sign = 0;
            int staA=118;
            int staB=118;
            int staB=1901;
            for (List<StockOutParam.LocDetl> locDetlList:lists){
                sign++;
                if (locDetlList.size()==0){
@@ -359,7 +359,7 @@

            int sign = 0;
            int staA=118;
            int staB=118;
            int staB=1901;
            for (List<StockOutParam.LocDetl> locDetlList:lists){
                sign++;
                if (locDetlList.size()==0){
@@ -466,7 +466,7 @@

            int sign = 0;
            int staA=118;
            int staB=118;
            int staB=1901;
            for (List<StockOutParam.LocDetl> locDetlList:lists){
                sign++;
                if (locDetlList.size()==0){