mes/nalinv-int
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/prd' into prd

Browse Source
This commit is contained in:
tangyu 2025-02-10 11:16:23 +08:00
commit ac821bc34a
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
int-core/src/main/java/com/foreverwin/iep/integration/handler/def/job/SapMaterialConsumptionJob.java
View File

@ -20,6 +20,7 @@ import org.springframework.stereotype.Component;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -77,9 +78,12 @@ public class SapMaterialConsumptionJob {
}
// 10笔10的送
if(zLotMaterialConsumptionTransactionList.size()>0){
List<List<ZLotMaterialConsumptionTransaction>> splitList = ListUtils.partition(zLotMaterialConsumptionTransactionList,10);
for (int i = 0; i < splitList.size(); i++) {
InvokeResponse invokeResponse = lotMaterialDealSendSapService.callLotMaterialConsumption(splitList.get(i), true, postingDate);
// 改成1笔1笔去送，便于核查和冲销
// List<List<ZLotMaterialConsumptionTransaction>> splitList = ListUtils.partition(zLotMaterialConsumptionTransactionList,10);
for (int i = 0; i < zLotMaterialConsumptionTransactionList.size(); i++) {
List<ZLotMaterialConsumptionTransaction> newList = new ArrayList<>();
newList.add(zLotMaterialConsumptionTransactionList.get(i));
InvokeResponse invokeResponse = lotMaterialDealSendSapService.callLotMaterialConsumption(newList, true, postingDate);
if (!"S".equals(invokeResponse.getResult())) {
XxlJobHelper.log("WARN:同步261物料消耗数据失败!!!" + invokeResponse.getMessageContent());
// return ReturnT.FAIL;

28
int-core/src/main/java/com/foreverwin/iep/integration/handler/def/job/SapShopOrderCompleteJob.java
View File

@ -24,6 +24,7 @@ import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 101完工入库JOB
@ -79,12 +80,27 @@ public class SapShopOrderCompleteJob {
}
// 10笔10的送
if(zLotMaterialCompleteTransactionList.size()>0){
List<List<ZLotMaterialCompleteTransaction>> splitList = ListUtils.partition(zLotMaterialCompleteTransactionList,10);
for (int i = 0; i < splitList.size(); i++) {
InvokeResponse invokeResponse = lotMaterialDealSendSapService.callLotMaterialComplete(splitList.get(i), true, postingDate);
if (!"S".equals(invokeResponse.getResult())) {
XxlJobHelper.log("WARN:同步101或531完工入库数据失败!!!" + invokeResponse.getMessageContent());
// return ReturnT.FAIL;
// 先处理101的
List<ZLotMaterialCompleteTransaction> oneZeroOneList = zLotMaterialCompleteTransactionList.stream().filter(zLotMaterialCompleteTransaction -> "101".equals(zLotMaterialCompleteTransaction.getProductType())).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(oneZeroOneList)){
List<List<ZLotMaterialCompleteTransaction>> splitList = ListUtils.partition(oneZeroOneList,10);
for (int i = 0; i < splitList.size(); i++) {
InvokeResponse invokeResponse = lotMaterialDealSendSapService.callLotMaterialComplete(splitList.get(i), true, postingDate);
if (!"S".equals(invokeResponse.getResult())) {
XxlJobHelper.log("WARN:同步101完工入库数据失败!!!" + invokeResponse.getMessageContent());
}
}
}
// 再处理531的
List<ZLotMaterialCompleteTransaction> fiveThreeOneList = zLotMaterialCompleteTransactionList.stream().filter(zLotMaterialCompleteTransaction -> "531".equals(zLotMaterialCompleteTransaction.getProductType())).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(fiveThreeOneList)){
List<List<ZLotMaterialCompleteTransaction>> splitList = ListUtils.partition(fiveThreeOneList,10);
for (int i = 0; i < splitList.size(); i++) {
InvokeResponse invokeResponse = lotMaterialDealSendSapService.callLotMaterialComplete(splitList.get(i), true, postingDate);
if (!"S".equals(invokeResponse.getResult())) {
XxlJobHelper.log("WARN:同步531完工入库数据失败!!!" + invokeResponse.getMessageContent());
}
}
}
}