From a97c0e84c8d1f50aa65935643a580527f30b7ece Mon Sep 17 00:00:00 2001 From: 廖井涛 <2265517004@qq.com> Date: 星期二, 12 三月 2024 08:39:38 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override --- north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java | 65 ++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java new file mode 100644 index 0000000..800bab9 --- /dev/null +++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java @@ -0,0 +1,65 @@ +package com.example.erp.controller.pp; + +import com.example.erp.common.Constants; +import com.example.erp.common.Result; +import com.example.erp.entity.pp.Rework; +import com.example.erp.entity.sd.Delivery; +import com.example.erp.entity.sd.OrderDetail; +import com.example.erp.exception.ServiceException; +import com.example.erp.service.pp.ReworkService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/rework") +public class ReworkController { + + @Autowired + ReworkService reworkService; + + + + /*鍙戣揣璁㈠崟鏌ヨ*/ + @ApiOperation("鍙繑宸ユ暟鎹煡璇㈡帴鍙�") + @PostMapping("/getSelectRework/{pageNum}/{pageSize}") + public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){ + return Result.seccess(reworkService.getSelectRework(pageNum,pageSize)); + } + + @ApiOperation("杩斿伐鏁版嵁鏌ヨ鎺ュ彛") + @PostMapping("/SelectRework/{pageNum}/{pageSize}/{selectDate}") + public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody Rework rework){ + return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework)); + } + + + @ApiOperation("杩斿伐鎺ュ彛") + @PostMapping("/saveRework") + public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){ + if(reworkService.saveRework(object)){ + + return Result.seccess(); + + }else { + throw new ServiceException(Constants.Code_500,"杩斿伐澶辫触"); + + } + } + + @ApiOperation("杩斿伐瀹℃牳鎺ュ彛") + @PostMapping("/updateRework") + public Result updateRework( @RequestBody Map<String,Object> object){ + if(reworkService.updateRework(object)){ + + return Result.seccess(); + + }else { + throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触"); + + } + } +} -- Gitblit v1.8.0