From 9c12e20237eb56bf2b53f3d751ba618b56954fad Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期六, 02 十二月 2023 17:44:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 32 ++
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java | 4
consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java | 32 ++-
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 24 +-
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java | 41 +--
consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java | 31 +-
consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java | 57 +++++
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 6
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 55 +++-
consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java | 51 +++-
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryService.java | 56 +++++
consum-base/src/main/java/com/consum/base/service/impl/BaseCategoryServiceImpl.java | 5
consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java | 4
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 18 -
consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java | 13
consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java | 36 ++-
consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java | 2
consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java | 4
consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java | 63 ++++++
consum-base/src/main/java/com/consum/base/pojo/response/BaseGoodsTemplateInfo.java | 1
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java | 16 +
consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java | 18 -
22 files changed, 408 insertions(+), 161 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 965d462..055a230 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
@@ -4,7 +4,7 @@
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.BaseCategoryParam;
import com.consum.base.pojo.ProjectTreeResult;
-import com.consum.base.service.BaseCategoryServiceImpl;
+import com.consum.base.service.BaseCategoryService;
import com.consum.base.service.BaseGoodsTemplateServiceImpl;
import com.consum.model.po.BaseCategory;
import com.iplatform.model.po.S_user_core;
@@ -35,7 +35,7 @@
public class BaseCategoryController extends BaseController {
@Autowired
- private BaseCategoryServiceImpl baseCategoryService;
+ private BaseCategoryService baseCategoryService;
@Autowired
private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
index a3e1880..fa64b01 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
@@ -3,7 +3,7 @@
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.FinSysTenantDepartmentParam;
-import com.consum.base.service.FinSysTenantDepartmentServiceImpl;
+import com.consum.base.service.FinSysTenantDepartmentService;
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
import com.walker.db.page.GenericPager;
@@ -32,7 +32,7 @@
public class FinSysTenantDepartmentController extends BaseController {
@Autowired
- private FinSysTenantDepartmentServiceImpl departmentService;
+ private FinSysTenantDepartmentService departmentService;
/**
* @Description 鏂板
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index f03df71..946f689 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -14,7 +14,7 @@
import com.consum.base.pojo.response.FinSysTenantUserVO;
import com.consum.base.pojo.response.FinSysTenantVO;
import com.consum.base.pojo.response.UserVO;
-import com.consum.base.service.FinSysTenantDepartmentServiceImpl;
+import com.consum.base.service.FinSysTenantDepartmentService;
import com.consum.base.service.FinSysTenantServiceImpl;
import com.consum.base.service.FinSysTenantUserServiceImpl;
import com.consum.model.po.FinSysTenant;
@@ -31,22 +31,38 @@
import com.iplatform.model.po.S_role;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.*;
+import com.walker.infrastructure.utils.CollectionUtils;
+import com.walker.infrastructure.utils.DateUtils;
+import com.walker.infrastructure.utils.NumberGenerator;
+import com.walker.infrastructure.utils.PhoneNumberUtils;
+import com.walker.infrastructure.utils.StringUtils;
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 java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.*;
/**
* @Description 绯荤粺鐢ㄦ埛
@@ -71,7 +87,7 @@
private RoleServiceImpl roleService;
@Autowired
- private FinSysTenantDepartmentServiceImpl finSysTenantDepartmentService;
+ private FinSysTenantDepartmentService finSysTenantDepartmentService;
@Autowired
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 e72ee86..0a6772f 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
@@ -13,7 +13,7 @@
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.LWhFormInventoryService;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormInventory;
import com.iplatform.model.po.S_user_core;
@@ -52,7 +52,7 @@
public class LWhFormInventoryController extends BaseController {
@Autowired
- private LWhFormInventoryServiceImpl lWhFormInventoryService;
+ private LWhFormInventoryService lWhFormInventoryService;
@Autowired
private FinSysTenantUserServiceImpl finSysTenantUserService;
@@ -86,7 +86,7 @@
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();
}
@@ -113,7 +113,7 @@
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);
}
@@ -132,10 +132,10 @@
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);
}
@@ -175,7 +175,7 @@
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();
@@ -233,7 +233,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("鏆傚瓨澶辫触锛�");
}
@@ -259,7 +259,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("鐩樼偣澶辫触锛�");
}
@@ -284,7 +284,7 @@
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);
}
@@ -302,12 +302,12 @@
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);
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 7769dae..4041761 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -24,7 +24,7 @@
import com.consum.base.pojo.response.TransferInfoVO;
import com.consum.base.service.BaseWarehouseServiceImpl;
import com.consum.base.service.LWhFormTransferCoreService;
-import com.consum.base.service.LWhFormTransferServiceImpl;
+import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordServiceImpl;
import com.consum.base.service.LWhProcureModelUserServiceImpl;
@@ -71,7 +71,7 @@
public class LWhFormTransferController extends BaseController {
@Autowired
- private LWhFormTransferServiceImpl lWhFormTransferService;
+ private LWhFormTransferService lWhFormTransferService;
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Autowired
@@ -426,6 +426,7 @@
}
}
+ // TODO 浣跨敤浜轰慨鏀硅皟鐢�
return ResponseValue.success();
}
@@ -497,19 +498,6 @@
return ResponseValue.success(result);
}
-
- @ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")
- })
- @GetMapping("/query/detail")
- public ResponseValue queryDepartmentTransferOrder(Long agencyId) {
-
- TransferInfoVO transferInfoVO = new TransferInfoVO();
-
- lWhFormTransferService.queryDepartmentTransferOrder();
- return ResponseValue.success(transferInfoVO);
- }
@ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�")
@ApiImplicitParams({
diff --git a/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java b/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java
index a2ac052..1d1737c 100644
--- a/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/core/service/LWhWarningCoreServiceImpl.java
@@ -8,16 +8,15 @@
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.WhWarning;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
/**
@@ -59,8 +58,8 @@
return;
}
List<Long> allChangModelList = baseModelIdList.stream()
- .distinct()
- .collect(Collectors.toList());
+ .distinct()
+ .collect(Collectors.toList());
baseModelIdList = allChangModelList;
// 灏嗘暟鎹彃鍏ュ簱瀛橀璀︺�怶H_WARNING銆�
@@ -116,7 +115,6 @@
private String KU_CUN_NORMAL_MODEL = "update WH_WARNING set STATES=2 where WAREHOUSE_TYPE=? and BASE_WAREHOUSE_ID=?";
/**
- *
* @param warehouseType
* @param warehouseId
* @param normalBaseModelIdList 搴撳瓨姝ｅ父鐨�
@@ -132,7 +130,7 @@
StringBuilder sql = new StringBuilder(KU_CUN_NORMAL_MODEL);
if (!org.springframework.util.CollectionUtils.isEmpty(normalBaseModelIdList)) {
- sql.append(" and BASE_GOODS_MODELS_ID in(").append( org.apache.commons.lang3.StringUtils.join(normalBaseModelIdList, ",")).append(")");
+ sql.append(" and BASE_GOODS_MODELS_ID in(").append(org.apache.commons.lang3.StringUtils.join(normalBaseModelIdList, ",")).append(")");
}
return lWhWarningService.update(sql.toString(), params.toArray());
}
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/BaseGoodsTemplateInfo.java b/consum-base/src/main/java/com/consum/base/pojo/response/BaseGoodsTemplateInfo.java
index 0c3d446..104da19 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/response/BaseGoodsTemplateInfo.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/BaseGoodsTemplateInfo.java
@@ -13,4 +13,5 @@
private String baseGoodsTemplateName;
private Integer count;
+ private String unit;
}
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
index 3104725..5e6fc4a 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
@@ -31,7 +31,7 @@
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
- private BaseCategoryServiceImpl baseCategoryService;
+ private BaseCategoryService baseCategoryService;
@Autowired
private BaseGoodsModelsServiceImpl baseGoodsModelsService;
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
index dea1689..f2d56cd 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
@@ -12,12 +12,15 @@
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
/**
* @Description 浠撳簱绠＄悊
@@ -32,9 +35,7 @@
@Autowired
private FinSysTenantServiceImpl finSysTenantService;
@Autowired
- private FinSysTenantDepartmentServiceImpl departmentService;
- @Autowired
- private FinSysTenantUserServiceImpl userService;
+ private FinSysTenantDepartmentService departmentService;
@Autowired
private SDictDataServiceImpl sDictDataService;
diff --git a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
index 5fdda99..e1bfc3c 100644
--- a/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/DepFormScrappedServiceImpl.java
@@ -10,7 +10,14 @@
import com.consum.base.pojo.LDeptFormScrappedParam;
import com.consum.base.pojo.query.LDeptFormScrappedQry;
import com.consum.base.pojo.response.DepFormScrappedExtendVo;
-import com.consum.model.po.*;
+import com.consum.model.po.BaseCategory;
+import com.consum.model.po.DepFormScrapped;
+import com.consum.model.po.DepFormScrappedGoods;
+import com.consum.model.po.DepFormScrappedModel;
+import com.consum.model.po.FinSysTenantDepartment;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.SDictData;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -19,16 +26,15 @@
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import com.walker.web.ResponseValue;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* @ClassName DepFormScrappedServiceImpl
@@ -43,11 +49,11 @@
@Resource
private CodeGeneratorService codeGeneratorService;
@Resource
- private FinSysTenantDepartmentServiceImpl departmentService;
+ private FinSysTenantDepartmentService departmentService;
@Resource
- private LWhFormTransferServiceImpl lWhFormTransferService;
+ private LWhFormTransferService lWhFormTransferService;
@Resource
- private BaseCategoryServiceImpl baseCategoryService;
+ private BaseCategoryService baseCategoryService;
@Resource
private SDictDataServiceImpl sDictDataService;
@Resource
@@ -85,7 +91,6 @@
lDeptFormScrapped.setDepartmentId(sysInfo.getSysDeptId());
lDeptFormScrapped.setDepartmentName(department.getName());
}
-
lDeptFormScrapped.setCreateTime(dealTime);
lDeptFormScrapped.setStates(1);
@@ -255,10 +260,10 @@
depFormScrappedModel.setDepFormScrappedGoodsId(scrappedGoodsId);
List<DepFormScrappedModel> scrappedModelList = select(depFormScrappedModel);
List<List<DepFormScrappedModel>> modelList = scrappedModelList.stream()
- .collect(Collectors.groupingBy(DepFormScrappedModel::getBaseGoodsModelsId))
- .values().stream()
- .map(list -> list.stream().collect(Collectors.toList()))
- .collect(Collectors.toList());
+ .collect(Collectors.groupingBy(DepFormScrappedModel::getBaseGoodsModelsId))
+ .values().stream()
+ .map(list -> list.stream().collect(Collectors.toList()))
+ .collect(Collectors.toList());
scrappedGoodsMap.put("models", modelList);
goodsList.add(scrappedGoodsMap);
@@ -285,6 +290,7 @@
}
return select(sql.append(EXPORT_SQL_END).toString(), paramts, new MapperUtil());
}
+
public List<Map<String, Object>> listByModel(LDeptFormScrappedQry param) {
HashMap<String, Object> paramts = new HashMap<>();
StringBuilder sql = new StringBuilder(EXPORT_SQL);
@@ -299,7 +305,7 @@
paramts.put("businessFormCode", param.getBusinessFormCode());
}
//鐗╁搧鍚嶇О
- if (StringUtils.isNotEmpty(param.getGoodsTemplateName())){
+ if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
sql.append(" and model.BASE_GOODS_TEMPLATE_NAME LIKE :goodsTemplateName ");
paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java b/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java
new file mode 100644
index 0000000..99c4151
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentService.java
@@ -0,0 +1,63 @@
+package com.consum.base.service;
+
+import com.consum.base.pojo.FinSysTenantDepartmentParam;
+import com.consum.model.po.FinSysTenantDepartment;
+import com.consum.model.po.FinSysTenantUser;
+import com.walker.db.page.GenericPager;
+import com.walker.jdbc.service.BaseService;
+import java.util.List;
+
+public interface FinSysTenantDepartmentService extends BaseService {
+
+
+ FinSysTenantDepartment getByNameAndTenantId(String name, Long tenantId);
+
+ /**
+ * @Description 鏂板
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/26
+ */
+ int add(FinSysTenantDepartmentParam param, FinSysTenantUser sysInfo);
+
+ /**
+ * @Description 閮ㄩ棬鍒楄〃鏌ヨ
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/26
+ */
+ GenericPager<FinSysTenantDepartment> queryList(FinSysTenantDepartmentParam param);
+
+ FinSysTenantDepartment selectByCode(String code);
+
+ /**
+ * @Description 缂栬緫
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/26
+ */
+ int updateFinSysTenantDepartment(FinSysTenantDepartment department, FinSysTenantUser sysInfo);
+
+ /**
+ * 鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬璇︽儏
+ *
+ * @author 鍗㈠簡闃�
+ * @Date 2023/10/26
+ */
+ FinSysTenantDepartment getById(Long id);
+
+ /**
+ * @param department
+ * @param currentUser
+ * @Description 鏍规嵁id鍒犻櫎閮ㄩ棬
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/26
+ */
+ int updateById(FinSysTenantDepartment department, FinSysTenantUser currentUser);
+
+ /**
+ * 鏍规嵁鏈烘瀯id鏌ヨ閮ㄩ棬
+ *
+ * @param agencyId
+ * @return
+ */
+ List<FinSysTenantDepartment> getByTenantId(Long agencyId);
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
index 988d31e..9daeba8 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
@@ -41,7 +41,7 @@
private LWhProcureModelService lWhProcureModelService;
private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
- private LWhFormInventoryServiceImpl lWhFormInventoryService;
+ private LWhFormInventoryService lWhFormInventoryService;
private LWhFormProcureCoreService lWhFormProcureCoreService;
private LWhFormOutputServiceImpl lWhFormOutputService;
@@ -55,7 +55,7 @@
LWhProcureModelService lWhProcureModelService,
BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
LWhGoodsService lWhGoodsService,
- LWhFormInventoryServiceImpl lWhFormInventoryService,
+ LWhFormInventoryService lWhFormInventoryService,
LWhFormProcureCoreService lWhFormProcureCoreService,
LWhFormOutputServiceImpl lWhFormOutputService
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryService.java
new file mode 100644
index 0000000..500e3a2
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryService.java
@@ -0,0 +1,56 @@
+package com.consum.base.service;
+
+import com.consum.base.core.utils.PageUtil;
+import com.consum.base.pojo.excel.InventoryExcelTemplate;
+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.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.jdbc.service.BaseService;
+import java.util.List;
+
+public interface LWhFormInventoryService extends BaseService {
+
+ int add(FormInventoryParam param, FinSysTenantUser currentUser, FinSysTenantUser operatorUser, FinSysTenantUser monitorUser);
+
+ /**
+ * @Description 鐩樼偣鍗曞垪琛ㄦ煡璇�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/31
+ */
+ GenericPager<LWhFormInventory> queryList(LWhFormInventoryQry param, FinSysTenantUser sysInfo);
+
+
+ FormInventoryVO saveInventory(FormInventoryVO dto, Long id);
+
+
+ /**
+ * 淇濆瓨鐩樼偣淇℃伅
+ *
+ * @author 鍗㈠簡闃�
+ * @date 2023/10/31
+ */
+ int updateInventoryInfo(LWhFormInventoryParam dto, Integer state, S_user_core currentUser, FinSysTenantUser sysInfo);
+
+
+ /**
+ * @return
+ * @Description 寮傚父鏄庣粏鍒楄〃鏌ヨ
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/1
+ */
+ PageUtil<FormInventoryDetailVO> queryPdDetailList(LWhFormInventoryQry param, FinSysTenantUser sysInfo);
+
+ List<FormInventoryGoodsVO> selectDetailById(Long id);
+
+ FormInventoryVO queryInventBaseGoodTemplate(Long id);
+
+ List<InventoryExcelTemplate> getExportList(Long id);
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
index 13f4f61..9cebb1c 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
@@ -41,7 +41,7 @@
*/
@Slf4j
@Service
-public class LWhFormInventoryServiceImpl extends BaseServiceImpl {
+public class LWhFormInventoryServiceImpl extends BaseServiceImpl implements LWhFormInventoryService {
@Autowired
private CodeGeneratorService codeGeneratorService;
@@ -83,6 +83,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
+ @Override
public int add(FormInventoryParam param, FinSysTenantUser currentUser, FinSysTenantUser operatorUser, FinSysTenantUser monitorUser) {
//鏂板鐩樼偣鍗�
LWhFormInventory lWhFormInventory = new LWhFormInventory();
@@ -121,6 +122,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
+ @Override
public GenericPager<LWhFormInventory> queryList(LWhFormInventoryQry param, FinSysTenantUser sysInfo) {
StringBuilder sql = new StringBuilder(QUERY_LIST);
HashMap<String, Object> paramts = new HashMap<>();
@@ -158,7 +160,8 @@
}
- public List<FormInventoryGoodsVO> saveInventory(FormInventoryVO dto, Long id) {
+ @Override
+ public FormInventoryVO saveInventory(FormInventoryVO dto, Long id) {
//1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(id));
if (lWhFormInventory == null) {
@@ -177,8 +180,8 @@
log.error("鐩樼偣鍗曠墿鍝佷负绌�");
}
List<FormInventoryGoodsVO> result = inventoryGoodsService.add(formInventoryGoodsList, id);
-
- return result;
+ dto.setFormInventoryGoodsList(result);
+ return dto;
}
@@ -189,6 +192,7 @@
* @date 2023/10/31
*/
@Transactional(rollbackFor = Exception.class)
+ @Override
public int updateInventoryInfo(LWhFormInventoryParam dto, Integer state, S_user_core currentUser, FinSysTenantUser sysInfo) {
//1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(dto.getId()));
@@ -233,6 +237,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/11/1
*/
+ @Override
public PageUtil<FormInventoryDetailVO> queryPdDetailList(LWhFormInventoryQry param, FinSysTenantUser sysInfo) {
StringBuilder sql = new StringBuilder(QUERY_PD_DETAIL_LIST);
HashMap<String, Object> paramts = new HashMap<>();
@@ -303,6 +308,7 @@
return pageUtil;
}
+ @Override
public List<FormInventoryGoodsVO> selectDetailById(Long id) {
String sql = "select fig.id, fig.BASE_GOODS_TEMPLATE_ID,fig.GOODS_TEMPLATE_NAME,fig.BASE_GOODS_MODELS_NAME,"
@@ -319,6 +325,7 @@
return result;
}
+ @Override
public FormInventoryVO queryInventBaseGoodTemplate(Long id) {
FormInventoryVO formInventoryVO = new FormInventoryVO();
@@ -354,6 +361,7 @@
return formInventoryVO;
}
+ @Override
public List<InventoryExcelTemplate> getExportList(Long id) {
String sql = "SELECT\n"
+ "\tfi.INVENTORY_DATE createTime,\n"
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
index d8573f1..c21a84c 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
@@ -222,7 +222,11 @@
goodsModelNumList.forEach(itemModelInfo -> {
// 闇�瑕佽皟鎷ㄧ殑鐗╁搧鐨勬煇涓瀷鍙�
Long baseGoodsModelsId = itemModelInfo.getBaseGoodsModelsId();
- allChangModelList.add(baseGoodsModelsId);
+
+ //TODO 涓虹┖鏃朵笉鍔犲叆鏇存柊鍒楄〃
+ if (baseGoodsModelsId != null) {
+ allChangModelList.add(baseGoodsModelsId);
+ }
// 闇�瑕佽皟鎷ㄧ殑鐗╁搧鏌愪釜鍨嬪彿鐨勬暟閲�
Integer counts = itemModelInfo.getCounts();
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
index 5fb144f..daf8093 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
@@ -15,20 +15,30 @@
import com.consum.base.pojo.response.FormScrappedGoodsVO;
import com.consum.base.pojo.response.GoodsModelVO;
import com.consum.base.pojo.response.LWhFormScrappedExtendVO;
-import com.consum.model.po.*;
+import com.consum.model.po.BaseGoodsModels;
+import com.consum.model.po.BaseGoodsTemplate;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantDepartment;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormScrapped;
+import com.consum.model.po.LWhFormScrappedGoods;
+import com.consum.model.po.SDictData;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-import java.util.stream.Collectors;
/**
* @Description 鎶ュ簾鍗�
@@ -43,7 +53,7 @@
@Autowired
private BaseWarehouseServiceImpl baseWarehouseService;
@Autowired
- private FinSysTenantDepartmentServiceImpl departmentService;
+ private FinSysTenantDepartmentService departmentService;
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
@@ -72,7 +82,7 @@
* @return 1.鏂板鎶ュ簾鍗� 2.鏂板鎶ュ簾鍗曠墿鍝�
*/
- public int add(LWhFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
+ public int add(LWhFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
//1.鏂板鎶ュ簾鍗曡褰�
LWhFormScrapped lWhFormScrapped = new LWhFormScrapped();
//鎶ュ簾鍗昳d
@@ -93,25 +103,6 @@
return 0;
}
wareHouseName = warehouse.getWarehouseName();
-// if (0 == 0) {
-// warehouseId = param.getWarehouseId();
-// //鏍规嵁浠撳簱id鏌ヨ浠撳簱
-// BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
-// if (warehouse == null) {
-// log.error("浠撳簱涓嶅瓨鍦�");
-// return 0;
-// }
-// wareHouseName = warehouse.getWarehouseName();
-// } else {
-// // 鏌ヨ閮ㄩ棬鍚嶇О
-// warehouseId = param.getDepartmentId();
-// FinSysTenantDepartment sysTenantDepartment = departmentService.getById(warehouseId);
-// if (sysTenantDepartment == null) {
-// log.error("閮ㄩ棬涓嶅瓨鍦�");
-// return 0;
-// }
-// wareHouseName = sysTenantDepartment.getName();
-// }
lWhFormScrapped.setWarehouseId(warehouseId);
lWhFormScrapped.setWarehouseName(wareHouseName);
lWhFormScrapped.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
index 81cd08f..e890509 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
@@ -5,23 +5,27 @@
import com.consum.base.core.service.LWhWarningCoreServiceImpl;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
-import com.consum.model.po.*;
+import com.consum.model.po.LGoodsUserRecord;
+import com.consum.model.po.LWarehouseFlow;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhGoodsRecord;
+import com.consum.model.po.LWhGoodsRecordDetails;
+import com.consum.model.po.LWhProcureModelUser;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.NumberGenerator;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
/**
* @ClassName LWhFormTransferCoreService
@@ -35,7 +39,7 @@
public class LWhFormTransferCoreService {
@Resource
- private LWhFormTransferServiceImpl lWhFormTransferService;
+ private LWhFormTransferService lWhFormTransferService;
@Resource
private LWhFormOutputCoreService lWhFormOutputCoreService;
@Resource
@@ -128,7 +132,7 @@
String nickName = currentUser.getNick_name();
// 鍑哄簱鍗曟祦姘磇d
Long outWarehouseFlowId = lWhFormTransfer.getOutWarehouseFlowId();
- if (outWarehouseFlowId == null){
+ if (outWarehouseFlowId == null) {
log.error("璋冩嫧澶辫触锛佹湭鎵惧埌鍑哄簱鍗�");
return;
}
@@ -188,7 +192,7 @@
synchronized (warehouseModelLockObj) {
// 鏍规嵁鍑哄簱娴佹按ID 鏌ヨ 鍑哄簱鐨勭墿鍝両D
outGoodsIds = getGoodsidByFlowId(outWarehouseFlowId, oldRecordId);
- if (CollectionUtils.isEmpty(outGoodsIds)){
+ if (CollectionUtils.isEmpty(outGoodsIds)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new RuntimeException("鍏ュ簱鍗曞け璐ワ紝鏈煡璇㈠埌鐗╁搧锛�");
}
@@ -211,7 +215,7 @@
lWhProcureModelUser.setTransBusinessId(whFormTransferId);
lWhProcureModelUser.setBaseGoodsModelsId(baseGoodsModelsId);
List<LWhProcureModelUser> goodsUserInfo = goodsBaseService.select(lWhProcureModelUser);
- if (CollectionUtils.isEmpty(goodsUserInfo)){
+ if (CollectionUtils.isEmpty(goodsUserInfo)) {
continue;
}
int totalGoodsNum = goodsUserInfo.stream().filter(item -> item.getGoodsNum() != null).mapToInt(LWhProcureModelUser::getGoodsNum).sum();
@@ -258,7 +262,6 @@
//灏嗕繚绠′粨搴撲俊鎭洿鏂板埌 鐗╁搧浠撳簱淇濈璁板綍銆怢_GOODS_WH_RECORD銆�
lGoodsWhRecordService.insertNewRecord(outGoodsIds, inWarehouseFlowId, dealTime);
-
LWhGoodsRecordDetails lWhGoodsRecordDetails = new LWhGoodsRecordDetails();
lWhGoodsRecordDetails.setWhGoodsRecordId(oldRecordId);
List<LWhGoodsRecordDetails> goodsRecordDetailsList = lWhGoodsRecordDetailsService.select(lWhGoodsRecordDetails);
@@ -282,7 +285,7 @@
lWhFormTransferService.update(lWhFormTransfer);
//褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
- if (inWarehouseType == 0){
+ if (inWarehouseType == 0) {
lWhWarningCoreService.updateKuCun(Convert.toShort(inWarehouseType, (short) 0), inWarehouseId, allChangModelList, null, dealTime);
}
log.info("璋冩嫧鍗曪細{} 鍏ュ簱瀹屾垚", whFormTransferId);
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java
new file mode 100644
index 0000000..1c067fb
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferService.java
@@ -0,0 +1,57 @@
+package com.consum.base.service;
+
+import com.consum.base.pojo.excel.TransferExcelTemplate;
+import com.consum.base.pojo.query.TransferQry;
+import com.consum.base.pojo.request.LWhFormTransferParam;
+import com.consum.base.pojo.response.LWHFromTransferExtendVO;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormTransfer;
+import com.walker.db.page.GenericPager;
+import com.walker.jdbc.service.BaseService;
+import java.util.List;
+import java.util.Map;
+
+public interface LWhFormTransferService extends BaseService {
+
+ long add(LWhFormTransferParam param, FinSysTenantUser sysInfo) throws Exception;
+
+
+ /**
+ * @Description 鍒楄〃鏌ヨ
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/30
+ */
+ GenericPager<LWhFormTransfer> queryFormTransferList(TransferQry param);
+
+ /**
+ * @Description 鏍规嵁id鏌ヨ璇︽儏
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/30
+ */
+ LWHFromTransferExtendVO getById(Long id);
+
+
+ /**
+ * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/31
+ */
+ List<TransferExcelTemplate> export(Long id, Integer type);
+
+ /**
+ * 鎾ら攢
+ *
+ * @author 鍗㈠簡闃�
+ * @date 2023/10/31
+ */
+ int updateStatus(Long id);
+
+ GenericPager<Map<String, Object>> queryTransferInfo(TransferQry transferQry);
+
+
+ GenericPager<Map<String, Object>> queryFormTransferDetailList(TransferQry param);
+
+ List<Map<String, Object>> queryDepartmentTransferOrder();
+
+ LWhFormTransfer selectById(Long id);
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseCategoryServiceImpl.java
similarity index 97%
rename from consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/BaseCategoryServiceImpl.java
index 8ccb9f5..7b10210 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseCategoryServiceImpl.java
@@ -1,9 +1,10 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
import com.consum.base.Constants;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.BaseCategoryParam;
import com.consum.base.pojo.ProjectTreeResult;
+import com.consum.base.service.BaseCategoryService;
import com.consum.model.po.BaseCategory;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -23,7 +24,7 @@
* @Date 2023/10/23
*/
@Service
-public class BaseCategoryServiceImpl extends BaseServiceImpl {
+public class BaseCategoryServiceImpl extends BaseServiceImpl implements BaseCategoryService {
private static final String QUERY_TREE_ALL = "select * from base_category where states = 1 order by FATHER_CATEGORY_ID, LEVELS ASC";
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java
similarity index 93%
rename from consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java
index 99b1cbd..8a7b2a9 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java
@@ -1,19 +1,19 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
import com.consum.base.Constants;
-import com.consum.base.pojo.FinSysTenantDepartmentParam;
import com.consum.base.core.utils.IdUtil;
+import com.consum.base.pojo.FinSysTenantDepartmentParam;
+import com.consum.base.service.FinSysTenantDepartmentService;
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
import java.util.HashMap;
import java.util.List;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
/**
* @Description 閮ㄩ棬绠＄悊
@@ -21,16 +21,17 @@
* @Date 2023/10/26
*/
@Service
-public class FinSysTenantDepartmentServiceImpl extends BaseServiceImpl {
+public class FinSysTenantDepartmentServiceImpl extends BaseServiceImpl implements FinSysTenantDepartmentService {
private static final String QUERY_BY_CODE = "SELECT * FROM fin_sys_tenant_department WHERE CODE = ?";
/**
- * @Description 鏍规嵁 閮ㄩ棬鍚嶇О鍜屾満鏋刬d 鏌ヨ閮ㄩ棬
+ * @Description 鏍规嵁 閮ㄩ棬鍚嶇О鍜屾満鏋刬d 鏌ヨ閮ㄩ棬
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
- public FinSysTenantDepartment getByNameAndTenantId(String name,Long tenantId) {
+ @Override
+ public FinSysTenantDepartment getByNameAndTenantId(String name, Long tenantId) {
StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -48,10 +49,11 @@
}
/**
- * @Description 鏂板
+ * @Description 鏂板
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
+ @Override
public int add(FinSysTenantDepartmentParam param, FinSysTenantUser sysInfo) {
FinSysTenantDepartment department = new FinSysTenantDepartment();
BeanUtils.copyProperties(param, department);
@@ -70,6 +72,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
+ @Override
public GenericPager<FinSysTenantDepartment> queryList(FinSysTenantDepartmentParam param) {
StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 and is_delete = 0 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -101,6 +104,7 @@
return selectSplit(sql.toString(), paramts, new FinSysTenantDepartment());
}
+ @Override
public FinSysTenantDepartment selectByCode(String code) {
List<FinSysTenantDepartment> select = this.select(QUERY_BY_CODE, new Object[]{code}, new FinSysTenantDepartment());
if (StringUtils.isEmptyList(select)) {
@@ -115,6 +119,7 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
+ @Override
public int updateFinSysTenantDepartment(FinSysTenantDepartment department, FinSysTenantUser sysInfo) {
department.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
department.setUpdateBy(sysInfo.getUserName());
@@ -123,20 +128,23 @@
/**
* 鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬璇︽儏
+ *
* @author 鍗㈠簡闃�
* @Date 2023/10/26
*/
+ @Override
public FinSysTenantDepartment getById(Long id) {
return this.get(new FinSysTenantDepartment(id));
}
/**
+ * @param department
+ * @param currentUser
* @Description 鏍规嵁id鍒犻櫎閮ㄩ棬
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
- * @param department
- * @param currentUser
*/
+ @Override
public int updateById(FinSysTenantDepartment department, FinSysTenantUser currentUser) {
department.setIsDelete(Constants.IS_DELETE_YES);
//鍒犻櫎鏃堕棿
@@ -148,9 +156,11 @@
/**
* 鏍规嵁鏈烘瀯id鏌ヨ閮ㄩ棬
+ *
* @param agencyId
* @return
*/
+ @Override
public List<FinSysTenantDepartment> getByTenantId(Long agencyId) {
StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 and is_delete = 0 ");
HashMap<String, Object> paramts = new HashMap<>();
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
similarity index 93%
rename from consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
index 199896f..1df2daf 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -1,4 +1,4 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
@@ -15,10 +15,32 @@
import com.consum.base.pojo.response.FormTransferGoodsVO;
import com.consum.base.pojo.response.GoodsModelVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
-import com.consum.model.po.*;
+import com.consum.base.service.BaseGoodsModelsServiceImpl;
+import com.consum.base.service.BaseWarehouseManagerService;
+import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.FinSysTenantServiceImpl;
+import com.consum.base.service.LWhFormOutputServiceImpl;
+import com.consum.base.service.LWhFormTransferService;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.LWhProcureModelService;
+import com.consum.base.service.LWhProcureModelUserRecordServiceImpl;
+import com.consum.base.service.LWhProcureModelUserServiceImpl;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.BaseWarehouseManager;
+import com.consum.model.po.FinSysTenant;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhProcureModel;
+import com.consum.model.po.LWhProcureModelUser;
+import com.consum.model.po.LWhProcureModelUserRecord;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,15 +48,13 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
-import java.util.*;
-
/**
* @Description 璋冩嫧绠＄悊
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
@Service
-public class LWhFormTransferServiceImpl extends BaseServiceImpl {
+public class LWhFormTransferServiceImpl extends BaseServiceImpl implements LWhFormTransferService {
@Autowired
private BaseWarehouseServiceImpl baseWarehouseService;
@@ -47,11 +67,7 @@
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Autowired
- private LWhFormOutputCoreService lWhFormOutputCoreService;
- @Autowired
private LWhFormOutputServiceImpl lWhFormOutputService;
- @Autowired
- private LWhGoodsRecordService lWhGoodsRecordService;
@Autowired
private BaseGoodsModelsServiceImpl baseGoodsModelsService;
@Autowired
@@ -60,8 +76,6 @@
private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
@Autowired
private BaseWarehouseManagerService baseWarehouseManagerService;
- @Autowired
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
private static String QUERY_FORM_TRANSFER_LIST = "SELECT ft.* FROM l_wh_form_transfer ft "
+ "left join L_WH_PROCURE_MODEL pm on pm.BUSINESS_ID = ft.id "
@@ -346,13 +360,16 @@
List<FormTransferGoodsVO> formTransferGoods = Lists.newArrayList();
for (Map<String, Object> map : procureModelList) {
FormTransferGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormTransferGoodsVO.class);
-
+ Long baseGoodsTemplateId = procureTemplateInfoVO.getId();
// 鏌ヨ鍨嬪彿鏁伴噺
List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
String sql2 = "SELECT pm.id,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount "
+ "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
- + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID " + "WHERE pm.BUSINESS_ID =:id";
- List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap, new MapperUtil());
+ + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID " + "WHERE pm.BUSINESS_ID =:id and bgt.id =:baseGoodsTemplateId";
+ Map<String, Object> goodsModelParamMap = new HashMap<>();
+ goodsModelParamMap.put("id", result.getId());
+ goodsModelParamMap.put("baseGoodsTemplateId", baseGoodsTemplateId);
+ List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, goodsModelParamMap, new MapperUtil());
modelList.forEach(item -> {
GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
Integer businessType = result.getBusinessType();
@@ -381,9 +398,8 @@
}
goodsModelVOList.add(goodsModelVO);
+ procureTemplateInfoVO.setModels(goodsModelVOList);
});
-
- procureTemplateInfoVO.setModels(goodsModelVOList);
formTransferGoods.add(procureTemplateInfoVO);
}
result.setFormTransferGoods(formTransferGoods);
@@ -577,4 +593,11 @@
return select;
}
+
+ @Override
+ public LWhFormTransfer selectById(Long id) {
+ LWhFormTransfer lWhFormTransfer = new LWhFormTransfer();
+ lWhFormTransfer.setId(id);
+ return this.get(lWhFormTransfer);
+ }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
index d4a2747..85d1297 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/UsingFormBackServiceImpl.java
@@ -18,12 +18,16 @@
import com.consum.base.pojo.response.UsingFormBackGoodsTemplateInfo;
import com.consum.base.pojo.response.UsingFormBackModelInfo;
import com.consum.base.pojo.response.UsingFormBackVO;
-import com.consum.base.service.BaseCategoryServiceImpl;
+import com.consum.base.service.BaseCategoryService;
+import com.consum.base.service.FinSysTenantDepartmentService;
+import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.UsingFormBackGoodsService;
import com.consum.base.service.UsingFormBackModelService;
import com.consum.base.service.UsingFormBackService;
import com.consum.model.po.BaseCategory;
+import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormTransfer;
import com.consum.model.po.UsingFormBack;
import com.consum.model.po.UsingFormBackGoods;
import com.consum.model.po.UsingFormBackModel;
@@ -54,18 +58,25 @@
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
- private BaseCategoryServiceImpl baseCategoryService;
+ private BaseCategoryService baseCategoryService;
@Autowired
private UsingFormBackModelService usingFormBackModelService;
@Autowired
private UsingFormBackGoodsService usingFormBackGoodsService;
-
+ @Autowired
+ private FinSysTenantDepartmentService finSysTenantDepartmentService;
+ @Autowired
+ private LWhFormTransferService lWhFormTransferService;
@Override
public void add(UsingFormBackParam usingFormBackParam, FinSysTenantUser sysInfo) {
Long departmentId = usingFormBackParam.getDepartmentId();
- String departmentName = usingFormBackParam.getDepartmentName();
+ FinSysTenantDepartment department = finSysTenantDepartmentService.getById(departmentId);
+ if (department == null) {
+ throw new RuntimeException("閮ㄩ棬涓嶅瓨鍦�");
+ }
+ String departmentName = department.getName();
Long operatorId = usingFormBackParam.getOperatorId();
String operatorName = usingFormBackParam.getOperatorName();
Long backTime = usingFormBackParam.getDealTime();
@@ -93,8 +104,12 @@
usingFormBackGoods.setClassification(classification);
usingFormBackGoods.setTransBusinessId(transBusinessId);
usingFormBackGoods.setBusinessFormCode(businessFormCode);
-// usingFormBackGoods.setTransOutWarehouseType();
-// usingFormBackGoods.setTransOutWarehouseId();
+
+ LWhFormTransfer lWhFormTransfer = lWhFormTransferService.selectById(transBusinessId);
+ Integer outWarehouseType = lWhFormTransfer.getOutWarehouseType();
+ Long outWarehouseId = lWhFormTransfer.getOutWarehouseId();
+ usingFormBackGoods.setTransOutWarehouseType(outWarehouseType);
+ usingFormBackGoods.setTransOutWarehouseId(outWarehouseId);
usingFormBackModelService.insert(usingFormBackGoods);
for (baseGoodModel model : backingGoodsInfo.getModels()) {
@@ -180,7 +195,7 @@
map.put("agencyId", agencyId);
}
if (StringUtils.isNotEmpty(createName)) {
- sql.append("AND ufb.CREATE_NAME = :createName ");
+ sql.append("AND ufb.OPERATOR_NAME = :createName ");
map.put("createName", createName);
}
sql.append("ORDER BY ufb.CREATE_TIME DESC ");
@@ -194,7 +209,8 @@
Long id = usingFormBackVO.getId();
StringBuilder countSql = new StringBuilder("SELECT \n"
+ "\tufbg.BASE_GOODS_TEMPLATE_NAME,\n"
- + "\tsum(ufbm.COUNTS) count\n"
+ + "\tsum(ufbm.COUNTS) count,\n"
+ + "\tufbm.UNIT\n"
+ "FROM\n"
+ "\tusing_form_back_goods ufbg\n"
+ "\tLEFT JOIN using_form_back_model ufbm ON ufbg.ID = ufbm.USING_FORM_BACK_GOODS_ID\n"
@@ -350,7 +366,7 @@
map.put("agencyId", agencyId);
}
if (StringUtils.isNotEmpty(createName)) {
- sql.append("AND ufb.CREATE_NAME = :createName ");
+ sql.append("AND ufb.OPERATOR_NAME = :createName ");
map.put("createName", createName);
}
sql.append("ORDER BY ufb.CREATE_TIME DESC ");
@@ -373,9 +389,9 @@
UsingFormBack usingFormBack = new UsingFormBack();
usingFormBack.setId(IdUtil.generateId());
usingFormBack.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.GOBACK));
-// usingFormBack.setOutWarehouseType();
-// usingFormBack.setOutWarehouseId();
-// usingFormBack.setOutWarehouseName();
+ usingFormBack.setOutWarehouseType(1);
+ usingFormBack.setOutWarehouseId(departmentId);
+ usingFormBack.setOutWarehouseName(departmentName);
String tenantId = sysInfo.getTenantId();
String tenantName = sysInfo.getTenantName();
@@ -384,9 +400,14 @@
usingFormBack.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
usingFormBack.setStates(1);
- usingFormBack.setDepartmentId(departmentId);
- usingFormBack.setDepartmentName(departmentName);
- usingFormBack.setOperatorId(operatorId);
+ Long sysDeptId = sysInfo.getSysDeptId();
+ FinSysTenantDepartment department = finSysTenantDepartmentService.getById(sysDeptId);
+ if (department == null) {
+ throw new RuntimeException("閮ㄩ棬涓嶅瓨鍦�");
+ }
+ usingFormBack.setDepartmentId(department.getId());
+ usingFormBack.setDepartmentName(department.getName());
+ usingFormBack.setOperatorId(sysInfo.getId());
usingFormBack.setOperatorName(operatorName);
usingFormBack.setDealTime(backTime);
usingFormBack.setProcureDoc(procureDoc);
--
Gitblit v1.9.1