From b4adff68a07b783fc90da1c9370d8be5f383e700 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期三, 08 五月 2024 13:46:34 +0800
Subject: [PATCH] 20240528修改: bug41、42、43修改 领用单(分发单)，调拨单，流程优化
---
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
index bfb6d88..7693076 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
@@ -84,7 +84,7 @@
FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
finSysTenantUser.setSysUserId(param.getOperatorUserId());
FinSysTenantUser operatorUser =
- finSysTenantUserService.select(finSysTenantUser).stream().findFirst().orElse(null);
+ finSysTenantUserService.select(finSysTenantUser).stream().findFirst().orElse(null);
// 鏍规嵁鐩戠洏浜篿d鏌ヨ鐩戠洏浜�
FinSysTenantUser monitorUserInfo = new FinSysTenantUser();
monitorUserInfo.setId(param.getMonitorUserId());
@@ -103,7 +103,7 @@
*/
@ApiOperation(value = "鐩樼偣鍗曞垪琛ㄦ煡璇�", notes = "鐩樼偣鍗曞垪琛ㄦ煡璇�")
@ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam",
- required = true, paramType = "query")})
+ required = true, paramType = "query")})
@GetMapping("/list")
public ResponseValue queryList() {
LWhFormInventoryQry param = CommonUtil.getObjFromReq(LWhFormInventoryQry.class);
@@ -119,9 +119,31 @@
return ResponseValue.success(pager);
}
+ /**
+ * 鏌ヨ姝よ处鍙疯鑹诧紝鏄惁鐜板湪杩樺彲浠ュ鍔犵洏鐐逛换鍔�
+ *
+ * @return
+ */
+ @ApiOperation(value = "鏌ヨ姝よ处鍙疯鑹诧紝鏄惁鐜板湪杩樺彲浠ュ鍔犵洏鐐逛换鍔�", notes = "鏌ヨ姝よ处鍙疯鑹诧紝鏄惁鐜板湪杩樺彲浠ュ鍔犵洏鐐逛换鍔�")
+ @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam",
+ required = true, paramType = "query")})
+ @GetMapping("/isAddInventory")
+ public ResponseValue isAddInventory() {
+ LWhFormInventoryQry param = CommonUtil.getObjFromReq(LWhFormInventoryQry.class);
+ LWhFormInventoryQry param2 = new LWhFormInventoryQry();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ Integer res = lWhFormInventoryService.isAddInventory(param, sysInfo);
+ return ResponseValue.success(res);
+ }
+
@ApiOperation(value = "鐩樼偣鍗曠墿鍝佸垪琛ㄦ煡璇�", notes = "鐩樼偣鍗曠墿鍝佸垪琛ㄦ煡璇�", response = FormInventoryVO.class)
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
+ @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
@ApiResponse(code = 200, message = "鎴愬姛", response = FormInventoryVO.class)
@GetMapping("/query")
public ResponseValue queryInventBaseGoodTemplate(Long id) {
@@ -188,7 +210,7 @@
*/
@ApiOperation(value = "鏍规嵁id鍒犻櫎鐩樼偣", notes = "鏍规嵁id鍒犻櫎鐩樼偣")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
+ @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
@DeleteMapping("/del")
public ResponseValue delById(Long id) {
if (id == null) {
@@ -264,7 +286,7 @@
*/
@ApiOperation(value = "寮傚父鏄庣粏鍒楄〃鏌ヨ", notes = "寮傚父鏄庣粏鍒楄〃鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam", paramType = "query")})
+ @ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam", paramType = "query")})
@GetMapping("/list/PdDetail")
public ResponseValue queryPdDetailList() {
LWhFormInventoryQry param = CommonUtil.getObjFromReq(LWhFormInventoryQry.class);
@@ -282,7 +304,7 @@
@ApiOperation(value = "鏍规嵁id鏌ヨ鐩樼偣鐗╁搧璇︾粏淇℃伅", notes = "鏍规嵁id鏌ヨ鐩樼偣鐗╁搧璇︾粏淇℃伅")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鐩樼偣id", dataType = "Long", required = true, paramType = "query")})
+ @ApiImplicitParam(name = "id", value = "鐩樼偣id", dataType = "Long", required = true, paramType = "query")})
@GetMapping("/detail")
public ResponseValue selectDetailById(Long id) {
FinSysTenantUser sysInfo = this.getSysInfo();
@@ -305,7 +327,7 @@
@ApiOperation(value = "鐩樼偣鍗曞鍑�", notes = "鐩樼偣鍗曞鍑�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
+ @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
@GetMapping("/list/export")
public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
@@ -329,7 +351,7 @@
map.put("monitorName", monitorName);
map.put("name", operatorName);
Workbook workbook = ExcelExportUtil.exportExcel(params, InventoryExcelTemplate.class, exportList, map);
- String filePath = downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook);
+ String filePath = downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", workbook);
return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
--
Gitblit v1.9.1