#

Junjie

2025-07-16 071ba2cac8a040786340271226e43e13ad18440b

#

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -35,6 +35,8 @@
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private LocDetlService locDetlService;
@@ -445,4 +447,58 @@
        return R.ok();
    }

    @GetMapping("/order/logTransferDBDD/{orderNo}")
    @Transactional
    public R logTransferDBDD(@PathVariable("orderNo")  String orderNo) {
        Order orderSou = orderService.selectByNo(orderNo);
        if (!orderSou.getSettle().equals(2L)) {
            return R.error("订单状态不正确，请联系管理员");
        }

        List<OrderDetl> old = orderDetlService.selectByOrderId(orderSou.getId());
        if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", orderNo))) {
            throw new CoolException("重整出库订单【orderNo = " + orderNo + "】明细失败");
        }
        List<WrkDetlLog> wrkDetls = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
                .eq("order_no", orderNo));
        for (WrkDetlLog wrkDetlLog : wrkDetls) {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(wrkDetlLog);

            OrderDetl orderDetl = new OrderDetl();
            orderDetl.sync(wrkDetl);
            orderDetl.setQty(wrkDetl.getAnfme());
            orderDetl.setOrderId(orderSou.getId());
            orderDetl.setOrderNo(orderSou.getOrderNo());
            orderDetl.setStatus(1);
            orderDetl.setCreateTime(orderSou.getCreateTime());
            orderDetl.setCreateBy(orderSou.getCreateBy());
            orderDetl.setUpdateTime(orderSou.getUpdateTime());
            orderDetl.setUpdateBy(orderSou.getUpdateBy());
            orderDetl.setId(null);
            //先按照批次匹配，再按照无批次号批次，因为销售发货，批次号可能带，有可能不携带，所以就会有问题；而且考虑到一条订单里如果相同物料，一条带批次，一条不带批次，情况
            for (OrderDetl xxx : old) {
                if (xxx.beSimilar(wrkDetl)) {
                    orderDetl.setRemark(xxx.getRemark());
                }
            }
            if (Cools.isEmpty(orderDetl.getRemark())) {
                for (OrderDetl xxx : old) {
                    if (xxx.beSimilarByWrkDetl(wrkDetl)) {
                        orderDetl.setRemark(xxx.getRemark());
                    }
                }
            }
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("重整出库订单【orderNo = " + orderNo + "】明细失败");
            }
        }

        // 修改订单状态 2.作业中 ===>> 4.待上报
        if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
            throw new CoolException("服务器内部错误，请联系管理员");
        }
        return R.ok();
    }

}