自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
luxiaotao1123
2022-11-03 91d05844fa5d170face76455d38a330f24e214bc 
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java


@@ -102,7 +102,7 @@


        wrkMast.setIoType(1); // 入出库状态：1.入库


        Double ioPri = wrkMastService.getIoPri(1, dto.getLocNo());


        wrkMast.setIoPri(ioPri); // 优先级：13


        wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true)?1:0);;


        wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true) ? 1 : 0);


        wrkMast.setCrnNo(dto.getCrnNo());


        wrkMast.setSourceStaNo(dto.getSourceStaNo());


        wrkMast.setStaNo(dto.getStaNo());


@@ -234,7 +234,7 @@


            wrkMast.setIoType(ioType); // 入出库状态


            Double ioPri = wrkMastService.getIoPri(ioType, dto.getLocNo());


            wrkMast.setIoPri(ioPri); // 优先级：13


            wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), false)?1:0);;


            wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), false) ? 1 : 0);


            wrkMast.setCrnNo(locMast.getCrnNo());


            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站


            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站


@@ -254,7 +254,9 @@


            }


            // 生成工作档明细


            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {


                if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}


                if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {


                    continue;


                }


                WrkDetl wrkDetl = new WrkDetl();


                wrkDetl.sync(detlDto.getLocDetl());


                wrkDetl.setOrderNo(""); // 手动出库不需要带出库存中的单据编号


@@ -311,7 +313,7 @@


        wrkMast.setIoType(ioType); // 入出库状态


        Double ioPri = wrkMastService.getIoPri(ioType, taskDto.getLocNo());


        wrkMast.setIoPri(ioPri); // 优先级：13


        wrkMast.setOutMost(locMastService.isOutMost(taskDto.getLocNo(), false)?1:0);;


        wrkMast.setOutMost(locMastService.isOutMost(taskDto.getLocNo(), false) ? 1 : 0);


        wrkMast.setCrnNo(locMast.getCrnNo());


        wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站


        wrkMast.setStaNo(staDesc.getStnNo()); // 目标站


@@ -331,7 +333,9 @@


        }


        // 生成工作档明细


        for (LocDto locDto : taskDto.getLocDtos()) {


            if (locDto.getAnfme()==null || locDto.getAnfme() <= 0.0D) { continue; }


            if (locDto.getAnfme() == null || locDto.getAnfme() <= 0.0D) {


                continue;


            }


            LocDetl locDetl = locDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch());


            if (locDetl == null || locDetl.getAnfme() < locDto.getAnfme()) {


                throw new CoolException(locDto.getLocNo() + "库位中" + locDto.getMatnr() + "商品库存不足！");


@@ -356,6 +360,7 @@


            // 修改订单明细


            if (BaseController.isJSON(locDto.getOrderNo())) {


                String[] orderNos = GetOrderNo(locDto.getOrderNo());


                if (!Cools.isEmpty(orderNos)){


                Double anfme = locDto.getAnfme();


                for (String orderNo:orderNos){


                    OrderDetl orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), locDto.getBatch());


@@ -371,6 +376,16 @@


                        if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),anfme)) {


                            throw new CoolException("修改订单明细数量失败");


                        }


                        }


                        orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);


                    }


                }else {


                    OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());


                    if (orderDetl == null) {


                        orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);


                    }


                    if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {


                        throw new CoolException("修改订单明细数量失败");


                    }


                    orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);


                }


@@ -404,10 +419,9 @@


    }




    private String[] GetOrderNo(String orderNo){


        String s1 = Recombination(orderNo, ",");


        String s2 = Recombination(s1, "\"}");


        String[] s3= s2.split("\"");


        String[] s =new String[(s3.length-1)/3];


        String[] s3 = orderNo.split("\"");


        String[] s = new String[(s3.length - 1) / 6];


        if (!Cools.isEmpty(s3)){


        int i=0;


        int j=0;


        for (String ss:s3){


@@ -417,23 +431,27 @@


            }


            j++;


        }


        }else {


            s=null;


        }


        return s;


    }


    private String Recombination(String a,String b){


        String[] d=a.split(b);


        String c="";


        if (b.equals(",")){


            for (int i=0;i<d.length;i++){


                if (i%2!=0){


                    c=c+d[i];




    private String[] GetAnfme(String orderNo) {


        String[] s3 = orderNo.split("\"");


        String[] s = new String[(s3.length - 1) / 6];


        int i = 0;


        int j = 0;


        for (String ss : s3) {


            if (ss.equals("anfme")) {


                String[] s4 = s3[j + 1].split(":");


                String[] s5 = s4[1].split("\\.");


                s[i] = s5[0];


                i++;


                }


            j++;


            }


        }else if(b.equals("\"}")){


            for (int i=0;i<d.length-1;i++){


                c=c+d[i];


            }


        }


        return c;


        return s;


    }




    @Override


@@ -453,7 +471,7 @@


        wrkMast.setIoType(10); // 入出库状态：10.空板入库


        Double ioPri = wrkMastService.getIoPri(10, dto.getLocNo());


        wrkMast.setIoPri(ioPri); // 优先级：10


        wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true)?1:0);;


        wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), true) ? 1 : 0);


        wrkMast.setCrnNo(dto.getCrnNo());


        wrkMast.setSourceStaNo(dto.getSourceStaNo());


        wrkMast.setStaNo(dto.getStaNo());


@@ -539,7 +557,7 @@


            wrkMast.setIoPri(ioPri);


            wrkMast.setSourceStaNo(sourceStaNo); // 源站


            wrkMast.setStaNo(param.getOutSite()); // 目标站


            wrkMast.setOutMost(locMastService.isOutMost(locNo, false)?1:0);;


            wrkMast.setOutMost(locMastService.isOutMost(locNo, false) ? 1 : 0);


            wrkMast.setCrnNo(locMast.getCrnNo());


            wrkMast.setSourceLocNo(locNo); // 源库位


            wrkMast.setFullPlt("N"); // 满板：Y


@@ -616,7 +634,7 @@


        wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID


        wrkMast.setIoType(11); // 入出库状态： 11.库格移载


        wrkMast.setIoPri(10D);


        wrkMast.setOutMost(locMastService.isOutMost(locNo, false)?1:0);;


        wrkMast.setOutMost(locMastService.isOutMost(locNo, false) ? 1 : 0);


        wrkMast.setCrnNo(sourceLoc.getCrnNo());


        wrkMast.setSourceLocNo(sourceLocNo); // 源库位


        wrkMast.setLocNo(locNo); // 目标库位


@@ -727,7 +745,9 @@


            Iterator<LocDetlAdjustParam.LocDetlAdjust> iterator1 = list.iterator();


            while (iterator1.hasNext()) {


                LocDetlAdjustParam.LocDetlAdjust adjust = iterator1.next();


                if (adjust.getCount() == 0) { continue; }


                if (adjust.getCount() == 0) {


                    continue;


                }


                if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch())) {


                    if (!locDetl.getAnfme().equals(adjust.getCount())) {


                        // todo 盘点记录


@@ -776,7 +796,9 @@




        // 添加库存


        for (LocDetlAdjustParam.LocDetlAdjust adjust : list) {


            if (adjust.getCount() == 0.0D) { continue; }


            if (adjust.getCount() == 0.0D) {


                continue;


            }


            Mat mat = matService.selectByMatnr(adjust.getMatnr());


            LocDetl locDetl = new LocDetl();


            locDetl.sync(mat);


@@ -878,6 +900,30 @@


        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());


        for (WrkDetl wrkDetl : wrkDetls) {


            if (!Cools.isEmpty(wrkDetl.getOrderNo())) {


                String[] orderNos = GetOrderNo(wrkDetl.getOrderNo());


                if (!Cools.isEmpty(orderNos)){


                    String[] anfmes = GetAnfme(wrkDetl.getOrderNo());


                    int i = 0;


                    for (String orderNo : orderNos) {


                        if (!Cools.isEmpty(orderNo)) {


                            Double anfme = Integer.parseInt(anfmes[i]) + 0.0;


                            i++;


                            if (BaseController.isJSON(wrkDetl.getOrderNo())) {


                                if (!orderDetlService.decrease(orderNo, wrkDetl.getMatnr(), wrkDetl.getBatch(), anfme)) {


                                    throw new CoolException("订单数据回滚失败");


                                }


                            } else {


                                // 订单合并出库


                                List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);


                                for (OrderDto orderDto : orderDtoList) {


                                    if (!orderDetlService.decrease(orderDto.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), orderDto.getAnfme())) {


                                        throw new CoolException("订单数据回滚失败");


                                    }


                                }


                            }


                        }


                    }


                }else {


                if (BaseController.isJSON(wrkDetl.getOrderNo())) {


                    if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {


                        throw new CoolException("订单数据回滚失败");


@@ -888,6 +934,7 @@


                    for (OrderDto orderDto : orderDtoList) {


                        if (!orderDetlService.decrease(orderDto.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), orderDto.getAnfme())) {


                            throw new CoolException("订单数据回滚失败");


                            }


                        }


                    }


                }


@@ -1067,7 +1114,7 @@


                wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID


                wrkMast.setIoType(11); // 入出库状态： 11.库格移载


                wrkMast.setIoPri(15D);


                wrkMast.setOutMost(locMastService.isOutMost(loc.getLocNo(), false)?1:0);;


                wrkMast.setOutMost(locMastService.isOutMost(loc.getLocNo(), false) ? 1 : 0);


                wrkMast.setCrnNo(sourceLoc.getCrnNo());


                wrkMast.setSourceLocNo(sourceLocNo); // 源库位


                wrkMast.setLocNo(loc.getLocNo()); // 目标库位