From 9a6a85eecf1dd8489de45eb3ab804d3e33605be2 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 18 八月 2022 09:22:19 +0800
Subject: [PATCH] Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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..7ef3992 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,7 @@
@Value("${mes.startUpTestPACK}")
private String suspendTestPACK;
+
@Override
@@ -618,11 +619,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,7 +636,7 @@
if (!testMastService.insert(testMast)){
throw new CoolException("娣诲姞testMast澶辫触");
}
- locMast.setPackStatus(2);
+ locMast.setPackStatus(1);
locMast.setModiTime(now);
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
throw new CoolException("鐢宠娴嬭瘯澶辫触");
@@ -646,7 +647,7 @@
public void suspendTestPACK() {
ReturnT<String> result=suspendTestPACK1();
if (!result.isSuccess()) {
- log.error("娴嬭瘯鐢宠澶辫触");
+ log.error("鏆傚仠娴嬭瘯澶辫触");
}
}
@Transactional
@@ -728,5 +729,19 @@
}
return SUCCESS;
}
+ @Transactional
+ public void transplant(Review review){
+ //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
+ LocMast targetLocNo = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1",2)
+ .eq("loc_sts","O")
+ .eq("fire_status", 0)
+ .eq("pack_status",0));
+ if (targetLocNo != null){
+ workService.locMove(review.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(review.getUserId()));
+ }else {
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+ }
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
--
Gitblit v1.9.1