From 170c89b9b8e6d5c3117d53e7b38f782651ebfcde Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 22 十二月 2023 14:04:04 +0800
Subject: [PATCH] 物品统计表中总数量改为在库数量+报废数量
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
index 459499b..4261eb3 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -19,7 +19,9 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.type.CategoryType;
+import com.consum.base.core.type.StatesType;
import com.consum.base.core.type.TransferBusinessType;
+import com.consum.base.core.type.TransferStatesType;
import com.consum.base.core.type.WareHouseType;
import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
@@ -118,7 +120,7 @@
// 鍏ュ簱浠撳簱涓哄綋鍓嶇敤鎴风殑榛樿浠撳簱涓殑绗竴涓�
String tenantId = sysInfo.getTenantId();
String tenantName = sysInfo.getTenantName();
- BaseWarehouse warehouse = baseWarehouseService.getDefaultWarehouseByAgencyId(Long.valueOf(tenantId));
+ BaseWarehouse warehouse = baseWarehouseService.getWarehouseByAgencyId(Long.valueOf(tenantId), null);
if (warehouse == null) {
log.error("浠撳簱涓嶅瓨鍦�");
throw new Exception("浠撳簱涓嶅瓨鍦�");
@@ -177,7 +179,7 @@
lWhFormTransfer.setOperatorName(sysInfo.getUserName());
lWhFormTransfer.setCreateTime(param.getCreateTime());
// 0=寰呭嚭搴擄紱1=寰呮帴鏀讹紱2=宸插叆搴撳簱:4=宸叉挙閿�
- lWhFormTransfer.setStates(0);
+ lWhFormTransfer.setStates(TransferStatesType.OUT_PENDING.getValue());
lWhFormTransfer.setProcureDoc(param.getProcureDoc());
int flag1 = this.insert(lWhFormTransfer);
@@ -217,7 +219,7 @@
// 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
// 璋冩嫧鐢宠鏃舵病鏈変粨搴搃d 鏌ヨ涓婄骇鏈烘瀯鐨勬墍鏈変粨搴�
List<BaseWarehouse> baseWareHouseList =
- baseWarehouseService.getBaseWareHouseList(outAgencyId, (short)1);
+ baseWarehouseService.getBaseWareHouseList(outAgencyId, StatesType.NORMAL.getValue());
List<Long> warehouseIdList =
baseWareHouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toList());
int goodsNum = lWhGoodsService.queryGoodsModelNum(WareHouseType.TENANT.getValue(), warehouseIdList,
@@ -543,7 +545,7 @@
*/
public int updateStatus(Long id) {
LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id);
- lWhFormTransfer.setStates(4);
+ lWhFormTransfer.setStates(TransferStatesType.CANCEL.getValue());
return this.update(lWhFormTransfer);
}
@@ -642,11 +644,11 @@
}
if (param.getOutAgencyId() != null) {
sql.append("AND ft.OUT_AGENCY_ID like :outAgencyId ");
- params.put("outAgencyId", param.getOutAgencyId());
+ params.put("outAgencyId", param.getOutAgencyId() + StringUtils.CHAR_PERCENT);
}
- if (param.getOutAgencyId() != null) {
+ if (param.getInAgencyId() != null) {
sql.append("AND ft.IN_AGENCY_ID like :inAgencyId ");
- params.put("inAgencyId", param.getInAgencyId());
+ params.put("inAgencyId", param.getInAgencyId() + StringUtils.CHAR_PERCENT);
}
if (StringUtils.isNotEmpty(param.getOperatorName())) {
sql.append("AND ft.OPERATOR_NAME = :operatorName ");
--
Gitblit v1.9.1