From 4c85017e06c3ffd79e9a3fab2d5b01419f8b743f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 09:39:04 +0800
Subject: [PATCH] #修改 1. 收货单历史档ID 更新 2. 收货单据字典类型转换 3. 收货单明细跟踪码修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 132 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 132 insertions(+), 0 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 8906fbf..1e7709d 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,12 +1,144 @@
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;
+import com.vincent.rsf.server.api.entity.dto.PoItemsDto;
+import com.vincent.rsf.server.api.service.ReceiveMsgService;
+import com.vincent.rsf.server.api.service.ReportMsgService;
+import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
+import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
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;
+import com.vincent.rsf.server.system.entity.SerialRule;
+import com.vincent.rsf.server.system.mapper.SerialRuleMapper;
+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.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author Ryan
+ * @description
+ * @throws
+ * @return
+ * @time 2025/3/7 08:02
+ */
@Service("asnOrderService")
public class AsnOrderServiceImpl extends ServiceImpl<AsnOrderMapper, AsnOrder> implements AsnOrderService {
+ @Autowired
+ private ReceiveMsgService receiveMsgService;
+ @Autowired
+ private ReportMsgService reportMsgService;
+ @Resource
+ private PurchaseMapper purchaseMapper;
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
+ @Resource
+ private SerialRuleMapper serialRuleMapper;
+
+ @Override
+ public boolean notifyInspect(List<AsnOrder> orders) {
+ if (orders.isEmpty()) {
+ throw new CoolException("涓婃姤鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ Set<Long> asnIds = orders.stream().map(AsnOrder::getId).collect(Collectors.toSet());
+ if (asnIds.isEmpty()) {
+ throw new CoolException("ASN鍗曟嵁涓嶈兘涓虹┖锛侊紒");
+ }
+ List<PoItemsDto> items = purchaseMapper.poList(asnIds);
+ if (reportMsgService.reportInspectNotify(items)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ @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);
+ }
+
+ @Override
+ public R saveOrderAndItems(AsnOrderAndItemsParams params) {
+ if (Objects.isNull(params.getOrders())) {
+ throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
+ }
+ AsnOrder orders = params.getOrders();
+ if (Objects.isNull(orders)) {
+ throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒");
+ }
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, orders);
+ if (Objects.isNull(ruleCode)) {
+ throw new CoolException("鏀惰揣閫氱煡鍗曠紪鐮佺敓鎴愬け璐ワ紒锛�");
+ }
+ orders.setCode(ruleCode);
+ if (!this.save(orders)) {
+ throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
+ }
+ if (params.getItems().isEmpty()) {
+ throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕笉鑳戒负瀵掗鑺傦紒锛�");
+ }
+ params.getItems().forEach(item -> {
+ item.put("asnId", orders.getId());
+ item.put("asnCode", orders.getCode());
+ item.put("poCode", orders.getPoCode());
+ if (!asnOrderItemService.fieldsSave(item)) {
+ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ });
+ 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