拣货单出库完成，但是库存没减，日志埋点

pang.jiabao

5 天以前 d9aab59e3d4c8688eaf00c0d98f6926a218ff57f

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

@@ -3,22 +3,19 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.entity.param.ExamineParam;
import com.zy.asrs.mapper.OrderCheckMapper;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@Slf4j
@@ -40,6 +37,14 @@

    @Autowired
    private LocCheckService locCheckService;

    @Autowired
    private ManLocDetlService manLocDetlService;

    @Autowired
    private NodeService nodeService;
    @Autowired
    private OrderCheckService orderCheckService;

    @Override
    public OrderCheck selectByNo(String orderNo) {
@@ -76,8 +81,9 @@
        }
        if (complete) {
            for (OrderDetl orderDetl : orderDetls) {
                //生成单据和入库通知档时，给batch为空的明细赋了一个 =""， 现在改为null，回传用
                if (orderDetl.getBatch().equals("")){
                if (Cools.isEmpty(orderDetl.getBatch())){
                    orderDetlService.updateById(orderDetl);
                }else if (orderDetl.getBatch().equals("")){//生成单据和入库通知档时，给batch为空的明细赋了一个 =""， 现在改为null，回传用
                    orderDetl.setBatch(null);
                    orderDetlService.updateById(orderDetl);
                }
@@ -89,55 +95,55 @@

    }

    @Override
    public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
        try {
            List<DetlDto> detlDtos = new ArrayList<>();
            wrkDetls.forEach(wrkDetl -> {
                detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
            });
            String orderNo = "HAND" + snowflakeIdWorker.nextId();
            if (pakin) {
                // 生成入库单据
                OpenOrderPakinParam openParam = new OpenOrderPakinParam();
                openParam.setOrderNo(orderNo);
                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
                openParam.setOrderType("手动入库单");
                openParam.setOrderDetails(detlDtos);
                openService.pakinOrderCreate(openParam);
            } else {
                // 生成出库单据
                OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
                openParam.setOrderNo(orderNo);
                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
                openParam.setOrderType("手动出库单");
                openParam.setOrderDetails(detlDtos);
                openService.pakoutOrderCreate(openParam);
            }

            OrderCheck order = this.selectByNo(orderNo);
            if (null == order) {
                throw new CoolException("生成单据失败");
            }
            if (!this.updateSettle(order.getId(), 4L, null)) {
                throw new CoolException("修改单据状态失败");
            }
            for (DetlDto detlDto : detlDtos) {
                // 修改订单明细数量
                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
                    throw new CoolException("修改单据明细数量失败");
                }
                // 修改订单作业数量
                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
                    throw new CoolException("修改单据作业数量失败");
                }
            }
        } catch (Exception e) {
            log.error("saveHandlerOrder===>>", e);
            return false;
        }
        return true;
    }
//    @Override
//    public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
//        try {
//            List<DetlDto> detlDtos = new ArrayList<>();
//            wrkDetls.forEach(wrkDetl -> {
//                detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
//            });
//            String orderNo = "HAND" + snowflakeIdWorker.nextId();
//            if (pakin) {
//                // 生成入库单据
//                OpenOrderPakinParam openParam = new OpenOrderPakinParam();
//                openParam.setOrderNo(orderNo);
//                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
//                openParam.setOrderType("手动入库单");
//                openParam.setOrderDetails(detlDtos);
//                openService.pakinOrderCreate(openParam);
//            } else {
//                // 生成出库单据
//                OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
//                openParam.setOrderNo(orderNo);
//                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
//                openParam.setOrderType("手动出库单");
//                openParam.setOrderDetails(detlDtos);
//                openService.pakoutOrderCreate(openParam);
//            }
//
//            OrderCheck order = this.selectByNo(orderNo);
//            if (null == order) {
//                throw new CoolException("生成单据失败");
//            }
//            if (!this.updateSettle(order.getId(), 4L, null)) {
//                throw new CoolException("修改单据状态失败");
//            }
//            for (DetlDto detlDto : detlDtos) {
//                // 修改订单明细数量
//                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
//                    throw new CoolException("修改单据明细数量失败");
//                }
//                // 修改订单作业数量
//                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
//                    throw new CoolException("修改单据作业数量失败");
//                }
//            }
//        } catch (Exception e) {
//            log.error("saveHandlerOrder===>>", e);
//            return false;
//        }
//        return true;
//    }



@@ -166,9 +172,8 @@
    }

    @Override
    public List<OrderCheck> selectToBeHistoryOrder(boolean isERP) {
        int settle = isERP ? 6 : 4;
        return this.baseMapper.selectToBeHistoryOrder(settle);
    public List<OrderCheck> selectToBeHistoryOrder() {
        return this.baseMapper.selectToBeHistoryOrder();
    }

    @Override
@@ -179,5 +184,69 @@
        locCheckService.delete(new EntityWrapper<LocCheck>().eq("order_no", orderNo));
    }

    @Override
    public R examine(ExamineParam param) {
     for (ExamineParam.data list:param.getList()){
         EntityWrapper<ManLocDetl> wrapper = new EntityWrapper<>();
         wrapper.eq("matnr", list.getMatnr())
                 .eq("loc_no", list.getLocNo())
                 .eq("batch", list.getBatch());

         ManLocDetl manLocDetl = manLocDetlService.selectOne(wrapper);
         if (manLocDetl == null){
             Date now = new Date();

             Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", list.getLocNo()));

             ManLocDetl manLocDetl1 = new ManLocDetl();

             manLocDetl1.setLocNo(list.getLocNo());
             manLocDetl1.setNodeId(node.getId());
             manLocDetl1.setAnfme(list.getRealAnfme());
             manLocDetl1.setMatnr(list.getMatnr());
             manLocDetl1.setMaktx(list.getMaktx());
             manLocDetl1.setStatus(1);
             manLocDetl1.setCreateTime(now);
             manLocDetl1.setModiTime(now);
             manLocDetl1.setOrderNo(list.getOrderNo());
             manLocDetl1.setStockFreeze(1);
             manLocDetl1.setBatch(list.getBatch());

             if (!manLocDetlService.insert(manLocDetl1)){
                 return R.error("插入数据失败");
             }

         }else {
             if (list.getRealAnfme() == 0){
                 if (!manLocDetlService.delete(wrapper)){
                     return R.error("删除数据失败！");
                 }
             }else {
                 manLocDetl.setAnfme(list.getRealAnfme());
                 if (!manLocDetlService.update(manLocDetl,wrapper)){
                     return R.error("更新库存数量失败！");
                 }
             }
         }

         EntityWrapper<LocCheck> wrapper2 = new EntityWrapper<>();
         wrapper2.eq("order_no", list.getOrderNo())
                 .eq("matnr", list.getMatnr())
                 .eq("loc_no", list.getLocNo());
         LocCheck checkDetl = locCheckService.selectOne(wrapper2);
         checkDetl.setType(2);
         if (!locCheckService.update(checkDetl,wrapper2)){
             return R.error("更新盘点明细失败！");
         }
     }
        OrderCheck orderCheck = orderCheckService.selectOne(new EntityWrapper<OrderCheck>().eq("order_no", param.getOrderNo()));
        orderCheck.setSettle(4L);
        if (!orderCheckService.update(orderCheck,new EntityWrapper<OrderCheck>().eq("order_no", param.getOrderNo()))){
            return R.error("更新盘点单状态失败！");
        }

        return R.ok();
}

}