From 7261ee93908d61a2c714645f19501aee9a7aba7b Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 24 十一月 2023 17:35:51 +0800
Subject: [PATCH] --部门物品分发
---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index 38adcd8..ed68075 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -7,6 +7,7 @@
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.LWhFormProcureGoodsInfoParam;
import com.consum.base.pojo.LWhFormProcureParam;
import com.consum.base.pojo.LWhProcureModelParam;
@@ -166,7 +167,7 @@
}
String modelName = (String) tempGoodsInfo.get("modelname");
// 鏌ヨ鍨嬪彿搴撳瓨
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
LWhProcureModel model = new LWhProcureModel();
model.setId(NumberGenerator.getLongSequenceNumber());
model.setFromProcureGoodsId(fromProcureGoodsId);
@@ -178,6 +179,7 @@
model.setCounts(counts);
model.setWorehouseCount(goodsModelNum);
model.setSupplier(supplier);
+ model.setTotalAmount(price * counts);
procureModelList.add(model);
}
procureGoodList.add(procureGood);
@@ -228,8 +230,13 @@
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
-
- GenericPager genericPager = lWhFormProcureService.queryFormProcureList(param);
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ if (param.getAgencyId() == null) {
+ param.setAgencyId(Long.valueOf(tenantId));
+ }
+ PageUtil genericPager = lWhFormProcureService.queryFormProcureList(param);
List<LWhFormProcure> data = genericPager.getDatas();
ArrayList<FormProcureVO> result = new ArrayList<>();
if (!CollectionUtils.isEmpty(data)) {
@@ -262,6 +269,7 @@
} catch (Exception e) {
e.printStackTrace();
}
+ genericPager.setDatas(result);
return ResponseValue.success(genericPager);
}
@@ -323,6 +331,9 @@
return ResponseValue.error("閲囪喘鍗昳d涓虹┖");
}
LWhFormProcure lWhFormProcure = lWhFormProcureService.get(new LWhFormProcure(id));
+ if (lWhFormProcure == null) {
+ return ResponseValue.error("閲囪喘鍗曚笉瀛樺湪");
+ }
LWhFormProcureExtendVO lWhFormProcureExtendVO = new LWhFormProcureExtendVO();
BeanUtils.copyProperties(lWhFormProcure, lWhFormProcureExtendVO);
--
Gitblit v1.9.1