From acb1348d6746ea9e6a48542baa203123559518cf Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期三, 02 七月 2025 15:52:29 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   18 ++++++++++++++++--
 1 files changed, 16 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..bff7c10 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);
     }
@@ -382,6 +384,11 @@
 
         if(stockNum.doubleValue() > zsl.doubleValue()) {
             return R.error("缁勬墭鏁伴噺瓒呰繃ERP搴撳瓨");
+        }
+
+        List<CombParam.CombMat> combMats = combParam.getCombMats();
+        for (CombParam.CombMat mat : combMats) {
+            mat.setStandby1(nccSaleXclGgsybWms.getCkbm());
         }
 
         mobileService.comb(combParam, getUserId());
@@ -676,4 +683,11 @@
         return R.ok("鍑哄簱鎴愬姛");
     }
 
+    @RequestMapping("/checkOut/submit/auth")
+    @ManagerAuth(memo = "鐩樼偣涓婃姤ERP")
+    public R checkOutSubmit(@RequestParam("orderId") Integer orderId) {
+        mobileService.checkOutSubmit(orderId, getUserId());
+        return R.ok("涓婃姤ERP鎴愬姛");
+    }
+
 }

--
Gitblit v1.9.1