修改顶部拍照的照片路径

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 ip+pics[0]+"*"+ ip+pics[1];
-        return configProperties.getIP()+":9007/api/pic/"+pics[0]+";"+ configProperties.getIP()+":9007/api/pic/"+pics[1];
     }
 
-
     /**
      * 相机转动，拍照，并返回图片地址
      * 顶部拍照 C1

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);

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]);