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 | 168 +++++++++++++++++++++++++++-----------------------------
1 files changed, 81 insertions(+), 87 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 710f2f3..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
@@ -1,7 +1,22 @@
package com.consum.base.controller;
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.PageUtil;
@@ -12,8 +27,8 @@
import com.consum.base.pojo.response.FormInventoryDetailVO;
import com.consum.base.pojo.response.FormInventoryGoodsVO;
import com.consum.base.pojo.response.FormInventoryVO;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
-import com.consum.base.service.LWhFormInventoryServiceImpl;
+import com.consum.base.service.FinSysTenantUserService;
+import com.consum.base.service.LWhFormInventoryService;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormInventory;
import com.iplatform.model.po.S_user_core;
@@ -21,29 +36,14 @@
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.web.ResponseValue;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
/**
* @Description 鐩樼偣
@@ -56,10 +56,9 @@
public class LWhFormInventoryController extends BaseController {
@Autowired
- private LWhFormInventoryServiceImpl lWhFormInventoryService;
+ private LWhFormInventoryService lWhFormInventoryService;
@Autowired
- private FinSysTenantUserServiceImpl finSysTenantUserService;
-
+ private FinSysTenantUserService finSysTenantUserService;
/**
* @Description 鏂板
@@ -67,9 +66,7 @@
* @Date 2023/10/31
*/
@ApiOperation(value = "鏂板鐩樼偣", notes = "鏂板鐩樼偣")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "FormInventoryParam")
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "FormInventoryParam")})
@PostMapping("/add")
public ResponseValue add() {
@@ -82,15 +79,17 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- //鏍规嵁鐩樼偣浜篿d鏌ヨ鐩樼偣浜�
+ // 鏍规嵁鐩樼偣浜篿d鏌ヨ鐩樼偣浜�
+ // 鐩樼偣浜篿d涓簊ysUserId瀛楁鏌ヨ
FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
- finSysTenantUser.setId(param.getOperatorUserId());
- FinSysTenantUser operatorUser = finSysTenantUserService.get(finSysTenantUser);
- //鏍规嵁鐩戠洏浜篿d鏌ヨ鐩戠洏浜�
+ finSysTenantUser.setSysUserId(param.getOperatorUserId());
+ FinSysTenantUser operatorUser =
+ finSysTenantUserService.select(finSysTenantUser).stream().findFirst().orElse(null);
+ // 鏍规嵁鐩戠洏浜篿d鏌ヨ鐩戠洏浜�
FinSysTenantUser monitorUserInfo = new FinSysTenantUser();
monitorUserInfo.setId(param.getMonitorUserId());
FinSysTenantUser monitorUser = finSysTenantUserService.get(monitorUserInfo);
- int result = this.lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser);
+ int result = lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser);
if (result > 0) {
return ResponseValue.success();
}
@@ -103,9 +102,8 @@
* @Date 2023/10/31
*/
@ApiOperation(value = "鐩樼偣鍗曞垪琛ㄦ煡璇�", notes = "鐩樼偣鍗曞垪琛ㄦ煡璇�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam", required = true, paramType = "query")
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam",
+ required = true, paramType = "query")})
@GetMapping("/list")
public ResponseValue queryList() {
LWhFormInventoryQry param = CommonUtil.getObjFromReq(LWhFormInventoryQry.class);
@@ -117,14 +115,35 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager<LWhFormInventory> pager = this.lWhFormInventoryService.queryList(param, sysInfo);
+ GenericPager<LWhFormInventory> pager = lWhFormInventoryService.queryList(param, sysInfo);
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) {
@@ -135,11 +154,11 @@
if (id == null) {
return ResponseValue.error("鍙傛暟涓嶈兘涓虹┖");
}
- //閫氳繃鏈烘瀯鏌ヨ鐩稿叧鐨勬ā鏉夸俊鎭�
- FormInventoryVO formInventoryVO = this.lWhFormInventoryService.queryInventBaseGoodTemplate(id);
+ // 閫氳繃鏈烘瀯鏌ヨ鐩稿叧鐨勬ā鏉夸俊鎭�
+ FormInventoryVO formInventoryVO = lWhFormInventoryService.queryInventBaseGoodTemplate(id);
// 淇濆瓨鍚庤繑鍥炶褰曚俊鎭�
- List<FormInventoryGoodsVO> result = this.lWhFormInventoryService.saveInventory(formInventoryVO, id);
+ FormInventoryVO result = lWhFormInventoryService.saveInventory(formInventoryVO, id);
return ResponseValue.success(result);
}
@@ -149,9 +168,7 @@
* @Date 2023/10/31
*/
@ApiOperation(value = "缂栬緫鐩樼偣", notes = "缂栬緫鐩樼偣")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "FormInventoryParam")
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "FormInventoryParam")})
@PostMapping("/edit")
public ResponseValue edit() {
FormInventoryParam param = CommonUtil.getObjFromReqBody(FormInventoryParam.class);
@@ -171,15 +188,15 @@
return ResponseValue.error("缂栬緫澶辫触锛�");
}
- //鏍规嵁鐩樼偣浜篿d鏌ヨ鐩樼偣浜�
+ // 鏍规嵁鐩樼偣浜篿d鏌ヨ鐩樼偣浜�
FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
finSysTenantUser.setId(param.getOperatorUserId());
FinSysTenantUser operatorUser = finSysTenantUserService.get(finSysTenantUser);
- //鏍规嵁鐩戠洏浜篿d鏌ヨ鐩戠洏浜�
+ // 鏍规嵁鐩戠洏浜篿d鏌ヨ鐩戠洏浜�
FinSysTenantUser monitorUserInfo = new FinSysTenantUser();
monitorUserInfo.setId(param.getMonitorUserId());
FinSysTenantUser monitorUser = finSysTenantUserService.get(monitorUserInfo);
- int result = this.lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser);
+ int result = lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser);
if (result > 0) {
return ResponseValue.success();
@@ -193,8 +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) {
@@ -215,7 +231,6 @@
return ResponseValue.success(1);
}
-
/**
* 鏆傚瓨
*
@@ -223,9 +238,7 @@
* @date 2023/10/31
*/
@ApiOperation(value = "鐩樼偣鏆傚瓨", notes = "鐩樼偣鏆傚瓨")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "LWhFormInventoryDto")
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "LWhFormInventoryDto")})
@PostMapping("/temporary/storage")
public ResponseValue updateTemporaryStorage() {
LWhFormInventoryParam param = CommonUtil.getObjFromReqBody(LWhFormInventoryParam.class);
@@ -237,7 +250,7 @@
return ResponseValue.error("鍙傛暟閿欒");
}
- int num = this.lWhFormInventoryService.updateInventoryInfo(param, 1, null, null);
+ int num = lWhFormInventoryService.updateInventoryInfo(param, 1, null, null);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鏆傚瓨澶辫触锛�");
}
@@ -248,9 +261,7 @@
* @date 2023/10/31
*/
@ApiOperation(value = "瀹屾垚鐩樼偣", notes = "瀹屾垚鐩樼偣")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "LWhFormInventoryDto")
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "LWhFormInventoryDto")})
@PostMapping("/finish")
public ResponseValue updateFinishPd() {
LWhFormInventoryParam param = CommonUtil.getObjFromReqBody(LWhFormInventoryParam.class);
@@ -263,7 +274,7 @@
}
S_user_core currentUser = this.getCurrentUser();
FinSysTenantUser sysInfo = this.getSysInfo();
- int num = this.lWhFormInventoryService.updateInventoryInfo(param, 2, currentUser, sysInfo);
+ int num = lWhFormInventoryService.updateInventoryInfo(param, 2, currentUser, sysInfo);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鐩樼偣澶辫触锛�");
}
@@ -275,8 +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);
@@ -288,14 +298,13 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- PageUtil<FormInventoryDetailVO> result = this.lWhFormInventoryService.queryPdDetailList(param, sysInfo);
+ PageUtil<FormInventoryDetailVO> result = lWhFormInventoryService.queryPdDetailList(param, sysInfo);
return ResponseValue.success(result);
}
@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();
@@ -306,19 +315,21 @@
LWhFormInventory lWhFormInventory = new LWhFormInventory();
lWhFormInventory.setId(id);
- LWhFormInventory item = this.lWhFormInventoryService.get(lWhFormInventory);
+ LWhFormInventory item = lWhFormInventoryService.get(lWhFormInventory);
if (Objects.isNull(item)) {
return ResponseValue.error("鐩樼偣鍗曚笉瀛樺湪");
}
BeanUtils.copyProperties(item, formInventoryVO);
- List<FormInventoryGoodsVO> formInventoryGoodsVOS = this.lWhFormInventoryService.selectDetailById(id);
+ List<FormInventoryGoodsVO> formInventoryGoodsVOS = lWhFormInventoryService.selectDetailById(id);
formInventoryVO.setFormInventoryGoodsList(formInventoryGoodsVOS);
return ResponseValue.success(formInventoryVO);
}
@ApiOperation(value = "鐩樼偣鍗曞鍑�", notes = "鐩樼偣鍗曞鍑�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
@GetMapping("/list/export")
- public void export(Long id, HttpServletResponse response) throws IOException {
+ public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
List<InventoryExcelTemplate> exportList = lWhFormInventoryService.getExportList(id);
if (CollectionUtils.isEmpty(exportList)) {
@@ -339,26 +350,9 @@
map.put("endDate", DateUtils.toShowDate(endTime));
map.put("monitorName", monitorName);
map.put("name", operatorName);
- Workbook workbook = ExcelExportUtil.exportExcel(params, InventoryExcelTemplate.class,
- exportList, map);
-
- downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook);
+ Workbook workbook = ExcelExportUtil.exportExcel(params, InventoryExcelTemplate.class, exportList, map);
+ String filePath = downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
-
- private void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) {
- try (OutputStream out = response.getOutputStream()) {
- response.setCharacterEncoding("UTF-8");
- response.setHeader("content-Type", "application/vnd.ms-excel");
- response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName + ".xls", "UTF-8"));
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- workbook.write(baos);
- response.setHeader("Content-Length", String.valueOf(baos.size()));
- out.write(baos.toByteArray());
- } catch (Exception e) {
- logger.error("瀵煎嚭鏂囦欢澶辫触", e);
- }
- }
-
}
-
--
Gitblit v1.9.1