From edc87e2fc3760cd7d1230bc058acf5620ea2c465 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 02 十二月 2023 15:03:15 +0800
Subject: [PATCH] 部门分发添加,分发单型号查询
---
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
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 29710be..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
@@ -53,7 +53,7 @@
@Autowired
private BaseWarehouseServiceImpl baseWarehouseService;
@Autowired
- private FinSysTenantDepartmentServiceImpl departmentService;
+ private FinSysTenantDepartmentService departmentService;
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
@@ -82,38 +82,27 @@
* @return 1.鏂板鎶ュ簾鍗� 2.鏂板鎶ュ簾鍗曠墿鍝�
*/
- public int add(LWhFormScrappedParam param, int warehouseType, S_user_core currentUser, FinSysTenantUser sysInfo) {
+ public int add(LWhFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
//1.鏂板鎶ュ簾鍗曡褰�
LWhFormScrapped lWhFormScrapped = new LWhFormScrapped();
//鎶ュ簾鍗昳d
long lWhFormScrappedId = IdUtil.generateId();
lWhFormScrapped.setId(lWhFormScrappedId);
lWhFormScrapped.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Scrapped));
- lWhFormScrapped.setWarehouseType(warehouseType);
+ lWhFormScrapped.setWarehouseType(0);
// 鍏敤
Long warehouseId = null;
//浠撳簱鍚嶇О
String wareHouseName = null;
- if (warehouseType == 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();
+ warehouseId = param.getWarehouseId();
+ //鏍规嵁浠撳簱id鏌ヨ浠撳簱
+ BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
+ if (warehouse == null) {
+ log.error("浠撳簱涓嶅瓨鍦�");
+ return 0;
}
+ wareHouseName = warehouse.getWarehouseName();
lWhFormScrapped.setWarehouseId(warehouseId);
lWhFormScrapped.setWarehouseName(wareHouseName);
lWhFormScrapped.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
@@ -167,7 +156,7 @@
LWhFormScrappedGoods scrappedGoods = new LWhFormScrappedGoods();
scrappedGoods.setId(IdUtil.generateId());
//鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, scrappedGoods.getBaseGoodsModelsId(), 1, null);
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, scrappedGoods.getBaseGoodsModelsId(), 1, null);
if (params.getCounts() > goodsNum) {
log.error("鎶ュ簾鏁伴噺澶т簬搴撳瓨鏁伴噺");
return 0;
--
Gitblit v1.9.1