From 452d10d439e356d6bd618f0d09092af5c783f8f6 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期四, 24 八月 2023 10:47:41 +0800
Subject: [PATCH] 新增设置最大流水号
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java | 63 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
index fef60d8..5aaed90 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
@@ -3,12 +3,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.CodeBasicSecDTO;
+import com.vci.ubcs.code.dto.CodeOrderDTO;
+import com.vci.ubcs.code.dto.CodeRuleDTO;
import com.vci.ubcs.code.entity.CodeBasicSec;
import com.vci.ubcs.code.service.ICodeBasicSecService;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.code.wrapper.CodeBasicSecWrapper;
-import com.vci.ubcs.com.vci.starter.exception.VciBaseException;
-import com.vci.ubcs.com.vci.starter.web.util.VciBaseUtil;
+import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springblade.core.mp.support.Condition;
@@ -40,27 +44,16 @@
@Autowired
private ICodeBasicSecService codeBasicSecService;
- /**
- * 缂栫爜瑙勫垯 鍒嗛〉
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 1)
- @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆codeRuleVO")
- public R<IPage<CodeBasicSecVO>> list(CodeBasicSec codeBasicSec, Query query) {
- IPage<CodeBasicSec> pages = codeBasicSecService.page(Condition.getPage(query), Condition.getQueryWrapper(codeBasicSec));
- return R.data(CodeBasicSecWrapper.build().pageVO(pages));
- }
-
/**
* 鐮佹鍩虹淇℃伅鍒楄〃
- * @param codeBasicSecVO 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param bladeQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
*/
@GetMapping("/gridCodeBasicSec")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉 鐮佹鍩虹淇℃伅鍒楄〃", notes = "浼犲叆codeRuleVO")
- public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(CodeBasicSecVO codeBasicSecVO, Query query){
- IPage<CodeBasicSecVO> codeRuleVOIPage = codeBasicSecService.gridCodeBasicSec(Condition.getPage(query.setAscs("ordernum")),codeBasicSecVO);
+ public R<IPage<CodeBasicSecVO>> gridCodeBasicSec(BladeQueryObject bladeQueryObject) throws Exception{
+ IPage<CodeBasicSecVO> codeRuleVOIPage = codeBasicSecService.gridCodeBasicSec(bladeQueryObject.getQuery().setAscs("ordernum"),bladeQueryObject.getConditionMap());
return R.data(codeRuleVOIPage);
}
@@ -72,7 +65,7 @@
@PostMapping( "/addSave")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "澧炲姞 鐮佹鍩虹淇℃伅", notes = "codeBasicSecDTO")
- public R addSave(@RequestBody CodeBasicSecDTO codeBasicSecDTO){
+ public R addSave(@Valid @RequestBody CodeBasicSecDTO codeBasicSecDTO){
boolean resBoolean;
try {
resBoolean = codeBasicSecService.addSave(codeBasicSecDTO);
@@ -139,26 +132,26 @@
/**
* 鍙傜収鐮佹鍩虹淇℃伅鍒楄〃
- * @param codeBasicSecVO 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param bladeQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
*/
@GetMapping("/refDataGrid")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "鍙傜収鐮佹鍩虹淇℃伅鍒楄〃", notes = "codeBasicSecVO")
- public R<IPage<CodeBasicSecVO>> refDataGridCodeBasicSec(CodeBasicSecVO codeBasicSecVO, Query query){
- return R.data(codeBasicSecService.refDataGridCodeBasicSec(Condition.getPage(query),codeBasicSecVO));
+ public R<IPage<CodeBasicSecVO>> refDataGridCodeBasicSec(BladeQueryObject bladeQueryObject){
+ return R.data(codeBasicSecService.refDataGridCodeBasicSec(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap()));
}
/**
* 鍙傛暟鍒嗙被鐮佹鍩虹淇℃伅鍒楄〃
- * @param codeBasicSecVO 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑锛屽繀椤昏鏈夌紪鐮佽鍒欑殑涓婚敭 pkCodeRule
+ * @param bladeQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑锛屽繀椤昏鏈夌紪鐮佽鍒欑殑涓婚敭 pkCodeRule
* @return 鐮佹鐨勪俊鎭�
*/
@GetMapping("/refDataGridClassifySec")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "鍙傛暟鍒嗙被鐮佹鍩虹淇℃伅鍒楄〃", notes = "codeBasicSecVO")
- public R<IPage<CodeBasicSecVO>> refDataGridClassifySec(CodeBasicSecVO codeBasicSecVO, Query query){
- return R.data(codeBasicSecService.refDataGridClassifySec(Condition.getPage(query), codeBasicSecVO));
+ public R<IPage<CodeBasicSecVO>> refDataGridClassifySec(BladeQueryObject bladeQueryObject){
+ return R.data(codeBasicSecService.refDataGridClassifySec(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap()));
}
/**
@@ -215,4 +208,28 @@
return R.status(codeBasicSecService.downOrderNum(oid));
}
+ /**
+ * 鏌ヨ缂栫爜瑙勫垯鐨勬墍鏈夋祦姘翠緷璧栫殑鐮佹
+ * @param ruleOid 缂栫爜瑙勫垯涓婚敭
+ * @return
+ */
+ @GetMapping("/getCodeRuleAndBasicSecByRuleOid")
+ @ApiOperationSupport(order = 13)
+ @ApiOperation(value = "鏌ヨ缂栫爜瑙勫垯鐨勬墍鏈夋祦姘翠緷璧栫殑鐮佹", notes = "浼犲叆oid")
+ public R<CodeRuleVO> getCodeRuleAndBasicSecByRuleOid(String ruleOid){
+ return R.data(codeBasicSecService.getSerialNumberDepend(ruleOid));
+ }
+
+
+ /**
+ * 璁剧疆鏈�澶ф祦姘村彿
+ * @param codeOrderDTO 缂栫爜鐢宠浼犺緭瀵硅薄
+ * @return
+ */
+ @PostMapping("/setMaxSerialNumberForCodeRule")
+ @ApiOperationSupport(order = 14)
+ @ApiOperation(value = "璁剧疆鏈�澶ф祦姘村彿", notes = "codeOrderDTO")
+ public R setMaxSerialNumberForCodeRule(@RequestBody CodeOrderDTO codeOrderDTO){
+ return R.success(codeBasicSecService.setMaxSerialNumberForCodeRule(codeOrderDTO));
+ }
}
--
Gitblit v1.9.3