From 6586db1ec90fd6fbf0e4c7795137379b80ee31c1 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 11 十二月 2023 10:59:54 +0800
Subject: [PATCH] 1.修改批量更新 2.盘点人查询问题
---
consum-base/src/main/java/com/consum/base/core/type/InventoryResultType.java | 48 ++++++
consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryGoodsServiceImpl.java | 24 +-
deploy-jar-single/src/main/java/com/consum/test/CodeGeneratorServiceTest.java | 81 +++++------
consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java | 14 +-
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsService.java | 40 +++++
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 95 +++++-------
consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java | 6
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryGoodsController.java | 21 +-
consum-base/src/main/java/com/consum/base/pojo/request/baseGoodModel.java | 3
consum-base/src/main/java/com/consum/base/pojo/response/UserVO.java | 3
consum-base/src/main/java/com/consum/base/pojo/request/UsingFormBackGoodsInfo.java | 15 +-
consum-base/src/main/java/com/consum/base/pojo/UseRecordSkuVO.java | 6
consum-base/src/main/java/com/consum/base/pojo/response/UsingFormBackVO.java | 5
consum-base/src/main/java/com/consum/base/pojo/response/OutAndInDetailVO.java | 2
consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoVO.java | 4
consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java | 39 ++---
consum-base/src/main/java/com/consum/base/pojo/response/DepartmentVO.java | 4
consum-base/src/main/java/com/consum/base/pojo/response/LWhFormScrappedVO.java | 2
18 files changed, 235 insertions(+), 177 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
index 6de9ff5..9d8bc49 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
@@ -1,5 +1,15 @@
package com.consum.base.controller;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+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.pojo.BaseCategoryParam;
@@ -9,20 +19,10 @@
import com.consum.model.po.BaseCategory;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.tree.TreeNode;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
+
import io.swagger.annotations.Api;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-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 鐗╁搧鍒嗙被
@@ -39,12 +39,6 @@
@Autowired
private BaseGoodsTemplateService baseGoodsTemplateService;
-
- private boolean multiRoot = true;
- private TreeNode dummyRoot = null;
- private Map<Long, TreeNode> rootMap = new TreeMap();
- private Map<Long, TreeNode> childMap = new TreeMap();
- private long defaultParentId = 0L;
/**
* @Description 鑾峰彇鍒嗙被鏍�
@@ -74,8 +68,9 @@
if (param.getOrderNumber() == null) {
return ResponseValue.error("椤哄簭鍙蜂负绌�");
}
- //鍒ゆ柇鍚屼竴鐖剁被id涓嬪垎绫诲悕绉版槸鍚﹂噸澶�
- BaseCategory category = this.baseCategoryService.getByCategoryNameAndFatherCategoryId(param.getCategoryName(), param.getFatherCategoryId());
+ // 鍒ゆ柇鍚屼竴鐖剁被id涓嬪垎绫诲悕绉版槸鍚﹂噸澶�
+ BaseCategory category = this.baseCategoryService.getByCategoryNameAndFatherCategoryId(param.getCategoryName(),
+ param.getFatherCategoryId());
if (category != null) {
return ResponseValue.error("鍒嗙被鍚嶇О宸插瓨鍦�");
}
@@ -106,7 +101,6 @@
GenericPager<BaseCategory> pager = this.baseCategoryService.queryBaseCategoryList(param);
return ResponseValue.success(pager);
}
-
/**
* @Description 缂栬緫
@@ -145,7 +139,7 @@
* @author 鍗㈠簡闃�
* @date 2023/10/23
*/
- //鍒嗙被涓嬫湁姝ｅ父鐘舵�佺殑鐗╁搧鏃讹紝涓嶅厑璁哥鐢�
+ // 鍒嗙被涓嬫湁姝ｅ父鐘舵�佺殑鐗╁搧鏃讹紝涓嶅厑璁哥鐢�
@PostMapping("/updStatus")
public ResponseValue updateStatus() {
BaseCategory baseCategory = CommonUtil.getObjFromReqBody(BaseCategory.class);
@@ -156,7 +150,7 @@
if (baseCategory == null || baseCategory.getId() == null || baseCategory.getStates() == null) {
return ResponseValue.error("鍙傛暟閿欒");
}
- //鏍规嵁鍒嗙被id鍜岀姸鎬佹煡璇㈢墿鍝佹ā鐗�
+ // 鏍规嵁鍒嗙被id鍜岀姸鎬佹煡璇㈢墿鍝佹ā鐗�
List<BaseCategory> list = this.baseGoodsTemplateService.getByCategoryId(baseCategory.getId());
if (baseCategory.getStates() == 2 && !CollectionUtils.isEmpty(list)) {
return ResponseValue.error("鍒嗙被涓嬫湁姝ｅ父鐘舵�佺殑鐗╁搧锛屼笉鍏佽绂佺敤");
@@ -221,4 +215,3 @@
}
}
-
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 0a6772f..1a90e83 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;
@@ -21,25 +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.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,16 +60,13 @@
@Autowired
private FinSysTenantUserServiceImpl finSysTenantUserService;
-
/**
* @Description 鏂板
* @Author 鍗㈠簡闃�
* @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() {
@@ -78,11 +79,13 @@
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);
@@ -99,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);
@@ -119,8 +121,7 @@
@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) {
@@ -131,7 +132,7 @@
if (id == null) {
return ResponseValue.error("鍙傛暟涓嶈兘涓虹┖");
}
- //閫氳繃鏈烘瀯鏌ヨ鐩稿叧鐨勬ā鏉夸俊鎭�
+ // 閫氳繃鏈烘瀯鏌ヨ鐩稿叧鐨勬ā鏉夸俊鎭�
FormInventoryVO formInventoryVO = lWhFormInventoryService.queryInventBaseGoodTemplate(id);
// 淇濆瓨鍚庤繑鍥炶褰曚俊鎭�
@@ -145,9 +146,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);
@@ -167,11 +166,11 @@
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);
@@ -189,8 +188,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) {
@@ -211,7 +209,6 @@
return ResponseValue.success(1);
}
-
/**
* 鏆傚瓨
*
@@ -219,9 +216,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);
@@ -244,9 +239,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);
@@ -271,8 +264,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);
@@ -290,8 +282,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();
@@ -314,8 +305,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 void export(Long id, HttpServletResponse response) throws Exception {
@@ -338,12 +328,9 @@
map.put("endDate", DateUtils.toShowDate(endTime));
map.put("monitorName", monitorName);
map.put("name", operatorName);
- Workbook workbook = ExcelExportUtil.exportExcel(params, InventoryExcelTemplate.class,
- exportList, map);
+ Workbook workbook = ExcelExportUtil.exportExcel(params, InventoryExcelTemplate.class, exportList, map);
downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook);
}
-
}
-
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryGoodsController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryGoodsController.java
index b7edec7..20b4cbf 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryGoodsController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryGoodsController.java
@@ -1,17 +1,20 @@
package com.consum.base.controller;
-import com.consum.base.BaseController;
-import com.consum.base.service.LWhFormInventoryGoodsServiceImpl;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormInventoryGoods;
-import com.walker.web.ResponseValue;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import java.util.List;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import com.consum.base.BaseController;
+import com.consum.base.service.LWhFormInventoryGoodsService;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormInventoryGoods;
+import com.walker.web.ResponseValue;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
/**
* @Description 鐩樼偣鍗曠墿鍝�
@@ -24,7 +27,7 @@
public class LWhFormInventoryGoodsController extends BaseController {
@Autowired
- private LWhFormInventoryGoodsServiceImpl inventoryGoodsService;
+ private LWhFormInventoryGoodsService inventoryGoodsService;
/**
* @return
@@ -42,7 +45,7 @@
if (id == null) {
ResponseValue.error("鍙傛暟閿欒");
}
- List<LWhFormInventoryGoods> list = this.inventoryGoodsService.getByInventoryId(id);
+ List<LWhFormInventoryGoods> list = inventoryGoodsService.getByInventoryId(id);
return ResponseValue.success(list);
}
diff --git a/consum-base/src/main/java/com/consum/base/core/type/InventoryResultType.java b/consum-base/src/main/java/com/consum/base/core/type/InventoryResultType.java
new file mode 100644
index 0000000..3e7d668
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/core/type/InventoryResultType.java
@@ -0,0 +1,48 @@
+package com.consum.base.core.type;
+
+/**
+ * InventoryResultType
+ *
+ * @author asus
+ * @version 2023/12/11 10:32
+ **/
+public enum InventoryResultType {
+ /**
+ * 姝ｅ父
+ */
+ NORMAL(1, "姝ｅ父"),
+ /**
+ * 鐩樼泩
+ */
+ SURPLUS(2, "鐩樼泩"),
+
+ /**
+ * 鐩樹簭
+ */
+ LOSS(3, "鐩樹簭");
+
+ private Integer value;
+
+ private String desc;
+
+ InventoryResultType(Integer value, String desc) {
+ this.value = value;
+ this.desc = desc;
+ }
+
+ public Integer getValue() {
+ return value;
+ }
+
+ public void setValue(Integer value) {
+ this.value = value;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoVO.java b/consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoVO.java
index 8588f4c..bf24156 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/RecordUserInfoVO.java
@@ -5,12 +5,12 @@
/**
* @author asus
* @version 1.0
- * @description: TODO
+ * @description: 浣跨敤璁板綍淇℃伅
* @date 2023/11/8 15:20
*/
@Data
public class RecordUserInfoVO {
- //浠ュ墠鐨勮褰昳d
+ // 浠ュ墠鐨勮褰昳d
private Long oldProcureModelId;
// 浣跨敤浜�
diff --git a/consum-base/src/main/java/com/consum/base/pojo/UseRecordSkuVO.java b/consum-base/src/main/java/com/consum/base/pojo/UseRecordSkuVO.java
index c61b922..63caf0f 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/UseRecordSkuVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/UseRecordSkuVO.java
@@ -1,17 +1,17 @@
package com.consum.base.pojo;
import java.util.List;
+
import lombok.Data;
/**
* @author asus
* @version 1.0
- * @description: TODO
+ * @description: 浣跨敤璁板綍鍟嗗搧淇℃伅
* @date 2023/11/8 15:20
*/
@Data
public class UseRecordSkuVO {
-
// 鍗曞彿id
private Long procureModelId;
@@ -22,8 +22,6 @@
// 璁￠噺鍗曚綅
private String unit;
-
private List<RecordUserInfoVO> recordUserInfos;
-
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/request/UsingFormBackGoodsInfo.java b/consum-base/src/main/java/com/consum/base/pojo/request/UsingFormBackGoodsInfo.java
index aa864b1..dd3e40a 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/request/UsingFormBackGoodsInfo.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/request/UsingFormBackGoodsInfo.java
@@ -1,28 +1,29 @@
package com.consum.base.pojo.request;
-import io.swagger.annotations.ApiModel;
import java.util.List;
+
+import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* @author asus
* @version 1.0
- * @description: TODO
+ * @description: 閮ㄩ棬閫�鍥炵墿鍝佷俊鎭�
* @date 2023/12/1 13:16
*/
@Data
@ApiModel
public class UsingFormBackGoodsInfo {
- //鍒嗙被缂栧彿
+ // 鍒嗙被缂栧彿
private Long baseCategoryId;
- //鐗╁搧妯＄増缂栧彿
+ // 鐗╁搧妯＄増缂栧彿
private Long baseGoodsTemplateId;
- //鐗╁搧妯＄増鍚嶅瓧
+ // 鐗╁搧妯＄増鍚嶅瓧
private String goodsTemplateName;
- //鍒嗗彂鍗昳d
+ // 鍒嗗彂鍗昳d
private Long transBusinessId;
- //鍒嗗彂鍗曠紪鍙�
+ // 鍒嗗彂鍗曠紪鍙�
private String businessFormCode;
private List<baseGoodModel> models;
diff --git a/consum-base/src/main/java/com/consum/base/pojo/request/baseGoodModel.java b/consum-base/src/main/java/com/consum/base/pojo/request/baseGoodModel.java
index 287c4ce..25d18c1 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/request/baseGoodModel.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/request/baseGoodModel.java
@@ -7,7 +7,7 @@
/**
* @author asus
* @version 1.0
- * @description: TODO
+ * @description: 閮ㄩ棬鐗╁搧妯℃澘淇℃伅
* @date 2023/12/1 13:21
*/
@Data
@@ -31,6 +31,5 @@
private Integer userUseCount;
private Integer goodsNum;
private Integer counts;
-
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/DepartmentVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/DepartmentVO.java
index e9eb47a..371f981 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/DepartmentVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/DepartmentVO.java
@@ -2,12 +2,13 @@
import java.util.ArrayList;
import java.util.List;
+
import lombok.Data;
/**
* @author asus
* @version 1.0
- * @description: TODO
+ * @description: 閮ㄩ棬鍜岀敤鎴蜂俊鎭�
* @date 2023/11/16 16:57
*/
@Data
@@ -17,6 +18,5 @@
private String name;
private String type;
private List<UserVO> children = new ArrayList<>();
-
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormScrappedVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormScrappedVO.java
index 904ccfe..745dea9 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormScrappedVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/LWhFormScrappedVO.java
@@ -8,7 +8,7 @@
/**
* @author asus
* @version 1.0
- * @description: TODO
+ * @description: 鎶ュ簾鍗曞垪琛�
* @date 2023/11/22 16:29
*/
@Data
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/OutAndInDetailVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/OutAndInDetailVO.java
index a9ebdf1..b12b73f 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/OutAndInDetailVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/OutAndInDetailVO.java
@@ -8,7 +8,7 @@
/**
* @author asus
* @version 1.0
- * @description: TODO
+ * @description: 鍑哄叆搴撴槑缁嗕俊鎭�
* @date 2023/11/28 11:25
*/
@NoArgsConstructor
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/UserVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/UserVO.java
index 01c7945..1cd5830 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/UserVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/UserVO.java
@@ -5,7 +5,7 @@
/**
* @author asus
* @version 1.0
- * @description: TODO
+ * @description: 鐢ㄦ埛淇℃伅
* @date 2023/11/16 16:57
*/
@Data
@@ -14,6 +14,5 @@
private Long id;
private String name;
private String type;
-
}
\ No newline at end of file
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/UsingFormBackVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/UsingFormBackVO.java
index c65f015..12369cb 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/UsingFormBackVO.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/UsingFormBackVO.java
@@ -1,13 +1,14 @@
package com.consum.base.pojo.response;
import java.util.List;
+
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author asus
* @version 1.0
- * @description: TODO
+ * @description: 閮ㄩ棬閫�鍥炲崟鎹�
* @date 2023/12/1 17:12
*/
@NoArgsConstructor
@@ -20,5 +21,5 @@
private String businessFormCode;
private String operatorName;
- private List<GoodsTemplateCountVO> goodsTemplateInfoList;
+ private List<GoodsTemplateCountVO> goodsTemplateInfoList;
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsService.java
new file mode 100644
index 0000000..d863f7a
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsService.java
@@ -0,0 +1,40 @@
+package com.consum.base.service;
+
+import java.util.List;
+
+import com.consum.base.pojo.response.FormInventoryGoodsVO;
+import com.consum.model.po.LWhFormInventoryGoods;
+import com.walker.jdbc.service.BaseService;
+
+/**
+ * LWhFormInventoryGoodsService
+ *
+ * @author asus
+ * @version 2023/12/11 10:28
+ **/
+public interface LWhFormInventoryGoodsService extends BaseService {
+ /**
+ * 鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鐗╁搧
+ *
+ * @param id
+ * @return
+ */
+ List<LWhFormInventoryGoods> getByInventoryId(Long id);
+
+ /**
+ * 鎻掑叆鐩樼偣鐗╁搧淇℃伅
+ *
+ * @param inventoryGoodsList
+ * @param inventoryId
+ * @return
+ */
+ List<FormInventoryGoodsVO> add(List<FormInventoryGoodsVO> inventoryGoodsList, Long inventoryId);
+
+ /**
+ * 鎵归噺鏇存柊鐩樼偣鐗╁搧淇℃伅
+ *
+ * @param inventoryGoodsList
+ * @return
+ */
+ int updateInventoryGoods(List<FormInventoryGoodsVO> inventoryGoodsList);
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
index 16d53b6..7cf993b 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
@@ -19,7 +19,7 @@
import com.consum.base.core.utils.IdUtil;
import com.consum.base.service.BaseGoodsTemplateService;
import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.LWhFormInventoryGoodsServiceImpl;
+import com.consum.base.service.LWhFormInventoryGoodsService;
import com.consum.base.service.LWhFormInventoryService;
import com.consum.base.service.LWhFormOutputService;
import com.consum.base.service.LWhFormProcureGoodsService;
@@ -50,7 +50,7 @@
@Transactional(propagation = Propagation.REQUIRED)
public class LWhFormInventoryCoreService {
- private LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods;
+ private LWhFormInventoryGoodsService lWhFormInventoryGoods;
private LWhFormOutputCoreService lWhFormOutputCoreService;
private CodeGeneratorService codeGeneratorService;
private LWhFormProcureService lWhFormProcureServiceImpl;
@@ -64,7 +64,7 @@
private LWhFormOutputService lWhFormOutputService;
@Autowired
- public LWhFormInventoryCoreService(LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods,
+ public LWhFormInventoryCoreService(LWhFormInventoryGoodsService lWhFormInventoryGoods,
LWhFormOutputCoreService lWhFormOutputCoreService,
CodeGeneratorService codeGeneratorService,
LWhFormProcureService lWhFormProcureServiceImpl,
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryGoodsServiceImpl.java
similarity index 84%
rename from consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryGoodsServiceImpl.java
index 953aa85..a2ef2c6 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryGoodsServiceImpl.java
@@ -1,4 +1,4 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
import java.util.ArrayList;
import java.util.List;
@@ -7,8 +7,10 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import com.consum.base.core.type.InventoryResultType;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.response.FormInventoryGoodsVO;
+import com.consum.base.service.LWhFormInventoryGoodsService;
import com.consum.model.po.LWhFormInventoryGoods;
import com.walker.jdbc.service.BaseServiceImpl;
@@ -22,20 +24,16 @@
@Slf4j
@Service
@Transactional(propagation = Propagation.REQUIRED)
-public class LWhFormInventoryGoodsServiceImpl extends BaseServiceImpl {
+public class LWhFormInventoryGoodsServiceImpl extends BaseServiceImpl implements LWhFormInventoryGoodsService {
- /**
- * @return
- * @Description 鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗曠墿鍝�
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/31
- */
+ @Override
public List<LWhFormInventoryGoods> getByInventoryId(Long id) {
LWhFormInventoryGoods inventoryGoods = new LWhFormInventoryGoods();
inventoryGoods.setWhFormInventoryId(id);
return this.select(inventoryGoods);
}
+ @Override
public List<FormInventoryGoodsVO> add(List<FormInventoryGoodsVO> inventoryGoodsList, Long inventoryId) {
List<LWhFormInventoryGoods> goodsList = new ArrayList<>();
for (FormInventoryGoodsVO inventoryGoods : inventoryGoodsList) {
@@ -56,6 +54,7 @@
return inventoryGoodsList;
}
+ @Override
public int updateInventoryGoods(List<FormInventoryGoodsVO> inventoryGoodsList) {
List<LWhFormInventoryGoods> goodsList = new ArrayList<>();
for (FormInventoryGoodsVO inventoryGoods : inventoryGoodsList) {
@@ -68,13 +67,14 @@
lWhFormInventoryGoods.setInventoryCounts(realNum);
lWhFormInventoryGoods.setErrorCounts(Math.abs(errorCount));
// 鐩樼偣缁撴灉锛�1=姝ｅ父锛�2=鐩樼泩锛�3=鐩樹簭锛�
- lWhFormInventoryGoods.setInventoryResult((errorCount > 0) ? 2 : (errorCount < 0) ? 3 : 1);
- // TODO 鎵归噺鏇存柊
- this.update(lWhFormInventoryGoods);
- // goodsList.add(lWhFormInventoryGoods);
+ lWhFormInventoryGoods.setInventoryResult((errorCount > 0) ? InventoryResultType.SURPLUS.getValue()
+ : (errorCount < 0) ? InventoryResultType.LOSS.getValue() : InventoryResultType.NORMAL.getValue());
+ // this.update(lWhFormInventoryGoods);
+ goodsList.add(lWhFormInventoryGoods);
}
}
+ this.updateBatch(goodsList);
return 1;
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
index fab2164..e2845c7 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
@@ -1,10 +1,5 @@
package com.consum.base.service.impl;
-import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.FinSysTenantServiceImpl;
-import com.consum.base.service.LWhFormInventoryGoodsServiceImpl;
-import com.consum.base.service.LWhFormInventoryService;
-import com.consum.base.service.LWhGoodsService;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,6 +26,11 @@
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.BaseWarehouseService;
+import com.consum.base.service.FinSysTenantServiceImpl;
+import com.consum.base.service.LWhFormInventoryGoodsService;
+import com.consum.base.service.LWhFormInventoryService;
+import com.consum.base.service.LWhGoodsService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantUser;
@@ -57,7 +57,7 @@
@Autowired
private BaseWarehouseService baseWarehouseService;
@Autowired
- private LWhFormInventoryGoodsServiceImpl inventoryGoodsService;
+ private LWhFormInventoryGoodsService inventoryGoodsService;
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
@@ -208,7 +208,7 @@
log.error("鐩樼偣鍗曠墿鍝佷负绌�");
return 0;
}
- this.inventoryGoodsService.updateInventoryGoods(inventoryGoodsList);
+ inventoryGoodsService.updateInventoryGoods(inventoryGoodsList);
// 淇敼鐩樼偣鍗�
if (state == 2) {
// 瀹屾垚鐩樼偣鏃惰缃畬鎴愮洏鐐规椂闂�
diff --git a/deploy-jar-single/src/main/java/com/consum/test/CodeGeneratorServiceTest.java b/deploy-jar-single/src/main/java/com/consum/test/CodeGeneratorServiceTest.java
index 9704716..8965f7f 100644
--- a/deploy-jar-single/src/main/java/com/consum/test/CodeGeneratorServiceTest.java
+++ b/deploy-jar-single/src/main/java/com/consum/test/CodeGeneratorServiceTest.java
@@ -1,46 +1,35 @@
-//package com.consum.test;
-//
-//import com.consum.ConsumApplication;
-//import com.consum.base.core.CodeGeneratorEnum;
-//import com.consum.base.core.CodeGeneratorService;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringRunner;
-//
-//
-//@RunWith(SpringRunner.class)
-//@SpringBootTest(classes = {ConsumApplication.class})
-//public class CodeGeneratorServiceTest {
-//
-// @Autowired
-// private CodeGeneratorService service;
-//
-// @Test
-// public void createWarehouseCode(){
-// for (int i=0;i<5;i++){
-// String code =service.createWarehouseCode();
-// System.out.println(code);
-// }
-// }
-//
-//// @Test
-//// public void createGoodsTemplateCode(){
-//// String[] prefixs = new String[] {"A","B","C","A","B"};
-//// int[] leis = new int[]{1,2,2,1,2};
-//// for (int i=0;i<5;i++){
-//// String code =service.createGoodsTemplateCode(prefixs[i],leis[i]);
-//// System.out.println(code);
-//// }
-//// }
-//
-// @Test
-// public void createBusinessFormCode(){
-// for (int i=0;i<5;i++){
-// String code =service.createBusinessFormCode(CodeGeneratorEnum.Transfer);
-// System.out.println(code);
-// }
-// }
-//
-//}
+package com.consum.test;
+
+import java.util.ArrayList;
+
+import org.apache.commons.compress.utils.Lists;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.consum.base.service.LWhFormInventoryGoodsService;
+import com.consum.model.po.LWhFormInventoryGoods;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class CodeGeneratorServiceTest {
+
+ @Autowired
+ private LWhFormInventoryGoodsService service;
+
+ @Test
+ public void createWarehouseCode() {
+ ArrayList<LWhFormInventoryGoods> objects = Lists.newArrayList();
+ for (int i = 1; i < 4; i++) {
+ LWhFormInventoryGoods entity = new LWhFormInventoryGoods();
+ entity.setId(Long.valueOf(i));
+ entity.setPrice(10.00);
+ objects.add(entity);
+ }
+ int i = service.updateBatch(objects);
+ System.out.println(i);
+ }
+
+}
--
Gitblit v1.9.1