From 55b0ad7d6c0dbab544f23878626bc16b529f1950 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 八月 2025 14:26:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 71 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 92c10d4..7d7f3ea 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -366,42 +366,41 @@
ckbmList.add(storeType.getStoreId());
}
- NccSaleXclGgsybWms nccSaleXclGgsybWms = nccSaleXclGgsybWmsService.selectOne(new EntityWrapper<NccSaleXclGgsybWms>()
- .eq("WLBM", combMat.getMatnr())
- .eq("VBATCHCODE", combMat.getBatch())
- .in("CKBM", ckbmList)
- );
- if(null == nccSaleXclGgsybWms) {
- return R.error("鏈煡鍒癊RP搴撳瓨");
- }
-
- //ERP搴撳瓨鏁伴噺
- BigDecimal zsl = nccSaleXclGgsybWms.getZsl();
-
- //鑾峰彇绔嬪簱鏁伴噺
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
- .eq("matnr", combMat.getMatnr())
- .eq("batch", combMat.getBatch())
- );
- BigDecimal stockNum = new BigDecimal(0);
- for (LocDetl locDetl : locDetls) {
- stockNum = stockNum.add(BigDecimal.valueOf(locDetl.getAnfme()));
- }
-
- //鍔犱笂缁勬墭鏁伴噺
- for (CombParam.CombMat mat : combParam.getCombMats()) {
- stockNum = stockNum.add(BigDecimal.valueOf(mat.getAnfme()));
- }
-
- if(stockNum.doubleValue() > zsl.doubleValue()) {
- return R.error("缁勬墭鏁伴噺瓒呰繃ERP搴撳瓨");
- }
-
- List<CombParam.CombMat> combMats = combParam.getCombMats();
- for (CombParam.CombMat mat : combMats) {
- mat.setStandby1(nccSaleXclGgsybWms.getCkbm());
- mat.setCstateid(nccSaleXclGgsybWms.getCstateid());
- }
+// NccSaleXclGgsybWms nccSaleXclGgsybWms = nccSaleXclGgsybWmsService.selectOne(new EntityWrapper<NccSaleXclGgsybWms>()
+// .eq("WLBM", combMat.getMatnr())
+// .eq("VBATCHCODE", combMat.getBatch())
+// .in("CKBM", ckbmList)
+// );
+// if(null == nccSaleXclGgsybWms) {
+// return R.error("鏈煡鍒癊RP搴撳瓨");
+// }
+//
+// //ERP搴撳瓨鏁伴噺
+// BigDecimal zsl = nccSaleXclGgsybWms.getZsl();
+//
+// //鑾峰彇绔嬪簱鏁伴噺
+// List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+// .eq("matnr", combMat.getMatnr())
+// .eq("batch", combMat.getBatch())
+// );
+// BigDecimal stockNum = new BigDecimal(0);
+// for (LocDetl locDetl : locDetls) {
+// stockNum = stockNum.add(BigDecimal.valueOf(locDetl.getAnfme()));
+// }
+//
+// //鍔犱笂缁勬墭鏁伴噺
+// for (CombParam.CombMat mat : combParam.getCombMats()) {
+// stockNum = stockNum.add(BigDecimal.valueOf(mat.getAnfme()));
+// }
+//
+// 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());
return R.ok("缁勬墭鎴愬姛");
--
Gitblit v1.9.1