From 979f2505861b77b8702604739486b62f1e339e76 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 07 十月 2025 08:44:11 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
index bdb26e2..c9855a2 100644
--- a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
+++ b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
@@ -3,11 +3,16 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.MatBarcode;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.service.MatBarcodeService;
+import com.zy.asrs.service.MobileService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -23,6 +28,8 @@
public class BarcodeMatnrController extends BaseController {
@Autowired
private MatBarcodeService matBarcodeService;
+ @Autowired
+ private MobileService mobileService;
/*
* 鐗╂枡鎵樼洏缁戝畾鍒嗛〉鏌ヨ
* */
@@ -65,4 +72,45 @@
matBarcodeService.deleteMatBarcode(list);
return R.ok();
}
+
+ /*鐗╂枡鎵樼洏缁戝畾
+ *
+ * */
+ @RequestMapping(value = "/barcodeMatnr/add/auth")
+ @ManagerAuth
+ public R add(WaitPakin waitPakin) {
+ if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())){
+ return R.error(BaseRes.PARAM);
+ }
+ matBarcodeService.addBarcodeMatnr(waitPakin);
+ return R.ok();
+ }
+
+ /*缁勬墭
+ *
+ * */
+ @RequestMapping(value = "/barcodeMatnr/add1/auth")
+ @ManagerAuth
+ public R comb(WaitPakin waitPakin) {
+ if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
+ return R.error(BaseRes.PARAM);
+ }
+ mobileService.combToWms(waitPakin);
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ /*骞舵澘
+ *
+ * */
+ @RequestMapping(value = "/barcodeMatnr/add2/auth")
+ @ManagerAuth
+ public R clamp(WaitPakin waitPakin) {
+ if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
+ return R.error(BaseRes.PARAM);
+ }
+ MobileAdjustParam combParam=new MobileAdjustParam();
+ combParam.setBarcode(waitPakin.getBarcode());
+ mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+ return R.ok("骞舵澘鎴愬姛");
+ }
}
--
Gitblit v1.9.1