From cd8ee38d84dee4db557982d31db081d13e606d50 Mon Sep 17 00:00:00 2001 From: QuShuailong Date: Wed, 13 Sep 2023 14:50:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B6=E9=83=A8=E6=8B=8D?= =?UTF-8?q?=E7=85=A7=E7=9A=84=E7=85=A7=E7=89=87=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhehekeji/web/service/PlcService.java | 10 ++++++---- .../java/com/zhehekeji/web/service/client/Decoder.java | 4 ++-- .../zhehekeji/web/service/putian/PTOrderContent.java | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java index bb73b4e..93e5f84 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -11,6 +11,7 @@ import com.zhehekeji.web.pojo.OrderVO; import com.zhehekeji.web.pojo.camera.CameraPtzPojo; import com.zhehekeji.web.service.RFID.RFIDMap; import com.zhehekeji.web.service.RFID.RFIDSocket; +import com.zhehekeji.web.service.client.ClientChanel; import com.zhehekeji.web.service.client.ECResultMessage; import com.zhehekeji.web.service.client.SCTransmission; import com.zhehekeji.web.entity.EmptyCheckPic; @@ -662,14 +663,15 @@ public class PlcService { */ public String IntoStockSave(String SRMNumber,String taskId,String goodsLocation,String picName){ + String ip ="http://"+ ClientChanel.getIpFromId(SRMNumber)+":9009/pic/"; + String[] pics = picName.split(";"); + String picNameDataBase = ip+pics[0]+";"+ ip+pics[1]; Order oldOrder = orderMapper.getOneByOrderNum(taskId); - oldOrder.setIntoStockPic(picName); + oldOrder.setIntoStockPic(picNameDataBase); orderMapper.updateById(oldOrder); - String[] pics = picName.split(";"); - return configProperties.getIP()+":9007/api/pic/"+pics[0]+";"+ configProperties.getIP()+":9007/api/pic/"+pics[1]; + return ip+pics[0]+"*"+ ip+pics[1]; } - /** * 相机转动，拍照，并返回图片地址 * 顶部拍照 C1 diff --git a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java b/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java index 4ed1083..f8d061e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/client/Decoder.java @@ -142,7 +142,7 @@ public class Decoder extends DelimiterBasedFrameDecoder { log.info("普天入库顶部拍照"); PTData ptDataSend = new PTData(ptData.getContent(), PTData.FLOW_A, PTData.Into_Stock_01); //保存order标表 - PTOrderContent ptOrderContent = PTOrderContent.OrderContentIS01And03(ptData.getContent(),"#"); + PTOrderContent ptOrderContent = PTOrderContent.OrderContentIS01And03(ptData.getContent(),","); String picPath = plcService.IntoStock(ptOrderContent.getSRMNUmber(), ptOrderContent.getTaskNo(), ptOrderContent.getGoodsLocation()); //返回普天 @@ -172,7 +172,7 @@ public class Decoder extends DelimiterBasedFrameDecoder { log.info("入库侧面拍照"); PTData ptDataSend = new PTData(ptData.getContent(), PTData.FLOW_A, PTData.Into_Stock_03); PuTianNettyClient.write(ptDataSend); - PTOrderContent ptOrderContent = PTOrderContent.OrderContentIS01And03(ptData.getContent()); + PTOrderContent ptOrderContent = PTOrderContent.OrderContentIS01And03(ptData.getContent(), ","); String srmNumber = ptOrderContent.getSRMNUmber(); // if (srmNumber.length() < 3){ // Integer number = Integer.valueOf(srmNumber); diff --git a/web/src/main/java/com/zhehekeji/web/service/putian/PTOrderContent.java b/web/src/main/java/com/zhehekeji/web/service/putian/PTOrderContent.java index 30d9759..91baa95 100644 --- a/web/src/main/java/com/zhehekeji/web/service/putian/PTOrderContent.java +++ b/web/src/main/java/com/zhehekeji/web/service/putian/PTOrderContent.java @@ -33,7 +33,7 @@ public class PTOrderContent { public static PTOrderContent OrderContentIS01And03(String data,String split){ PTOrderContent ptContent = new PTOrderContent(); - String [] info = data.split(","); + String [] info = data.split(split); ptContent.setSRMNUmber(info[0]); ptContent.setTaskNo(info[1]); ptContent.setGoodsLocation(info[2]);