no message

skyouc

7 天以前 e046dba174365eb8934ee1e4206f09821145e876

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

@@ -2,6 +2,7 @@


import com.alibaba.fastjson.JSONObject;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

import com.baomidou.mybatisplus.extension.service.IService;

import com.zy.asrs.framework.common.R;

@@ -126,7 +127,7 @@


        //组拖通知档

        waitPakins.forEach(pakin -> {

            waitPakinService.comb(pakin);

            waitPakinService.comb(pakin, ordersParam.getInType());

        });





@@ -238,10 +239,10 @@
        orders.forEach(order -> {

            List<OrderDetl> detls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()));

            Double sum = detls.stream().mapToDouble(OrderDetl::getQty).sum();

            Double summed = detls.stream().mapToDouble(OrderDetl::getWorkQty).sum();

            Double v = Math.round((sum + summed) * 1000) / 1000.0;

//            Double summed = detls.stream().mapToDouble(OrderDetl::getWorkQty).sum();

//            Double v = Math.round((sum ) * 1000) / 1000.0;

            Double anfme = detls.stream().mapToDouble(OrderDetl::getAnfme).sum();

            if (v.compareTo(anfme) == 0.0) {

            if (sum.compareTo(anfme) == 0.0) {

                order.setOrderSettle(OrderSettleType.COMPLETE.val());

                if (!orderService.updateById(order)) {

                    throw new CoolException("单据状态修改失败！！");

@@ -421,7 +422,8 @@
    @Override

    @Transactional(rollbackFor = Exception.class)

    public boolean bindOrderBySite(Map<String, Object> param) {

        CacheSite siteNo = cacheSiteMapper.selectOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, param.get("siteNo")), false);

        CacheSite siteNo = cacheSiteMapper.selectOne(new LambdaQueryWrapper<CacheSite>()

                .eq(CacheSite::getSiteNo, param.get("siteNo")), false);

        if (Objects.isNull(siteNo)) {

            throw new CoolException("站点异常！！");

        }

@@ -429,7 +431,8 @@
            if (!StringUtil.isNullOrEmpty(siteNo.getOrderNo())) {

                throw new CoolException("当前播种站点已绑定订单！！");

            }

            Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, param.get("orderNo").toString()));

            Order order = orderService.getOne(new LambdaQueryWrapper<Order>()

                    .eq(Order::getOrderNo, param.get("orderNo").toString()));

            if (Objects.isNull(order)) {

                throw new CoolException("绑定订单不存在！！");

            }

@@ -660,7 +663,16 @@
     */

    @Override

    public R getMatsByCode(String matnr) {

        return R.ok().add(matService.list(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr)));

        QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();

        wrapper.eq("matnr", matnr).select("matnr, SUM(anfme) anfme");

        LocDetl detl = locDetlService.getOne(wrapper);



        Mat one = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, detl.getMatnr()), false);

        if (Objects.isNull(one)) {

            throw new CoolException("物料不存在！！");

        }

        one.setAnfme(detl.getAnfme());

        return R.ok().add(Arrays.asList(one));

    }



    /**