From 5d745c2c8854d2c1e94e5ee9004d5219681f6d7c Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 29 十二月 2023 11:02:50 +0800
Subject: [PATCH] 增加图片验证码和登录日志
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 46 +++++++++++++++++++---------------------------
1 files changed, 19 insertions(+), 27 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 e03af4f..58cf0a1 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,6 +24,8 @@
import com.consum.base.BaseController;
import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.core.type.StatesType;
+import com.consum.base.core.type.TransferStatesType;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.GoodsUseRecordVO;
@@ -48,7 +50,7 @@
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordService;
import com.consum.base.service.LWhProcureModelUserService;
-import com.consum.base.service.impl.LWhFormTransferCoreService;
+import com.consum.base.service.core.LWhFormTransferCoreService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormTransfer;
@@ -123,15 +125,14 @@
if (transferBusinessType == 1) {
// 鍏堝嚭搴擄紝鍐嶅叆搴�
// 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
- List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id);
+ List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.BUMENFENFA, id);
Set<Long> baseModelIds =
modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
- // TODO 涓嶅悓搴撳鐞�
FinSysTenantUser sysTenantUser = this.getSysInfo();
String agencyId = sysTenantUser.getTenantId();
List<BaseWarehouse> baseWarehouseList =
- baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), null, (short)1);
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
// 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds);
@@ -139,14 +140,6 @@
if (ObjectUtils.isEmpty(goodsInfoDTO)) {
return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
}
- // FinSysTenantUser sysTenantUser = this.getSysInfo();
- // String agencyId = sysTenantUser.getTenantId();
- // List<BaseWarehouse> baseWarehouseList =
- // baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1);
- // if (CollectionUtils.isEmpty(baseWarehouseList)) {
- // return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
- // }
- // BaseWarehouse baseWarehouse = baseWarehouseList.get(0);
Long wareHouseId = goodsInfoDTO.getWarehouseId();
String warehouseName = goodsInfoDTO.getWarehouseName();
@@ -154,7 +147,7 @@
lWhFormTransfer.setOutWarehouseId(wareHouseId);
lWhFormTransfer.setOutWarehouseName(warehouseName);
lWhFormTransferService.update(lWhFormTransfer);
- lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
+ lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser(), WhBusinessEnum.BUMENFENFA);
lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), param.getOperatorName());
}
@@ -244,6 +237,10 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
+ String tenantId = sysInfo.getTenantId();
+ if (param.getInAgencyId() == null) {
+ param.setInAgencyId(Long.valueOf(tenantId));
+ }
GenericPager<Map<String, Object>> mapGenericPager = lWhFormTransferService.queryFormTransferDetailList(param);
return ResponseValue.success(mapGenericPager);
@@ -262,6 +259,10 @@
if (id == null) {
return ResponseValue.error("鍙傛暟閿欒");
}
+ LWhFormTransfer lWhFormTransfer = lWhFormTransferService.selectById(id);
+ if (lWhFormTransfer.getStates() != TransferStatesType.OUT_PENDING.getValue()) {
+ return ResponseValue.error("鐘舵�侀敊璇紝涓嶈兘鎾ら攢");
+ }
int num = this.lWhFormTransferService.updateStatus(id);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("淇敼澶辫触锛�");
@@ -275,7 +276,7 @@
@ApiOperation(value = "璋冩嫧鍏ュ簱", notes = "璋冩嫧鍏ュ簱")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),})
@PostMapping("/income")
- public ResponseValue income(Long id) {
+ public ResponseValue income(Long id) throws Exception {
lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), null);
return ResponseValue.success();
}
@@ -288,30 +289,21 @@
@ApiOperation(value = "璋冩嫧鍑哄簱", notes = "璋冩嫧鍑哄簱")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),})
@PostMapping("/output")
- public ResponseValue output(Long id) {
+ public ResponseValue output(Long id) throws Exception {
List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id);
Set<Long> baseModelIds =
modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
- // TODO 涓嶅悓搴撳鐞嗕笖涓烘湰鏈烘瀯鐨勪粨搴撶墿鍝�
FinSysTenantUser sysTenantUser = this.getSysInfo();
String agencyId = sysTenantUser.getTenantId();
List<BaseWarehouse> baseWarehouseList =
- baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), null, (short)1);
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
// 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds);
GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
- // 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
- // FinSysTenantUser sysTenantUser = this.getSysInfo();
- // String agencyId = sysTenantUser.getTenantId();
- // List<BaseWarehouse> baseWarehouseList =
- // baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), (short)1, (short)1);
- // if (CollectionUtils.isEmpty(baseWarehouseList)) {
- // return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
- // }
if (ObjectUtils.isEmpty(goodsInfoDTO)) {
return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
}
@@ -322,7 +314,7 @@
lWhFormTransfer.setOutWarehouseName(warehouseName);
lWhFormTransferService.update(lWhFormTransfer);
// lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
- lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser());
+ lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser(), WhBusinessEnum.DIAOBO);
return ResponseValue.success();
}
@@ -364,7 +356,7 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, TransferExcelTemplate.class, export, map);
- String filePath = downLoadExcel(fileName, response, workbook);
+ String filePath = downLoadExcel(fileName, workbook);
return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
--
Gitblit v1.9.1