From 87ff2a60723119530d071f6ed6b16fc2f3f023ca Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 05 十二月 2023 16:32:05 +0800
Subject: [PATCH] 报废单导出金额信息
---
consum-base/src/main/java/com/consum/base/pojo/excel/ScrappedInfoExcelTemplate.java | 4
consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java | 8 +
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 1
consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java | 72 ++++++++++-------
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 5
consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java | 2
consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java | 20 ++---
consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java | 4
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 6
consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java | 2
consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserService.java | 23 +++++
consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java | 6 +
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java | 10 ++
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java | 28 +-----
consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsRecordDetailsService.java | 24 ++---
15 files changed, 122 insertions(+), 93 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
index 9c6a5da..125fb25 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
@@ -175,8 +175,8 @@
int countNum =
export.stream().filter(item -> item.getNum() != null).mapToInt(ScrappedInfoExcelTemplate::getNum).sum();
- int totalAmount = export.stream().filter(item -> item.getTotalAmount() != null)
- .mapToInt(ScrappedInfoExcelTemplate::getTotalAmount).sum();
+ double totalAmount = export.stream().filter(item -> item.getTotalAmount() != null)
+ .mapToDouble(ScrappedInfoExcelTemplate::getAmount).sum();
Map<String, Object> map = new HashMap<>();
map.put("code", businessFormCode);
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 b60f2c7..69f7a19 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
@@ -38,11 +38,11 @@
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.LWhFormTransferCoreService;
+import com.consum.base.service.impl.LWhFormTransferCoreService;
import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordService;
-import com.consum.base.service.LWhProcureModelUserServiceImpl;
+import com.consum.base.service.LWhProcureModelUserService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormTransfer;
@@ -79,7 +79,7 @@
@Autowired
private LWhFormTransferCoreService lWhFormTransferCoreService;
@Autowired
- private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
+ private LWhProcureModelUserService lWhProcureModelUserService;
@Autowired
private LWhProcureModelUserRecordService lWhProcureModelUserRecordService;
@Autowired
diff --git a/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java b/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java
index c01de5a..b69414a 100644
--- a/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/core/DepFormScrappedCoreServiceImpl.java
@@ -17,7 +17,7 @@
import com.consum.base.core.utils.LockManage;
import com.consum.base.service.GoodsBaseServiceImpl;
import com.consum.base.service.LWarehouseFlowService;
-import com.consum.base.service.LWhGoodsRecordDetailsService;
+import com.consum.base.service.impl.LWhGoodsRecordDetailsService;
import com.consum.base.service.LWhGoodsRecordService;
import com.consum.base.service.LWhGoodsService;
import com.consum.model.po.DepFormScrapped;
diff --git a/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java b/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java
index d637230..0248e3f 100644
--- a/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/core/DepUsingFormBackCoreServiceImpl.java
@@ -18,7 +18,7 @@
import com.consum.base.core.utils.LockManage;
import com.consum.base.service.GoodsBaseServiceImpl;
import com.consum.base.service.LWarehouseFlowService;
-import com.consum.base.service.LWhGoodsRecordDetailsService;
+import com.consum.base.service.impl.LWhGoodsRecordDetailsService;
import com.consum.base.service.LWhGoodsRecordService;
import com.consum.base.service.LWhGoodsService;
import com.consum.model.po.BaseWarehouse;
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/ScrappedInfoExcelTemplate.java b/consum-base/src/main/java/com/consum/base/pojo/excel/ScrappedInfoExcelTemplate.java
index f2ef174..960e30d 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/excel/ScrappedInfoExcelTemplate.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/excel/ScrappedInfoExcelTemplate.java
@@ -26,7 +26,7 @@
@Excel(name = "鏁伴噺")
private Integer num;
@Excel(name = "閲戦")
- private Integer totalAmount;
+ private Double amount;
@Excel(name = "鎶ュ簾鍘熷洜")
private String deception;
@@ -34,6 +34,8 @@
private String remark;
@ExcelIgnore
+ private Integer totalAmount;
+ @ExcelIgnore
private String businessFormCode;
@ExcelIgnore
private Long dealTime;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
index 0e49726..4f72f9f 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
@@ -1,5 +1,6 @@
package com.consum.base.service;
+import com.consum.base.service.impl.LWhGoodsRecordDetailsService;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java
index 4cb4faf..237f001 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedGoodsService.java
@@ -1,29 +1,13 @@
package com.consum.base.service;
-import com.consum.model.po.LWhFormScrappedGoods;
-import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.walker.jdbc.service.BaseService;
/**
- * @ClassName LWhFormScrappedGoodsService
-
- * @Date 2023/10/30
- * @Description
- * @Version 1.0
+ * LWhFormScrappedGoodsService
+ *
+ * @author asus
+ * @version 2023/12/05 16:24
**/
-@Service
-public class LWhFormScrappedGoodsService extends BaseServiceImpl {
+public interface LWhFormScrappedGoodsService extends BaseService {
- /**
- * @Description 鏍规嵁鎶ュ簾鍗昳d鏌ヨ鎶ュ簾鍗曠墿鍝�
- * @Author 鍗㈠簡闃�
- * @Date 2023/11/2
- */
- public List<LWhFormScrappedGoods> getByFormScrappedId(Long id) {
- LWhFormScrappedGoods scrappedGoods = new LWhFormScrappedGoods();
- scrappedGoods.setFormScrappedId(id);
- return this.select(scrappedGoods);
- }
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserService.java b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserService.java
new file mode 100644
index 0000000..2e4c940
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserService.java
@@ -0,0 +1,23 @@
+package com.consum.base.service;
+
+import java.util.List;
+
+import com.consum.base.pojo.dto.UseRecordDTO;
+import com.walker.jdbc.service.BaseService;
+
+/**
+ * LWhProcureModelUserService
+ *
+ * @author asus
+ * @version 2023/12/05 16:14
+ **/
+public interface LWhProcureModelUserService extends BaseService {
+
+ /**
+ * 鏌ヨ浣跨敤浜鸿褰�
+ *
+ * @param businessId
+ * @return
+ */
+ List<UseRecordDTO> selectUseRecord(Long businessId);
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
similarity index 97%
rename from consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
index b828350..63d68bb 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
@@ -1,5 +1,11 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
+import com.consum.base.service.BaseWarehouseService;
+import com.consum.base.service.FinSysTenantServiceImpl;
+import com.consum.base.service.LWhFormInventoryCoreService;
+import com.consum.base.service.LWhFormInventoryGoodsServiceImpl;
+import com.consum.base.service.LWhFormInventoryService;
+import com.consum.base.service.LWhGoodsService;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
similarity index 77%
rename from consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
index c1a5c9e..1442df9 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedCoreService.java
@@ -1,4 +1,4 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
import java.util.ArrayList;
import java.util.List;
@@ -15,6 +15,12 @@
import com.consum.base.core.service.LWhWarningCoreServiceImpl;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
+import com.consum.base.service.BaseGoodsTemplateService;
+import com.consum.base.service.GoodsBaseServiceImpl;
+import com.consum.base.service.LWarehouseFlowService;
+import com.consum.base.service.LWhFormScrappedGoodsService;
+import com.consum.base.service.LWhGoodsRecordService;
+import com.consum.base.service.LWhGoodsService;
import com.consum.model.po.LWarehouseFlow;
import com.consum.model.po.LWhFormScrapped;
import com.consum.model.po.LWhFormScrappedGoods;
@@ -47,14 +53,11 @@
@Autowired
public LWhFormScrappedCoreService(GoodsBaseServiceImpl goodsBaseService,
- LWhFormScrappedGoodsService lWhFormScrappedGoodsService,
- BaseGoodsTemplateService baseGoodsTemplateService,
- LWhGoodsService lWhGoodsService,
- LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
- LWhGoodsRecordService lWhGoodsRecordServiceImpl,
- LWarehouseFlowService lWarehouseFlowService,
- LWhWarningCoreServiceImpl lWhWarningCoreService) {
-// this.lWhFormScrappedService = lWhFormScrappedService;
+ LWhFormScrappedGoodsService lWhFormScrappedGoodsService, BaseGoodsTemplateService baseGoodsTemplateService,
+ LWhGoodsService lWhGoodsService, LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
+ LWhGoodsRecordService lWhGoodsRecordServiceImpl, LWarehouseFlowService lWarehouseFlowService,
+ LWhWarningCoreServiceImpl lWhWarningCoreService) {
+ // this.lWhFormScrappedService = lWhFormScrappedService;
this.lWhFormScrappedGoodsService = lWhFormScrappedGoodsService;
this.baseGoodsTemplateService = baseGoodsTemplateService;
this.lWhGoodsService = lWhGoodsService;
@@ -64,7 +67,6 @@
this.goodsBaseService = goodsBaseService;
this.lWhWarningCoreService = lWhWarningCoreService;
}
-
/**
* 鏍规嵁 鎶ュ簾鍗曘�怢_WH_FORM_SCRAPPED銆� 鎶ュ簾鐗╁搧
@@ -93,7 +95,7 @@
// 娴佹按璁板綍鎬昏〃ID
long lWarehouseFlowId = IdUtil.generateId();
- //瑕佹姤搴熺殑鐗╁搧
+ // 瑕佹姤搴熺殑鐗╁搧
LWhFormScrappedGoods goods = new LWhFormScrappedGoods();
goods.setFormScrappedId(formScrappedId);
List<LWhFormScrappedGoods> formScrappedGoods = lWhFormScrappedGoodsService.select(goods);
@@ -105,21 +107,21 @@
// 鎸夊瀷鍙峰垎缁�
ArrayList<Long> allChangModelList = new ArrayList<>();
- Map<Long, List<LWhFormScrappedGoods>> modelGroup = formScrappedGoods.stream()
- .collect(Collectors.groupingBy(LWhFormScrappedGoods::getBaseGoodsModelsId));
+ Map<Long, List<LWhFormScrappedGoods>> modelGroup =
+ formScrappedGoods.stream().collect(Collectors.groupingBy(LWhFormScrappedGoods::getBaseGoodsModelsId));
for (Map.Entry<Long, List<LWhFormScrappedGoods>> entry : modelGroup.entrySet()) {
- //瑙勬牸鍨嬪彿缂栧彿
+ // 瑙勬牸鍨嬪彿缂栧彿
Long baseGoodsModelsId = entry.getKey();
allChangModelList.add(baseGoodsModelsId);
- //瀵规瘡缁勪腑瑕佹姤搴熺殑鏁伴噺姹傚拰
+ // 瀵规瘡缁勪腑瑕佹姤搴熺殑鏁伴噺姹傚拰
List<LWhFormScrappedGoods> modelGoodsList = entry.getValue();
- //鏌ヨ鍨嬪彿淇℃伅
+ // 鏌ヨ鍨嬪彿淇℃伅
Map<String, Object> tempGoodsInfo = baseGoodsTemplateService.queryGoodsInfoByModelId(baseGoodsModelsId);
- //瑕佹姤搴熺殑鎬绘暟閲�
+ // 瑕佹姤搴熺殑鎬绘暟閲�
int modelTotalNum = modelGoodsList.stream().mapToInt(LWhFormScrappedGoods::getCounts).sum();
- Long tempGoodsId = (Long) tempGoodsInfo.get("goodsid");
- String goodsName = (String) tempGoodsInfo.get("goodsname");
- String modelName = (String) tempGoodsInfo.get("modelname");
+ Long tempGoodsId = (Long)tempGoodsInfo.get("goodsid");
+ String goodsName = (String)tempGoodsInfo.get("goodsname");
+ String modelName = (String)tempGoodsInfo.get("modelname");
// 鎻掑叆 鍚勮鏍肩墿鍝佺殑杩涘嚭搴撹褰� L_WH_GOODS_RECORD
long whGoodsRecordId = IdUtil.generateId();
LWhGoodsRecord whGoodsRecord = new LWhGoodsRecord();
@@ -132,36 +134,43 @@
whGoodsRecord.setBaseGoodsModelsId(baseGoodsModelsId);
whGoodsRecord.setBaseGoodsModelsName(modelName);
whGoodsRecord.setDealTime(dealTime);
- //鏈璋冩暣绫诲瀷 1=璋冨锛�2=璋冨噺
+ // 鏈璋冩暣绫诲瀷 1=璋冨锛�2=璋冨噺
whGoodsRecord.setThisType(2);
whGoodsRecord.setThisCount(modelTotalNum);
- //閫氳繃LockManage鑾峰緱閿�
+ // 閫氳繃LockManage鑾峰緱閿�
Object warehouseModelLockObj = LockManage.acquireLock(warehouseType, warehouseId, baseGoodsModelsId);
synchronized (warehouseModelLockObj) {
for (LWhFormScrappedGoods formScrappedGood : modelGoodsList) {
- //鎶ュ簾鏁伴噺
+ // 鎶ュ簾鏁伴噺
Integer counts = formScrappedGood.getCounts();
- //鎶ュ簾鍗曠紪鍙�
+ // 鎶ュ簾鍗曠紪鍙�
Long transBusinessId = formScrappedGood.getTransBusinessId();
int goodsModelNum = 0;
List<Long> srappedGoodsIds = null;
if (warehouseType == null || warehouseType == 0) {
- srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, null, null, baseGoodsModelsId, (short) 1, counts);
+ srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, null, null,
+ baseGoodsModelsId, (short)1, counts);
} else {
- //浣跨敤浜哄憳鍚嶇О
+ // 浣跨敤浜哄憳鍚嶇О
String userName = formScrappedGood.getUserName();
// 鏍规嵁鍒嗗彂鍗曘�佽鏍煎瀷鍙风紪鍙枫�佷娇鐢ㄤ汉鍛樺悕绉帮紝杩涜鎶ュ簾
- srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId, transBusinessId, userName, baseGoodsModelsId,
- (short) 2, counts);
+ srappedGoodsIds = lWhGoodsService.queryScrappedGoodsIds(warehouseType, warehouseId,
+ transBusinessId, userName, baseGoodsModelsId, (short)2, counts);
}
+
if (CollectionUtils.isEmpty(srappedGoodsIds) || srappedGoodsIds.size() < counts) {
log.error("瑕佹姤搴熺殑鐗╁搧鏁伴噺涓嶈冻锛�");
// 鎵嬪姩鍥炴粴
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new RuntimeException("鎶ュ簾澶辫触!鍨嬪彿鏁伴噺涓嶈冻");
}
+ // 閫氳繃鐗╁搧id鏌ヨ鎵�鏈夊晢鍝佺殑鎬婚噾棰�
+ long amount = lWhGoodsService.queryGoodsPriceById(srappedGoodsIds);
+ LWhFormScrappedGoods lWhFormScrappedGoods = new LWhFormScrappedGoods(formScrappedGood.getId());
+ lWhFormScrappedGoods.setTotalAmount((int)amount);
+ lWhFormScrappedGoodsService.update(lWhFormScrappedGoods);
whGoodsRecord.setInitialCount(goodsModelNum);
whGoodsRecord.setEndCount(goodsModelNum - counts);
@@ -169,7 +178,7 @@
// 璁剧疆鐗╁搧涓烘姤搴熺姸鎬�
lWhGoodsService.modGoodsTransfering(srappedGoodsIds, null, null, null, 3);
// 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
- lWhGoodsRecordDetailsService.sameGoodsInsertMore(srappedGoodsIds, whGoodsRecordId, (short) 2);
+ lWhGoodsRecordDetailsService.sameGoodsInsertMore(srappedGoodsIds, whGoodsRecordId, (short)2);
}
lWhGoodsRecordServiceImpl.insert(whGoodsRecord);
}
@@ -201,8 +210,9 @@
lWhFormScrapped.setDealTime(dealTime);
goodsBaseService.update(lWhFormScrapped);
- //褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
- lWhWarningCoreService.updateKuCun(Convert.toShort(warehouseType,(short) 0), warehouseId, allChangModelList, null, dealTime);
+ // 褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
+ lWhWarningCoreService.updateKuCun(Convert.toShort(warehouseType, (short)0), warehouseId, allChangModelList,
+ null, dealTime);
return lWarehouseFlowId;
}
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 0e75cae..b82944a 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
@@ -16,6 +16,7 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
@@ -34,8 +35,6 @@
import com.consum.base.service.BaseGoodsTemplateService;
import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.FinSysTenantDepartmentService;
-import com.consum.base.service.LWhFormScrappedCoreService;
-import com.consum.base.service.LWhFormScrappedGoodsService;
import com.consum.base.service.LWhFormScrappedService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.SDictDataServiceImpl;
@@ -69,7 +68,7 @@
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
- private LWhFormScrappedGoodsService scrappedGoodsService;
+ private LWhFormScrappedGoodsServiceImpl scrappedGoodsService;
@Autowired
private SDictDataServiceImpl sDictDataService;
@Autowired
@@ -197,10 +196,6 @@
scrappedGoods.setBaseGoodsModelsName(baseGoodsModels.getModelName());
scrappedGoods.setUnit(baseGoodsModels.getUnit());
}
- // 閫氳繃鍨嬪彿id鏌ヨ璇ュ瀷鍙锋墍鏈夊晢鍝佺殑鎬婚噾棰�
- // GoodsModelCountDTO goodsModelCountDTO =
- // lWhGoodsService.queryGoodsAmount(baseGoodsModelsId, GoodsStatesType.SCRAP.getValue());
- // scrappedGoods.setTotalAmount(goodsModelCountDTO.getAmount());
scrappedGoodsList.add(scrappedGoods);
}
int flag2 = this.scrappedGoodsService.insertBatch(scrappedGoodsList);
@@ -387,11 +382,11 @@
@Override
public List<ScrappedInfoExcelTemplate> export(Long id) {
- String sql = "SELECT\n" + "\tBUSINESS_FORM_CODE,\n" + "\tfs.DEAL_TIME,\n" + "\tOPERATOR_NAME,\n"
- + "\tAGENCY_NAME tenantName,\n" + "\tGOODS_TEMPLATE_NAME templateName,\n"
- + "\tBASE_GOODS_MODELS_NAME baseModelName,\n" + "\tCOUNTS num,\n" + "\tSCRAPPED_NAME deception,\n"
- + "\tBEIZ remark\n" + "FROM\n" + "\tl_wh_form_scrapped_goods fsg\n"
- + "\tLEFT JOIN l_wh_form_scrapped fs ON fs.id = fsg.FORM_SCRAPPED_ID\n" + "WHERE\n" + "\tfs.ID = :id\n"
+ String sql = "SELECT BUSINESS_FORM_CODE,fs.DEAL_TIME,OPERATOR_NAME,\n"
+ + "\tAGENCY_NAME tenantName,GOODS_TEMPLATE_NAME templateName,\n"
+ + "\tBASE_GOODS_MODELS_NAME baseModelName,COUNTS num,SCRAPPED_NAME deception,\n"
+ + "\tBEIZ remark,total_amount FROM l_wh_form_scrapped_goods fsg\n"
+ + "\tLEFT JOIN l_wh_form_scrapped fs ON fs.id = fsg.FORM_SCRAPPED_ID WHERE fs.ID = :id\n"
+ "\tAND STATES = 1";
Map<String, Object> param = new HashMap<>();
param.put("id", id);
@@ -403,6 +398,7 @@
select.forEach(item -> {
ScrappedInfoExcelTemplate inventoryExcelTemplate =
MapUtils.convertMapToObj(item, ScrappedInfoExcelTemplate.class);
+ inventoryExcelTemplate.setAmount(CurrencyUtil.convertFenToYuan(inventoryExcelTemplate.getTotalAmount()));
list.add(inventoryExcelTemplate);
});
return list;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java
similarity index 96%
rename from consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java
index 25ab0e0..d7ffb63 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java
@@ -1,5 +1,13 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
+import com.consum.base.service.GoodsBaseServiceImpl;
+import com.consum.base.service.LGoodsUserRecordServiceImpl;
+import com.consum.base.service.LGoodsWhRecordServiceImpl;
+import com.consum.base.service.LWarehouseFlowService;
+import com.consum.base.service.LWhFormOutputCoreService;
+import com.consum.base.service.LWhFormTransferService;
+import com.consum.base.service.LWhGoodsRecordService;
+import com.consum.base.service.LWhGoodsService;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
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 103126f..0b09797 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
@@ -32,12 +32,11 @@
import com.consum.base.service.BaseWarehouseManagerService;
import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.FinSysTenantServiceImpl;
-import com.consum.base.service.LWhFormOutputService;
import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordService;
-import com.consum.base.service.LWhProcureModelUserServiceImpl;
+import com.consum.base.service.LWhProcureModelUserService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.BaseWarehouseManager;
import com.consum.model.po.FinSysTenant;
@@ -71,7 +70,7 @@
@Autowired
private BaseGoodsModelsServiceImpl baseGoodsModelsService;
@Autowired
- private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
+ private LWhProcureModelUserService lWhProcureModelUserService;
@Autowired
private LWhProcureModelUserRecordService lWhProcureModelUserRecordService;
@Autowired
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordDetailsService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsRecordDetailsService.java
similarity index 74%
rename from consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordDetailsService.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsRecordDetailsService.java
index f93b26e..03acd4e 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhGoodsRecordDetailsService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsRecordDetailsService.java
@@ -1,6 +1,10 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
-import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -10,9 +14,7 @@
import org.springframework.jdbc.core.simple.SimpleJdbcCall;
import org.springframework.stereotype.Service;
-import javax.annotation.PostConstruct;
-import java.util.List;
-import java.util.Map;
+import com.walker.jdbc.service.BaseServiceImpl;
/**
* @ClassName LWhGoodsRecordDetailsService
@@ -30,11 +32,9 @@
@PostConstruct
public void init() {
- this.simpleJdbcCall = new SimpleJdbcCall(jdbcTemplate)
- .withCatalogName(dataBaseName)
- .withProcedureName("insert_WH_GOODS_RECORD_DETAILS");
+ this.simpleJdbcCall = new SimpleJdbcCall(jdbcTemplate).withCatalogName(dataBaseName)
+ .withProcedureName("insert_WH_GOODS_RECORD_DETAILS");
}
-
@Autowired
public LWhGoodsRecordDetailsService(JdbcTemplate jdbcTemplate) {
@@ -42,10 +42,8 @@
}
public void sameGoodsInsertMore(List<Long> outGoodsId, long whGoodsRecordId, short thisType) {
- SqlParameterSource in = new MapSqlParameterSource()
- .addValue("WHGOODSIDList", StringUtils.join(outGoodsId, ","))
- .addValue("WH_GOODS_RECORD_ID", whGoodsRecordId)
- .addValue("THIS_TYPE", thisType);
+ SqlParameterSource in = new MapSqlParameterSource().addValue("WHGOODSIDList", StringUtils.join(outGoodsId, ","))
+ .addValue("WH_GOODS_RECORD_ID", whGoodsRecordId).addValue("THIS_TYPE", thisType);
Map<String, Object> out = simpleJdbcCall.execute(in);
System.out.println("Procedure result: " + out);
}
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java
similarity index 92%
rename from consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java
index cb18897..4421704 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhProcureModelUserServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhProcureModelUserServiceImpl.java
@@ -1,8 +1,9 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.dto.UseRecordDTO;
+import com.consum.base.service.LWhProcureModelUserService;
import com.google.common.collect.Lists;
import com.walker.jdbc.service.BaseServiceImpl;
import java.util.HashMap;
@@ -17,8 +18,9 @@
* @date 2023/11/2 16:21
*/
@Service
-public class LWhProcureModelUserServiceImpl extends BaseServiceImpl {
+public class LWhProcureModelUserServiceImpl extends BaseServiceImpl implements LWhProcureModelUserService {
+ @Override
public List<UseRecordDTO> selectUseRecord(Long businessId) {
String sql = "SELECT\n"
+ "\tpmur.ID,\n"
--
Gitblit v1.9.1