From ec3db382f74ce0dfaf8e7b96ad3d52ed772781b3 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期四, 19 六月 2025 13:21:43 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/locDetl/locDetl.js | 10 +++++++++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 +++---
2 files changed, 12 insertions(+), 4 deletions(-)
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 d285f24..7f2c52e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2088,7 +2088,7 @@
public boolean pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo, String barcode, String message) {
int maxRetry = 3; // 鏈�澶氶噸璇� 3 娆�
- long retryDelay = 3000; // 閲嶈瘯闂撮殧 3 绉�
+ long retryDelay = 10000; // 閲嶈瘯闂撮殧 10 绉�
boolean finalSuccess = false;
Map<String, Object> headers = getHeaders();
@@ -2110,7 +2110,7 @@
.setPath(MesConstant.GWCS_FPKW_URL)
.setHeaders(headers)
.setJson(body)
- .setTimeout(15, TimeUnit.SECONDS) // 璁剧疆杩炴帴 + 璇诲彇瓒呮椂涓�15绉�
+ .setTimeout(30, TimeUnit.SECONDS) // 璁剧疆杩炴帴 + 璇诲彇瓒呮椂涓�30绉�
.build()
.doPost();
@@ -2119,7 +2119,7 @@
try {
JSONObject resJson = JSON.parseObject(response);
int code = resJson.getIntValue("code"); // 瑙嗗叿浣撴帴鍙ｈ�屽畾
- if (code == 0) {
+ if (code == 200) {
success = true;
finalSuccess = true;
log.info("{} 鎴愬姛锛屽搷搴旓細{}", attemptMsg, response);
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index ac5f3c4..a8bc332 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -27,7 +27,15 @@
,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'specs', align: 'center',title: '鎺ュご', hide:true}
,{field: 'deadWarn$', align: 'center',title: '鐞嗚揣鐘舵��', hide: false}
- ,{field: 'threeCode', align: 'center',title: '鍚堟牸鍚�', hide: false}
+ ,{
+ field: 'threeCode',
+ align: 'center',
+ title: '鍚堟牸鍚�',
+ hide: false,
+ templet: function(d) {
+ return d.threeCode ? d.threeCode : '寰呭垽';
+ }
+ }
// ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
// ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
// ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
--
Gitblit v1.9.1