From bfb371013dcc740384b02a0ba678d6322a8bf97b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 07 五月 2025 18:50:24 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index 13186f7..970f79d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -87,7 +87,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception {
+ public synchronized R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception {
ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), AsnOrderTemplate.class, ExcelUtil.getDefaultImportParams());
if (result.getList().isEmpty()) {
throw new CoolException("鐗╂枡瀵煎叆澶辫触锛侊紒");
@@ -99,6 +99,9 @@
Map<String, List<AsnOrderTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(AsnOrderTemplate::getCode));
StringBuffer sbFaild = new StringBuffer();
for (String key : listMap.keySet()) {
+ if (StringUtils.isBlank(key)) {
+ throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒");
+ }
AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, key));
if (!Objects.isNull(order)) {
@@ -126,22 +129,32 @@
for (AsnOrderTemplate orderTemplate : listMap.get(key)) {
AsnOrderItem orderItem = new AsnOrderItem();
if (StringUtils.isBlank(orderTemplate.getMatnrCode())) {
- throw new CoolException(orderTemplate.getPoCode() + "锛氱墿鏂欑紪鐮佷笉鑳戒负绌猴紒锛�");
+ throw new CoolException(orderTemplate.getCode() + "锛氱墿鏂欑紪鐮佷笉鑳戒负绌猴紒锛�");
}
+ if (StringUtils.isBlank(orderTemplate.getAnfme())) {
+ throw new CoolException(orderTemplate.getCode() + "锛氭暟閲忎笉鑳戒负绌猴紒锛�");
+ }
+ if (StringUtils.isBlank(orderTemplate.getType())) {
+ throw new CoolException(orderTemplate.getCode() + "锛氬崟鎹被鍨嬩笉鑳戒负绌猴紒锛�");
+ }
+ if (StringUtils.isBlank(orderTemplate.getWkType())) {
+ throw new CoolException(orderTemplate.getCode() + "锛氫笟鍔＄被鍨嬩笉鑳戒负绌猴紒锛�");
+ }
+
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>()
.eq(Matnr::getCode, orderTemplate.getMatnrCode()));
if (Objects.isNull(matnr)) {
sbFaild.append(orderTemplate.getMatnrCode()).append("鐗╂枡涓嶅瓨鍦�");
throw new CoolException(sbFaild.toString());
}
- String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, matnr);
+// String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, matnr);
orderItem.setAsnId(order.getId())
.setAsnCode(order.getCode())
.setSplrBatch(orderTemplate.getSplrBatch())
.setPlatItemId(orderTemplate.getPlatItemId())
.setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
- .setTrackCode(trackCode)
- .setBarcode(trackCode)
+// .setTrackCode(trackCode)
+// .setBarcode(trackCode)
.setPoCode(orderTemplate.getPoCode())
.setPurUnit(matnr.getUnit())
.setCreateBy(loginUserId)
@@ -199,10 +212,10 @@
public boolean fieldsSave(Map<String, Object> params, Long loginUserId) {
AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
asnOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId);
- if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
- asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);
- }
+// if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
+// String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
+// asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);
+// }
if (StringUtils.isNoneBlank(asnOrderItem.getSplrCode())) {
Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
.eq(Companys::getId, asnOrderItem.getSplrCode())
--
Gitblit v1.9.1