From f3282df38c009fba13df3e0e539448821d0886b8 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期五, 30 九月 2022 13:59:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
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 dae07fb..04e0c31 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -82,7 +82,7 @@
@Autowired
private TestMastService testMastService;
@Autowired
- private WorkLogHandler workLogHandler;
+ private WorkService workService;
@Value("${mes.url}")
private String mesUrl;
@@ -92,6 +92,10 @@
@Value("${mes.startUpTestPACK}")
private String suspendTestPACK;
+
+ @Value("${mes.inPath}")
+ private String inpath;
+
@Override
@@ -618,11 +622,11 @@
public void startUpTestPACK(TestMast testMast) {
//鍚姩娴嬭瘯璇锋眰
- ReturnT<String> result=startUpTestPACK1(testMast);
- if (!result.isSuccess()) {
- log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
+// ReturnT<String> result=startUpTestPACK1(testMast);
+// if (!result.isSuccess()) {
+// log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
// throw new CoolException("娴嬭瘯鐢宠澶辫触");
- }
+// }
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()));
if (Cools.isEmpty(locMast)) {
throw new CoolException(BaseRes.PARAM);
@@ -635,8 +639,16 @@
if (!testMastService.insert(testMast)){
throw new CoolException("娣诲姞testMast澶辫触");
}
- locMast.setPackStatus(2);
+ locMast.setPackStatus(1);
locMast.setModiTime(now);
+
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locMast.getBarcode());
+ combParam.setLocno(locMast.getLocNo());
+ combParam.setPackSts(1);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ postMesData(inpath,combParam);
+
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
throw new CoolException("鐢宠娴嬭瘯澶辫触");
}
@@ -646,7 +658,7 @@
public void suspendTestPACK() {
ReturnT<String> result=suspendTestPACK1();
if (!result.isSuccess()) {
- log.error("娴嬭瘯鐢宠澶辫触");
+ log.error("鏆傚仠娴嬭瘯澶辫触");
}
}
@Transactional
@@ -685,9 +697,10 @@
String response = "";
boolean success = false;
try {
- Map<String, Object> map = new HashMap<>();
- map.put("appkey","ea1f0459efc02a79f046f982767939ae");
- response = new HttpHandler.Builder().setHeaders(map)
+// Map<String, Object> map = new HashMap<>();
+// map.put("appkey","ea1f0459efc02a79f046f982767939ae");
+ response = new HttpHandler.Builder()
+// .setHeaders(map)
.setUri(mesUrl)
.setPath(mesPath)
.setJson(JSON.toJSONString(combParam))
--
Gitblit v1.9.1