From b7a353e571a503a3dfb970af069efc0a65208839 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 02 十二月 2023 18:08:53 +0800
Subject: [PATCH] feat: 部门物品报废
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
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 37cba45..25e980b 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
@@ -6,6 +6,7 @@
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.param.BaseWarehouseParam1;
import com.consum.base.core.service.LWhWarningCoreServiceImpl;
+import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
@@ -105,7 +106,7 @@
// 璋冩嫧鍗曠墿鍝� 宸茬粡鎸夊瀷鍙峰垎濂戒簡
goodsModelNumList.forEach(itemModelInfo -> {
// 澶嶇敤瀵硅薄
- itemModelInfo.setId(NumberGenerator.getLongSequenceNumber());
+ itemModelInfo.setId(IdUtil.generateId());
itemModelInfo.setFromProcureGoodsId(null);
itemModelInfo.setBusinessType(3);
itemModelInfo.setBusinessId(outWarehouseFormId);
@@ -154,7 +155,7 @@
* @return 娴佹按璁板綍鎬昏〃ID
*/
@Transactional(rollbackFor = Exception.class)
- public Long outFormByTransId(Long outWarehouseFormId, WhBusinessEnum businessType, S_user_core currentUser, Long dealTime) {
+ public Long outFormByTransId(Long outWarehouseFormId, WhBusinessEnum businessType, S_user_core currentUser, Long dealTime, Long whFormTransferId) {
if (outWarehouseFormId == null) {
return null;
}
@@ -221,7 +222,11 @@
goodsModelNumList.forEach(itemModelInfo -> {
// 闇�瑕佽皟鎷ㄧ殑鐗╁搧鐨勬煇涓瀷鍙�
Long baseGoodsModelsId = itemModelInfo.getBaseGoodsModelsId();
- allChangModelList.add(baseGoodsModelsId);
+
+ //TODO 涓虹┖鏃朵笉鍔犲叆鏇存柊鍒楄〃
+ if (baseGoodsModelsId != null) {
+ allChangModelList.add(baseGoodsModelsId);
+ }
// 闇�瑕佽皟鎷ㄧ殑鐗╁搧鏌愪釜鍨嬪彿鐨勬暟閲�
Integer counts = itemModelInfo.getCounts();
@@ -290,7 +295,7 @@
warehouseFlow.setThisType(2);
warehouseFlow.setBusinessType(businessType.getValue() + 0);
- warehouseFlow.setBusinessFormId(lWarehouseFlowBusinessId);
+ warehouseFlow.setBusinessFormId(whFormTransferId == null ? lWarehouseFlowBusinessId : whFormTransferId);
warehouseFlow.setOperatorId(userId);
warehouseFlow.setOperatorName(nickName);
warehouseFlow.setDealTime(dealTime);
@@ -306,7 +311,7 @@
lWhFormOutputService.update(lWhFormOutput);
//褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
- if (outWarehouseType == 0){
+ if (outWarehouseType == 0) {
lWhWarningCoreService.updateKuCun(Convert.toShort(outWarehouseType, (short) 0), outWarehouseId, allChangModelList, null, dealTime);
}
return lWarehouseFlowId;
--
Gitblit v1.9.1