Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

zjj

2024-12-26 a484168b903a919b24d65a5d95dea88a04d8f34c

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

@@ -147,6 +147,10 @@
            orderDetl.setManu(detlDto.getMark());
            orderDetl.setSupp(detlDto.getSuppName()); //供应商
            orderDetl.setSku(detlDto.getCustomer());
            orderDetl.setTemp1(detlDto.getTemp1());
            orderDetl.setTemp2(detlDto.getTemp2());
            orderDetl.setTemp3(detlDto.getTemp3());
            orderDetl.setTemp4(detlDto.getTemp4());
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
@@ -289,6 +293,10 @@
            orderDetl.setManu(detlDto.getMark());
            orderDetl.setSupp(detlDto.getSuppName());
            orderDetl.setSku(detlDto.getCustomer());
            orderDetl.setTemp1(detlDto.getTemp1());
            orderDetl.setTemp2(detlDto.getTemp2());
            orderDetl.setTemp3(detlDto.getTemp3());
            orderDetl.setTemp4(detlDto.getTemp4());
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
@@ -711,4 +719,20 @@
            }
        });
    }
    @Transactional
    @Override
    public void orderDelete(String orderNo) {
        Order order = orderService.selectByNo(orderNo);
        if (order == null) {
            throw new CoolException("未查询到对应订单信息");
        }
        if (order.getSettle() != 1){
            throw new CoolException("该订单已有对应任务，禁止删除");
        }
        List<OrderDetl> OrderDetl = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
        if (!Cools.isEmpty(OrderDetl)) {
            orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
        }
        orderService.delete(new EntityWrapper<Order>().eq("order_no", orderNo));
    }
}