From 6e18b1e086f202512eeb9aa988a8b9026cfccec3 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 28 三月 2026 20:28:27 +0800
Subject: [PATCH] 修复

---
 src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 076c454..805b2db 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -207,23 +207,25 @@
                         wrkMastService.updateById(wrkMast);
                         //鍑哄簱涓烘満鍙板伐浣嶆椂锛屽喕缁撶浉瀵规湁鐨勫簱浣�,鍙婄浉閭诲簱浣�
                         String s = Utils.convertLocFormat(params.getLocNo());
-                        LocAroundBind bind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>()
-                                .eq("b_loc_no", s));
-                        if (!Objects.isNull(bind)) {
-                            bind.setFreeze(1);
-                            locAroundBindService.updateById(bind);
-                            //鍐荤粨鐩搁偦搴撲綅
-                            Integer[] aroundIds = freezeLocAround(bind.getOrderNo());
-                            if (aroundIds != null) {
-                                for (Integer id : aroundIds) {
-                                    if (id != null && id > 0) {
-                                        LocAroundBind aroundBind = locAroundBindService.selectOne(
-                                                new EntityWrapper<LocAroundBind>()
-                                                        .eq("dev_id", bind.getDevId())
-                                                        .eq("order_no", id));
-                                        if (aroundBind != null) {
-                                            aroundBind.setFreeze(1);
-                                            locAroundBindService.updateById(aroundBind);
+                        if(Cools.isEmpty(wrkMast.getLocNo())){
+                            LocAroundBind bind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>()
+                                    .eq("b_loc_no", s));
+                            if (!Objects.isNull(bind)) {
+                                bind.setFreeze(1);
+                                locAroundBindService.updateById(bind);
+                                //鍐荤粨鐩搁偦搴撲綅
+                                Integer[] aroundIds = freezeLocAround(bind.getOrderNo());
+                                if (aroundIds != null) {
+                                    for (Integer id : aroundIds) {
+                                        if (id != null && id > 0) {
+                                            LocAroundBind aroundBind = locAroundBindService.selectOne(
+                                                    new EntityWrapper<LocAroundBind>()
+                                                            .eq("dev_id", bind.getDevId())
+                                                            .eq("order_no", id));
+                                            if (aroundBind != null) {
+                                                aroundBind.setFreeze(1);
+                                                locAroundBindService.updateById(aroundBind);
+                                            }
                                         }
                                     }
                                 }
@@ -422,7 +424,7 @@
                         }
                         Double realQty = Math.round((wrkDetl.getStockQty() - wrkDetl.getAnfme()) * 10000) / 10000.0;
                         if (!Cools.isEmpty(weight)) {
-                            Double val = Math.round((weight - 3) * 10000) / 10000.0;
+                            Double val = Math.round((weight - 2.5) * 10000) / 10000.0;
                             //绉伴噸鍚庯紝璁$畻鍑虹湡瀹為暱搴�
                             realQty = val * matnr.getVolume();
                             if (realQty<matnr.getSafeQty()){

--
Gitblit v1.9.1