1

zhang

9 天以前 9afe7ca53c38f2aa1010c2ac2a778012d133160f

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

@@ -49,13 +49,24 @@
    private TagService tagService;
    @Autowired
    private TagMapper tagMapper;
    @Autowired
    private OrderDetlPakoutServiceImpl orderDetlPakoutService;
    @Autowired
    private OrderPakoutServiceImpl orderPakoutService;
    @Autowired
    private OrderPakinServiceImpl orderPakinService;

    @Override
    @Transactional
    public void pakinOrderCreate(OpenOrderPakinParam param) {
        OrderPakin orderPakin = orderPakinService.selectByNo(param.getOrderNo());
        Order order = orderService.selectByNo(param.getOrderNo());
        if (!Cools.isEmpty(order)) {
            throw new CoolException(param.getOrderNo() + "单据已存在，请勿重复提交");
        if (!Cools.isEmpty(orderPakin)) {
            if (orderPakin.getSettle() > 1L) {
                throw new CoolException(param.getOrderNo() + "单据已存在，请勿重复提交");
            }
            orderPakinService.remove(orderPakin.getId());
            orderService.remove(order.getId());
        }
        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
        Date now = new Date();
@@ -219,10 +230,11 @@
        // 如果单据不存在则添加；如果单据存在，作业中无法修改，反之则修改单据
        if (!Cools.isEmpty(order)) {
            if (order.getSettle() > 1L) {
                //TODO
                //throw new CoolException(param.getOrderNo() + "正在出库，无法修改单据");
                throw new CoolException(param.getOrderNo() + "正在出库，无法修改单据");
            }
            orderService.remove(order.getId());
            OrderPakout orderPakout = orderPakoutService.selectByNo(param.getOrderNo());
            orderPakoutService.remove(orderPakout.getId());
        }
        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
        Date now = new Date();