From ee3a4804211a44fe9796caff493635ba15f1b764 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 12 一月 2024 22:16:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 36 ++++++++++++++++++------------------
src/main/resources/application.yml | 8 +++++++-
2 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
index 0da9fed..5b6642e 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -22,7 +22,7 @@
/**
* Created by Monkey D. Luffy on 2023.07.25
- * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鑷姩琛ョ┖鏉�
+ * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鎷嗗灈淇℃伅涓婁紶
*/
@Slf4j
@Service
@@ -42,10 +42,10 @@
@Autowired
private BasDevpService basDevpService;
- @Value("${srXghyErp.url}")
+ @Value("${srHangJia.url}")
private String erpUrl;
- @Value("${srXghyErp.barcodeUploadPath}")
- private String barcodeUploadpath;
+ @Value("${srHangJia.reportOutPath}")
+ private String reportOutPath;
public ReturnT<String> start(int staNo) {
try {
@@ -70,19 +70,19 @@
singleMountUnstackingCompleteParam.setStaStart(staNo);
singleMountUnstackingCompleteParam.setStaEnd(staNo>119? 135:131);
ReturnT<String> result = null;
- result = postMesData(barcodeUploadpath,singleMountUnstackingCompleteParam);
+ result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
System.out.println(result);
- if (true){
- for (WrkDetl wrkDetl:wrkDetls){
- WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
- wrkDetlSingle.sync(wrkDetl);
- wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
- wrkDetlSingleService.insert(wrkDetlSingle);
- }
- wrkMast.setSheetNo("1");
- wrkMastService.updateById(wrkMast);
- return SUCCESS;
- }
+// if (true){
+// for (WrkDetl wrkDetl:wrkDetls){
+// WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
+// wrkDetlSingle.sync(wrkDetl);
+// wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
+// wrkDetlSingleService.insert(wrkDetlSingle);
+// }
+// wrkMast.setSheetNo("1");
+// wrkMastService.updateById(wrkMast);
+// return SUCCESS;
+// }
if (result.getCode()==200){
for (WrkDetl wrkDetl:wrkDetls){
WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
@@ -95,7 +95,7 @@
basDevpService.updateById(basDevp);
return SUCCESS;
}else {
- log.error("鏉＄爜涓婁紶涓帶澶辫触");
+ log.error("鎷嗗灈淇℃伅涓婁紶澶辫触");
}
}
}catch (Exception e){
@@ -120,7 +120,7 @@
if (jsonObject.getString("result").equals("Y")) {
success = true;
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}"+erpUrl+erpPath, JSON.toJSONString(combParam), response);
+ log.error("鎷嗗灈淇℃伅涓婁紶璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}"+erpUrl+erpPath, JSON.toJSONString(combParam), response);
throw new CoolException("涓婃姤erp绯荤粺澶辫触");
}
} catch (Exception e) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 20649bf..338a464 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -66,4 +66,10 @@
# 鍏ュ簱涓婃姤
inPath: EosServer/PluginGateway.ashx?pluginid=DataIOHttp&func=senddata&userno=ASRS&sign=5DD885999945BA2F3DC9A61F1B857DB3&dataname=cprkwc
# 鍑哄簱涓婃姤
- outPath: EosServer/PluginGateway.ashx?pluginid=DataIOHttp&func=senddata&userno=ASRS&sign=5DD885999945BA2F3DC9A61F1B857DB3&dataname=cpckwc
\ No newline at end of file
+ outPath: EosServer/PluginGateway.ashx?pluginid=DataIOHttp&func=senddata&userno=ASRS&sign=5DD885999945BA2F3DC9A61F1B857DB3&dataname=cpckwc
+srHangJia:
+ url: 192.168.18.229:16126
+ # 鎷嗗灈淇℃伅涓婁紶
+ reportOutPath: api/DepalletizingInfo/Post
+ # 鐮佸灈淇℃伅涓婁紶
+ reportInPath: api/PalletizingInfo/Post
\ No newline at end of file
--
Gitblit v1.9.1