From 0dcc14943b6dcaecf56597ed149e61da997be8e5 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 20 三月 2026 09:29:54 +0800
Subject: [PATCH] fix: BOM的单位产出需要数量精度修改、返回单位取消产品表绑定

---
 src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
index 7ee2e65..d4a9737 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
@@ -170,14 +170,24 @@
 
     @Override
     public Boolean addProductOrder(ProductOrder productOrder) {
-        String string = generateNextOrderNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
-        productOrder.setNpsNo(string);
+        fillAndSaveProductOrder(productOrder);
+        return true;
+    }
+
+    @Override
+    public Long insertProductOrder(ProductOrder productOrder) {
+        fillAndSaveProductOrder(productOrder);
+        return productOrder.getId();
+    }
+
+    private void fillAndSaveProductOrder(ProductOrder productOrder) {
+        String orderNo = generateNextOrderNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+        productOrder.setNpsNo(orderNo);
         productOrder.setCompleteQuantity(BigDecimal.ZERO);
         this.save(productOrder);
         if (ObjectUtils.isNotEmpty(productOrder.getRouteId())) {
             this.bindingRoute(productOrder);
         }
-        return true;
     }
 
     @Override
@@ -248,7 +258,7 @@
         //  鍒犻櫎闄勮〃鐨勫伐鑹鸿矾绾夸笌BOM
         for (Long id : ids) {
             ProductOrder productOrder = baseMapper.selectById(id);
-            appendixService.deleteData(productOrder.getRouteId());
+            appendixService.deleteData(productOrder.getId(), productOrder.getRouteId());
         }
 
 //        productProcessRouteItemMapper.delete(new LambdaQueryWrapper<ProductProcessRouteItem>().in(ProductProcessRouteItem::getProductOrderId, ids));

--
Gitblit v1.9.3