From 71d838e032d13a46a07917f5606862496220ea74 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 08 一月 2024 08:35:35 +0800
Subject: [PATCH] # 入库拣货功能添加
---
src/main/java/com/zy/asrs/controller/MobileController.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 59 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 77bae09..0ec5bf0 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -16,8 +15,6 @@
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
-import com.zy.common.model.LocDto;
-import com.zy.common.model.TaskDto;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -403,14 +400,72 @@
return mobileService.manDetlOrigInNo(json,getUser());
}
+// @RequestMapping("/manDetl/out/origin")
+// @ManagerAuth(memo = "骞冲簱涓嬫灦")
+// public R manDetlout(@RequestBody JSONObject json){
+// if (json == null){
+// return R.error("浼犲叆鏁版嵁涓虹┖");
+// }
+// return mobileService.manDetlOriginOut(json,getUser());
+// }
+
@RequestMapping("/manDetl/out/origin")
@ManagerAuth(memo = "骞冲簱涓嬫灦")
- public R manDetlout(@RequestBody JSONObject json){
+ public R manDetlout2(@RequestBody JSONObject json){
if (json == null){
return R.error("浼犲叆鏁版嵁涓虹┖");
}
return mobileService.manDetlOriginOut(json,getUser());
}
+ @RequestMapping("/plaDetl/packin/v1")
+// @ManagerAuth(memo="pla鍏ュ簱")
+ public R plaPackIn(@RequestBody JSONObject json){
+ String locNo = json.get("locNo").toString();
+ String batch = json.get("batch").toString();
+ String packageNo = json.get("packageNo").toString();
+ if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
+ return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+ }
+ mobileService.plaPakin(locNo,batch,packageNo);
+ return R.ok();
+ }
+ @RequestMapping("/plaDetl/packout1/v1")
+// @ManagerAuth(memo="pla鍑哄簱")
+ public R plaPackOut1(@RequestBody JSONObject json){
+ String locNo = json.get("locNo").toString();
+ String batch = json.get("batch").toString();
+ String packageNo = json.get("packageNo").toString();
+ String orderNo = json.get("orderNo").toString();
+ String orderDetlId = json.get("orderDetlId").toString();
+ String wrkNo = json.get("wrkNo").toString();
+ Double anfme = Double.parseDouble(json.get("anfme").toString());
+
+ if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
+ return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+ }
+
+ mobileService.plaPakout(locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
+ return R.ok();
+ }
+
+ @RequestMapping("/plaDetl/packout/v1")
+// @ManagerAuth(memo="pla鍑哄簱")
+ public R plaPackOut(@RequestBody JSONObject json){
+ String locNo = json.get("locNo").toString();
+ String batch = json.get("batch").toString();
+ String packageNo = json.get("packageNo").toString();
+ String orderNo = json.get("orderNo").toString();
+ String orderDetlId = json.get("orderDetlId").toString();
+ String wrkNo = json.get("wrkNo").toString();
+ Double anfme = Double.parseDouble(json.get("anfme").toString());
+
+ if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
+ return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+ }
+
+ mobileService.plaPakout(locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
+ return R.ok();
+ }
}
--
Gitblit v1.9.1