From abc5baf903a2bd229fb7f2decd35b26536d86e13 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 29 十一月 2023 15:07:57 +0800
Subject: [PATCH] 部门分发增加出库和入库
---
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 80 +++++++++++++++++++++++++++++++---------
1 files changed, 62 insertions(+), 18 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 6f4a5e7..a7f8bab 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,6 +1,7 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.query.LWhFormInventoryQry;
import com.consum.base.pojo.request.FormInventoryParam;
@@ -9,10 +10,10 @@
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.LWhFormInventoryGoodsServiceImpl;
import com.consum.base.service.LWhFormInventoryServiceImpl;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormInventory;
+import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
@@ -27,7 +28,6 @@
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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -45,8 +45,7 @@
private LWhFormInventoryServiceImpl lWhFormInventoryService;
@Autowired
private FinSysTenantUserServiceImpl finSysTenantUserService;
- @Autowired
- private LWhFormInventoryGoodsServiceImpl inventoryGoodsService;
+
/**
* @Description 鏂板
@@ -58,7 +57,13 @@
@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "FormInventoryParam")
})
@PostMapping("/add")
- public ResponseValue add(@RequestBody FormInventoryParam param) {
+ public ResponseValue add() {
+
+ FormInventoryParam param = CommonUtil.getObjFromReqBody(FormInventoryParam.class);
+ FormInventoryParam formInventoryParam = new FormInventoryParam();
+ CommonUtil.copyProperties(param, formInventoryParam);
+ param = formInventoryParam;
+
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -88,7 +93,12 @@
@ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam", required = true, paramType = "query")
})
@GetMapping("/list")
- public ResponseValue queryList(LWhFormInventoryQry param) {
+ public ResponseValue queryList() {
+ 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("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -111,10 +121,12 @@
if (id == null) {
return ResponseValue.error("鍙傛暟涓嶈兘涓虹┖");
}
+ //閫氳繃鏈烘瀯鏌ヨ鐩稿叧鐨勬ā鏉夸俊鎭�
FormInventoryVO formInventoryVO = this.lWhFormInventoryService.queryInventBaseGoodTemplate(id);
- this.lWhFormInventoryService.saveInventory(formInventoryVO, id);
- return ResponseValue.success(formInventoryVO);
+ // 淇濆瓨鍚庤繑鍥炶褰曚俊鎭�
+ List<FormInventoryGoodsVO> result = this.lWhFormInventoryService.saveInventory(formInventoryVO, id);
+ return ResponseValue.success(result);
}
/**
@@ -127,7 +139,12 @@
@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "FormInventoryParam")
})
@PostMapping("/edit")
- public ResponseValue edit(@RequestBody FormInventoryParam param) {
+ public ResponseValue edit() {
+ FormInventoryParam param = CommonUtil.getObjFromReqBody(FormInventoryParam.class);
+ FormInventoryParam formInventoryParam = new FormInventoryParam();
+ CommonUtil.copyProperties(param, formInventoryParam);
+ param = formInventoryParam;
+
LWhFormInventory lWhFormInventory = lWhFormInventoryService.get(new LWhFormInventory(param.getId()));
if (lWhFormInventory == null) {
return ResponseValue.error("缂栬緫澶辫触锛�");
@@ -139,8 +156,18 @@
if (num == 0) {
return ResponseValue.error("缂栬緫澶辫触锛�");
}
- ResponseValue add = this.add(param);
- if (add.getCode() == ResponseValue.CODE_SUCCESS) {
+
+ //鏍规嵁鐩樼偣浜篿d鏌ヨ鐩樼偣浜�
+ FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
+ finSysTenantUser.setId(param.getOperatorUserId());
+ FinSysTenantUser operatorUser = finSysTenantUserService.get(finSysTenantUser);
+ //鏍规嵁鐩戠洏浜篿d鏌ヨ鐩戠洏浜�
+ FinSysTenantUser monitorUserInfo = new FinSysTenantUser();
+ monitorUserInfo.setId(param.getMonitorUserId());
+ FinSysTenantUser monitorUser = finSysTenantUserService.get(monitorUserInfo);
+ int result = this.lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser);
+
+ if (result > 0) {
return ResponseValue.success();
}
@@ -186,12 +213,17 @@
@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "LWhFormInventoryDto")
})
@PostMapping("/temporary/storage")
- public ResponseValue temporaryStorage(@RequestBody LWhFormInventoryParam dto) {
- if (dto == null) {
+ public ResponseValue updateTemporaryStorage() {
+ LWhFormInventoryParam param = CommonUtil.getObjFromReqBody(LWhFormInventoryParam.class);
+ LWhFormInventoryParam formInventoryParam = new LWhFormInventoryParam();
+ CommonUtil.copyProperties(param, formInventoryParam);
+ param = formInventoryParam;
+
+ if (param == null) {
return ResponseValue.error("鍙傛暟閿欒");
}
- int num = this.lWhFormInventoryService.updateInventoryInfo(dto, 1);
+ int num = this.lWhFormInventoryService.updateInventoryInfo(param, 1, null, null);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鏆傚瓨澶辫触锛�");
}
@@ -206,12 +238,19 @@
@ApiImplicitParam(name = "param", value = "鐩樼偣鍗曚俊鎭�", dataType = "LWhFormInventoryDto")
})
@PostMapping("/finish")
- public ResponseValue finishPd(@RequestBody LWhFormInventoryParam dto) {
- if (dto == null) {
+ public ResponseValue updateFinishPd() {
+ LWhFormInventoryParam param = CommonUtil.getObjFromReqBody(LWhFormInventoryParam.class);
+ LWhFormInventoryParam formInventoryParam = new LWhFormInventoryParam();
+ CommonUtil.copyProperties(param, formInventoryParam);
+ param = formInventoryParam;
+
+ if (param == null) {
return ResponseValue.error("鍙傛暟閿欒");
}
+ S_user_core currentUser = this.getCurrentUser();
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ int num = this.lWhFormInventoryService.updateInventoryInfo(param, 2, currentUser, sysInfo);
- int num = this.lWhFormInventoryService.updateInventoryInfo(dto, 2);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鐩樼偣澶辫触锛�");
}
@@ -225,7 +264,12 @@
@ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam", paramType = "query")
})
@GetMapping("/list/PdDetail")
- public ResponseValue queryPdDetailList(LWhFormInventoryQry param) {
+ public ResponseValue queryPdDetailList() {
+ 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("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
--
Gitblit v1.9.1