From f5f7889cd423667b4b6d63d12ff9c78750952262 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 17 五月 2023 16:48:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/StarUpTestPACKHandler.java | 46 +++++++
src/main/java/com/zy/asrs/entity/TestMast.java | 2
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 75 +++++-------
src/main/java/com/zy/asrs/controller/OpenController.java | 37 +++---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 56 +++------
src/main/java/com/zy/asrs/controller/MobileController.java | 27 ++--
src/main/java/com/zy/asrs/task/StartUpTestPACKScheduler.java | 34 +++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 24 ++--
src/main/resources/application.yml | 2
src/main/java/com/zy/asrs/service/MobileService.java | 2
src/main/java/com/zy/asrs/utils/PostMesDataUtils.java | 4
11 files changed, 181 insertions(+), 128 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index f5bdf33..ff28b43 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -330,22 +330,25 @@
/*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
- @PostMapping("/test/startUp/auth")
- @ManagerAuth(memo = "鐢宠PACK娴嬭瘯")
- public synchronized R startUpTestPACK(@RequestBody TestMast testMast) {
- if (Cools.isEmpty(testMast)) {
- return R.parse(BaseRes.PARAM);
- }
- mobileService.startUpTestPACK(testMast); //鎻愪氦娴嬭瘯绯荤粺
- return R.ok();
- }
+// @PostMapping("/test/startUp/auth")
+// @ManagerAuth(memo = "鐢宠PACK娴嬭瘯")
+// public synchronized R startUpTestPACK(@RequestBody TestMast testMast) {
+// if (Cools.isEmpty(testMast)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// mobileService.startUpTestPACK(testMast); //鎻愪氦娴嬭瘯绯荤粺
+// return R.ok();
+// }
+
@PostMapping("/test/suspend/auth")
// @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
@ResponseBody
public synchronized R suspendTestPACK(@RequestBody SearchLocParam param) {
-
- mobileService.suspendTestPACK(param.getBarcode()); //璇锋眰鏆傚仠娴嬭瘯
- return R.ok();
+ if (mobileService.suspendTestPACK(param.getBarcode())){ //璇锋眰鏆傚仠娴嬭瘯
+ return R.ok();
+ }else {
+ return R.error("鏆傚仠澶辫触");
+ }
}
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4ea809c..77a711b 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -250,31 +250,30 @@
return R.ok(map);
}
- @PostMapping("/rpv/infoReview/auth/v1")
- @AppAuth(memo = "娴嬭瘯鏉＄爜淇℃伅澶嶆牳璇锋眰")
- 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);
- }
- TestMast testMast = openService.infoReview(param);
- if (testMast.getStatus() == 3) {
- return R.ok();
- } else if (testMast.getStatus() == 2) {
- return R.error("绛夊緟鍛樺伐鎿嶄綔...");
- }
- return R.error();
- }
+// @PostMapping("/rpv/infoReview/auth/v1")
+// @AppAuth(memo = "娴嬭瘯鏉＄爜淇℃伅澶嶆牳璇锋眰")
+// 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);
+// }
+// TestMast testMast = openService.infoReview(param);
+// if (testMast.getStatus() == 3) {
+// return R.ok();
+// } else if (testMast.getStatus() == 2) {
+// return R.error("绛夊緟鍛樺伐鎿嶄綔...");
+// }
+// return R.error();
+// }
@PostMapping("/rpv/testFinish/auth/v1")
@AppAuth(memo = "娴嬭瘯瀹屾垚")
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/TestMast.java b/src/main/java/com/zy/asrs/entity/TestMast.java
index a5daaad..664e348 100644
--- a/src/main/java/com/zy/asrs/entity/TestMast.java
+++ b/src/main/java/com/zy/asrs/entity/TestMast.java
@@ -103,7 +103,7 @@
case 0:
return "鏆傚仠";
case 1:
- return "鐢宠涓�";
+ return "寰呮祴";
case 2:
return "澶嶆牳涓�";
case 3:
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 5bf6108..3943d85 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(String channel);
+ boolean 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 6263465..a04142d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -634,70 +634,52 @@
@Transactional
public void startUpTestPACK(TestMast testMast) {
if(Cools.isEmpty(testMast.getLocNo())){
- throw new CoolException("搴撲綅鍙蜂负绌�");
- }else if(Cools.isEmpty(testMast.getUserId())){
- throw new CoolException("鐢ㄦ埛缂栫爜涓虹┖");
+ log.error("搴撲綅鍙蜂负绌�");
+ return;
}else if(Cools.isEmpty(testMast.getBarcode())){
- throw new CoolException("PACK鐮佷负绌�");
+ log.error("PACK鐮佷负绌�");
+ return;
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", testMast.getLocNo())
.eq("loc_sts","F")
);
if (Cools.isEmpty(locMast)) {
- throw new CoolException("鏈煡璇㈠埌搴撲綅鍙凤細"+testMast.getLocNo()+" 璇锋鏌ュ簱浣嶅彿鎴栬�呮鏌ュ簱浣嶇姸鎬佹槸鍚︽湭鍦ㄥ簱");
+ log.error("鏈煡璇㈠埌搴撲綅鍙凤細"+testMast.getLocNo()+" 璇锋鏌ュ簱浣嶅彿鎴栬�呮鏌ュ簱浣嶇姸鎬佹槸鍚︽湭鍦ㄥ簱");
+ return;
}
Date now = new Date();
- testMast.setStatus(1);
- testMast.setChannel(locMast.getChannel());
testMast.setModiTime(now);
testMast.setAppeTime(now);
// 鍚姩娴嬭瘯璇锋眰
ReturnT<String> result=startUpTestPACK1(testMast);
- if (!result.isSuccess()) {
+ if (Cools.isEmpty(result) || !result.isSuccess()) {
log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
- throw new CoolException("娴嬭瘯鐢宠澶辫触");
+ return;
+ }
+ testMast.setStatus(3);
+
+ if (!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode", testMast.getBarcode()))){
+ log.error("鏇存柊testMast澶辫触");
+ return;
}
- TestMast testMast1 = testMastService.selectOne(new EntityWrapper<TestMast>()
- .eq("loc_no", testMast.getLocNo())
- .eq("barcode", testMast.getBarcode())
- .eq("user_id",testMast.getUserId())
- .eq("channel",locMast.getChannel().toString())
- .lt("status",4)
- );
- if (Cools.isEmpty(testMast1)){
- if (!testMastService.insert(testMast)){
- throw new CoolException("娣诲姞testMast澶辫触");
- }
- }else {
- if (!testMastService.update(testMast,new EntityWrapper<TestMast>()
- .eq("loc_no", testMast.getLocNo())
- .eq("barcode", testMast.getBarcode())
- .eq("user_id",testMast.getUserId())
- .eq("channel",locMast.getChannel().toString())
- .lt("status",4)
- )){
- throw new CoolException("鏇存柊testMast澶辫触");
- }
- }
-
- locMast.setPackStatus(1);
+ locMast.setPackStatus(2);
locMast.setModiTime(now);
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
- throw new CoolException("鐢宠娴嬭瘯澶辫触");
+ log.error("鐢宠娴嬭瘯澶辫触");
}
-// throw new CoolException("寮傚父锛侊紒锛佽瑙勮寖浣跨敤鎴栬仈绯荤鐞嗗憳");
}
@Override
@Transactional
- public void suspendTestPACK(String channel) {
+ public boolean suspendTestPACK(String channel) {
ReturnT<String> result=suspendTestPACK1(channel);
if (!result.isSuccess()) {
log.error("鏆傚仠娴嬭瘯澶辫触");
}
+ return result.isSuccess();
}
@Transactional
public ReturnT<String> startUpTestPACK1(TestMast testMast){
@@ -705,12 +687,12 @@
try {
Review review=new Review();
review.setLocNo(testMast.getLocNo());
- review.setUserId(testMast.getUserId());
review.setBarcode(testMast.getBarcode());
review.setChannel(testMast.getChannel().toString());
review.setRequestTime(DateUtils.convert(new Date()));
if (testMast.getChannel()<1 || testMast.getChannel()>48){
log.error("閫氶亾鏈夎锛岃鏌ョ湅锛�");
+ return null;
} else if (testMast.getChannel()<=8){
renUrl=renUrl1;
}else if (testMast.getChannel()<=16){
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 367f64b..6182266 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -798,12 +798,12 @@
Date date = new Date();
locMast.setPackStatus(3);
locMast.setModiTime(date);
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(3);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(locMast.getBarcode());
+// combParam.setLocNo(locMast.getLocNo());
+// combParam.setPackSts(3);
+// combParam.setRequestTime(DateUtils.convert(new Date()));
+// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
@@ -839,12 +839,12 @@
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()));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(locMast.getBarcode());
+// combParam.setLocNo(locMast.getLocNo());
+// combParam.setPackSts(4);
+// combParam.setRequestTime(DateUtils.convert(new Date()));
+// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
diff --git a/src/main/java/com/zy/asrs/task/StartUpTestPACKScheduler.java b/src/main/java/com/zy/asrs/task/StartUpTestPACKScheduler.java
new file mode 100644
index 0000000..958b0a5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/StartUpTestPACKScheduler.java
@@ -0,0 +1,34 @@
+package com.zy.asrs.task;
+
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.handler.StarUpTestPACKHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class StartUpTestPACKScheduler {
+
+ @Value("${wcs-slave.doubleDeep}")
+ private boolean confirmDeep;
+ @Autowired
+ private StarUpTestPACKHandler starUpTestPACKHandler;
+
+ /**
+ *
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute() {
+ if (confirmDeep) return;
+
+ ReturnT<String> result = starUpTestPACKHandler.start();
+ if (!result.isSuccess()) {
+ log.error("鐢宠娴嬭瘯澶辫触");
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/StarUpTestPACKHandler.java b/src/main/java/com/zy/asrs/task/handler/StarUpTestPACKHandler.java
new file mode 100644
index 0000000..f3e1f82
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/StarUpTestPACKHandler.java
@@ -0,0 +1,46 @@
+package com.zy.asrs.task.handler;
+
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.TestMast;
+import com.zy.asrs.service.MobileService;
+import com.zy.asrs.service.TestMastService;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/7/6
+ */
+@Service
+@Slf4j
+public class StarUpTestPACKHandler extends AbstractHandler<String> {
+ @Autowired
+ private MobileService mobileService;
+ @Autowired
+ private TestMastService testMastService;
+
+ @Transactional
+ public ReturnT<String> start() {
+ try{
+ List<TestMast> testMasts = testMastService.selectList(new EntityWrapper<TestMast>().eq("status", 2));
+ if (Cools.isEmpty(testMasts)){
+ return SUCCESS;
+ }
+ for (TestMast testMast : testMasts){
+ mobileService.startUpTestPACK(testMast);
+ }
+
+ }catch (Exception e){
+ log.error("鐢宠娴嬭瘯寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ return SUCCESS;
+ }
+
+}
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 c78edef..b9f626e 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -132,19 +132,19 @@
}
}
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
- try {
- if(!Cools.isEmpty(orderDetl)){
- if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- wrkDetl.getBatch(),wrkDetl.getAnfme())){
-// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
-// wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- } catch (Exception ignore){}
+// // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+// OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+// try {
+// if(!Cools.isEmpty(orderDetl)){
+// if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+// wrkDetl.getBatch(),wrkDetl.getAnfme())){
+//// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
+//// wrkMast.getWrkNo(), wrkMast.getLocNo());
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+// }
+// }
+// } catch (Exception ignore){}
}
// 淇敼搴撲綅鐘舵�� S ====>> F
@@ -406,38 +406,21 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
- for (WrkDetl wrkDetl : wrkDetls101) {
- Date date = new Date();
- WaitPakin waitPakin = new WaitPakin();
- waitPakin.setMatnr(wrkDetl.getMatnr());
- waitPakin.setMaktx(wrkDetl.getMaktx());
- waitPakin.setZpallet(wrkDetl.getZpallet()); // Pack鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(1.0); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setManuDate(date.toString());
- waitPakin.setAppeUser(null);
- waitPakin.setAppeTime(date);
- waitPakin.setModiUser(null);
- waitPakin.setModiTime(date);
-// waitPakin.setDeadWarn(wrkDetl.getSettingTimes());
- if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
- try {
- if(!Cools.isEmpty(orderDetl)){
- if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- wrkDetl.getBatch(),wrkDetl.getAnfme())){
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
-// wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
- }
- } catch (Exception ignore){}
- }
+// for (WrkDetl wrkDetl : wrkDetls101) {
+// // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+// OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+// try {
+// if(!Cools.isEmpty(orderDetl)){
+// if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+// wrkDetl.getBatch(),wrkDetl.getAnfme())){
+//// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
+//// wrkMast.getWrkNo(), wrkMast.getLocNo());
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+// }
+// }
+// } catch (Exception ignore){}
+// }
// 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
@@ -467,6 +450,8 @@
locMast.setBarcode("");
locMast.setModiTime(now);
locMast.setIoTime(now);
+ locMast.setFireStatus(0);
+ locMast.setPackStatus(0);
if (!locMastService.updateById(locMast)) {
// exceptionHandle("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
index 981975b..7cc409d 100644
--- a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
+++ b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
@@ -18,6 +18,10 @@
private ApiLogService apiLogService = new ApiLogServiceImpl();
public ReturnT<String> postMesData(String name,String URL,String mesPath, Object combParam){
+ if (true){
+ System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
+ return SUCCESS;
+ }
if(combParam != null){
String response = "";
boolean success = false;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4282afd..f51b119 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,7 +12,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=zjfnasrs
+ url: jdbc:sqlserver://192.168.4.13:1433;databasename=zjfnasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1