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 | 76 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 29 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 3617b00..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;
@@ -36,6 +36,7 @@
import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -49,7 +50,7 @@
public class AsnOrderItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, WkOrderItem> implements AsnOrderItemService {
@Autowired
- private AsnOrderService asnOrderMapper;
+ private AsnOrderMapper asnOrderMapper;
@Autowired
private FieldsService fieldsService;
@@ -58,9 +59,6 @@
private FieldsItemService fieldsItemService;
@Autowired
private MatnrService matnrService;
-
- @Autowired
- private AsnOrderItemService asnOrderItemService;
@Autowired
private CompanysService companysService;
@@ -106,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());
@@ -135,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<>();
@@ -197,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("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
}
}
@@ -239,30 +237,50 @@
if (Objects.isNull(wkOrderItem.getAnfme()) || Double.compare(wkOrderItem.getAnfme(), 0.0) <= 0) {
throw new CoolException("璁″垝鏁颁笉鑳戒负绌猴紒锛�");
}
- //淇濆瓨鎵╁睍瀛楁
- try {
- StringBuffer sb = new StringBuffer();
- if (Objects.isNull(wkOrderItem.getFieldsIndex()) || StringUtils.isBlank(wkOrderItem.getFieldsIndex())) {
- List<Fields> fields = FieldsUtils.getFieldsSta();
- for (Fields field : fields) {
- if (Objects.isNull(params.get(field.getFields()))) {
- continue;
+
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, wkOrderItem.getMatnrCode()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鏁版嵁閿欒锛氱墿鏂�" + wkOrderItem.getMatnrCode() + "涓嶅瓨鍦紒锛�");
+ }
+ Long originalId = wkOrderItem.getId();
+ BeanUtils.copyProperties(matnr, wkOrderItem);
+ wkOrderItem.setId(originalId);
+ wkOrderItem.setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId()).setMaktx(matnr.getName());
+
+ WkOrder wkOrder = asnOrderMapper.selectById(Long.parseLong(params.get("orderId").toString()));
+ if (Objects.isNull(wkOrder)) {
+ throw new CoolException("鏁版嵁閿欒锛屽崟鎹笉瀛樺湪锛侊紒");
+ }
+ if (!wkOrder.getType().equals(OrderType.ORDER_OUT.type)) {
+ //淇濆瓨鎵╁睍瀛楁
+ try {
+ StringBuffer sb = new StringBuffer();
+ if (Objects.isNull(wkOrderItem.getFieldsIndex()) || StringUtils.isBlank(wkOrderItem.getFieldsIndex())) {
+ List<Fields> fields = FieldsUtils.getFieldsSta();
+ for (Fields field : fields) {
+ if (Objects.isNull(params.get(field.getFields()))) {
+ continue;
+ }
+ //瀛楁鎷兼帴
+ sb.append(params.get(field.getFields()));
}
- //瀛楁鎷兼帴
- sb.append(params.get(field.getFields()));
+ sb.append(wkOrderItem.getMatnrId() + wkOrderItem.getSplrBatch());
+ //鑾峰彇16浣島uid
+ String uuid16 = Cools.md5Chinese(sb.toString());
+ wkOrderItem.setFieldsIndex(uuid16);
+ params.put("index", uuid16);
}
- sb.append(wkOrderItem.getMatnrId() + wkOrderItem.getSplrBatch());
- //鑾峰彇16浣島uid
- String uuid16 = Cools.md5Chinese(sb.toString());
- wkOrderItem.setFieldsIndex(uuid16);
- params.put("index", uuid16);
+ //淇濆瓨鎴栨洿鏂板姩鎬佸瓧娈靛��
+ FieldsUtils.updateFieldsValue(params);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
}
- //淇濆瓨鎴栨洿鏂板姩鎬佸瓧娈靛��
- FieldsUtils.updateFieldsValue(params);
- } catch (Exception e) {
- throw new RuntimeException(e);
}
wkOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId);
+ wkOrderItem.setBaseUnit(matnr.getUnit());
+ wkOrderItem.setPurUnit(matnr.getUnit());
+ wkOrderItem.setStockUnit(matnr.getUnit());
+ wkOrderItem.setPriceUnitId(matnr.getUnit());
if (!this.saveOrUpdate(wkOrderItem)) {
throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
}
--
Gitblit v1.9.1