From 4325565ac6a3028f1071602e067b41e5932faa79 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期二, 02 一月 2024 16:05:52 +0800
Subject: [PATCH] 1、增加登录系统日志 2、修改上传文件，名称判断错误问题 3、修改单据新增时，仓库判断问题
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
index 83fe6e2..067df3e 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
@@ -1,6 +1,7 @@
package com.consum.base.service.impl;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -15,6 +16,7 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.type.WareHouseType;
import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
@@ -38,7 +40,8 @@
import com.consum.base.service.LWhFormScrappedGoodsService;
import com.consum.base.service.LWhFormScrappedService;
import com.consum.base.service.LWhGoodsService;
-import com.consum.base.service.SDictDataServiceImpl;
+import com.consum.base.service.SDictDataService;
+import com.consum.base.service.core.LWhFormScrappedCoreService;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseGoodsTemplate;
import com.consum.model.po.BaseWarehouse;
@@ -49,6 +52,7 @@
import com.consum.model.po.SDictData;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
@@ -71,7 +75,7 @@
@Autowired
private LWhFormScrappedGoodsService scrappedGoodsService;
@Autowired
- private SDictDataServiceImpl sDictDataService;
+ private SDictDataService sDictDataService;
@Autowired
private BaseGoodsModelsService baseGoodsModelsService;
@Autowired
@@ -103,7 +107,7 @@
long lWhFormScrappedId = IdUtil.generateId();
lWhFormScrapped.setId(lWhFormScrappedId);
lWhFormScrapped.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Scrapped));
- lWhFormScrapped.setWarehouseType(0);
+ lWhFormScrapped.setWarehouseType(WareHouseType.TENANT.getValue());
// 鍏敤
Long warehouseId = null;
@@ -125,6 +129,7 @@
lWhFormScrapped.setOperatorName(sysInfo.getUserName());
lWhFormScrapped.setDealTime(param.getDealTime());
lWhFormScrapped.setStates(0);
+ lWhFormScrapped.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
lWhFormScrapped.setUploadFiles(param.getUploadFiles());
// 鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬
FinSysTenantDepartment department = this.departmentService.getById(sysInfo.getSysDeptId());
@@ -175,8 +180,9 @@
LWhFormScrappedGoods scrappedGoods = new LWhFormScrappedGoods();
scrappedGoods.setId(IdUtil.generateId());
// 鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum =
- lWhGoodsService.queryGoodsModelNum(0, warehouseId, scrappedGoods.getBaseGoodsModelsId(), 1, null);
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
+ int goodsNum = lWhGoodsService.queryGoodsModelNum(WareHouseType.TENANT.getValue(), warehouseIds,
+ scrappedGoods.getBaseGoodsModelsId(), 1, null);
if (params.getCounts() > goodsNum) {
log.error("鎶ュ簾鏁伴噺澶т簬搴撳瓨鏁伴噺");
return 0;
@@ -200,7 +206,7 @@
scrappedGoodsList.add(scrappedGoods);
}
int flag2 = this.scrappedGoodsService.insertBatch(scrappedGoodsList);
- if (flag2 != scrappedGoodsList.size()) {
+ if (flag2 == 0) {
log.error("鏂板鎶ュ簾鍗曠墿鍝佽褰� 澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return 0;
--
Gitblit v1.9.1