diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index 454bce8..596078a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -116,8 +116,6 @@ public class OrderController { @AuthRuleAnnotation("") @GetMapping("udiwms/inout/order/error") public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) { -// orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_FAIL); -// orderFilterRequest.setStatusOrOne(ConstantStatus.ORDER_STATUS_TEMP_SAVE); CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId())); if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success(); @@ -130,7 +128,6 @@ public class OrderController { } orderFilterRequest.setCustomerId(null); -// List orderEntityList = orderService.filterListOr(orderFilterRequest); List orderEntityList = orderService.filterList(orderFilterRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(orderEntityList); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java index 761eabc..3d24ec3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/OrderService.java @@ -120,4 +120,5 @@ public interface OrderService { * @param responseList */ void queryInvName(List responseList); + } diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index 7a89185..29c3ae9 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -286,7 +286,10 @@