| | |
| | | |
| | | @GetMapping("/station/list") |
| | | @ApiOperation(value = "查询我的集货站列表") |
| | | public ResponseEntity<ReturnDataDTO<List<StationStatisticDTO>>> statisticStationList(String name){ |
| | | LocalDateTime now = LocalDateTime.now(); |
| | | LocalDateTime towAm = LocalDate.now().atTime(2, 0, 0); |
| | | LocalDateTime fivePm = LocalDate.now().atTime(17, 0, 0); |
| | | public ResponseEntity<ReturnDataDTO<List<StationStatisticDTO>>> statisticStationList(String name |
| | | , String status, String date){ |
| | | /*if(StringUtils.isEmpty(date)){ |
| | | throw new ValidationException("请选择日期"); |
| | | }*/ |
| | | LocalDateTime startDate; |
| | | LocalDateTime endDate; |
| | | if(now.isAfter(towAm)){ |
| | | startDate = fivePm.plusDays(-1); |
| | | endDate = fivePm; |
| | | LocalDate localDate = deliveryOrderService.parseLocalDate(date); |
| | | if(localDate != null){ |
| | | endDate = localDate.atTime(17, 0, 0); |
| | | startDate = endDate.plusDays(-1); |
| | | } else { |
| | | startDate = fivePm.plusDays(-2); |
| | | endDate = fivePm.plusDays(-1); |
| | | LocalDateTime now = LocalDateTime.now(); |
| | | LocalDateTime towAm = LocalDate.now().atTime(2, 0, 0); |
| | | LocalDateTime fivePm = LocalDate.now().atTime(17, 0, 0); |
| | | if(now.isAfter(towAm)){ |
| | | startDate = fivePm.plusDays(-1); |
| | | endDate = fivePm; |
| | | } else { |
| | | startDate = fivePm.plusDays(-2); |
| | | endDate = fivePm.plusDays(-1); |
| | | } |
| | | } |
| | | return returnData(R.SUCCESS.getCode(), deliveryOrderService.statisticStationList(name,startDate,endDate)); |
| | | |
| | | return returnData(R.SUCCESS.getCode(), deliveryOrderService.statisticStationList(name, startDate, endDate, status)); |
| | | } |
| | | |
| | | |
| | |
| | | }) |
| | | public ResponseEntity<ReturnDataDTO<DeliveryOrderItemDTO>> getDeliveryOrderItem(String id){ |
| | | return returnData(R.SUCCESS.getCode(), deliveryOrderService.getDeliveryOrderItem(id)); |
| | | } |
| | | |
| | | @PostMapping("/list/items/views") |
| | | @ApiOperation(value = "获取商品详情列表") |
| | | public ResponseEntity<ReturnDataDTO<List<DeliveryOrderItemDTO>>> getDeliveryOrderItem(@RequestBody PostQueryDTO dto){ |
| | | return returnData(R.SUCCESS.getCode(), deliveryOrderService.getDeliveryOrderItems(dto)); |
| | | } |
| | | |
| | | //////////////////////////////////////////////////////////新接口 |
| | |
| | | @ApiOperation(value = "补货操作详情") |
| | | public ResponseEntity<ReturnDataDTO<OrderItemCheckNumDTO>> getReplaceCheck(String orderItemId){ |
| | | return returnData(R.SUCCESS.getCode(), deliveryOrderService.getOtherCheck(orderItemId |
| | | , Constants.CHECK_TYPE.replace.name())); |
| | | , Constants.CHECK_TYPE.replace.name(), false)); |
| | | } |
| | | |
| | | @GetMapping("/check/info/lack") |
| | | @ApiOperation(value = "缺货操作详情") |
| | | public ResponseEntity<ReturnDataDTO<OrderItemCheckNumDTO>> getLackCheck(String orderItemId){ |
| | | return returnData(R.SUCCESS.getCode(), deliveryOrderService.getOtherCheck(orderItemId |
| | | , Constants.CHECK_TYPE.lack.name())); |
| | | , Constants.CHECK_TYPE.lack.name(), false)); |
| | | } |
| | | |
| | | @PostMapping("/check/info/do/reduce") |
| | |
| | | @ApiOperation(value = "补货操作") |
| | | public ResponseEntity<ReturnDataDTO> doReplaceCheck(@RequestBody OrderItemCheckCommitDTO dto) { |
| | | dto.setType(Constants.CHECK_TYPE.replace.name()); |
| | | deliveryOrderService.doCheck(dto, null, null, null); |
| | | deliveryOrderService.doCheck(dto, null, null); |
| | | String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId()); |
| | | deliveryOrderService.checkOrderStatus(orderId); |
| | | return returnData(R.SUCCESS.getCode(), null); |
| | |
| | | @ApiOperation(value = "缺货操作") |
| | | public ResponseEntity<ReturnDataDTO> doLackCheck(@RequestBody OrderItemCheckCommitDTO dto) { |
| | | dto.setType(Constants.CHECK_TYPE.lack.name()); |
| | | deliveryOrderService.doCheck(dto, null, null, null); |
| | | deliveryOrderService.doCheck(dto, null, null); |
| | | String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId()); |
| | | deliveryOrderService.checkOrderStatus(orderId); |
| | | return returnData(R.SUCCESS.getCode(), null); |