From 7e8c672d13a4d5c9ef6d8b62f6fc1ce092a6c123 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期一, 11 八月 2025 08:23:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 87 ++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index e5bd07f..7d7f3ea 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -268,6 +268,7 @@
matParam.setWeight(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
matParam.setAnfme2(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue());
matParam.setTiaoma(nccJcQilibcBarcodeflowWms.getVbarcode());
+ matParam.setCstateid(nccJcQilibcBarcodeflowWms.getCstateid());
return R.ok().add(matParam);
}
@@ -291,6 +292,7 @@
matParam.setAnfme2(0.0D);
matParam.setTiaoma(nccQilibcTmprintWms.getBarcode());
matParam.setStandby1(nccQilibcTmprintWms.getCkbm());
+ matParam.setCstateid(nccQilibcTmprintWms.getCstateid());
return R.ok().add(matParam);
}
@@ -330,6 +332,7 @@
matParam.setAnfme(0.0D);
matParam.setAnfme2(0.0D);
matParam.setTiaoma(batch);
+ matParam.setCstateid(wrkDetlLog.getCstateid());
String[] split = wrkDetlLog.getOrderNo().split("-");
map.put("orderNo", split[0]);
@@ -363,41 +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());
- }
+// 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("缁勬墭鎴愬姛");
@@ -698,4 +701,18 @@
return R.ok("涓婃姤ERP鎴愬姛");
}
+ @RequestMapping("/pallet/toOutSta")
+ @ManagerAuth(memo = "鎵樼洏鍘诲嚭搴撳彛")
+ public R toOutSta(@RequestBody PalletToOutStaParam param) {
+ mobileService.toOutSta(param, getUserId());
+ return R.ok();
+ }
+
+ @RequestMapping("/pallet/toAllOut")
+ @ManagerAuth(memo = "鎷ｆ枡杞叏鏉�")
+ public R toAllOut(@RequestBody PalletToAllOutParam param) {
+ mobileService.toAllOut(param, getUserId());
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1