rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 一些优化

This commit is contained in:
曹鹏飞 2025-11-17 14:04:50 +08:00
parent 7309136378
commit 172ddbc444
10 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/SAPConfig.java
View File

@ -12,7 +12,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
import java.util.HashMap;
import java.util.Map;
@ -92,13 +91,11 @@ public class SAPConfig {
}
@Bean(destroyMethod = "")
@Lazy
public JCoDestination jcoDestination() throws JCoException {
return JCoDestinationManager.getDestination(ABAP_AS_POOLED);
}
@Bean
@Lazy
public JCoRepository getJCoRepository() throws JCoException {
return jcoDestination().getRepository();
}

10
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
View File

@ -301,11 +301,11 @@ public class OutAssistanceController extends BaseController {
});
outAssistanceItemService.updateBatchById(datas);
outAssistanceTicketItemService.saveBatch(ticketItems);
outAssistanceTicketService.save(ticket);
if (!request.getNeedAudit()) {
//不需要审核
submitSap(order, ticket, records, datas);
} else {
outAssistanceTicketService.save(ticket);
inventoryForOutRepository.saveAll(request.getRecommendBatch()
.stream()
.map(item -> {
@ -360,9 +360,11 @@ public class OutAssistanceController extends BaseController {
}).toList()
)
);
ticket.setMatDoc(dto.getMatDoc());
ticket.setDocYear(dto.getDocYear());
outAssistanceTicketService.save(ticket);
outAssistanceTicketService.lambdaUpdate()
.set(WmsOutAssistanceTicket::getMatDoc, dto.getMatDoc())
.set(WmsOutAssistanceTicket::getDocYear, dto.getDocYear())
.eq(WmsOutAssistanceTicket::getId, ticket.getId())
.update();
}
/**

10
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
View File

@ -289,11 +289,11 @@ public class OutCostCenterController extends BaseController {
});
outCostcenterItemService.updateBatchById(datas);
outCostcenterTicketItemService.saveBatch(ticketItems);
outCostcenterTicketService.save(ticket);
if (!request.getNeedAudit()) {
//不需要审核
submitSap(order, ticket, records, datas);
} else {
outCostcenterTicketService.save(ticket);
inventoryForOutRepository.saveAll(request.getRecommendBatch()
.stream()
.map(item -> {
@ -347,9 +347,11 @@ public class OutCostCenterController extends BaseController {
}).toList()
)
);
ticket.setMatDoc(vo.getEMblnr());
ticket.setDocYear(vo.getEMJahr());
outCostcenterTicketService.save(ticket);
outCostcenterTicketService.lambdaUpdate()
.set(WmsOutCostcenterTicket::getMatDoc, vo.getEMblnr())
.set(WmsOutCostcenterTicket::getDocYear, vo.getEMJahr())
.eq(WmsOutCostcenterTicket::getId, ticket.getId())
.update();
}
/**

10
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
View File

@ -418,11 +418,11 @@ public class OutProduceController extends BaseController {
});
outProduceItemService.updateBatchById(datas);
outProduceTicketItemService.saveBatch(ticketItems);
outProduceTicketService.save(ticket);
if (!request.getNeedAudit()) {
//不需要审核
submitSap(order, ticket, records, datas);
} else {
outProduceTicketService.save(ticket);
inventoryForOutRepository.saveAll(request.getRecommendBatch()
.stream()
.map(ifo -> {
@ -472,9 +472,11 @@ public class OutProduceController extends BaseController {
}).toList()
)
);
ticket.setMatDoc(vo.getMat_doc());
ticket.setDocYear(vo.getDocYear());
outProduceTicketService.save(ticket);
outProduceTicketService.lambdaUpdate()
.set(WmsOutProduceTicket::getMatDoc, vo.getMat_doc())
.set(WmsOutProduceTicket::getDocYear, vo.getDocYear())
.eq(WmsOutProduceTicket::getId, ticket.getId())
.update();
}
/**

17
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ScanRecordController.java
View File

@ -102,13 +102,16 @@ public class ScanRecordController extends BaseController {
dto.getItems().forEach(item -> {
OutDifferenceItemVO itemVO = new OutDifferenceItemVO()
.setRecommendbatchNo(item.getBatchNo())
.setRecommendSerialNo(item.getSerialNo())
.setRecommendNum(item.getNum());
List<OutMaterialScanRecord> mrecords = records.stream()
.filter(r -> StrUtil.equals(r.getMaterialNo(), dto.getMaterialNo())
&& StrUtil.equals(r.getBatchNo(), item.getBatchNo()))
&& StrUtil.equals(r.getBatchNo(), item.getBatchNo())
&& StrUtil.equals(r.getSerialNo(), item.getSerialNo()))
.toList();
if (CollectionUtil.isNotEmpty(mrecords)) {
itemVO.setScanBatchNo(item.getBatchNo());
itemVO.setScanSerialNo(item.getSerialNo());
itemVO.setScanNum(mrecords.stream().map(OutMaterialScanRecord::getNum).reduce(BigDecimal.ZERO, BigDecimal::add));
records.removeAll(mrecords);
}
@ -120,18 +123,18 @@ public class ScanRecordController extends BaseController {
records.stream()
.collect(Collectors.groupingBy(OutMaterialScanRecord::getMaterialNo))
.forEach((k, v) -> {
OutDifferenceVO vo = new OutDifferenceVO()
.setMaterialNo(k);
OutDifferenceVO vo = vos.stream().filter(it -> StrUtil.equals(it.getMaterialNo(), k)).findFirst().get();
v.stream()
.collect(Collectors.groupingBy(OutMaterialScanRecord::getBatchNo))
.forEach((batchNo, vv) -> {
.collect(Collectors.groupingBy(OutMaterialScanRecord::getKey8))
.forEach((key, vv) -> {
vo.getItems().add(new OutDifferenceItemVO()
.setRecommendbatchNo("")
.setRecommendSerialNo("")
.setRecommendNum(BigDecimal.ZERO)
.setScanBatchNo(batchNo)
.setScanBatchNo(StrUtil.split(key, "|").get(1))
.setScanSerialNo(StrUtil.split(key, "|").get(2))
.setScanNum(vv.stream().map(OutMaterialScanRecord::getNum).reduce(BigDecimal.ZERO, BigDecimal::add)));
});
vos.add(vo);
});
}
return ApiResult.success(vos);

10
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
View File

@ -339,11 +339,11 @@ public class TransferCompanyController extends BaseController {
.eq(WmsTransferCompany::getId, order.getId())
.update();
transferCompanyTicketItemService.saveBatch(ticketItems);
transferCompanyTicketService.save(ticket);
if (!request.getNeedAudit()) {
//不需要审核
submitSap(order, ticket, records, datas, ticketItems);
} else {
transferCompanyTicketService.save(ticket);
inventoryForOutRepository.saveAll(request.getRecommendBatch()
.stream()
.map(item -> {
@ -399,9 +399,11 @@ public class TransferCompanyController extends BaseController {
).toList()
)
);
ticket.setDocYear(vo.getMjahr());
ticket.setMatDoc(vo.getMblnr());
transferCompanyTicketService.save(ticket);
transferCompanyTicketService.lambdaUpdate()
.set(WmsTransferCompanyTicket::getMatDoc, vo.getMblnr())
.set(WmsTransferCompanyTicket::getDocYear, vo.getMjahr())
.eq(WmsTransferCompanyTicket::getId, ticket.getId())
.update();
}
/**

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java
View File

@ -21,7 +21,6 @@ import com.nflg.wms.common.util.VUtil;
import com.sap.conn.jco.*;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
@ -33,11 +32,9 @@ import java.util.stream.Collectors;
public class SapService {
@Resource
@Lazy
private JCoDestination destination;
@Resource
@Lazy
private JCoRepository repository;
/**

7
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/OutMaterialScanRecord.java
View File

@ -164,4 +164,11 @@ public class OutMaterialScanRecord {
public String getKey7() {
return materialNo + "|" + batchNo;
}
@Transient
private String key8;
public String getKey8() {
return materialNo + "|" + batchNo + "|" + this.serialNo;
}
}

10
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutDifferenceItemVO.java
View File

@ -14,6 +14,11 @@ public class OutDifferenceItemVO {
*/
private String recommendbatchNo;
/**
* 推荐序列号
*/
private String recommendSerialNo;
/**
* 推荐数量
*/
@ -24,6 +29,11 @@ public class OutDifferenceItemVO {
*/
private String scanBatchNo;
/**
* 扫码序列号
*/
private String scanSerialNo;
/**
* 扫码数量
*/

6
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java
View File

@ -60,14 +60,14 @@ public class WmsInventoryServiceImpl extends ServiceImpl<WmsInventoryMapper, Wms
} else {
BigDecimal left = inventory.getNum();
for (WmsInventory info : list) {
if (left.compareTo(info.getNum()) <= 0) {
break;
}
BigDecimal sub = NumberUtil.min(info.getNum(), left);
left = left.subtract(sub);
info.setNum(info.getNum().subtract(sub));
info.setUpdateBy(UserUtil.getUserName());
info.setUpdateTime(LocalDateTime.now());
if (left.compareTo(BigDecimal.ZERO) <= 0) {
break;
}
}
if (left.compareTo(BigDecimal.ZERO) > 0) {
errorMaterialNos.add(inventory.getMaterialNo());