From d62f66a249ee0f0e8393fb1d269d9ba540a8bd91 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期三, 04 九月 2024 18:49:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/controller/MobileController.java | 9 ++++++---
src/main/resources/license.lic | 0
src/main/resources/application.yml | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index b606a4e..57c37d7 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -455,8 +455,8 @@
return R.ok("鍏ュ簱鎴愬姛");
}
- @RequestMapping("/plaDetl/packin/v2")
- //@ManagerAuth(memo="pla鍏ュ簱")
+ @RequestMapping("/plaDetl/packin/v1锛�")
+ @ManagerAuth(memo="pla鍏ュ簱")
@Transactional
public R plaPackInTestErp(@RequestBody JSONObject json) throws ParseException {
String locNo = json.get("locNo").toString();
@@ -470,11 +470,14 @@
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
//娴嬭瘯
- if(true){
+ if(false){
User user = new User();
user.setUsername("test");
mobileService.plaPakin(brand,locNo,batch,packageNo,user);
json.put("user",user.getUsername());
+ }else {
+ mobileService.plaPakin(brand,locNo,batch,packageNo,getUser());
+ json.put("user",getUser().getUsername());
}
}
//鍏ュ簱鎴愬姛鍚庝笂鎶RP
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 93116ee..80e75bf 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -142,7 +142,7 @@
Order order = this.selectById(orderId);
- int count = manPakOutService.selectCount(new EntityWrapper<ManPakOut>().eq("doc_name", order.getOrderNo()));
+ int count = manPakOutService.selectCount(new EntityWrapper<ManPakOut>().eq("doc_num", order.getOrderNo()));
if(count > 0){
throw new CoolException("璇峰厛鍒犻櫎鎷ｈ揣鍗�");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ab99946..1f54a01 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
spring:
- application:
+ aporder/delete/authplication:
name: @pom.build.finalName@
jmx:
enabled: false
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
new file mode 100644
index 0000000..cfcc36d
--- /dev/null
+++ b/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1