From dcbe21414886c6c982e2ff7339f8be6977093585 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 27 十一月 2023 14:17:19 +0800
Subject: [PATCH] 完成盘点时进行出入库
---
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 55 ++++++++++++++++++++++++++-----------------------------
1 files changed, 26 insertions(+), 29 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 13101c5..d7eeeb0 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,22 +1,27 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
+import com.consum.base.core.utils.PageUtil;
+import com.consum.base.pojo.query.LWhFormInventoryQry;
import com.consum.base.pojo.request.FormInventoryParam;
import com.consum.base.pojo.request.LWhFormInventoryParam;
+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.LWhFormInventoryCoreService;
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;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
import java.util.List;
-import java.util.Map;
import java.util.Objects;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +46,9 @@
private LWhFormInventoryServiceImpl lWhFormInventoryService;
@Autowired
private FinSysTenantUserServiceImpl finSysTenantUserService;
+ @Autowired
+ private LWhFormInventoryCoreService lWhFormInventoryCoreService;
+
/**
* @Description 鏂板
@@ -82,7 +90,7 @@
@ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam", required = true, paramType = "query")
})
@GetMapping("/list")
- public ResponseValue queryList(com.consum.base.pojo.LWhFormInventoryParam param) {
+ public ResponseValue queryList(LWhFormInventoryQry param) {
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -91,10 +99,11 @@
return ResponseValue.success(pager);
}
- @ApiOperation(value = "鐩樼偣鍗曠墿鍝佸垪琛ㄦ煡璇�", notes = "鐩樼偣鍗曠墿鍝佸垪琛ㄦ煡璇�")
+ @ApiOperation(value = "鐩樼偣鍗曠墿鍝佸垪琛ㄦ煡璇�", notes = "鐩樼偣鍗曠墿鍝佸垪琛ㄦ煡璇�", response = FormInventoryVO.class)
@ApiImplicitParams({
@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) {
FinSysTenantUser sysInfo = this.getSysInfo();
@@ -105,6 +114,8 @@
return ResponseValue.error("鍙傛暟涓嶈兘涓虹┖");
}
FormInventoryVO formInventoryVO = this.lWhFormInventoryService.queryInventBaseGoodTemplate(id);
+
+ this.lWhFormInventoryService.saveInventory(formInventoryVO, id);
return ResponseValue.success(formInventoryVO);
}
@@ -165,25 +176,6 @@
return ResponseValue.success(1);
}
- /**
- * @Description 鐩樼偣
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/31
- */
- @ApiOperation(value = "鐩樼偣", notes = "鐩樼偣")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")
- })
- @GetMapping("/select/pdList")
- @Deprecated
- public ResponseValue queryPdList(Long id) {
- if (id == null) {
- return ResponseValue.error("鐩樼偣澶辫触锛�");
- }
-
- List list = this.lWhFormInventoryService.queryPdList(id);
- return ResponseValue.success(list);
- }
/**
* 鏆傚瓨
@@ -201,7 +193,7 @@
return ResponseValue.error("鍙傛暟閿欒");
}
- int num = this.lWhFormInventoryService.temporaryStorage(dto, 1);
+ int num = this.lWhFormInventoryService.updateInventoryInfo(dto, 1);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鏆傚瓨澶辫触锛�");
}
@@ -221,8 +213,13 @@
return ResponseValue.error("鍙傛暟閿欒");
}
- int num = this.lWhFormInventoryService.temporaryStorage(dto, 2);
- return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鐩樼偣澶辫触锛�");
+ int num = this.lWhFormInventoryService.updateInventoryInfo(dto, 2);
+
+ S_user_core currentUser = this.getCurrentUser();
+ FinSysTenantUser sysInfo = this.getSysInfo();
+
+ String inOutFormByInventoryId = lWhFormInventoryCoreService.createInOutFormByInventoryId(dto.getId(), currentUser, sysInfo);
+ return num > 0 ? ResponseValue.success(1) : ResponseValue.error(inOutFormByInventoryId);
}
/**
@@ -232,16 +229,16 @@
*/
@ApiOperation(value = "寮傚父鏄庣粏鍒楄〃鏌ヨ", notes = "寮傚父鏄庣粏鍒楄〃鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam", required = true, paramType = "query")
+ @ApiImplicitParam(name = "param", value = "鐩樼偣鏉′欢", dataType = "LWhFormInventoryParam", paramType = "query")
})
@GetMapping("/list/PdDetail")
- public ResponseValue queryPdDetailList(com.consum.base.pojo.LWhFormInventoryParam param) {
+ public ResponseValue queryPdDetailList(LWhFormInventoryQry param) {
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager<Map<String, Object>> pager = this.lWhFormInventoryService.queryPdDetailList(param, sysInfo);
- return ResponseValue.success(pager);
+ PageUtil<FormInventoryDetailVO> result = this.lWhFormInventoryService.queryPdDetailList(param, sysInfo);
+ return ResponseValue.success(result);
}
@ApiOperation(value = "鏍规嵁id鏌ヨ鐩樼偣鐗╁搧璇︾粏淇℃伅", notes = "鏍规嵁id鏌ヨ鐩樼偣鐗╁搧璇︾粏淇℃伅")
--
Gitblit v1.9.1