diff --git a/web/src/main/java/com/zhehekeji/web/service/client/RealtimeCheckMap.java b/web/src/main/java/com/zhehekeji/web/service/client/RealtimeCheckMap.java index 09fbff3..83fb4b6 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/RealtimeCheckMap.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/RealtimeCheckMap.java @@ -14,9 +14,15 @@ public class RealtimeCheckMap { public static void put(String SRMNumber,CheckInfo checkInfo){ checkInfo.setTime(LocalDateTime.now()); - String ip = ClientChanel.getIpFromId(SRMNumber); - ip = ip +":9008/pic"; + String ip ="http://"+ClientChanel.getIpFromId(SRMNumber)+":9009/pic/"+checkInfo.getCheckCode()+"/"+checkInfo.getTaskNo()+"/"+checkInfo.getTaskNo()+"/"; + ip = ip +":9009/pic"; checkInfo.setIP(ip); + checkInfo.setSidePic1(String.format("{}/1.png",ip)); + checkInfo.setSidePic2(String.format("{}/2.png",ip)); + checkInfo.setSidePic3(String.format("{}/3.png",ip)); + checkInfo.setSidePic4(String.format("{}/4.png",ip)); + checkInfo.setTopPic1(String.format("{}/5.png",ip)); + checkInfo.setTopPic2(String.format("{}/6.png",ip)); map.put(SRMNumber,checkInfo); } @@ -63,6 +69,8 @@ public class RealtimeCheckMap { private String IP; + private String taskNo; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime time; 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 409d78e..ab1cee2 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,6 +125,7 @@ public class TMTransmission { checkInfo.setColumn(column); checkInfo.setRow(row); checkInfo.setSide(inout); + checkInfo.setTaskNo(this.taskNo); //checkInfo.setWMSCategory(); //checkInfo.setWMSCount(); //checkInfo.setWMSCode(); 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 128515c..812152e 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 @@ -108,13 +108,13 @@ public class PTData { public static PTData StockCheck04(String SRMNumber, String taskId, String goodsLocation, Stock stock){ StringBuffer contentSB = new StringBuffer(); String status = stock.getStatus().equals("2")?"Y":"N"; - String ip ="http://"+ClientChanel.getIpFromId(SRMNumber)+":9009/pic/"+stock.getCode()+"/"+stock.getCheckNum(); - String pic1 = ip + 1; - String pic2 = ip + 2; - String pic3 = ip + 3; - String pic4 = ip + 4; - String pic5 = ip + 5; - String pic6 = ip + 6; + String ip ="http://"+ClientChanel.getIpFromId(SRMNumber)+":9009/pic/"+stock.getCode()+"/"+stock.getCheckNum()+"/"+stock.getCheckNum()+"/"; + String pic1 = ip + 1 + ".png"; + String pic2 = ip + 2 + ".png"; + String pic3 = ip + 3 + ".png"; + String pic4 = ip + 4 + ".png"; + String pic5 = ip + 5 + ".png"; + String pic6 = ip + 6 + ".png"; contentSB.append(SRMNumber).append(",").append(taskId).append(",").append(goodsLocation).append(",").append(stock.getWmsCode()).append(",").append(stock.getWmsCount()) .append(",").append(stock.getCode()).append(",").append(stock.getCount()).append(",").append(status).append(",").append(pic1) .append("$").append(pic2).append("$").append(pic3).append("$").append(pic4).append("$").append(pic5).append("$").append(pic6);