自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
#
Junjie
8 天以前 b67bafd95dc17136ac0eab068ba51cd55e1669f3 
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java


@@ -94,6 +94,15 @@


    @Resource


    private OrderPakoutService orderPakOutService;




    @Autowired


    private InventoryCheckOrderService checkOrderService;




    @Autowired


    private InventoryCheckOrderDetlService checkOrderDetlService;




    @Resource


    private OrderDetlPakoutService orderDetlPakoutService;




    @Override


    @Transactional


    public String startupFullPutStore(FullStoreParam param, Long userId) {


@@ -180,6 +189,7 @@


    public void startupFullTakeStore(StockOutParam param, Long userId) {


        // 目标站点状态检测


        BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());




        // 获取库位明细


        List<LocDetlDto> locDetlDtos = new ArrayList<>();


        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {


@@ -199,7 +209,7 @@


            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));


            if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {


                // 启动出库开始 101.出库


                stockOut(staNo, locDetlDtos, null, userId);


                stockOut(staNo, locDetlDtos, null, userId, null, param.getItemId());


            } else {


                throw new CoolException("所选库位存在状态不为F、D的库位，库位号：" + locMast.getLocNo() + " 、当前状态：" + locMast.getLocSts() + "-" + locMast.getLocSts$());


            }


@@ -288,7 +298,7 @@




    @Override


    @Transactional


    public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {


    public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId, String checkOrderNo, String itemId) {


        Date now = new Date();


        // 合并同类项


        Set<String> locNos = new HashSet<>();


@@ -315,6 +325,15 @@


                ioType = dto.isAll() ? 101 : 103;


            } else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {


                ioType = 107;


                if (Cools.isEmpty(checkOrderNo)) {


                    checkOrderNo = DateUtils.createTimeStamp();


                    InventoryCheckOrder checkOrder = new InventoryCheckOrder();


                    checkOrder.setCreateBy(userId);


                    checkOrder.setStatus("1");


                    checkOrder.setCreateTime(new Date());


                    checkOrder.setOrderNo(checkOrderNo);


                    checkOrderService.insert(checkOrder);


                }


            }


            assert ioType != null;


            // 获取库位


@@ -351,6 +370,7 @@


            wrkMast.setAppeTime(now);


            wrkMast.setModiUser(userId);


            wrkMast.setModiTime(now);


            wrkMast.setPacked(itemId);


            if (!wrkMastService.insert(wrkMast)) {


                throw new CoolException("保存工作档失败，出库库位号：" + dto.getLocNo());


            }


@@ -372,6 +392,22 @@


                wrkDetl.setModiUser(userId);


                if (!wrkDetlService.insert(wrkDetl)) {


                    throw new CoolException("保存工作档明细失败");


                }


                if (ioType == 107) {


                    List<InventoryCheckOrderDetl> checkOrderDetls = checkOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", checkOrderNo).eq("loc_no", dto.getLocNo()));


                    if (checkOrderDetls != null && !checkOrderDetls.isEmpty()) {


                        throw new CoolException("该库位的盘点任务已经添加到了该库位中");


                    }


                    InventoryCheckOrderDetl checkOrderDetl = new InventoryCheckOrderDetl();


                    checkOrderDetl.setOrderNo(checkOrderNo);


                    checkOrderDetl.setMatnr(detlDto.getLocDetl().getMatnr());


                    checkOrderDetl.setMaktx(detlDto.getLocDetl().getMaktx());


                    checkOrderDetl.setBatch(detlDto.getLocDetl().getBatch());


                    checkOrderDetl.setLocNo(detlDto.getLocDetl().getLocNo());


                    checkOrderDetl.setAnfme(detlDto.getLocDetl().getAnfme());


                    checkOrderDetl.setIoTime(new Date());


                    checkOrderDetl.setStatus("0");


                    checkOrderDetlService.insert(checkOrderDetl);


                }


            }


            // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中


@@ -438,15 +474,15 @@


                continue;


            }


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


            OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getBrand()


            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getBrand()


                    , locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());


            if (orderDetl == null) {


                orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), null, locDto.getBrand()


            if (orderDetlPakout == null) {


                orderDetlPakout = orderDetlPakoutService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null, locDto.getBrand()


                        , locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());




            }


            WrkDetl wrkDetl = new WrkDetl();


            wrkDetl.sync(orderDetl);


            wrkDetl.sync(orderDetlPakout);


            wrkDetl.setZpallet(wrkMast.getBarcode());


            wrkDetl.setIoTime(now);


            wrkDetl.setWrkNo(workNo);


@@ -457,6 +493,7 @@


            wrkDetl.setAppeUser(userId);


            wrkDetl.setModiTime(now);


            wrkDetl.setModiUser(userId);


            wrkDetl.setThreeCode(orderDetlPakout.getId() + "");


            if (!wrkDetlService.insert(wrkDetl)) {


                throw new CoolException("保存工作档明细失败");


            }


@@ -465,11 +502,12 @@


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


//            }


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


            OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE, orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),


                    orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),


                    orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3()


                    , locDto.getAnfme());


            OrderInAndOutUtil.updateOrder(Boolean.FALSE, orderDetl.getOrderId(), 2L, userId);


            orderDetlPakoutService.increaseWorkQtyById(orderDetlPakout.getId(), locDto.getAnfme());


//            OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE, orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),


//                    orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),


//                    orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3()


//                    ,locDto.getAnfme() );


            OrderInAndOutUtil.updateOrder(Boolean.FALSE, orderDetlPakout.getOrderId(), 2L, userId);


        }


        // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中


        locMast = locMastService.selectById(taskDto.getLocNo());


@@ -704,7 +742,7 @@


            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));


            if (locMast.getLocSts().equals("F")) {


                // 启动出库开始 107.盘点出库


                stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId);


                stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId, param.getCheckId(), null);


            } else {


                throw new CoolException("所选库位存在状态不为F的库位，库位号：" + locMast.getLocNo() + " 、当前状态：" + locMast.getLocSts() + "-" + locMast.getLocSts$());


            }


@@ -1407,7 +1445,9 @@


////                        stockOutRe(wrkMast, wrkDetls);


//            }


//        }




        if (wrkMast.getIoType() == 107) {


            checkOrderDetlService.delete(new EntityWrapper<InventoryCheckOrderDetl>().eq("loc_no", locNo));


        }


        // 取消操作人员记录


        wrkMast.setManuType("手动取消");


        wrkMast.setModiUser(userId);