From 113756e1bfdb3de594b46d5676e3a7fff01499f7 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期一, 10 十月 2022 14:28:38 +0800
Subject: [PATCH] #lsh
---
src/main/java/com/zy/asrs/controller/OpenController.java | 6 +++---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 8 +++++---
src/main/java/com/zy/asrs/controller/MobileController.java | 3 ++-
src/main/java/com/zy/asrs/entity/LocMast.java | 2 +-
src/main/java/com/zy/asrs/entity/param/Review.java | 2 ++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 18 ++++++++++++++++++
src/main/resources/application.yml | 4 ++--
src/main/java/com/zy/asrs/service/MobileService.java | 2 +-
8 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 620e484..f5bdf33 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -343,7 +343,8 @@
// @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
@ResponseBody
public synchronized R suspendTestPACK(@RequestBody SearchLocParam param) {
- mobileService.suspendTestPACK(); //璇锋眰鏆傚仠娴嬭瘯
+
+ mobileService.suspendTestPACK(param.getBarcode()); //璇锋眰鏆傚仠娴嬭瘯
return R.ok();
}
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index a35cc59..b987afe 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -210,6 +210,7 @@
public synchronized R hostName(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) HeartBeat param,
HttpServletRequest request){
+ appkey="ea1f0459efc02a79f046f982767939ae";
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -227,7 +228,6 @@
public synchronized R combPack(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) CombParam param,
HttpServletRequest request){
-
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -262,7 +262,7 @@
public synchronized R infoReview(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) Review param,
HttpServletRequest request){
-
+ appkey="ea1f0459efc02a79f046f982767939ae";
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -280,7 +280,7 @@
public synchronized R testFinish(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) Review param,
HttpServletRequest request){
-
+ appkey="ea1f0459efc02a79f046f982767939ae";
auth(appkey, param, request);
Map<String,Boolean> map=new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index b450370..c11ce1e 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -186,7 +186,7 @@
@TableField("fire_status")
private Integer fireStatus;
-// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.闈欑疆涓�;5:闈欑疆瀹屾垚}
+// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.闈欑疆涓�;5:闈欑疆瀹屾垚;6:鏆傚仠娴嬭瘯;7:绱ф�ュ嚭搴�;}
@ApiModelProperty(value= "")
@TableField("pack_status")
private Integer packStatus;
diff --git a/src/main/java/com/zy/asrs/entity/param/Review.java b/src/main/java/com/zy/asrs/entity/param/Review.java
index d1e0208..f0ce57a 100644
--- a/src/main/java/com/zy/asrs/entity/param/Review.java
+++ b/src/main/java/com/zy/asrs/entity/param/Review.java
@@ -8,6 +8,8 @@
private String locNo;
// 鐢ㄦ埛鐮�
private String userId;
+// 閫氶亾鍙�
+ private String channel;
// PACK鏉＄爜
private String barcode;
// 璇锋眰鏃堕棿, yyyy-MM-dd HH:mm:ss
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 37b340e..5bf6108 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -39,6 +39,6 @@
//pda鐢宠娴嬭瘯璋冪敤
void startUpTestPACK(TestMast testMast);
//鏆傚仠娴嬭瘯
- void suspendTestPACK();
+ void suspendTestPACK(String channel);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 9d3cea4..f122ed7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -661,8 +661,8 @@
}
@Override
@Transactional
- public void suspendTestPACK() {
- ReturnT<String> result=suspendTestPACK1();
+ public void suspendTestPACK(String channel) {
+ ReturnT<String> result=suspendTestPACK1(channel);
if (!result.isSuccess()) {
log.error("鏆傚仠娴嬭瘯澶辫触");
}
@@ -674,6 +674,7 @@
review.setLocNo(testMast.getLocNo());
review.setUserId(testMast.getUserId());
review.setBarcode(testMast.getBarcode());
+ review.setChannel(testMast.getChannel().toString());
review.setRequestTime(DateUtils.convert(new Date()));
return postMesData(renUrl,startUpTestPACK,review);
}catch (Exception e) {
@@ -684,10 +685,11 @@
}
}
@Transactional
- public ReturnT<String> suspendTestPACK1(){
+ public ReturnT<String> suspendTestPACK1(String channel){
try {
Review review=new Review();
review.setPause(true);
+ review.setChannel(channel);
review.setRequestTime(DateUtils.convert(new Date()));
return postMesData(renUrl,suspendTestPACK,review);
}catch (Exception e) {
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index ddef2a3..ad309dd 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -579,6 +579,15 @@
@Override
@Transactional
public void combPACK(CombParam param) {
+ if (Cools.isEmpty(param.getPackNo())){
+ throw new CoolException("缂哄皯鍙傛暟锛歱ackNo");
+ }else if (Cools.isEmpty(param.getPackName())){
+ throw new CoolException("缂哄皯鍙傛暟锛歱ackName");
+ }else if (Cools.isEmpty(param.getSettingTimes())){
+ throw new CoolException("缂哄皯鍙傛暟锛歴ettingTimes");
+ }else if (Cools.isEmpty(param.getRequestTime())){
+ throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");
+ }
if (Cools.isEmpty(param.getPackNo())) {
throw new CoolException(BaseRes.PARAM);
}
@@ -629,6 +638,15 @@
@Override
@Transactional
public void combPackOut(CombParam param) {
+ if (Cools.isEmpty(param.getPackNo())){
+ throw new CoolException("缂哄皯鍙傛暟锛歱ackNo");
+ }else if (Cools.isEmpty(param.getPackName())){
+ throw new CoolException("缂哄皯鍙傛暟锛歱ackName");
+ }else if (Cools.isEmpty(param.getSettingTimes())){
+ throw new CoolException("缂哄皯鍙傛暟锛歴ettingTimes");
+ }else if (Cools.isEmpty(param.getRequestTime())){
+ throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");
+ }
if (Cools.isEmpty(param.getPackNo())) {
throw new CoolException(BaseRes.PARAM);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 79bf391..1bff631 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -60,8 +60,8 @@
outPath: mes-pm/in/stock/condition/exWarehouse
ren:
- url: 172.28.15.251:7899
+ url: 172.28.15.196:12784
# 鍚姩娴嬭瘯璇锋眰
- startUpTestPACK: ynwms/open/asrs/rpv/test/open/auth
+ startUpTestPACK: TestStart
#鏆傚仠娴嬭瘯
suspendTestPACK: ynwms/open/asrs/rpv/test/open/auth
\ No newline at end of file
--
Gitblit v1.9.1