ERP_override.git

			@@ -15,6 +15,7 @@
			import com.example.erp.exception.ServiceException;
			import com.example.erp.service.sd.DeliveryService;
			import com.example.erp.tools.DownExcel;
			import com.fasterxml.jackson.core.JsonProcessingException;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -28,7 +29,7 @@

			@RestController
			@Api(value="发货controller",tags={"发货操作接口"})
			@RequestMapping("/Delivery")
			@RequestMapping("/delivery")
			public class DeliveryController {
			@Autowired
			DeliveryService deliveryService;
			@@ -38,7 +39,7 @@
			@ApiOperation("发货订单查询接口")
			@SaCheckPermission("selectDelivery.search")
			@PostMapping("/getSelectShippingOrder/{pageNum}/{pageSize}/{selectDate}")
			public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Delivery delivery){
			public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Delivery delivery) throws JsonProcessingException {
			return Result.seccess(deliveryService.getSelectShippingOrder(pageNum,pageSize,selectDate,delivery));
			}

			@@ -104,15 +105,15 @@
			@ApiOperation("发货订单查询接口")
			@SaCheckPermission("selectDelivery.search")
			@PostMapping("/getSelectDeliveryPrinting")
			public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail) throws IllegalAccessException {
			return Result.seccess(deliveryService.getSelectDeliveryPrinting(deliveryDetail));
			public Result getSelectDeliveryPrinting( @RequestBody Map<String,Object> object) throws IllegalAccessException {
			return Result.seccess(deliveryService.getSelectDeliveryPrinting(object));
			}

			@ApiOperation("订单发货订单查询接口")
			@SaCheckPermission("selectDelivery.search")
			@PostMapping("/getSelectOrderPrinting")
			public Result getSelectOrderPrinting( @RequestBody OrderDetail orderDetail){
			return Result.seccess(deliveryService.getSelectOrderPrinting(orderDetail));
			@PostMapping("/getSelectOrderPrinting/{selectedValues}")
			public Result getSelectOrderPrinting(@PathVariable List<String> selectedValues, @RequestBody OrderDetail orderDetail){
			return Result.seccess(deliveryService.getSelectOrderPrinting(orderDetail,selectedValues));
			}

			@ApiOperation("发货明细报表")
			@@ -129,6 +130,12 @@
			DownExcel.download(response, DeliveryDetailProductDTO.class, deliveryService.exportDeliveryDetailProductReport(dates),"orderReport");
			}

			@ApiOperation("发货单打印计数")
			@PostMapping ("/updateDeliveryPrintNumber/{deliveryId}")
			public Result updateDeliveryPrintNumber(@PathVariable String deliveryId) {

			return Result.seccess(deliveryService.updateDeliveryPrintNumber(deliveryId));
			}