From 713f9df59d85cead6913f21a1f0767f9afe80763 Mon Sep 17 00:00:00 2001 From: QuShuailong Date: Wed, 5 Jul 2023 20:28:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E7=BB=99?= =?UTF-8?q?=E6=99=AE=E5=A4=A9=E7=9A=84=E7=9B=98=E7=82=B9=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhehekeji/web/service/client/TMTransmission.java | 2 +- .../main/java/com/zhehekeji/web/service/putian/PTData.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/service/client/TMTransmission.java b/web/src/main/java/com/zhehekeji/web/service/client/TMTransmission.java index 2aa346a..4139a5d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/TMTransmission.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/TMTransmission.java @@ -125,7 +125,7 @@ public class TMTransmission { category = strings[4]; count = Integer.valueOf(strings[5]); rstCategory = strings[6]; - rstCount = strings[7].contains("NULL") ? -1 : Integer.valueOf(strings[7]); + rstCount = Integer.valueOf(strings[7]); checkRst = strings[8]; collectOver = false; log.info("taskNo:{}, srmNumber:{}, goodsLocation:{}", taskNo, SRMNumber, goodsLocation); diff --git a/web/src/main/java/com/zhehekeji/web/service/putian/PTData.java b/web/src/main/java/com/zhehekeji/web/service/putian/PTData.java index a6903c0..55eacad 100644 --- a/web/src/main/java/com/zhehekeji/web/service/putian/PTData.java +++ b/web/src/main/java/com/zhehekeji/web/service/putian/PTData.java @@ -144,8 +144,8 @@ public class PTData { String smokeCount = tmTransmission.getCount().toString(); String smokeRstCategory = tmTransmission.getRstCategory(); Integer rstCount = tmTransmission.getRstCount(); - String smokeRstCount = rstCount == -1 ? "NULL" : rstCount.toString(); - String checkRst = tmTransmission.getCheckRst().equals("1")?"Y":"N"; + String smokeRstCount = rstCount.toString(); + String checkRst = tmTransmission.getCheckRst(); String ip ="http://"+ClientChanel.getIpFromId(tmTransmission.getSRMNumber())+":9009/pic/"+tmTransmission.getGoodsLocation()+"/" +tmTransmission.getTaskNo()+"/"; String pic1 = ip + 1 + ".png";