From b864a88a6d34cbed2cfaad7f5e843ea1330c9c91 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 七月 2024 10:31:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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
index 68f0d69..ba7aa77 100644
--- 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
@@ -3,6 +3,7 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
+import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.Rework;
import com.example.erp.entity.sd.Delivery;
import com.example.erp.entity.sd.OrderDetail;
@@ -13,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.sql.Date;
import java.util.List;
import java.util.Map;
@@ -46,27 +48,24 @@
@SaCheckPermission("AddRework.add")
@PostMapping("/saveRework")
public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
- if(reworkService.saveRework(object)){
-
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"杩斿伐澶辫触");
-
- }
+ return Result.seccess(reworkService.saveRework(object));
}
@ApiOperation("杩斿伐瀹℃牳鎺ュ彛")
@SaCheckPermission("SelectRework.review")
@PostMapping("/updateRework")
public Result updateRework( @RequestBody Map<String,Object> object){
- if(reworkService.updateRework(object)){
+ return Result.seccess(reworkService.updateRework(object));
+ }
- return Result.seccess();
+ @ApiOperation("杩斿伐娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @SaCheckPermission("PrintFlowCard.search")
+ @PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
+ public Result selectPrint(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(reworkService.selectPrintSv(selectTime1,selectTime2, flowCard));
- }else {
- throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
-
- }
}
}
--
Gitblit v1.8.0