From d82c353588cb3a9a080bccb65e06e44a5d9dcfb0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 八月 2025 08:45:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index e18a416..16cdac0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -8,6 +8,7 @@
 import com.zy.asrs.mapper.WrkDetlMapper;
 import com.zy.asrs.service.MatService;
 import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.utils.MatUtils;
 import com.zy.common.model.DetlDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -66,20 +67,8 @@
                 return false;
             }
 
-            //鏇存柊杈呮枡
-            Mat mat = matService.selectByMatnr(matnr);
-            if (mat == null) {
-                return false;
-            }
-
-            //杞崲鍏崇郴
-            String origin = mat.getOrigin();
-            if (Cools.isEmpty(origin)) {
-                return true;
-            }
-            String[] split = origin.split("/");
-            //杈呭崟浣�
-            Double weight = (anfme / Double.parseDouble(split[1])) / Double.parseDouble(split[0]);
+            //璁$畻杈呭崟浣�
+            Double weight = MatUtils.calcWeight(matnr, anfme);
             return baseMapper.updateWeight(weight, wrkNo, matnr, batch) > 0;
         }
     }
@@ -103,4 +92,9 @@
     public List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo) {
         return this.baseMapper.selectAndLogByOrderNoGroupByMatnrOfSum(orderNo);
     }
+
+    @Override
+    public boolean updateBarcode(Integer wrkNo, String barcode) {
+        return this.baseMapper.updateBarcode(wrkNo, barcode) > 0;
+    }
 }

--
Gitblit v1.9.1