#

zjj

7 天以前 aa95589f3b49e10a72b2200a865c46b8077a4204

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

@@ -528,8 +528,12 @@
//        wrkMastLogEntityWrapper.isNotNull("sheet_no");
        wrkMastLogService.selectList(wrkMastLogEntityWrapper).forEach(wrkMastLog -> {
            if (wrkMastLog.getWrkSts() == 5 || wrkMastLog.getWrkSts() == 15) {
                List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>()
                        .eq("wrk_no", wrkMastLog.getWrkNo()).eq("zpallet", wrkMastLog.getBarcode()));
                EntityWrapper<WrkDetlLog> wrkDetlLogEntityWrapper = new EntityWrapper<>();
                wrkDetlLogEntityWrapper.eq("wrk_no", wrkMastLog.getWrkNo());
                if (wrkMastLog.getIoType() != 300 && wrkMastLog.getIoType() != 301){
                    wrkDetlLogEntityWrapper.eq("zpallet", wrkMastLog.getBarcode());
                }
                List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(wrkDetlLogEntityWrapper);
                wrkDetlLogs.forEach(wrkDetlLog -> {
                    if (wrkDetlLog.getOrderNo() != null && !wrkDetlLog.getOrderNo().isEmpty()) {
                        LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
@@ -719,4 +723,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));
    }
}