From 4d71579aef114f21a225bb2e7a59631488f0d76e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 27 三月 2025 15:43:28 +0800
Subject: [PATCH] 站点类型修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 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 098d817..27e33ef 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
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.manager.service.impl;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -21,6 +22,7 @@
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
@@ -66,22 +68,6 @@
}
}
- @Override
- public R generateBarcode(List<AsnOrder> orders) {
- orders.forEach(order -> {
- 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) {
@@ -130,4 +116,32 @@
});
return R.ok("淇濆瓨鎴愬姛!!");
}
+
+ /**
+ * 琛ㄥ崟鏄庣粏淇敼
+ * @param params
+ * @return
+ */
+ @Override
+ @Transactional
+ public R updateOrderItem(AsnOrderAndItemsParams params) {
+ if (Objects.isNull(params.getOrders())) {
+ throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getOrders().getId())) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹甀D涓嶈兘涓虹┖锛侊紒");
+ }
+ if (this.updateById(params.getOrders())) {
+ throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
+ }
+ if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
+ return R.ok("淇敼瀹屾垚锛侊紒");
+ }
+ List<Map<String, Object>> items = params.getItems();
+ List<AsnOrderItem> asnOrderItems = JSONArray.parseArray(JSONArray.toJSONString(items), AsnOrderItem.class);
+ if (asnOrderItemService.saveOrUpdateBatch(asnOrderItems)) {
+ throw new CoolException("鏄庣粏淇敼澶辫触锛侊紒");
+ }
+ return R.ok("淇敼瀹屾垚锛侊紒");
+ }
}
--
Gitblit v1.9.1