From e29200a02010e97f1ba8bb83ba9be867e11876da Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 29 七月 2025 16:29:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 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 67840c8..9bad96a 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);
}
@@ -290,6 +291,7 @@
matParam.setAnfme(0.0D);
matParam.setAnfme2(0.0D);
matParam.setTiaoma(nccQilibcTmprintWms.getBarcode());
+ matParam.setStandby1(nccQilibcTmprintWms.getCkbm());
return R.ok().add(matParam);
}
@@ -336,6 +338,13 @@
return R.ok().add(map);
}
+ @RequestMapping("/comb/cancel")
+ @ManagerAuth(memo = "鍙栨秷缁勬墭")
+ public R combCancel(@RequestBody CombCancelParam param) {
+ mobileService.combCancel(param, getUserId());
+ return R.ok("鍙栨秷缁勬墭鎴愬姛");
+ }
+
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam) {
@@ -355,7 +364,7 @@
ckbmList.add(storeType.getStoreId());
}
- /*NccSaleXclGgsybWms nccSaleXclGgsybWms = nccSaleXclGgsybWmsService.selectOne(new EntityWrapper<NccSaleXclGgsybWms>()
+ NccSaleXclGgsybWms nccSaleXclGgsybWms = nccSaleXclGgsybWmsService.selectOne(new EntityWrapper<NccSaleXclGgsybWms>()
.eq("WLBM", combMat.getMatnr())
.eq("VBATCHCODE", combMat.getBatch())
.in("CKBM", ckbmList)
@@ -389,7 +398,8 @@
List<CombParam.CombMat> combMats = combParam.getCombMats();
for (CombParam.CombMat mat : combMats) {
mat.setStandby1(nccSaleXclGgsybWms.getCkbm());
- }*/
+ mat.setCstateid(nccSaleXclGgsybWms.getCstateid());
+ }
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
@@ -690,4 +700,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