From cfe049492f81d2c650a2b17348593edbc5054498 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 18 三月 2026 07:52:44 +0800
Subject: [PATCH] #3.5
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 ec25964..93e5287 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
@@ -23,10 +23,10 @@
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.enums.QlyIsptResult;
+import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -50,7 +50,7 @@
public class AsnOrderItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, WkOrderItem> implements AsnOrderItemService {
@Autowired
- private AsnOrderService asnOrderMapper;
+ private AsnOrderMapper asnOrderMapper;
@Autowired
private FieldsService fieldsService;
@@ -61,15 +61,10 @@
private MatnrService matnrService;
@Autowired
- private AsnOrderItemService asnOrderItemService;
-
- @Autowired
private CompanysService companysService;
@Autowired
private DictDataService dictDataService;
- @Autowired
- private AsnOrderService asnOrderService;
@Override
public R generateBarcode(List<Long> orders) {
@@ -109,7 +104,7 @@
throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒");
}
AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
- WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, key));
+ WkOrder order = asnOrderMapper.selectOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, key));
if (!Objects.isNull(order)) {
sbFaild.append(template.getCode()).append(",宸叉坊鍔狅紒锛�");
throw new CoolException(sbFaild.toString());
@@ -138,7 +133,7 @@
.setCreateBy(loginUserId)
.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()));
- if (!asnOrderMapper.save(order)) {
+ if (asnOrderMapper.insert(order) <= 0) {
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
List<WkOrderItem> items = new ArrayList<>();
@@ -200,17 +195,17 @@
}
items.add(orderItem);
- if (!asnOrderItemService.save(orderItem)) {
+ if (!this.save(orderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");
}
}
if (!items.isEmpty()) {
// double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
double anfme = items.stream().mapToDouble(WkOrderItem::getAnfme).sum();
- if (!asnOrderMapper.update(new LambdaUpdateWrapper<WkOrder>()
+ if (asnOrderMapper.update(null, new LambdaUpdateWrapper<WkOrder>()
// .set(AsnOrder::getQty, qty)
.set(WkOrder::getAnfme, anfme)
- .eq(WkOrder::getId, order.getId()))) {
+ .eq(WkOrder::getId, order.getId())) <= 0) {
throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
}
}
@@ -252,7 +247,7 @@
wkOrderItem.setId(originalId);
wkOrderItem.setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId()).setMaktx(matnr.getName());
- WkOrder wkOrder = asnOrderService.getById(Long.parseLong(params.get("orderId").toString()));
+ WkOrder wkOrder = asnOrderMapper.selectById(Long.parseLong(params.get("orderId").toString()));
if (Objects.isNull(wkOrder)) {
throw new CoolException("鏁版嵁閿欒锛屽崟鎹笉瀛樺湪锛侊紒");
}
--
Gitblit v1.9.1