对接

zhang

2 天以前 1236197ab939a618b82b9e9ea6fddf94b8740b58

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

@@ -80,7 +80,12 @@
            boolean orderNo1 = orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", param.getOrderNo()));

        }
        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
        DocType docType;
        if (param.getOrderType().equals("调拨单")){
             docType = docTypeService.selectOrAdd("调拨单(入)", Boolean.TRUE);
        }else {
             docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
        }
        Date now = new Date();
        // 单据主档
        order = new Order(
@@ -119,7 +124,7 @@
                now,    // 修改时间
                null    // 备注
        );
        order.setShipCode(String.valueOf(param.getDetails().get(0).getQuality()));
        //order.setShipCode(String.valueOf(param.getDetails().get(0).getQuality()));
        if (!orderService.insert(order)) {
            throw new CoolException("生成单据主档失败，请联系管理员");
        }
@@ -129,6 +134,7 @@
        for (DetlDto detail : orderDetails) {
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
                    , detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
            dto.setQuality(detail.getQuality());
            if (DetlDto.has(list, dto)) {
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                assert detlDto != null;
@@ -164,6 +170,7 @@
            orderDetl.setTemp2(detlDto.getTemp2());
            orderDetl.setTemp3(detlDto.getTemp3());
            orderDetl.setTemp4(detlDto.getTemp4());
            orderDetl.setInspect(detlDto.getQuality());
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
@@ -229,7 +236,12 @@
            }
            orderService.remove(order.getId());
        }
        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
        DocType docType;
        if (param.getOrderType().equals("调拨单")){
            docType = docTypeService.selectOrAdd("调拨单(出)", Boolean.FALSE);
        }else {
            docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
        }
        Date now = new Date();
        // 单据主档
        order = new Order(
@@ -276,7 +288,7 @@
        List<DetlDto> list = new ArrayList<>();
        List<DetlDto> orderDetails = param.getDetails();
        for (DetlDto detail : orderDetails) {
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),param.getFromOrderNo()
                    , detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
            dto.setTemp1(param.getQuality());
            if (DetlDto.has(list, dto)) {