From 3e92e0756704a97537e730627de4ecfe99c0c034 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期日, 16 十月 2022 10:31:17 +0800
Subject: [PATCH] #lsh
---
src/main/webapp/views/testMast/testMast.html | 1
src/main/webapp/views/locMast/locMast_detail.html | 7 +
src/main/java/com/zy/asrs/entity/TestMast.java | 2
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 60 +++++++++++++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 6 +
src/main/java/com/zy/asrs/task/handler/StandingHandler.java | 4
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 9 ---
src/main/java/com/zy/asrs/entity/LocMast.java | 11 ++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 44 ++++++++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 4 +
10 files changed, 125 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8c88539..982bd8d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,7 +1,6 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
@@ -289,7 +288,10 @@
}
if (param.getTestResult().equals("OK")){
map.put("isComplete",openService.testFinish(param));
- }else {
+ }else if(param.getTestResult().equals("NG")){
+ openService.testNG(param);
+ map.put("isComplete",false);
+ }else{
map.put("isComplete",false);
}
return R.ok(map);
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index c11ce1e..c9ab2f0 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:闈欑疆瀹屾垚;6:鏆傚仠娴嬭瘯;7:绱ф�ュ嚭搴�;}
+// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;}
@ApiModelProperty(value= "")
@TableField("pack_status")
private Integer packStatus;
@@ -328,6 +328,7 @@
}
}
+// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;}
public String getPackStatus$() {
if (null == this.packStatus){ return null; }
switch (this.packStatus){
@@ -340,12 +341,14 @@
case 3:
return "娴嬭瘯瀹屾垚";
case 4:
- return "闈欑疆涓�";
+ return "娴嬭瘯NG";
case 5:
- return "闈欑疆瀹屾垚";
+ return "闈欑疆涓�";
case 6:
- return "鏆傚仠娴嬭瘯";
+ return "闈欑疆瀹屾垚";
case 7:
+ return "鏆傚仠娴嬭瘯";
+ case 8:
return "绱ф�ュ嚭搴�";
default:
return String.valueOf(this.packStatus);
diff --git a/src/main/java/com/zy/asrs/entity/TestMast.java b/src/main/java/com/zy/asrs/entity/TestMast.java
index 9364706..5788bfc 100644
--- a/src/main/java/com/zy/asrs/entity/TestMast.java
+++ b/src/main/java/com/zy/asrs/entity/TestMast.java
@@ -51,7 +51,7 @@
private String userId;
/**
- * 鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍�;3 4: 瀹屾垚
+ * 娴嬭瘯鐘舵�� 0:鏆傚仠;1:鐢宠涓�;2:宸插鏍�;3娴嬭瘯涓�;4:瀹屾垚;5宸茬Щ搴�;
*/
@ApiModelProperty(value= "鐘舵�� 0: 鏆傚仠 1: 鐢宠涓� 2: 澶嶆牳涓� 3: 娴嬭瘯涓� 4: 瀹屾垚 5.宸茬Щ搴�")
private Integer status;
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 3c6060a..9f0f6e0 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -60,6 +60,10 @@
*/
Boolean testFinish(Review review);
/**
+ * pda娴嬭瘯NG锛堝け璐ワ級
+ */
+ Boolean testNG(Review review);
+ /**
* 鍑哄簱閫氱煡鍗�
*/
void combPackOut(CombParam param);
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 1fa5aa5..36d75c3 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -718,11 +718,11 @@
if (locMast.getLocSts().equals("F")) {
locMast.setLocSts("R");
locMast.setModiTime(now);
- locMast.setPackStatus(5); //5:闈欑疆瀹屾垚
+ locMast.setPackStatus(6); //6:闈欑疆瀹屾垚
CombParam combParam = new CombParam();
combParam.setPackNo(locMast.getBarcode());
combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(6);
+ combParam.setPackSts(7);
combParam.setRequestTime(DateUtils.convert(new Date()));
postMesData(inpath,combParam);
@@ -831,6 +831,46 @@
return success;
}
+ @Override
+ @Transactional
+ public Boolean testNG(Review review) {
+ Boolean success=true;
+ Wrapper wrapper = new EntityWrapper<TestMast>()
+ .eq("loc_no", review.getLocNo())
+ .eq("barcode", review.getBarcode())
+ .eq("user_Id", review.getUserId());
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
+ if (null == locMast ||locMast.getPackStatus()!=2){
+ throw new CoolException("浜у搧鐘舵�佷笉鏄� 2:娴嬭瘯涓�");
+ }else if (!review.getBarcode().equals(locMast.getBarcode())){
+ throw new CoolException("pack鐮佷笉鍚�");
+ }
+ TestMast testMast = testMastService.selectOne(wrapper);
+ if(null != testMast){
+ if (testMast.getStatus()==3){
+ Date date = new Date();
+ locMast.setPackStatus(4);
+ locMast.setModiTime(date);
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locMast.getBarcode());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(4);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ postMesData(inpath,combParam);
+ if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
+ throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
+ }
+ }else if (Cools.isEmpty(testMast.getStatus())){
+ throw new CoolException("鐘舵�佸紓甯�");
+ }else {
+ throw new CoolException("鐘舵�佷笉鏄� 3:娴嬭瘯涓�");
+ }
+ } else {
+ throw new CoolException("鐘舵�佸紓甯�");
+ }
+ return success;
+ }
+
private ReturnT<String> postMesData(String mesPath, Object combParam){
if(combParam != null){
String response = "";
diff --git a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
index 7611e9f..7b3c8eb 100644
--- a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
@@ -62,7 +62,7 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("fire_status", 0)
.eq("loc_sts", "F")
- .eq("pack_status", 4));
+ .eq("pack_status", 5));
Integer ioType = 101; //鍏ュ嚭搴撶被鍨�
//闈欑疆瀹屾垚鍑哄簱绔�104
for(LocMast locMast : locMasts){
@@ -115,7 +115,7 @@
if (locMast.getLocSts().equals("F")) {
locMast.setLocSts("R");
locMast.setModiTime(now);
- locMast.setPackStatus(5); //5:闈欑疆瀹屾垚
+ locMast.setPackStatus(6); //6:闈欑疆瀹屾垚
CombParam combParam = new CombParam();
combParam.setPackNo(locMast.getBarcode());
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index be19e16..2b9f511 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -92,15 +92,6 @@
combParam.setRequestTime(DateUtils.convert(new Date()));
result = postMesData(outPath,combParam);
}
- }else if(wrkMast.getWrkSts() == 4 && wrkMast.getIoType() == 11){
- if(wrkDetl != null){
- CombParam combParam = new CombParam();
- combParam.setPackNo(wrkDetl.getZpallet());
- combParam.setLocNo(wrkMast.getLocNo());
- combParam.setPackSts(5);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- result = postMesData(inpath,combParam);
- }
}
if(null != result && !result.isSuccess()){
return result;
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index aedd638..03033b9 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -1,14 +1,20 @@
package com.zy.asrs.task.handler;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -36,6 +42,13 @@
private TestMastService testMastService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Value("${mes.url}")
+ private String mesUrl;
+
+ @Value("${mes.inPath}")
+ private String inpath;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -302,7 +315,7 @@
if (locMast.getLocType1()==sourceLoc.getLocType1()){
locMast.setPackStatus(packStatus);
}else {
- locMast.setPackStatus(4); //4:闈欑疆涓�
+ locMast.setPackStatus(5); //5:闈欑疆涓�
if (locMast.getLocType1()==1 && sourceLoc.getLocType1()==2){
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("loc_no",sourceLoc.getLocNo())
@@ -315,6 +328,12 @@
throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
}
}
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locMast.getBarcode());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(5);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ postMesData(inpath,combParam);
}
if (!locMastService.updateById(locMast)) {
// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -436,5 +455,44 @@
}
return SUCCESS;
}
+ private ReturnT<String> postMesData(String mesPath,Object combParam){
+ if(combParam != null){
+ String response = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(mesUrl)
+ .setPath(mesPath)
+ .setJson(JSON.toJSONString(combParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ success = true;
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", mesUrl+mesPath, JSON.toJSONString(combParam), response);
+ throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "涓婃姤mes绯荤粺",
+ mesUrl + mesPath,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(combParam),
+ response,
+ success
+ );
+ } catch (Exception e) { log.error("", e); }
+ }
+ }
+ return SUCCESS;
+ }
}
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index 55ee17e..436b16e 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -90,8 +90,11 @@
<option value="1">寰呮祴</option>
<option value="2">娴嬭瘯涓�</option>
<option value="3">娴嬭瘯瀹屾垚</option>
- <option value="4">闈欑疆涓�</option>
- <option value="5">闈欑疆瀹屾垚</option>
+ <option value="4">娴嬭瘯澶辫触</option>
+ <option value="5">闈欑疆涓�</option>
+ <option value="6">闈欑疆瀹屾垚</option>
+ <option value="7">鏆傚仠娴嬭瘯</option>
+ <option value="8">绱ф�ュ嚭搴�</option>
</select>
</div>
</div>
diff --git a/src/main/webapp/views/testMast/testMast.html b/src/main/webapp/views/testMast/testMast.html
index a651bf8..92c9977 100644
--- a/src/main/webapp/views/testMast/testMast.html
+++ b/src/main/webapp/views/testMast/testMast.html
@@ -96,6 +96,7 @@
<option value="2">宸插鏍�</option>
<option value="3">娴嬭瘯涓�</option>
<option value="4">瀹屾垚</option>
+ <option value="5">宸茬Щ搴�</option>
</select>
</div>
</div>
--
Gitblit v1.9.1