From 2a865ce08ad71501542b0a512d7868e5a6622df4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 17 一月 2024 08:55:31 +0800
Subject: [PATCH] # 配置属性修改
---
src/main/java/com/zy/asrs/controller/MobileController.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 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 6329b95..14228b3 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -17,6 +17,7 @@
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -419,7 +420,7 @@
}
@RequestMapping("/plaDetl/packin/v1")
-// @ManagerAuth(memo="pla鍏ュ簱")
+ //@ManagerAuth(memo="pla鍏ュ簱")
public R plaPackIn(@RequestBody JSONObject json){
String locNo = json.get("locNo").toString();
String batch = json.get("batch").toString();
@@ -427,7 +428,33 @@
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- mobileService.plaPakin(locNo,batch,packageNo);
+ //娴嬭瘯
+ if(true){
+ User user = new User();
+ user.setUsername("test");
+ mobileService.plaPakin(locNo,batch,packageNo,user);
+ return R.ok();
+ }
+ mobileService.plaPakin(locNo,batch,packageNo,getUser());
+ 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();
}
@@ -449,4 +476,11 @@
mobileService.plaPakout(locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
return R.ok();
}
+
+ public static void main(String[] args) {
+ String aa = "aabb";
+ String[] ccs = aa.split("cc");
+ System.out.println(ccs[0]);
+ }
+
}
--
Gitblit v1.9.1