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/controller/LWhFormTransferController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
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 e53acb8..5dd5eae 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
@@ -131,7 +131,7 @@
lWhFormTransferService.update(lWhFormTransfer);
lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
- lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser());
+ lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), param.getOperatorName());
}
return ResponseValue.success();
@@ -251,7 +251,7 @@
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),})
@PostMapping("/income")
public ResponseValue income(Long id) {
- lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser());
+ lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), null);
return ResponseValue.success();
}
@@ -279,7 +279,8 @@
lWhFormTransfer.setOutWarehouseId(wareHouseId);
lWhFormTransfer.setOutWarehouseName(warehouseName);
lWhFormTransferService.update(lWhFormTransfer);
- lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
+ // lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
+ lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser());
return ResponseValue.success();
}
@@ -340,9 +341,13 @@
CommonUtil.copyProperties(param, param2);
param = param2;
- S_user_core currentUser = this.getCurrentUser();
- if (currentUser == null) {
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ String tenantId = sysInfo.getTenantId();
+ if (param.getOutAgencyId() == null) {
+ param.setOutAgencyId(Long.valueOf(tenantId));
}
GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager =
this.lWhFormTransferService.queryTransferInfo(param);
@@ -397,6 +402,12 @@
lWhProcureModelUser.setNowUserPhone(item.getPhone());
lWhProcureModelUser.setNowUserName(item.getUserName());
lWhProcureModelUser.setGoodsNum(item.getCount());
+
+ // 璁剧疆涓�涓嬪湪鐢ㄦ暟閲�
+ Long oldProcureModelId = item.getOldProcureModelId();
+ LWhProcureModelUser oldInfo =
+ lWhProcureModelUserService.get(new LWhProcureModelUser(oldProcureModelId));
+ lWhProcureModelUser.setUseCount(oldInfo.getUseCount());
procureModelUserList.add(lWhProcureModelUser);
}
@@ -452,6 +463,7 @@
List<RecordUserInfoVO> recordUserInfoList = recordList.stream().map(userInfo -> {
RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
+ recordUserInfoVO.setOldProcureModelId(userInfo.getOldProcureModelId());
recordUserInfoVO.setUseName(userInfo.getUseName());
recordUserInfoVO.setPhone(userInfo.getPhone());
recordUserInfoVO.setNum(userInfo.getNum());
--
Gitblit v1.9.1