From dadf503b15f3423980ad2bc17d23ea1a444aca10 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期三, 14 五月 2025 17:48:00 +0800
Subject: [PATCH] 【UPDATE】修改mapper适配mybatis-plus
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
index dc8ed21..2ab9146 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
@@ -14,6 +14,7 @@
import jakarta.annotation.Resource;
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.mapper.ApsPlateStandardRequireMapper;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.service.IApsPlateStandardRequireService;
@@ -27,6 +28,7 @@
* @author zhl
* @date 2025-05-06
*/
+@Slf4j
@Service
public class ApsPlateStandardRequireServiceImpl implements IApsPlateStandardRequireService
{
@@ -173,8 +175,8 @@
String batchNum= requireBatchService.getNewBatchNumber();
/*鑾峰彇閽ｉ噾涓诲崟淇℃伅*/
List<ApsPlatePlan> mainPlans = platePlanMapper.selectPlatePlanByPlantMajor(plantCode,mainOrderType);
- Hashtable<String, ApsMaterialStorageManagement> usedStorage = new Hashtable<>();
-
+ Hashtable<String, BigDecimal> usedStorage = new Hashtable<>();
+ log.info("寮�濮嬬敓鎴愰渶姹傦細");
for (ApsPlatePlan mainPlan : mainPlans) {
String itemNumber = mainPlan.getItemNumber();
/*鏍规嵁鏂欏彿 鑾峰彇BOM Header */
@@ -184,7 +186,7 @@
List<ApsPlateStandardRequireBomStockDetail> stockDetailsList=new ArrayList<>();
List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList=new ArrayList<>();
-
+ log.info("寮�濮嬬敓鎴愰渶姹傦細宸ュ崟鍙凤細"+mainPlan.getDocumentNumber());
getBomRequires(plantCode, "0","0",itemNumber,BigDecimal.ONE, batchNum, null
, mainPlan, requiresList, 0L,stockDetailsList,orderDetailsList,usedStorage
);
@@ -198,7 +200,7 @@
apsPlateStandardRequireMapper.batchInsert(batch);
}
}
-
+ log.info("鐢熸垚瀹屾垚");
// if(!stockDetailsList.isEmpty()){
// int batchSize = 1000;
// stockDetailsList.forEach(x->x.setId(IdUtil.getSnowflakeNextId()));
@@ -226,6 +228,10 @@
}*/
}
+ usedStorage.forEach((key,value)->{
+ log.info("鏂欏彿锛�"+key+"锛屽簱瀛橈細"+value);
+ });
+
}
/**
@@ -249,7 +255,7 @@
List<ApsPlateStandardRequire> allRequires,
Long level,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList,
List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList,
- Hashtable<String, ApsMaterialStorageManagement> usedStorage
+ Hashtable<String, BigDecimal> usedStorage
) {
/*鏋勫缓闇�姹備俊鎭�*/
ApsPlateStandardRequire require = new ApsPlateStandardRequire();
@@ -262,20 +268,22 @@
require.setBomLineId(bomLineId);
require.setBomLineCode(itemCode);
require.setBomLineLevel(level);
- require.setBomUseAmount(itemNum);
+ require.setOrderCreateTime(plan.getOrderCreateTime());
require.setCreateTime(DateUtils.getNowDate());
require.setCreateBy(SecurityUtils.getUsername());
require.setDelFlag("0");
require.setProductionBase(plan.getProductionBase());
- /*璁＄畻闇�姹傛暟閲�*/
+ /*BOM鐢ㄩ噺 level0=1 */
if (level == 0) {
require.setBomUseAmount(BigDecimal.ONE);
} else {
- require.setBomUseAmount(itemNum.multiply(plan.getProductionQuantity()));
+ require.setBomUseAmount(itemNum);
}
+ /*璁＄畻闇�姹傛暟閲�*/
+ require.setRequireAmount(itemNum.multiply(plan.getProductionQuantity()));
/*鏌ユ壘搴撳瓨锛岃绠楀噣闇�姹傦紝淇濆瓨鍓╀綑搴撳瓨锛屼繚瀛樺簱瀛樻墸鍑忔槑缁�*/
/*榛樿鍑�闇�姹備负BOM鐢ㄩ噺*/
- require.setNetRequirement(require.getBomUseAmount());
+ require.setNetRequirement(require.getRequireAmount());
/*璇诲彇搴撳瓨淇℃伅鐨勪紭鍏堢骇-> 鍐呭瓨銆乺edis銆乨b*/
/* ApsMaterialStorageManagement storage = usedStorage.get(itemCode);
@@ -312,7 +320,7 @@
, afterStockAmount, require.getId(), stockDetailsList
);
/*鏇存柊鍐呭瓨涓殑搴撳瓨浣跨敤淇℃伅*/
- // usedStorage.put(itemCode, storage);
+ usedStorage.put(itemCode, afterStockAmount);
}
}
/*鏈尮閰嶆暟閲忥紝榛樿涓哄噣闇�姹�*/
@@ -346,7 +354,12 @@
/*璁剧疆寮�濮嬫椂闂�*/
Date startDay = new Date();
- startDay.setTime(require.getCompleteDate().getTime() - totalRouteMillisecond);
+ /*寮�濮嬫椂闂� 榛樿涓� 瀹屾垚鏃堕棿 濡傛灉鍑�闇�姹�>0 寮�濮嬫椂闂�=缁撴潫鏃堕棿-宸ュ簭鎬诲伐鏃�*/
+ startDay.setTime(require.getCompleteDate().getTime());
+ if(require.getNetRequirement().compareTo(BigDecimal.ZERO)>0){
+ startDay.setTime(require.getCompleteDate().getTime() - totalRouteMillisecond);
+ }
+
require.setStartDate(startDay);
/*璁＄畻鏄惁鏈夐闄�*/
@@ -367,6 +380,7 @@
matchRequireAndSubPlan(require,orderDetailsList);
}
allRequires.add(require);
+ log.info("宸茬敓鎴愰渶姹傦細"+plan.getDocumentNumber()+"bomHeaderCode:"+bomHeaderCode+"bomLineCode:"+itemCode+"bomLevel:"+level);
if (require.getNetRequirement().compareTo(BigDecimal.ZERO) > 0) {
/*褰撳墠Bom鑺傜偣澶勭悊瀹屾垚鍚庯紝澶勭悊涓嬬骇BOM*/
long nextLevel=level+1;
--
Gitblit v1.9.3