From 0345d3175861c5612e937487770a5ba4e8468b14 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 10 五月 2025 09:49:52 +0800
Subject: [PATCH] 收货单打印功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 128 ++++++++++++++++++++++++++++++------------
1 files changed, 91 insertions(+), 37 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 99b749e..7ab439d 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
@@ -13,6 +13,7 @@
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
import com.vincent.rsf.server.manager.entity.AsnOrderLog;
+import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.mapper.PurchaseMapper;
@@ -24,6 +25,7 @@
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.mapper.SerialRuleMapper;
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;
@@ -95,7 +97,8 @@
}
@Override
- public R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) {
+ @Transactional(rollbackFor = Exception.class)
+ public R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
if (Objects.isNull(params.getOrders())) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
}
@@ -114,18 +117,12 @@
throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
}
if (params.getItems().isEmpty()) {
- throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕笉鑳戒负瀵掗鑺傦紒锛�");
+ throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕笉鑳戒负绌猴紒锛�");
}
- params.getItems().forEach(item -> {
- item.put("asnId", orders.getId());
- item.put("asnCode", orders.getCode());
- item.put("poCode", orders.getPoCode());
- item.put("createBy", loginUserId);
- item.put("updateBy", loginUserId);
- if (!asnOrderItemService.fieldsSave(item)) {
- throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
- }
- });
+ params.setOrders(orders);
+
+ svaeOrUpdateOrderItem(params, loginUserId);
+
return R.ok("淇濆瓨鎴愬姛!!");
}
@@ -137,33 +134,61 @@
* @return
*/
@Override
- @Transactional
- public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) {
- if (Objects.isNull(params.getOrders())) {
+ @Transactional(rollbackFor = Exception.class)
+ public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
+ AsnOrder orders = params.getOrders();
+ if (Objects.isNull(orders)) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(params.getOrders().getId())) {
+ if (Objects.isNull(orders.getId())) {
throw new CoolException("鏁版嵁閿欒锛氬崟鎹甀D涓嶈兘涓虹┖锛侊紒");
}
- if (!this.updateById(params.getOrders())) {
+ if (!this.updateById(orders)) {
throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
}
if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
- return R.ok("淇敼瀹屾垚锛侊紒");
+ 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("鏄庣粏淇敼澶辫触锛侊紒");
- }
+
+ svaeOrUpdateOrderItem(params, loginUserId);
+
return R.ok("淇敼瀹屾垚锛侊紒");
}
/**
- * @author Ryan
- * @description 鎵归噺淇敼
* @param
* @return
+ * @author Ryan
+ * @description 鏇存柊鎴栦繚瀛樻槑缁�
+ * @time 2025/4/7 13:28
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
+ AsnOrder orders = params.getOrders();
+ params.getItems().forEach(item -> {
+ item.put("asnId", orders.getId());
+ item.put("asnCode", orders.getCode());
+ item.put("poCode", orders.getPoCode());
+ item.put("createBy", loginUserId);
+ item.put("updateBy", loginUserId);
+ if (!asnOrderItemService.fieldsSave(item, loginUserId)) {
+ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ });
+ List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
+ .eq(AsnOrderItem::getAsnId, params.getOrders().getId()));
+ double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ orders.setAnfme(sum);
+ if (!this.updateById(orders)) {
+ throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
+ }
+ }
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 鎵归噺淇敼
* @time 2025/4/1 07:58
*/
@Override
@@ -174,11 +199,11 @@
}
return this.update(new LambdaUpdateWrapper<AsnOrder>()
.in(AsnOrder::getId, params.getIds())
- .set(!Objects.isNull(order.getRleStatus()), AsnOrder::getRleStatus, order.getRleStatus())
- .set(!Objects.isNull(order.getNtyStatus()), AsnOrder::getNtyStatus, order.getNtyStatus())
- .set(!Objects.isNull(order.getStatus()), AsnOrder::getStatus, order.getStatus())
- .set(!Objects.isNull(order.getWkType()), AsnOrder::getWkType, order.getWkType())
- .set(!Objects.isNull(order.getExceStatus()), AsnOrder::getExceStatus, order.getExceStatus())
+ .set(!Objects.isNull(order.getRleStatus()), AsnOrder::getRleStatus, order.getRleStatus())
+ .set(!Objects.isNull(order.getNtyStatus()), AsnOrder::getNtyStatus, order.getNtyStatus())
+ .set(!Objects.isNull(order.getStatus()), AsnOrder::getStatus, order.getStatus())
+ .set(!Objects.isNull(order.getWkType()), AsnOrder::getWkType, order.getWkType())
+ .set(!Objects.isNull(order.getExceStatus()), AsnOrder::getExceStatus, order.getExceStatus())
.set(AsnOrder::getUpdateBy, userId));
}
@@ -206,28 +231,56 @@
return R.ok("鏀惰揣鎴愬姛锛侊紒");
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R closeOrder(Long id) {
+ AsnOrder order = this.getById(id);
+ if (Objects.isNull(order)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ try {
+ operateOrderLogs(order);
+ } catch (Exception e) {
+ throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒");
+ }
+ return null;
+ }
+
/**
- * @author Ryan
- * @description 鍒犻櫎鍘熶富鍗曞強鏄庣粏锛屽姞鍏ュ巻鍙叉。
* @param
* @return
+ * @author Ryan
+ * @description 鍒犻櫎鍘熶富鍗曞強鏄庣粏锛屽姞鍏ュ巻鍙叉。
* @time 2025/3/19 19:53
*/
@Transactional(rollbackFor = Exception.class)
- private void operateOrderLogs(AsnOrder asrder) throws Exception{
+ public synchronized void operateOrderLogs(AsnOrder asrder) throws Exception {
if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
+ asrder.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
+
+ if (!this.updateById(asrder)) {
+ throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒");
+ }
+ List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, asrder.getId()));
+ if (orderItems.isEmpty()) {
+ throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
+ }
+// if (Objects.isNull(asrder.getAnfme()) || asrder.getAnfme().compareTo(0.00) == 0) {
+// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
+// }
AsnOrder order = this.getById(asrder.getId());
AsnOrderLog orderLog = new AsnOrderLog();
- order.setExceStatus(Short.valueOf("2"));
+// order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
BeanUtils.copyProperties(order, orderLog);
orderLog.setId(null);
orderLog.setAsnId(order.getId());
- if (!this.saveOrUpdate(order)) {
- throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
+// if (!this.saveOrUpdate(order)) {
+// throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+// }
+// orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
if (!asnOrderLogService.save(orderLog)) {
throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
}
@@ -237,6 +290,7 @@
AsnOrderItemLog itemLog = new AsnOrderItemLog();
BeanUtils.copyProperties(item, itemLog);
itemLog.setAsnItemId(itemLog.getId())
+ .setLogId(orderLog.getId())
.setAsnId(item.getAsnId());
logs.add(itemLog);
});
--
Gitblit v1.9.1