出入库流程功能优化

skyouc

2 天以前 7215f3607ef81440be5f38cfeda4f11682ab1fe2

 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
@@ -13,6 +14,7 @@
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.CodeRes;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.DetlDto;
import com.zy.common.model.MesPakinParam;
@@ -56,6 +58,10 @@
    @Autowired
    private OrderDetlPakinService orderDetlPakinService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private MatService matService;


@@ -67,7 +73,7 @@
        }

        Order order1 = OrderInAndOutUtil.selectByNo(order.getPakinPakoutStatus$(), order.getOrderNo());
        if (!Cools.isEmpty(order1)){
        if (!Cools.isEmpty(order1)) {
            return FAIL.setMsg("请等待...订单执行档案正在转历史档案！！！");
        }
        List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
@@ -77,12 +83,12 @@

        // 单据明细档
        List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
        for (OrderDetl orderDetl : orderDetlList){
            if (orderDetl.getQty().equals(0D)){
        for (OrderDetl orderDetl : orderDetlList) {
            if (orderDetl.getQty().equals(0D)) {
                continue;
            }
            orderDetl.setWorkQty(orderDetl.getQty());
            orderDetl.setAnfme(orderDetl.getAnfme()-orderDetl.getQty());
            orderDetl.setAnfme(orderDetl.getAnfme() - orderDetl.getQty());
            orderDetl.setQty(0D);
            orderDetlService.updateById(orderDetl);
        }
@@ -96,6 +102,7 @@

    /**
     * 上报单据转执行单据
     *
     * @author Ryan
     * @date 2026/1/5 14:07
     */
@@ -109,44 +116,51 @@
        //设置为单据执行中
        order.setSettle(2L);

        OrderInAndOutUtil.insertOrder(order.getPakinPakoutStatus$(),order);
        OrderInAndOutUtil.insertOrder(order.getPakinPakoutStatus$(), order);
        // 单据明细档
        List<DetlDto> list = new ArrayList<>();
        List<OrderDetl> orderDetlList = new ArrayList<>();

        for (OrderDetl detail : orderDetls) {
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),
                    detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(),
                    detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
            if (DetlDto.has(list, dto)) {
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
                assert detlDto != null;
                detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());

                OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
                OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
                assert orderDetl != null;
                orderDetl.setAnfme(orderDetl.getAnfme() + detail.getAnfme());
            } else {
                list.add(dto);

                orderDetlList.add(detail);
            }
        }
        for (OrderDetl orderDetl : orderDetlList){
        for (OrderDetl orderDetl : orderDetlList) {
            orderDetl.setWorkQty(0D);
            OrderInAndOutUtil.insertOrderDetl(order.getPakinPakoutStatus$(),order,orderDetl);
            OrderInAndOutUtil.insertOrderDetl(order.getPakinPakoutStatus$(), order, orderDetl);
        }
        OrderPakin pakinOrder = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", order.getOrderNo()));
            if (Objects.isNull(pakinOrder)){
                return FAIL.setMsg("入库单据不存在！！！");
            }
        if (Objects.isNull(pakinOrder)) {
            return FAIL.setMsg("入库单据不存在！！！");
        }
        //如果为入库单 PakinPakoutStatus = 1，单据生成完毕后，生成入库组托档。
        if (pakinOrder.getPakinPakoutStatus().equals(1)){
        if (pakinOrder.getPakinPakoutStatus().equals(1)) {
            List<OrderDetlPakin> pakinOrderDetls = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_id", pakinOrder.getId()));
            if (!Objects.isNull(pakinOrderDetls) && !pakinOrderDetls.isEmpty()) {
                pakinOrderDetls.forEach(orderDetl -> {
                    int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",orderDetl.getBarcode()));
                    int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",orderDetl.getBarcode()));
                    int coutPakin = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", orderDetl.getBarcode()));
                    if (countLoc > 0 || countWrk > 0 || coutPakin > 0) {
                         throw new CoolException(CodeRes.EXIST_500);
                    }
                    WaitPakin waitPakin = new WaitPakin();
                    BeanUtils.copyProperties(orderDetl, waitPakin);
                    Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", orderDetl.getMatnr()));
                    if (Objects.isNull(matnr)){
                    if (Objects.isNull(matnr)) {
                        throw new CoolException(orderDetl.getMatnr() + "商品档案不存在");
                    }
                    if (!Objects.isNull(orderDetl.getBarcode()) && !orderDetl.getBarcode().isEmpty()) {
@@ -155,7 +169,10 @@
                    }
                    waitPakin.setOrderId(pakinOrder.getId());
                    waitPakin.setAnfme(orderDetl.getAnfme());
                    waitPakin.setUnit(orderDetl.getUnit());
                    waitPakin.setOrderNo(pakinOrder.getOrderNo());
                    waitPakin.setVolume(orderDetl.getVolume());
                    waitPakin.setSafeQty(orderDetl.getSafeQty());
                    waitPakin.setIoStatus("N");
                    waitPakin.setStatus("Y");
                    waitPakin.setAppeTime(new Date());
@@ -182,32 +199,32 @@
            return SUCCESS;
        }
        Order orderSou = orderService.selectByNo(order.getOrderNo());
        if (!orderSou.getSettle().equals(2L)){
        if (!orderSou.getSettle().equals(2L)) {
            return FAIL.setMsg("订单状态不正确，请联系管理员");
        }
        List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(orderSou.getId());

        List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());

        for (OrderDetl orderDetlSou : orderDetlList){
            for (OrderDetl orderDetl : orderDetls){
                if (orderDetl.getQty().equals(0D)){
        for (OrderDetl orderDetlSou : orderDetlList) {
            for (OrderDetl orderDetl : orderDetls) {
                if (orderDetl.getQty().equals(0D)) {
                    continue;
                }
                if (orderDetlSou.beSimilar(orderDetl)){
                if (orderDetlSou.beSimilar(orderDetl)) {
                    double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
                    if (v<orderDetl.getQty() || orderDetl.getQty().equals(v)){
                    if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
                        orderDetlSou.setQty(orderDetlSou.getAnfme());
                        orderDetl.setQty(orderDetl.getQty() - v);
                        break;
                    } else {
                        orderDetlSou.setQty(orderDetlSou.getQty()+orderDetl.getQty());
                        orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
                        orderDetl.setQty(0D);
                    }
                }
            }
        }
        for (OrderDetl orderDetlSou : orderDetlList){
        for (OrderDetl orderDetlSou : orderDetlList) {
            orderDetlService.updateById(orderDetlSou);
        }
        // 修改订单状态 2.作业中 ===>> 4.待上报
@@ -215,9 +232,10 @@
            throw new CoolException("服务器内部错误，请联系管理员");
        }
        // 修改订单状态 4.完成 ===>> 6.结束
        OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
        OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
        return SUCCESS;
    }

    @Transactional
    public ReturnT<String> startOrderReport(Order order) {
        DocType docType = docTypeService.selectById(order.getDocType());
@@ -233,7 +251,7 @@
            pakinParam.setLgortFrom("5008");
            pakinParam.setLgortTo("5006");
            for (OrderDetl orderDetl : orderDetls) {
                if (!orderDetl.getQty().equals(orderDetl.getAnfme())){
                if (!orderDetl.getQty().equals(orderDetl.getAnfme())) {
                    settle = 99L;//二次生成单据
                }
                String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
@@ -258,7 +276,7 @@
                        throw new CoolException("服务器内部错误，请联系管理员");
                    }
                } else {
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL + MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
                    throw new CoolException("上报mes系统失败");
                }
            } catch (Exception e) {
@@ -277,7 +295,9 @@
                            response,
                            success
                    );
                } catch (Exception e) { log.error("", e); }
                } catch (Exception e) {
                    log.error("", e);
                }
            }
        }
        // 出库完成上报
@@ -292,7 +312,7 @@
            }
            pakoutParam.setOrderNo(order.getOrderNo());
            for (OrderDetl orderDetl : orderDetls) {
                if (!orderDetl.getQty().equals(orderDetl.getAnfme())){
                if (!orderDetl.getQty().equals(orderDetl.getAnfme())) {
                    settle = 99L;//二次生成单据
                }
                String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
@@ -316,7 +336,7 @@
                        throw new CoolException("服务器内部错误，请联系管理员");
                    }
                } else {
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL + MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
                    throw new CoolException("上报mes系统失败");
                }
            } catch (Exception e) {
@@ -335,7 +355,9 @@
                            response,
                            success
                    );
                } catch (Exception e) { log.error("", e); }
                } catch (Exception e) {
                    log.error("", e);
                }
            }
        }
        return SUCCESS;