From b1c49ce18f24c7cf89c2b938f2737dba611d30ee Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 15 八月 2024 15:43:54 +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/ReplenishController.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
index 9e3605a..a248dda 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.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.PatchLog;
import com.example.erp.entity.pp.Rework;
import com.example.erp.exception.ServiceException;
@@ -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,40 @@
@SaCheckPermission("AddReplenish.add")
@PostMapping("/saveReplenish")
public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
- if(replenishService.saveReplenish(object)){
-
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"琛ョ墖澶辫触");
-
- }
+ return Result.seccess(replenishService.saveReplenish(object));
}
@ApiOperation("琛ョ墖瀹℃牳鎺ュ彛")
@SaCheckPermission("SelectReplenish.review")
@PostMapping("/updateReplenish")
public Result updateReplenish( @RequestBody Map<String,Object> object){
- if(replenishService.updateReplenish(object)){
-
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
-
- }
+ return Result.seccess(replenishService.updateReplenish(object));
}
+
+ @ApiOperation("琛ョ墖娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @SaCheckPermission("PrintFlowCard.search")
+ @PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
+ public Result selectPrint(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(replenishService.selectPrintSv(selectTime1,selectTime2, flowCard));
+
+ }
+
+ @ApiOperation("琛ョ墖鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
+ public Result getSelectPrintCustomLabel( @PathVariable String type,
+ @PathVariable Integer lableType,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(replenishService.getSelectPrintCustomLabelSv(type,lableType,object));
+
+ }
+
+// @ApiOperation("琛ョ墖鍒犻櫎鎺ュ彛")
+// @SaCheckPermission("SelectReplenish.review")
+// @PostMapping("/deleteReplenish")
+// public Result deleteReplenish( @RequestBody Map<String,Object> object){
+// return Result.seccess(replenishService.deleteReplenishSv(object));
+// }
}
--
Gitblit v1.8.0