Merge remote-tracking branch 'origin/master'

puzhibing

2025-04-25 0dcba4fd1cb536ab426622e31213d8a0194449ff

 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPExgMsgTakeEwayBillAck.java

@@ -54,14 +54,18 @@
    * 解析报文
    */
   public UPExgMsgTakeEwayBillAck decode(UPExgMsg exgMsg) {
      byte[] data = exgMsg.getData();
      ByteBuf byteBuf = Unpooled.wrappedBuffer(data);
      this.vehicleNo = exgMsg.getVehicleNo();
      this.vehicleColor = exgMsg.getVehicleColor();
      this.dataType = exgMsg.getDataType();
      this.dataLength = exgMsg.getDataLength();
      this.ewayBillLength = byteBuf.readInt();
      this.ewayBillInfo = Jtt809Util.readGBKString(byteBuf, this.ewayBillLength);
      try {
         byte[] data = exgMsg.getData();
         ByteBuf byteBuf = Unpooled.wrappedBuffer(data);
         this.vehicleNo = exgMsg.getVehicleNo();
         this.vehicleColor = exgMsg.getVehicleColor();
         this.dataType = exgMsg.getDataType();
         this.dataLength = exgMsg.getDataLength();
         this.ewayBillLength = byteBuf.readInt();
         this.ewayBillInfo = Jtt809Util.readGBKString(byteBuf, this.ewayBillLength);
      }catch (Exception e){
         e.printStackTrace();
      }
      return this;
   }
}