#1

lsh

19 小时以前 809f49807ce5f587fe881cfe4cc3d38d9c1a46a3

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

@@ -75,6 +75,16 @@
            }
            LocDto locDto = new LocDto(orderDetl.getManu(), orderDetl.getMatnr(), orderDetl.getMaktx(),orderDetl.getModel(),orderDetl.getSpecs(),
                    orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getBarcode(), orderDetl.getOrderNo(),orderDetl.getAnfme());
            LocDetl one = locDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch());
            if (one == null) {
                LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", locDto.getBatch()));
                if (locDetl == null) {
                    locDto.setLocNo(null);
                } else {
                    locDto.setLocNo(locDetl.getLocNo());
                }
            }

            locDto.setOrderDetlId(orderDetl.getId());
            locDto.setTkType(orderDetl.getTkType());
            locDtos.add(locDto);
@@ -145,6 +155,7 @@
            Order order = orderService.selectByNo(locDto.getOrderNo());

            DocType docType = docTypeService.selectById(order.getDocType());

            if (docType.getDocName().equals("不合格品出库")){
                staNoOrder = 212;
            }