From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/asrs/controller/MobileController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 553ce4f..102aa24 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -9,10 +9,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OffSaleParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
@@ -156,6 +153,53 @@
return R.ok("response.comb_success");
}
+ @RequestMapping("/cartonComb/auth")
+ @ManagerAuth(memo = "response.pallet_comb")
+ public R cartonComb(@RequestBody List<CombCartonParam> params ){
+ mobileService.cartonComb(params, getUserId());
+ return R.ok("response.comb_success");
+ }
+
+ @RequestMapping("/cartonScanReplace/auth")
+ @ManagerAuth(memo = "response.carton_scan")
+ public R cartonScanReplace(@RequestBody ScanParam scanParam){
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("barcode",scanParam.getCartonLabel()));
+ if (wrkDetls.isEmpty()) {
+ return R.error("response.no_data");
+ }
+ WrkDetl wrkDetl = wrkDetls.get(0);
+ return R.ok("response.scan_success").add(wrkDetl);
+
+ }
+ @RequestMapping("/labelReplace/auth")
+ @ManagerAuth(memo = "response.carton_scan_save")
+ public R cartonScanReplaceSave(@RequestBody ReplaceBarcodeParam replaceBarcodeParam) {
+ if (replaceBarcodeParam == null || Cools.isEmpty(replaceBarcodeParam.getReplaceParam())) {
+ return R.error("PARAM IS NULL");
+ }
+ for (ReplaceBarcodeParam.CombinedData param : replaceBarcodeParam.getReplaceParam()) {
+ WrkDetl wrkDetl = wrkDetlService.selectOne(
+ new EntityWrapper<WrkDetl>()
+ .eq("order_no", param.getOrderNo())
+ .eq("barcode", param.getBarcode())
+ );
+ if (wrkDetl == null) {
+ return R.error("DETL IS NULL, barcode=" + param.getBarcode());
+ }
+ if (!wrkDetlService.updateBuyerLabel(param.getOrderNo(), param.getBuyerLabelBarcode(),param.getBarcode())) {
+ return R.error("Failed to update, barcode=" + param.getBarcode());
+ }
+ }
+ return R.ok("response.replace_success");
+ }
+
+
+ @RequestMapping("/cartonScan/auth")
+ @ManagerAuth(memo = "response.carton_scan")
+ public R cartonScan(@RequestBody ScanParam scanParam){
+ OrderDetl orderDetl = mobileService.cartonScan(scanParam, getUserId());
+ return R.ok("response.scan_success").add(orderDetl);
+ }
@RequestMapping("/pack/get/auth")
@ManagerAuth(memo = "response.mobile_pack_get")
public R packGet(@RequestParam String barcode){
--
Gitblit v1.9.1