#

whycq

2022-06-27 7500ea270ab631379feced83e94b387d1885fb49

#

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

@@ -418,11 +418,15 @@
        BasDevp sta = basDevpService.checkSiteStatus(staNo);
        //根据订单号生成出库任务工作档
        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
        if (order.getSettle() != 1 && order.getSettle() != 2){
            throw new CoolException("该订单已处理");
        }

        List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
        Date now = new Date();
        for(OrderDetl orderDetl : orderDetls){
            //查询所有库位状态为F的库位信息
            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),null);
            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null);
            if (locDetls.size() == 0) {
                throw new CoolException("库存中没有该物料");
            }
@@ -453,7 +457,7 @@
                order.setSettle(2L);
                order.setUpdateBy(userId);
                order.setUpdateTime(now);
                if(orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))){
                if(!orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))){
                    throw new CoolException("更新订单状态失败");
                }
                orderDetl.setWorkQty(orderDetl.getWorkQty() + curOutQty);
@@ -464,7 +468,7 @@
                if(!Cools.isEmpty(orderDetl.getBatch())){
                    wrapper.eq("batch", orderDetl.getBatch());
                }
                if(orderDetlService.update(orderDetl, wrapper)){
                if(!orderDetlService.update(orderDetl, wrapper)){
                    throw new CoolException("更新订单明细失败");
                }
            }

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

@@ -784,6 +784,18 @@
            }
        }

        if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103) {
//            OrderDetl orderDetl = orderDetlService.selectItem()
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            for (WrkDetl wrkDetl : wrkDetls) {
                if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                    if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
                        throw new CoolException("订单数据回滚失败");
                    }
                }
            }
        }

//        // 订单关联
//        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
//        for (WrkDetl wrkDetl : wrkDetls) {

 src/main/resources/mapper/LocDetlMapper.xml

@@ -214,7 +214,7 @@
            and a.batch = #{batch}
        </if>
        <if test="orderNo != null and orderNo != ''">
            and a.orderNo = #{orderNo}
            and a.order_no = #{orderNo}
        </if>

        <if test="locNos != null and locNos.size > 0">
@@ -314,7 +314,7 @@
    </select>

    <select id="selectLocDetlSumQty" resultType="double">
        select SUM(qty) qty
        select SUM(anfme) anfme
        from asr_loc_detl
        where loc_no=#{locNo}
    </select>