From beff9e424cbc5a86fb02ae5b089bd6ae9d04d78e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 14:52:18 +0800
Subject: [PATCH] 修改 1. 仓库修改添加同名空管 2. 仓库库区修改添加同空管

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 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 03c5ccf..098d817 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
@@ -5,6 +5,8 @@
 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;
@@ -36,6 +38,8 @@
 
     @Autowired
     private ReceiveMsgService receiveMsgService;
+    @Autowired
+    private ReportMsgService reportMsgService;
     @Resource
     private PurchaseMapper purchaseMapper;
 
@@ -55,7 +59,7 @@
             throw new CoolException("ASN鍗曟嵁涓嶈兘涓虹┖锛侊紒");
         }
         List<PoItemsDto> items = purchaseMapper.poList(asnIds);
-        if (receiveMsgService.reportInspectNotify(items)) {
+        if (reportMsgService.reportInspectNotify(items)) {
             return true;
         } else {
             return false;
@@ -95,4 +99,35 @@
 
         return this.listByIds(longList);
     }
+
+    @Override
+    public R saveOrderAndItems(AsnOrderAndItemsParams params) {
+        if (Objects.isNull(params.getOrders())) {
+            throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
+        }
+        AsnOrder orders = params.getOrders();
+
+        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("淇濆瓨鎴愬姛!!");
+    }
 }

--
Gitblit v1.9.1