From 89e69825afdc8fb7619444d6e0bbc808502920e5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 14 三月 2025 13:22:36 +0800
Subject: [PATCH] #修改 1. 字段优化 2. 添加物料查询收货通知单接口
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 3bac15f..03c5ccf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -10,6 +10,7 @@
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.mapper.PurchaseMapper;
+import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -20,8 +21,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -39,8 +39,8 @@
@Resource
private PurchaseMapper purchaseMapper;
- @Resource
- private AsnOrderItemMapper asnOrderItemMapper;
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
@Resource
private SerialRuleMapper serialRuleMapper;
@@ -65,12 +65,34 @@
@Override
public R generateBarcode(List<AsnOrder> orders) {
orders.forEach(order -> {
- List<AsnOrderItem> items = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
- items.forEach(item -> {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
- //TODO asnorderitem 娣诲姞鍗曠嫭鐨勫瓧娈碉紝淇濆瓨缂栫爜
- });
+ List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
+ if (!items.isEmpty()) {
+ items.forEach(item -> {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
+ item.setTrackCode(ruleCode);
+ });
+ if (!asnOrderItemService.saveOrUpdateBatch(items)) {
+ throw new CoolException("鐢熸垚鏉＄爜澶辫触锛侊紒");
+ }
+ }
});
return R.ok();
}
+
+ @Override
+ public List<AsnOrder> getListByMatnr(Map<String, String> params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
+ }
+ List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
+ .like(!Objects.isNull(params.get("maktx")), AsnOrderItem::getMaktx, params.get("maktx"))
+ .eq(!Objects.isNull(params.get("matnrCode")), AsnOrderItem::getMatnrCode, params.get("matnrCode")));
+
+ if (orderItems.isEmpty()) {
+ return new ArrayList<>();
+ }
+ List<Long> longList = orderItems.stream().map(AsnOrderItem::getAsnId).collect(Collectors.toList());
+
+ return this.listByIds(longList);
+ }
}
--
Gitblit v1.9.1