From aeecbe9276c2ddb82ffeeb35b95f71b4d45cbf3e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 18 六月 2025 17:17:19 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 0a9cde4..a9cdf6e 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -285,8 +285,10 @@
         MatParam matParam = new MatParam();
         Synchro.Copy(mat, matParam);
         matParam.setBatch(nccQilibcTmprintWms.getVbatchcode());
-        matParam.setAnfme(nccQilibcTmprintWms.getAsnnum() == null ? 0.0D : nccQilibcTmprintWms.getAsnnum().doubleValue());
-        matParam.setAnfme2(nccQilibcTmprintWms.getNastnum() == null ? 0.0D : nccQilibcTmprintWms.getNastnum().doubleValue());
+//        matParam.setAnfme(nccQilibcTmprintWms.getAsnnum() == null ? 0.0D : nccQilibcTmprintWms.getAsnnum().doubleValue());
+//        matParam.setAnfme2(nccQilibcTmprintWms.getNastnum() == null ? 0.0D : nccQilibcTmprintWms.getNastnum().doubleValue());
+        matParam.setAnfme(0.0D);
+        matParam.setAnfme2(0.0D);
         matParam.setTiaoma(nccQilibcTmprintWms.getBarcode());
         return R.ok().add(matParam);
     }
@@ -384,6 +386,11 @@
             return R.error("缁勬墭鏁伴噺瓒呰繃ERP搴撳瓨");
         }
 
+        List<CombParam.CombMat> combMats = combParam.getCombMats();
+        for (CombParam.CombMat mat : combMats) {
+            mat.setStandby1(nccSaleXclGgsybWms.getCkbm());
+        }
+
         mobileService.comb(combParam, getUserId());
         return R.ok("缁勬墭鎴愬姛");
     }

--
Gitblit v1.9.1