shaozm
/
Queue
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 修改打印内容。

Browse Source
main
baocm 8 months ago
parent ec2b03473c
commit 8e849a12e1
7 changed files with 835 additions and 667 deletions
Show Stats Download Patch File Download Diff File

7
core/Publisher.cxx
Unescape Escape View File

@ -439,8 +439,10 @@ void PublisherApp::run()
std::map<std::string, std::string> print_msg;
print_msg["Title"] = "过衡单";
print_msg["DeviceID"] = std::to_string(info.DeviceID());
print_msg["DeviceName"] = info.DeviceName();
print_msg["GrossDeviceID"] = std::to_string(info.GrossDeviceID());
print_msg["GrossDeviceName"] = info.GrossDeviceName();
print_msg["TareDeviceID"] = std::to_string(info.TareDeviceID());
print_msg["TareDeviceName"] = info.TareDeviceName();
print_msg["TitleCorp"] = info.EnterpriseName();
print_msg["CoalNumber"] = info.BillNumber();
print_msg["CarNumber"] = info.CarNumber();
@ -460,6 +462,7 @@ void PublisherApp::run()
print_msg["OUTCoalYard"] = info.OutCoalYard();
print_msg["BatchNumber"] = info.BatchNumber();
print_msg["Warning"] = info.Warning();
print_msg["Tips"] = info.Tips();
print_msg["TicketType"] = info.TicketType();
print_receipt(print_msg);

312
lib/System.hpp
Unescape Escape View File

@ -514,11 +514,17 @@ public:
eProsima_user_DllExport WeightInfoOk(
const WeightInfoOk& x)
{
m_DeviceID = x.m_DeviceID;
m_GrossDeviceID = x.m_GrossDeviceID;
m_DeviceName = x.m_DeviceName;
m_GrossDeviceName = x.m_GrossDeviceName;
m_DeviceType = x.m_DeviceType;
m_GrossDeviceType = x.m_GrossDeviceType;
m_TareDeviceID = x.m_TareDeviceID;
m_TareDeviceName = x.m_TareDeviceName;
m_TareDeviceType = x.m_TareDeviceType;
m_EnterpriseName = x.m_EnterpriseName;
@ -558,6 +564,8 @@ public:
m_Warning = x.m_Warning;
m_Tips = x.m_Tips;
m_TicketType = x.m_TicketType;
m_IsPrintTicker = x.m_IsPrintTicker;
@ -571,9 +579,12 @@ public:
eProsima_user_DllExport WeightInfoOk(
WeightInfoOk&& x) noexcept
{
m_DeviceID = x.m_DeviceID;
m_DeviceName = std::move(x.m_DeviceName);
m_DeviceType = std::move(x.m_DeviceType);
m_GrossDeviceID = x.m_GrossDeviceID;
m_GrossDeviceName = std::move(x.m_GrossDeviceName);
m_GrossDeviceType = std::move(x.m_GrossDeviceType);
m_TareDeviceID = x.m_TareDeviceID;
m_TareDeviceName = std::move(x.m_TareDeviceName);
m_TareDeviceType = std::move(x.m_TareDeviceType);
m_EnterpriseName = std::move(x.m_EnterpriseName);
m_BillNumber = std::move(x.m_BillNumber);
m_CarNumber = std::move(x.m_CarNumber);
@ -593,6 +604,7 @@ public:
m_OutCoalYard = std::move(x.m_OutCoalYard);
m_BatchNumber = std::move(x.m_BatchNumber);
m_Warning = std::move(x.m_Warning);
m_Tips = std::move(x.m_Tips);
m_TicketType = std::move(x.m_TicketType);
m_IsPrintTicker = x.m_IsPrintTicker;
}
@ -605,11 +617,17 @@ public:
const WeightInfoOk& x)
{
m_DeviceID = x.m_DeviceID;
m_GrossDeviceID = x.m_GrossDeviceID;
m_GrossDeviceName = x.m_GrossDeviceName;
m_GrossDeviceType = x.m_GrossDeviceType;
m_DeviceName = x.m_DeviceName;
m_TareDeviceID = x.m_TareDeviceID;
m_DeviceType = x.m_DeviceType;
m_TareDeviceName = x.m_TareDeviceName;
m_TareDeviceType = x.m_TareDeviceType;
m_EnterpriseName = x.m_EnterpriseName;
@ -649,6 +667,8 @@ public:
m_Warning = x.m_Warning;
m_Tips = x.m_Tips;
m_TicketType = x.m_TicketType;
m_IsPrintTicker = x.m_IsPrintTicker;
@ -664,9 +684,12 @@ public:
WeightInfoOk&& x) noexcept
{
m_DeviceID = x.m_DeviceID;
m_DeviceName = std::move(x.m_DeviceName);
m_DeviceType = std::move(x.m_DeviceType);
m_GrossDeviceID = x.m_GrossDeviceID;
m_GrossDeviceName = std::move(x.m_GrossDeviceName);
m_GrossDeviceType = std::move(x.m_GrossDeviceType);
m_TareDeviceID = x.m_TareDeviceID;
m_TareDeviceName = std::move(x.m_TareDeviceName);
m_TareDeviceType = std::move(x.m_TareDeviceType);
m_EnterpriseName = std::move(x.m_EnterpriseName);
m_BillNumber = std::move(x.m_BillNumber);
m_CarNumber = std::move(x.m_CarNumber);
@ -686,6 +709,7 @@ public:
m_OutCoalYard = std::move(x.m_OutCoalYard);
m_BatchNumber = std::move(x.m_BatchNumber);
m_Warning = std::move(x.m_Warning);
m_Tips = std::move(x.m_Tips);
m_TicketType = std::move(x.m_TicketType);
m_IsPrintTicker = x.m_IsPrintTicker;
return *this;
@ -698,9 +722,12 @@ public:
eProsima_user_DllExport bool operator ==(
const WeightInfoOk& x) const
{
return (m_DeviceID == x.m_DeviceID &&
m_DeviceName == x.m_DeviceName &&
m_DeviceType == x.m_DeviceType &&
return (m_GrossDeviceID == x.m_GrossDeviceID &&
m_GrossDeviceName == x.m_GrossDeviceName &&
m_GrossDeviceType == x.m_GrossDeviceType &&
m_TareDeviceID == x.m_TareDeviceID &&
m_TareDeviceName == x.m_TareDeviceName &&
m_TareDeviceType == x.m_TareDeviceType &&
m_EnterpriseName == x.m_EnterpriseName &&
m_BillNumber == x.m_BillNumber &&
m_CarNumber == x.m_CarNumber &&
@ -720,6 +747,7 @@ public:
m_OutCoalYard == x.m_OutCoalYard &&
m_BatchNumber == x.m_BatchNumber &&
m_Warning == x.m_Warning &&
m_Tips == x.m_Tips &&
m_TicketType == x.m_TicketType &&
m_IsPrintTicker == x.m_IsPrintTicker);
}
@ -735,109 +763,216 @@ public:
}
/*!
* @brief This function sets a value in member DeviceID
* @param _DeviceID New value for member DeviceID
* @brief This function sets a value in member GrossDeviceID
* @param _GrossDeviceID New value for member GrossDeviceID
*/
eProsima_user_DllExport void GrossDeviceID(
int32_t _GrossDeviceID)
{
m_GrossDeviceID = _GrossDeviceID;
}
/*!
* @brief This function returns the value of member GrossDeviceID
* @return Value of member GrossDeviceID
*/
eProsima_user_DllExport int32_t GrossDeviceID() const
{
return m_GrossDeviceID;
}
/*!
* @brief This function returns a reference to member GrossDeviceID
* @return Reference to member GrossDeviceID
*/
eProsima_user_DllExport int32_t& GrossDeviceID()
{
return m_GrossDeviceID;
}
/*!
* @brief This function copies the value in member GrossDeviceName
* @param _GrossDeviceName New value to be copied in member GrossDeviceName
*/
eProsima_user_DllExport void DeviceID(
int32_t _DeviceID)
eProsima_user_DllExport void GrossDeviceName(
const std::string& _GrossDeviceName)
{
m_DeviceID = _DeviceID;
m_GrossDeviceName = _GrossDeviceName;
}
/*!
* @brief This function returns the value of member DeviceID
* @return Value of member DeviceID
* @brief This function moves the value in member GrossDeviceName
* @param _GrossDeviceName New value to be moved in member GrossDeviceName
*/
eProsima_user_DllExport int32_t DeviceID() const
eProsima_user_DllExport void GrossDeviceName(
std::string&& _GrossDeviceName)
{
return m_DeviceID;
m_GrossDeviceName = std::move(_GrossDeviceName);
}
/*!
* @brief This function returns a reference to member DeviceID
* @return Reference to member DeviceID
* @brief This function returns a constant reference to member GrossDeviceName
* @return Constant reference to member GrossDeviceName
*/
eProsima_user_DllExport int32_t& DeviceID()
eProsima_user_DllExport const std::string& GrossDeviceName() const
{
return m_DeviceID;
return m_GrossDeviceName;
}
/*!
* @brief This function returns a reference to member GrossDeviceName
* @return Reference to member GrossDeviceName
*/
eProsima_user_DllExport std::string& GrossDeviceName()
{
return m_GrossDeviceName;
}
/*!
* @brief This function copies the value in member DeviceName
* @param _DeviceName New value to be copied in member DeviceName
* @brief This function copies the value in member GrossDeviceType
* @param _GrossDeviceType New value to be copied in member GrossDeviceType
*/
eProsima_user_DllExport void DeviceName(
const std::string& _DeviceName)
eProsima_user_DllExport void GrossDeviceType(
const std::string& _GrossDeviceType)
{
m_DeviceName = _DeviceName;
m_GrossDeviceType = _GrossDeviceType;
}
/*!
* @brief This function moves the value in member DeviceName
* @param _DeviceName New value to be moved in member DeviceName
* @brief This function moves the value in member GrossDeviceType
* @param _GrossDeviceType New value to be moved in member GrossDeviceType
*/
eProsima_user_DllExport void DeviceName(
std::string&& _DeviceName)
eProsima_user_DllExport void GrossDeviceType(
std::string&& _GrossDeviceType)
{
m_DeviceName = std::move(_DeviceName);
m_GrossDeviceType = std::move(_GrossDeviceType);
}
/*!
* @brief This function returns a constant reference to member DeviceName
* @return Constant reference to member DeviceName
* @brief This function returns a constant reference to member GrossDeviceType
* @return Constant reference to member GrossDeviceType
*/
eProsima_user_DllExport const std::string& DeviceName() const
eProsima_user_DllExport const std::string& GrossDeviceType() const
{
return m_DeviceName;
return m_GrossDeviceType;
}
/*!
* @brief This function returns a reference to member DeviceName
* @return Reference to member DeviceName
* @brief This function returns a reference to member GrossDeviceType
* @return Reference to member GrossDeviceType
*/
eProsima_user_DllExport std::string& DeviceName()
eProsima_user_DllExport std::string& GrossDeviceType()
{
return m_DeviceName;
return m_GrossDeviceType;
}
/*!
* @brief This function copies the value in member DeviceType
* @param _DeviceType New value to be copied in member DeviceType
* @brief This function sets a value in member TareDeviceID
* @param _TareDeviceID New value for member TareDeviceID
*/
eProsima_user_DllExport void TareDeviceID(
int32_t _TareDeviceID)
{
m_TareDeviceID = _TareDeviceID;
}
/*!
* @brief This function returns the value of member TareDeviceID
* @return Value of member TareDeviceID
*/
eProsima_user_DllExport void DeviceType(
const std::string& _DeviceType)
eProsima_user_DllExport int32_t TareDeviceID() const
{
m_DeviceType = _DeviceType;
return m_TareDeviceID;
}
/*!
* @brief This function moves the value in member DeviceType
* @param _DeviceType New value to be moved in member DeviceType
* @brief This function returns a reference to member TareDeviceID
* @return Reference to member TareDeviceID
*/
eProsima_user_DllExport void DeviceType(
std::string&& _DeviceType)
eProsima_user_DllExport int32_t& TareDeviceID()
{
m_DeviceType = std::move(_DeviceType);
return m_TareDeviceID;
}
/*!
* @brief This function returns a constant reference to member DeviceType
* @return Constant reference to member DeviceType
* @brief This function copies the value in member TareDeviceName
* @param _TareDeviceName New value to be copied in member TareDeviceName
*/
eProsima_user_DllExport const std::string& DeviceType() const
eProsima_user_DllExport void TareDeviceName(
const std::string& _TareDeviceName)
{
return m_DeviceType;
m_TareDeviceName = _TareDeviceName;
}
/*!
* @brief This function returns a reference to member DeviceType
* @return Reference to member DeviceType
* @brief This function moves the value in member TareDeviceName
* @param _TareDeviceName New value to be moved in member TareDeviceName
*/
eProsima_user_DllExport std::string& DeviceType()
eProsima_user_DllExport void TareDeviceName(
std::string&& _TareDeviceName)
{
return m_DeviceType;
m_TareDeviceName = std::move(_TareDeviceName);
}
/*!
* @brief This function returns a constant reference to member TareDeviceName
* @return Constant reference to member TareDeviceName
*/
eProsima_user_DllExport const std::string& TareDeviceName() const
{
return m_TareDeviceName;
}
/*!
* @brief This function returns a reference to member TareDeviceName
* @return Reference to member TareDeviceName
*/
eProsima_user_DllExport std::string& TareDeviceName()
{
return m_TareDeviceName;
}
/*!
* @brief This function copies the value in member TareDeviceType
* @param _TareDeviceType New value to be copied in member TareDeviceType
*/
eProsima_user_DllExport void TareDeviceType(
const std::string& _TareDeviceType)
{
m_TareDeviceType = _TareDeviceType;
}
/*!
* @brief This function moves the value in member TareDeviceType
* @param _TareDeviceType New value to be moved in member TareDeviceType
*/
eProsima_user_DllExport void TareDeviceType(
std::string&& _TareDeviceType)
{
m_TareDeviceType = std::move(_TareDeviceType);
}
/*!
* @brief This function returns a constant reference to member TareDeviceType
* @return Constant reference to member TareDeviceType
*/
eProsima_user_DllExport const std::string& TareDeviceType() const
{
return m_TareDeviceType;
}
/*!
* @brief This function returns a reference to member TareDeviceType
* @return Reference to member TareDeviceType
*/
eProsima_user_DllExport std::string& TareDeviceType()
{
return m_TareDeviceType;
}
@ -1522,6 +1657,45 @@ public:
}
/*!
* @brief This function copies the value in member Tips
* @param _Tips New value to be copied in member Tips
*/
eProsima_user_DllExport void Tips(
const std::string& _Tips)
{
m_Tips = _Tips;
}
/*!
* @brief This function moves the value in member Tips
* @param _Tips New value to be moved in member Tips
*/
eProsima_user_DllExport void Tips(
std::string&& _Tips)
{
m_Tips = std::move(_Tips);
}
/*!
* @brief This function returns a constant reference to member Tips
* @return Constant reference to member Tips
*/
eProsima_user_DllExport const std::string& Tips() const
{
return m_Tips;
}
/*!
* @brief This function returns a reference to member Tips
* @return Reference to member Tips
*/
eProsima_user_DllExport std::string& Tips()
{
return m_Tips;
}
/*!
* @brief This function copies the value in member TicketType
* @param _TicketType New value to be copied in member TicketType
@ -1593,9 +1767,12 @@ public:
private:
int32_t m_DeviceID{0};
std::string m_DeviceName;
std::string m_DeviceType;
int32_t m_GrossDeviceID{0};
std::string m_GrossDeviceName;
std::string m_GrossDeviceType;
int32_t m_TareDeviceID{0};
std::string m_TareDeviceName;
std::string m_TareDeviceType;
std::string m_EnterpriseName;
std::string m_BillNumber;
std::string m_CarNumber;
@ -1615,6 +1792,7 @@ private:
std::string m_OutCoalYard;
std::string m_BatchNumber;
std::string m_Warning;
std::string m_Tips;
std::string m_TicketType;
bool m_IsPrintTicker{false};

14
lib/System.idl
Unescape Escape View File

@ -32,10 +32,13 @@ module WeighingSystem {
// ============================================
struct WeightInfoOk {
// 基础信息属性
long DeviceID; // 磅称编号
string DeviceName; // 磅称名称
string DeviceType; // 磅称类型 1:重磅 2:轻磅 3:通用称重 4:转煤
string EnterpriseName; // 本系统企业名称
long GrossDeviceID; // 毛重磅称编号
string GrossDeviceName; // 毛重磅称名称
string GrossDeviceType; // 毛重磅称类型 1:重磅 2:轻磅 3:通用称重 4:转煤
long TareDeviceID; // 皮重磅称编号
string TareDeviceName; // 皮重磅称名称
string TareDeviceType; // 皮重磅称类型 1:重磅 2:轻磅 3:通用称重 4:转煤
string EnterpriseName; // 本系统企业名称
// 业务单据属性
string BillNumber; // 票据号
@ -64,7 +67,8 @@ module WeighingSystem {
string BatchNumber; // 批次号
// 操作结果提示属性
string Warning; // 提示 字符串
string Warning; // 提示 LED显示
string Tips; // 提示 小票打印
// 打印磅单相关
string TicketType; // 磅单类型 1:一次称重 2:二次称重

2
lib/SystemCdrAux.hpp
Unescape Escape View File

@ -39,7 +39,7 @@ constexpr uint32_t InternalSystem_PrintReq_max_key_cdr_typesize {0UL};
constexpr uint32_t WeighingSystem_WeightInfoError_max_cdr_typesize {524UL};
constexpr uint32_t WeighingSystem_WeightInfoError_max_key_cdr_typesize {0UL};
constexpr uint32_t WeighingSystem_WeightInfoOk_max_cdr_typesize {4193UL};
constexpr uint32_t WeighingSystem_WeightInfoOk_max_cdr_typesize {4977UL};
constexpr uint32_t WeighingSystem_WeightInfoOk_max_key_cdr_typesize {0UL};
constexpr uint32_t InternalSystem_IoCtrlRsp_max_cdr_typesize {16UL};

186
lib/SystemCdrAux.ipp
Unescape Escape View File

@ -275,75 +275,87 @@ eProsima_user_DllExport size_t calculate_serialized_size(
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(0),
data.DeviceID(), current_alignment);
data.GrossDeviceID(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(1),
data.DeviceName(), current_alignment);
data.GrossDeviceName(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(2),
data.DeviceType(), current_alignment);
data.GrossDeviceType(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(3),
data.EnterpriseName(), current_alignment);
data.TareDeviceID(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(4),
data.BillNumber(), current_alignment);
data.TareDeviceName(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(5),
data.CarNumber(), current_alignment);
data.TareDeviceType(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(6),
data.Supplier(), current_alignment);
data.EnterpriseName(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(7),
data.GoodsType(), current_alignment);
data.BillNumber(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(8),
data.GrossWeight(), current_alignment);
data.CarNumber(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(9),
data.GrossTime(), current_alignment);
data.Supplier(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(10),
data.GrossOperater(), current_alignment);
data.GoodsType(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(11),
data.Tare(), current_alignment);
data.GrossWeight(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(12),
data.TareTime(), current_alignment);
data.GrossTime(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(13),
data.TareOperater(), current_alignment);
data.GrossOperater(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(14),
data.Suttle(), current_alignment);
data.Tare(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(15),
data.duduction1(), current_alignment);
data.TareTime(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(16),
data.duduction2(), current_alignment);
data.TareOperater(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(17),
data.duduction3(), current_alignment);
data.Suttle(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(18),
data.INCoalYard(), current_alignment);
data.duduction1(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(19),
data.OutCoalYard(), current_alignment);
data.duduction2(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(20),
data.BatchNumber(), current_alignment);
data.duduction3(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(21),
data.Warning(), current_alignment);
data.INCoalYard(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(22),
data.TicketType(), current_alignment);
data.OutCoalYard(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(23),
data.BatchNumber(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(24),
data.Warning(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(25),
data.Tips(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(26),
data.TicketType(), current_alignment);
calculated_size += calculator.calculate_member_serialized_size(eprosima::fastcdr::MemberId(27),
data.IsPrintTicker(), current_alignment);
@ -366,30 +378,34 @@ eProsima_user_DllExport void serialize(
eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR);
scdr
<< eprosima::fastcdr::MemberId(0) << data.DeviceID()
<< eprosima::fastcdr::MemberId(1) << data.DeviceName()
<< eprosima::fastcdr::MemberId(2) << data.DeviceType()
<< eprosima::fastcdr::MemberId(3) << data.EnterpriseName()
<< eprosima::fastcdr::MemberId(4) << data.BillNumber()
<< eprosima::fastcdr::MemberId(5) << data.CarNumber()
<< eprosima::fastcdr::MemberId(6) << data.Supplier()
<< eprosima::fastcdr::MemberId(7) << data.GoodsType()
<< eprosima::fastcdr::MemberId(8) << data.GrossWeight()
<< eprosima::fastcdr::MemberId(9) << data.GrossTime()
<< eprosima::fastcdr::MemberId(10) << data.GrossOperater()
<< eprosima::fastcdr::MemberId(11) << data.Tare()
<< eprosima::fastcdr::MemberId(12) << data.TareTime()
<< eprosima::fastcdr::MemberId(13) << data.TareOperater()
<< eprosima::fastcdr::MemberId(14) << data.Suttle()
<< eprosima::fastcdr::MemberId(15) << data.duduction1()
<< eprosima::fastcdr::MemberId(16) << data.duduction2()
<< eprosima::fastcdr::MemberId(17) << data.duduction3()
<< eprosima::fastcdr::MemberId(18) << data.INCoalYard()
<< eprosima::fastcdr::MemberId(19) << data.OutCoalYard()
<< eprosima::fastcdr::MemberId(20) << data.BatchNumber()
<< eprosima::fastcdr::MemberId(21) << data.Warning()
<< eprosima::fastcdr::MemberId(22) << data.TicketType()
<< eprosima::fastcdr::MemberId(23) << data.IsPrintTicker()
<< eprosima::fastcdr::MemberId(0) << data.GrossDeviceID()
<< eprosima::fastcdr::MemberId(1) << data.GrossDeviceName()
<< eprosima::fastcdr::MemberId(2) << data.GrossDeviceType()
<< eprosima::fastcdr::MemberId(3) << data.TareDeviceID()
<< eprosima::fastcdr::MemberId(4) << data.TareDeviceName()
<< eprosima::fastcdr::MemberId(5) << data.TareDeviceType()
<< eprosima::fastcdr::MemberId(6) << data.EnterpriseName()
<< eprosima::fastcdr::MemberId(7) << data.BillNumber()
<< eprosima::fastcdr::MemberId(8) << data.CarNumber()
<< eprosima::fastcdr::MemberId(9) << data.Supplier()
<< eprosima::fastcdr::MemberId(10) << data.GoodsType()
<< eprosima::fastcdr::MemberId(11) << data.GrossWeight()
<< eprosima::fastcdr::MemberId(12) << data.GrossTime()
<< eprosima::fastcdr::MemberId(13) << data.GrossOperater()
<< eprosima::fastcdr::MemberId(14) << data.Tare()
<< eprosima::fastcdr::MemberId(15) << data.TareTime()
<< eprosima::fastcdr::MemberId(16) << data.TareOperater()
<< eprosima::fastcdr::MemberId(17) << data.Suttle()
<< eprosima::fastcdr::MemberId(18) << data.duduction1()
<< eprosima::fastcdr::MemberId(19) << data.duduction2()
<< eprosima::fastcdr::MemberId(20) << data.duduction3()
<< eprosima::fastcdr::MemberId(21) << data.INCoalYard()
<< eprosima::fastcdr::MemberId(22) << data.OutCoalYard()
<< eprosima::fastcdr::MemberId(23) << data.BatchNumber()
<< eprosima::fastcdr::MemberId(24) << data.Warning()
<< eprosima::fastcdr::MemberId(25) << data.Tips()
<< eprosima::fastcdr::MemberId(26) << data.TicketType()
<< eprosima::fastcdr::MemberId(27) << data.IsPrintTicker()
;
scdr.end_serialize_type(current_state);
}
@ -410,98 +426,114 @@ eProsima_user_DllExport void deserialize(
switch (mid.id)
{
case 0:
dcdr >> data.DeviceID();
dcdr >> data.GrossDeviceID();
break;
case 1:
dcdr >> data.DeviceName();
dcdr >> data.GrossDeviceName();
break;
case 2:
dcdr >> data.DeviceType();
dcdr >> data.GrossDeviceType();
break;
case 3:
dcdr >> data.EnterpriseName();
dcdr >> data.TareDeviceID();
break;
case 4:
dcdr >> data.BillNumber();
dcdr >> data.TareDeviceName();
break;
case 5:
dcdr >> data.CarNumber();
dcdr >> data.TareDeviceType();
break;
case 6:
dcdr >> data.Supplier();
dcdr >> data.EnterpriseName();
break;
case 7:
dcdr >> data.GoodsType();
dcdr >> data.BillNumber();
break;
case 8:
dcdr >> data.GrossWeight();
dcdr >> data.CarNumber();
break;
case 9:
dcdr >> data.GrossTime();
dcdr >> data.Supplier();
break;
case 10:
dcdr >> data.GrossOperater();
dcdr >> data.GoodsType();
break;
case 11:
dcdr >> data.Tare();
dcdr >> data.GrossWeight();
break;
case 12:
dcdr >> data.TareTime();
dcdr >> data.GrossTime();
break;
case 13:
dcdr >> data.TareOperater();
dcdr >> data.GrossOperater();
break;
case 14:
dcdr >> data.Suttle();
dcdr >> data.Tare();
break;
case 15:
dcdr >> data.duduction1();
dcdr >> data.TareTime();
break;
case 16:
dcdr >> data.duduction2();
dcdr >> data.TareOperater();
break;
case 17:
dcdr >> data.duduction3();
dcdr >> data.Suttle();
break;
case 18:
dcdr >> data.INCoalYard();
dcdr >> data.duduction1();
break;
case 19:
dcdr >> data.OutCoalYard();
dcdr >> data.duduction2();
break;
case 20:
dcdr >> data.BatchNumber();
dcdr >> data.duduction3();
break;
case 21:
dcdr >> data.Warning();
dcdr >> data.INCoalYard();
break;
case 22:
dcdr >> data.TicketType();
dcdr >> data.OutCoalYard();
break;
case 23:
dcdr >> data.BatchNumber();
break;
case 24:
dcdr >> data.Warning();
break;
case 25:
dcdr >> data.Tips();
break;
case 26:
dcdr >> data.TicketType();
break;
case 27:
dcdr >> data.IsPrintTicker();
break;
@ -521,11 +553,17 @@ void serialize_key(
static_cast<void>(scdr);
static_cast<void>(data);
scdr << data.DeviceID();
scdr << data.GrossDeviceID();
scdr << data.GrossDeviceName();
scdr << data.DeviceName();
scdr << data.GrossDeviceType();
scdr << data.DeviceType();
scdr << data.TareDeviceID();
scdr << data.TareDeviceName();
scdr << data.TareDeviceType();
scdr << data.EnterpriseName();
@ -565,6 +603,8 @@ void serialize_key(
scdr << data.Warning();
scdr << data.Tips();
scdr << data.TicketType();
scdr << data.IsPrintTicker();

288
lib/SystemTypeObjectSupport.cxx
Unescape Escape View File

@ -328,110 +328,216 @@ void register_WeightInfoOk_type_identifier(
header_WeightInfoOk = TypeObjectUtils::build_complete_struct_header(TypeIdentifier(), detail_WeightInfoOk);
CompleteStructMemberSeq member_seq_WeightInfoOk;
{
TypeIdentifierPair type_ids_DeviceID;
ReturnCode_t return_code_DeviceID {eprosima::fastdds::dds::RETCODE_OK};
return_code_DeviceID =
TypeIdentifierPair type_ids_GrossDeviceID;
ReturnCode_t return_code_GrossDeviceID {eprosima::fastdds::dds::RETCODE_OK};
return_code_GrossDeviceID =
eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers(
"_int32_t", type_ids_DeviceID);
"_int32_t", type_ids_GrossDeviceID);
if (eprosima::fastdds::dds::RETCODE_OK != return_code_DeviceID)
if (eprosima::fastdds::dds::RETCODE_OK != return_code_GrossDeviceID)
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"DeviceID Structure member TypeIdentifier unknown to TypeObjectRegistry.");
"GrossDeviceID Structure member TypeIdentifier unknown to TypeObjectRegistry.");
return;
}
StructMemberFlag member_flags_DeviceID = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
StructMemberFlag member_flags_GrossDeviceID = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_DeviceID = 0x00000000;
bool common_DeviceID_ec {false};
CommonStructMember common_DeviceID {TypeObjectUtils::build_common_struct_member(member_id_DeviceID, member_flags_DeviceID, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_DeviceID, common_DeviceID_ec))};
if (!common_DeviceID_ec)
MemberId member_id_GrossDeviceID = 0x00000000;
bool common_GrossDeviceID_ec {false};
CommonStructMember common_GrossDeviceID {TypeObjectUtils::build_common_struct_member(member_id_GrossDeviceID, member_flags_GrossDeviceID, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_GrossDeviceID, common_GrossDeviceID_ec))};
if (!common_GrossDeviceID_ec)
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure DeviceID member TypeIdentifier inconsistent.");
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure GrossDeviceID member TypeIdentifier inconsistent.");
return;
}
MemberName name_DeviceID = "DeviceID";
eprosima::fastcdr::optional<AppliedBuiltinMemberAnnotations> member_ann_builtin_DeviceID;
MemberName name_GrossDeviceID = "GrossDeviceID";
eprosima::fastcdr::optional<AppliedBuiltinMemberAnnotations> member_ann_builtin_GrossDeviceID;
ann_custom_WeightInfoOk.reset();
CompleteMemberDetail detail_DeviceID = TypeObjectUtils::build_complete_member_detail(name_DeviceID, member_ann_builtin_DeviceID, ann_custom_WeightInfoOk);
CompleteStructMember member_DeviceID = TypeObjectUtils::build_complete_struct_member(common_DeviceID, detail_DeviceID);
TypeObjectUtils::add_complete_struct_member(member_seq_WeightInfoOk, member_DeviceID);
CompleteMemberDetail detail_GrossDeviceID = TypeObjectUtils::build_complete_member_detail(name_GrossDeviceID, member_ann_builtin_GrossDeviceID, ann_custom_WeightInfoOk);
CompleteStructMember member_GrossDeviceID = TypeObjectUtils::build_complete_struct_member(common_GrossDeviceID, detail_GrossDeviceID);
TypeObjectUtils::add_complete_struct_member(member_seq_WeightInfoOk, member_GrossDeviceID);
}
{
TypeIdentifierPair type_ids_DeviceName;
ReturnCode_t return_code_DeviceName {eprosima::fastdds::dds::RETCODE_OK};
return_code_DeviceName =
TypeIdentifierPair type_ids_GrossDeviceName;
ReturnCode_t return_code_GrossDeviceName {eprosima::fastdds::dds::RETCODE_OK};
return_code_GrossDeviceName =
eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers(
"anonymous_string_unbounded", type_ids_DeviceName);
"anonymous_string_unbounded", type_ids_GrossDeviceName);
if (eprosima::fastdds::dds::RETCODE_OK != return_code_DeviceName)
if (eprosima::fastdds::dds::RETCODE_OK != return_code_GrossDeviceName)
{
{
SBound bound = 0;
StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound);
if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER ==
TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn,
"anonymous_string_unbounded", type_ids_DeviceName))
"anonymous_string_unbounded", type_ids_GrossDeviceName))
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"anonymous_string_unbounded already registered in TypeObjectRegistry for a different type.");
}
}
}
StructMemberFlag member_flags_DeviceName = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
StructMemberFlag member_flags_GrossDeviceName = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_DeviceName = 0x00000001;
bool common_DeviceName_ec {false};
CommonStructMember common_DeviceName {TypeObjectUtils::build_common_struct_member(member_id_DeviceName, member_flags_DeviceName, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_DeviceName, common_DeviceName_ec))};
if (!common_DeviceName_ec)
MemberId member_id_GrossDeviceName = 0x00000001;
bool common_GrossDeviceName_ec {false};
CommonStructMember common_GrossDeviceName {TypeObjectUtils::build_common_struct_member(member_id_GrossDeviceName, member_flags_GrossDeviceName, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_GrossDeviceName, common_GrossDeviceName_ec))};
if (!common_GrossDeviceName_ec)
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure DeviceName member TypeIdentifier inconsistent.");
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure GrossDeviceName member TypeIdentifier inconsistent.");
return;
}
MemberName name_DeviceName = "DeviceName";
eprosima::fastcdr::optional<AppliedBuiltinMemberAnnotations> member_ann_builtin_DeviceName;
MemberName name_GrossDeviceName = "GrossDeviceName";
eprosima::fastcdr::optional<AppliedBuiltinMemberAnnotations> member_ann_builtin_GrossDeviceName;
ann_custom_WeightInfoOk.reset();
CompleteMemberDetail detail_DeviceName = TypeObjectUtils::build_complete_member_detail(name_DeviceName, member_ann_builtin_DeviceName, ann_custom_WeightInfoOk);
CompleteStructMember member_DeviceName = TypeObjectUtils::build_complete_struct_member(common_DeviceName, detail_DeviceName);
TypeObjectUtils::add_complete_struct_member(member_seq_WeightInfoOk, member_DeviceName);
CompleteMemberDetail detail_GrossDeviceName = TypeObjectUtils::build_complete_member_detail(name_GrossDeviceName, member_ann_builtin_GrossDeviceName, ann_custom_WeightInfoOk);
CompleteStructMember member_GrossDeviceName = TypeObjectUtils::build_complete_struct_member(common_GrossDeviceName, detail_GrossDeviceName);
TypeObjectUtils::add_complete_struct_member(member_seq_WeightInfoOk, member_GrossDeviceName);
}
{
TypeIdentifierPair type_ids_DeviceType;
ReturnCode_t return_code_DeviceType {eprosima::fastdds::dds::RETCODE_OK};
return_code_DeviceType =
TypeIdentifierPair type_ids_GrossDeviceType;
ReturnCode_t return_code_GrossDeviceType {eprosima::fastdds::dds::RETCODE_OK};
return_code_GrossDeviceType =
eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers(
"anonymous_string_unbounded", type_ids_DeviceType);
"anonymous_string_unbounded", type_ids_GrossDeviceType);
if (eprosima::fastdds::dds::RETCODE_OK != return_code_DeviceType)
if (eprosima::fastdds::dds::RETCODE_OK != return_code_GrossDeviceType)
{
{
SBound bound = 0;
StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound);
if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER ==
TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn,
"anonymous_string_unbounded", type_ids_DeviceType))
"anonymous_string_unbounded", type_ids_GrossDeviceType))
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"anonymous_string_unbounded already registered in TypeObjectRegistry for a different type.");
}
}
}
StructMemberFlag member_flags_DeviceType = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
StructMemberFlag member_flags_GrossDeviceType = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_DeviceType = 0x00000002;
bool common_DeviceType_ec {false};
CommonStructMember common_DeviceType {TypeObjectUtils::build_common_struct_member(member_id_DeviceType, member_flags_DeviceType, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_DeviceType, common_DeviceType_ec))};
if (!common_DeviceType_ec)
MemberId member_id_GrossDeviceType = 0x00000002;
bool common_GrossDeviceType_ec {false};
CommonStructMember common_GrossDeviceType {TypeObjectUtils::build_common_struct_member(member_id_GrossDeviceType, member_flags_GrossDeviceType, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_GrossDeviceType, common_GrossDeviceType_ec))};
if (!common_GrossDeviceType_ec)
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure DeviceType member TypeIdentifier inconsistent.");
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure GrossDeviceType member TypeIdentifier inconsistent.");
return;
}
MemberName name_DeviceType = "DeviceType";
eprosima::fastcdr::optional<AppliedBuiltinMemberAnnotations> member_ann_builtin_DeviceType;
MemberName name_GrossDeviceType = "GrossDeviceType";
eprosima::fastcdr::optional<AppliedBuiltinMemberAnnotations> member_ann_builtin_GrossDeviceType;
ann_custom_WeightInfoOk.reset();
CompleteMemberDetail detail_DeviceType = TypeObjectUtils::build_complete_member_detail(name_DeviceType, member_ann_builtin_DeviceType, ann_custom_WeightInfoOk);
CompleteStructMember member_DeviceType = TypeObjectUtils::build_complete_struct_member(common_DeviceType, detail_DeviceType);
TypeObjectUtils::add_complete_struct_member(member_seq_WeightInfoOk, member_DeviceType);
CompleteMemberDetail detail_GrossDeviceType = TypeObjectUtils::build_complete_member_detail(name_GrossDeviceType, member_ann_builtin_GrossDeviceType, ann_custom_WeightInfoOk);
CompleteStructMember member_GrossDeviceType = TypeObjectUtils::build_complete_struct_member(common_GrossDeviceType, detail_GrossDeviceType);
TypeObjectUtils::add_complete_struct_member(member_seq_WeightInfoOk, member_GrossDeviceType);
}
{
TypeIdentifierPair type_ids_TareDeviceID;
ReturnCode_t return_code_TareDeviceID {eprosima::fastdds::dds::RETCODE_OK};
return_code_TareDeviceID =
eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers(
"_int32_t", type_ids_TareDeviceID);
if (eprosima::fastdds::dds::RETCODE_OK != return_code_TareDeviceID)
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"TareDeviceID Structure member TypeIdentifier unknown to TypeObjectRegistry.");
return;
}
StructMemberFlag member_flags_TareDeviceID = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_TareDeviceID = 0x00000003;
bool common_TareDeviceID_ec {false};
CommonStructMember common_TareDeviceID {TypeObjectUtils::build_common_struct_member(member_id_TareDeviceID, member_flags_TareDeviceID, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_TareDeviceID, common_TareDeviceID_ec))};
if (!common_TareDeviceID_ec)
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure TareDeviceID member TypeIdentifier inconsistent.");
return;
}
MemberName name_TareDeviceID = "TareDeviceID";
eprosima::fastcdr::optional<AppliedBuiltinMemberAnnotations> member_ann_builtin_TareDeviceID;
ann_custom_WeightInfoOk.reset();
CompleteMemberDetail detail_TareDeviceID = TypeObjectUtils::build_complete_member_detail(name_TareDeviceID, member_ann_builtin_TareDeviceID, ann_custom_WeightInfoOk);
CompleteStructMember member_TareDeviceID = TypeObjectUtils::build_complete_struct_member(common_TareDeviceID, detail_TareDeviceID);
TypeObjectUtils::add_complete_struct_member(member_seq_WeightInfoOk, member_TareDeviceID);
}
{
TypeIdentifierPair type_ids_TareDeviceName;
ReturnCode_t return_code_TareDeviceName {eprosima::fastdds::dds::RETCODE_OK};
return_code_TareDeviceName =
eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers(
"anonymous_string_unbounded", type_ids_TareDeviceName);
if (eprosima::fastdds::dds::RETCODE_OK != return_code_TareDeviceName)
{
{
SBound bound = 0;
StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound);
if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER ==
TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn,
"anonymous_string_unbounded", type_ids_TareDeviceName))
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"anonymous_string_unbounded already registered in TypeObjectRegistry for a different type.");
}
}
}
StructMemberFlag member_flags_TareDeviceName = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_TareDeviceName = 0x00000004;
bool common_TareDeviceName_ec {false};
CommonStructMember common_TareDeviceName {TypeObjectUtils::build_common_struct_member(member_id_TareDeviceName, member_flags_TareDeviceName, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_TareDeviceName, common_TareDeviceName_ec))};
if (!common_TareDeviceName_ec)
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure TareDeviceName member TypeIdentifier inconsistent.");
return;
}
MemberName name_TareDeviceName = "TareDeviceName";
eprosima::fastcdr::optional<AppliedBuiltinMemberAnnotations> member_ann_builtin_TareDeviceName;
ann_custom_WeightInfoOk.reset();
CompleteMemberDetail detail_TareDeviceName = TypeObjectUtils::build_complete_member_detail(name_TareDeviceName, member_ann_builtin_TareDeviceName, ann_custom_WeightInfoOk);
CompleteStructMember member_TareDeviceName = TypeObjectUtils::build_complete_struct_member(common_TareDeviceName, detail_TareDeviceName);
TypeObjectUtils::add_complete_struct_member(member_seq_WeightInfoOk, member_TareDeviceName);
}
{
TypeIdentifierPair type_ids_TareDeviceType;
ReturnCode_t return_code_TareDeviceType {eprosima::fastdds::dds::RETCODE_OK};
return_code_TareDeviceType =
eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers(
"anonymous_string_unbounded", type_ids_TareDeviceType);
if (eprosima::fastdds::dds::RETCODE_OK != return_code_TareDeviceType)
{
{
SBound bound = 0;
StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound);
if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER ==
TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn,
"anonymous_string_unbounded", type_ids_TareDeviceType))
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"anonymous_string_unbounded already registered in TypeObjectRegistry for a different type.");
}
}
}
StructMemberFlag member_flags_TareDeviceType = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_TareDeviceType = 0x00000005;
bool common_TareDeviceType_ec {false};
CommonStructMember common_TareDeviceType {TypeObjectUtils::build_common_struct_member(member_id_TareDeviceType, member_flags_TareDeviceType, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_TareDeviceType, common_TareDeviceType_ec))};
if (!common_TareDeviceType_ec)
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure TareDeviceType member TypeIdentifier inconsistent.");
return;
}
MemberName name_TareDeviceType = "TareDeviceType";
eprosima::fastcdr::optional<AppliedBuiltinMemberAnnotations> member_ann_builtin_TareDeviceType;
ann_custom_WeightInfoOk.reset();
CompleteMemberDetail detail_TareDeviceType = TypeObjectUtils::build_complete_member_detail(name_TareDeviceType, member_ann_builtin_TareDeviceType, ann_custom_WeightInfoOk);
CompleteStructMember member_TareDeviceType = TypeObjectUtils::build_complete_struct_member(common_TareDeviceType, detail_TareDeviceType);
TypeObjectUtils::add_complete_struct_member(member_seq_WeightInfoOk, member_TareDeviceType);
}
{
TypeIdentifierPair type_ids_EnterpriseName;
@ -456,7 +562,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_EnterpriseName = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_EnterpriseName = 0x00000003;
MemberId member_id_EnterpriseName = 0x00000006;
bool common_EnterpriseName_ec {false};
CommonStructMember common_EnterpriseName {TypeObjectUtils::build_common_struct_member(member_id_EnterpriseName, member_flags_EnterpriseName, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_EnterpriseName, common_EnterpriseName_ec))};
if (!common_EnterpriseName_ec)
@ -494,7 +600,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_BillNumber = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_BillNumber = 0x00000004;
MemberId member_id_BillNumber = 0x00000007;
bool common_BillNumber_ec {false};
CommonStructMember common_BillNumber {TypeObjectUtils::build_common_struct_member(member_id_BillNumber, member_flags_BillNumber, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_BillNumber, common_BillNumber_ec))};
if (!common_BillNumber_ec)
@ -532,7 +638,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_CarNumber = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_CarNumber = 0x00000005;
MemberId member_id_CarNumber = 0x00000008;
bool common_CarNumber_ec {false};
CommonStructMember common_CarNumber {TypeObjectUtils::build_common_struct_member(member_id_CarNumber, member_flags_CarNumber, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_CarNumber, common_CarNumber_ec))};
if (!common_CarNumber_ec)
@ -570,7 +676,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_Supplier = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_Supplier = 0x00000006;
MemberId member_id_Supplier = 0x00000009;
bool common_Supplier_ec {false};
CommonStructMember common_Supplier {TypeObjectUtils::build_common_struct_member(member_id_Supplier, member_flags_Supplier, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_Supplier, common_Supplier_ec))};
if (!common_Supplier_ec)
@ -608,7 +714,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_GoodsType = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_GoodsType = 0x00000007;
MemberId member_id_GoodsType = 0x0000000a;
bool common_GoodsType_ec {false};
CommonStructMember common_GoodsType {TypeObjectUtils::build_common_struct_member(member_id_GoodsType, member_flags_GoodsType, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_GoodsType, common_GoodsType_ec))};
if (!common_GoodsType_ec)
@ -638,7 +744,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_GrossWeight = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_GrossWeight = 0x00000008;
MemberId member_id_GrossWeight = 0x0000000b;
bool common_GrossWeight_ec {false};
CommonStructMember common_GrossWeight {TypeObjectUtils::build_common_struct_member(member_id_GrossWeight, member_flags_GrossWeight, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_GrossWeight, common_GrossWeight_ec))};
if (!common_GrossWeight_ec)
@ -676,7 +782,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_GrossTime = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_GrossTime = 0x00000009;
MemberId member_id_GrossTime = 0x0000000c;
bool common_GrossTime_ec {false};
CommonStructMember common_GrossTime {TypeObjectUtils::build_common_struct_member(member_id_GrossTime, member_flags_GrossTime, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_GrossTime, common_GrossTime_ec))};
if (!common_GrossTime_ec)
@ -714,7 +820,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_GrossOperater = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_GrossOperater = 0x0000000a;
MemberId member_id_GrossOperater = 0x0000000d;
bool common_GrossOperater_ec {false};
CommonStructMember common_GrossOperater {TypeObjectUtils::build_common_struct_member(member_id_GrossOperater, member_flags_GrossOperater, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_GrossOperater, common_GrossOperater_ec))};
if (!common_GrossOperater_ec)
@ -744,7 +850,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_Tare = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_Tare = 0x0000000b;
MemberId member_id_Tare = 0x0000000e;
bool common_Tare_ec {false};
CommonStructMember common_Tare {TypeObjectUtils::build_common_struct_member(member_id_Tare, member_flags_Tare, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_Tare, common_Tare_ec))};
if (!common_Tare_ec)
@ -782,7 +888,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_TareTime = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_TareTime = 0x0000000c;
MemberId member_id_TareTime = 0x0000000f;
bool common_TareTime_ec {false};
CommonStructMember common_TareTime {TypeObjectUtils::build_common_struct_member(member_id_TareTime, member_flags_TareTime, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_TareTime, common_TareTime_ec))};
if (!common_TareTime_ec)
@ -820,7 +926,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_TareOperater = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_TareOperater = 0x0000000d;
MemberId member_id_TareOperater = 0x00000010;
bool common_TareOperater_ec {false};
CommonStructMember common_TareOperater {TypeObjectUtils::build_common_struct_member(member_id_TareOperater, member_flags_TareOperater, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_TareOperater, common_TareOperater_ec))};
if (!common_TareOperater_ec)
@ -850,7 +956,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_Suttle = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_Suttle = 0x0000000e;
MemberId member_id_Suttle = 0x00000011;
bool common_Suttle_ec {false};
CommonStructMember common_Suttle {TypeObjectUtils::build_common_struct_member(member_id_Suttle, member_flags_Suttle, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_Suttle, common_Suttle_ec))};
if (!common_Suttle_ec)
@ -880,7 +986,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_duduction1 = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_duduction1 = 0x0000000f;
MemberId member_id_duduction1 = 0x00000012;
bool common_duduction1_ec {false};
CommonStructMember common_duduction1 {TypeObjectUtils::build_common_struct_member(member_id_duduction1, member_flags_duduction1, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_duduction1, common_duduction1_ec))};
if (!common_duduction1_ec)
@ -910,7 +1016,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_duduction2 = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_duduction2 = 0x00000010;
MemberId member_id_duduction2 = 0x00000013;
bool common_duduction2_ec {false};
CommonStructMember common_duduction2 {TypeObjectUtils::build_common_struct_member(member_id_duduction2, member_flags_duduction2, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_duduction2, common_duduction2_ec))};
if (!common_duduction2_ec)
@ -940,7 +1046,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_duduction3 = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_duduction3 = 0x00000011;
MemberId member_id_duduction3 = 0x00000014;
bool common_duduction3_ec {false};
CommonStructMember common_duduction3 {TypeObjectUtils::build_common_struct_member(member_id_duduction3, member_flags_duduction3, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_duduction3, common_duduction3_ec))};
if (!common_duduction3_ec)
@ -978,7 +1084,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_INCoalYard = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_INCoalYard = 0x00000012;
MemberId member_id_INCoalYard = 0x00000015;
bool common_INCoalYard_ec {false};
CommonStructMember common_INCoalYard {TypeObjectUtils::build_common_struct_member(member_id_INCoalYard, member_flags_INCoalYard, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_INCoalYard, common_INCoalYard_ec))};
if (!common_INCoalYard_ec)
@ -1016,7 +1122,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_OutCoalYard = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_OutCoalYard = 0x00000013;
MemberId member_id_OutCoalYard = 0x00000016;
bool common_OutCoalYard_ec {false};
CommonStructMember common_OutCoalYard {TypeObjectUtils::build_common_struct_member(member_id_OutCoalYard, member_flags_OutCoalYard, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_OutCoalYard, common_OutCoalYard_ec))};
if (!common_OutCoalYard_ec)
@ -1054,7 +1160,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_BatchNumber = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_BatchNumber = 0x00000014;
MemberId member_id_BatchNumber = 0x00000017;
bool common_BatchNumber_ec {false};
CommonStructMember common_BatchNumber {TypeObjectUtils::build_common_struct_member(member_id_BatchNumber, member_flags_BatchNumber, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_BatchNumber, common_BatchNumber_ec))};
if (!common_BatchNumber_ec)
@ -1092,7 +1198,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_Warning = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_Warning = 0x00000015;
MemberId member_id_Warning = 0x00000018;
bool common_Warning_ec {false};
CommonStructMember common_Warning {TypeObjectUtils::build_common_struct_member(member_id_Warning, member_flags_Warning, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_Warning, common_Warning_ec))};
if (!common_Warning_ec)
@ -1107,6 +1213,44 @@ void register_WeightInfoOk_type_identifier(
CompleteStructMember member_Warning = TypeObjectUtils::build_complete_struct_member(common_Warning, detail_Warning);
TypeObjectUtils::add_complete_struct_member(member_seq_WeightInfoOk, member_Warning);
}
{
TypeIdentifierPair type_ids_Tips;
ReturnCode_t return_code_Tips {eprosima::fastdds::dds::RETCODE_OK};
return_code_Tips =
eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->type_object_registry().get_type_identifiers(
"anonymous_string_unbounded", type_ids_Tips);
if (eprosima::fastdds::dds::RETCODE_OK != return_code_Tips)
{
{
SBound bound = 0;
StringSTypeDefn string_sdefn = TypeObjectUtils::build_string_s_type_defn(bound);
if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER ==
TypeObjectUtils::build_and_register_s_string_type_identifier(string_sdefn,
"anonymous_string_unbounded", type_ids_Tips))
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION,
"anonymous_string_unbounded already registered in TypeObjectRegistry for a different type.");
}
}
}
StructMemberFlag member_flags_Tips = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_Tips = 0x00000019;
bool common_Tips_ec {false};
CommonStructMember common_Tips {TypeObjectUtils::build_common_struct_member(member_id_Tips, member_flags_Tips, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_Tips, common_Tips_ec))};
if (!common_Tips_ec)
{
EPROSIMA_LOG_ERROR(XTYPES_TYPE_REPRESENTATION, "Structure Tips member TypeIdentifier inconsistent.");
return;
}
MemberName name_Tips = "Tips";
eprosima::fastcdr::optional<AppliedBuiltinMemberAnnotations> member_ann_builtin_Tips;
ann_custom_WeightInfoOk.reset();
CompleteMemberDetail detail_Tips = TypeObjectUtils::build_complete_member_detail(name_Tips, member_ann_builtin_Tips, ann_custom_WeightInfoOk);
CompleteStructMember member_Tips = TypeObjectUtils::build_complete_struct_member(common_Tips, detail_Tips);
TypeObjectUtils::add_complete_struct_member(member_seq_WeightInfoOk, member_Tips);
}
{
TypeIdentifierPair type_ids_TicketType;
ReturnCode_t return_code_TicketType {eprosima::fastdds::dds::RETCODE_OK};
@ -1130,7 +1274,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_TicketType = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_TicketType = 0x00000016;
MemberId member_id_TicketType = 0x0000001a;
bool common_TicketType_ec {false};
CommonStructMember common_TicketType {TypeObjectUtils::build_common_struct_member(member_id_TicketType, member_flags_TicketType, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_TicketType, common_TicketType_ec))};
if (!common_TicketType_ec)
@ -1160,7 +1304,7 @@ void register_WeightInfoOk_type_identifier(
}
StructMemberFlag member_flags_IsPrintTicker = TypeObjectUtils::build_struct_member_flag(eprosima::fastdds::dds::xtypes::TryConstructFailAction::DISCARD,
false, false, false, false);
MemberId member_id_IsPrintTicker = 0x00000017;
MemberId member_id_IsPrintTicker = 0x0000001b;
bool common_IsPrintTicker_ec {false};
CommonStructMember common_IsPrintTicker {TypeObjectUtils::build_common_struct_member(member_id_IsPrintTicker, member_flags_IsPrintTicker, TypeObjectUtils::retrieve_complete_type_identifier(type_ids_IsPrintTicker, common_IsPrintTicker_ec))};
if (!common_IsPrintTicker_ec)

679
print/MsgHandler.cxx
Unescape Escape View File

@ -614,7 +614,7 @@ std::vector<std::string> MsgHandler::split_utf8_by_width(const std::string& str,
return result;
}
//HS-K33打印通用称重
//NP80A打印通用称重
void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
{
//这里组装打印输出内容
@ -637,27 +637,31 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
it = msg.find("TitleCorp");
if(it != msg.end())
{
szTemp = ot::UTF8ToGB2312(it->second.c_str()) + ot::UTF8ToGB2312("过衡单"); //过衡单
szTemp = ot::UTF8ToGB2312(it->second.c_str()) + ot::UTF8ToGB2312("磅单"); //过衡单
}
m_PrintData.insert(m_PrintData.end(), {0x0A, 0x0A});
// m_PrintData.insert(m_PrintData.end(), {0x0A, 0x0A});
m_PrintData.insert(m_PrintData.end(), szTemp.begin(), szTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_PrintData.insert(m_PrintData.end(), {0x0A, 0x0A});
//设置0号字
m_PrintData.insert(m_PrintData.end(), {0x1D, 0x21, 0x00});
szTemp=ot::UTF8ToGB2312(" ");
m_PrintData.insert(m_PrintData.end(), {0x0A, 0x0A});
m_PrintData.insert(m_PrintData.end(), szTemp.begin(), szTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
// szTemp=ot::UTF8ToGB2312(" ");
// m_PrintData.insert(m_PrintData.end(), {0x0A, 0x0A});
// m_PrintData.insert(m_PrintData.end(), szTemp.begin(), szTemp.end());
// m_PrintData.insert(m_PrintData.end(), {0x0A});
//设置左对齐
m_PrintData.insert(m_PrintData.end(), {0x1B, 0x61, 0x00});
//设置页模式
m_PrintData.insert(m_PrintData.end(), {0x1B, 0x4C});
m_PrintData.insert(m_PrintData.end(), {0x11, 0x21}); //进入页模式
m_PrintData.insert(m_PrintData.end(), {0x11, 0x25, 00});//设置页模式打印方向
m_PrintData.insert(m_PrintData.end(), {0x11, 0x23, 0x02, 0x30, 0x03, 0x60});//设置页模式宽度和高度,70mm*108mm
m_PrintData.insert(m_PrintData.end(), {0x11, 0x24, 0x00, 0x00, 0x00, 0x00});//设置打印坐标起点
//=============================开票时间=====================================
//加顶框
m_newObj[1] = ("┌");
m_newObj[7] = ("┬");
m_newObj[23] = ("┐");
blTemp = BuildLine(24,m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
@ -667,13 +671,13 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
//====票据号=====================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[0] = ("│");
m_newObj[26] = ("票据号");
m_newObj[120] = ("│");
m_newObj[144] = ("│");
it = msg.find("CoalNumber");
if(it != msg.end())
{
m_newObj[145] = it->second;
m_newObj[170] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
@ -683,7 +687,7 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[7] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24,m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
@ -692,13 +696,13 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
//====车牌号=====================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[0] = ("│");
m_newObj[26] = ("车牌号");
m_newObj[120] = ("│");
m_newObj[144] = ("│");
it = msg.find("CarNumber");
if(it != msg.end())
{
m_newObj[145] = it->second;
m_newObj[170] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
@ -707,7 +711,7 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[7] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24,m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
@ -716,13 +720,13 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
//====供应商=====================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[0] = ("│");
m_newObj[26] = ("往来单位");
m_newObj[120] = ("│");
m_newObj[144] = ("│");
it = msg.find("Supplier");
if(it != msg.end())
{
m_newObj[145] = it->second;
m_newObj[170] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
@ -731,7 +735,7 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[7] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24,m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
@ -740,13 +744,13 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
//====品种=====================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[0] = ("│");
m_newObj[26] = ("品　种");
m_newObj[120] = ("│");
m_newObj[144] = ("│");
it = msg.find("GoodsType");
if(it != msg.end())
{
m_newObj[145] = it->second;
m_newObj[170] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
@ -756,24 +760,23 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[7] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24,m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//====装货点=====================
//====批次号=====================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("装货点");
m_newObj[120] = ("│");
it = msg.find("OUTCoalYard");
m_newObj[0] = ("│");
m_newObj[26] = ("批次号");
m_newObj[144] = ("│");
it = msg.find("BatchNumber");
if(it != msg.end())
{
m_newObj[145] = it->second;
m_newObj[170] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
@ -782,24 +785,22 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[7] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24,m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//====卸货点=====================
//====磅称名称=====================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("卸货点");
m_newObj[120] = ("│");
it = msg.find("INCoalYard");
m_newObj[0] = ("│");
m_newObj[26] = ("汽车衡名称");
m_newObj[144] = ("│");
it = msg.find("GrossDeviceName");
if(it != msg.end())
{
m_newObj[145] = it->second;
m_newObj[170] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
@ -808,23 +809,22 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[7] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24,m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//====批次号=====================
//====磅称编号=====================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("批次号");
m_newObj[120] = ("│");
it = msg.find("BatchNumber");
m_newObj[0] = ("│");
m_newObj[26] = ("汽车衡编号");
m_newObj[144] = ("│");
it = msg.find("GrossDeviceID");
if(it != msg.end())
{
m_newObj[145] = it->second;
m_newObj[170] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
@ -833,402 +833,189 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[7] = ("┼");
m_newObj[17] = ("┬");
m_newObj[23] = ("┤");
blTemp = BuildLine(24,m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//=========毛重======================
//=========磅单类型======================
it = msg.find("TicketType");
if (it->second == "1")
m_newObj.clear();
m_newObj[0] = ("│");
m_newObj[26] = ("毛重");
m_newObj[144] = ("│");
it = msg.find("GrossWeight");
if (it != msg.end())
{
//=========毛重======================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("一次称重");
m_newObj[120] = ("│");
it = msg.find("GrossWeight");
if (it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj[384] = ("│");
m_newObj[404] = ("吨");
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[17] = ("┴");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//=========毛重操作员======================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("操作员");
m_newObj[120] = ("│");
it = msg.find("GrossOperater");
if (it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//=========毛重时间======================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("称重时间");
m_newObj[120] = ("│");
it = msg.find("GrossTime");
if (it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj[170] = it->second;
}
else
{
//=========毛重======================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("毛重");
m_newObj[120] = ("│");
it = msg.find("GrossWeight");
if (it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj[384] = ("│");
m_newObj[404] = ("吨");
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[17] = ("┴");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//=========毛重操作员======================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("操作员");
m_newObj[120] = ("│");
it = msg.find("GrossOperater");
if (it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//=========毛重时间======================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("毛重时间");
m_newObj[120] = ("│");
it = msg.find("GrossTime");
if (it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[17] = ("┬");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//=========皮重======================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("皮重");
m_newObj[120] = ("│");
it = msg.find("TareWeight");
if (it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj[384] = ("│");
m_newObj[404] = ("吨");
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[17] = ("┴");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//=========皮重操作员======================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("操作员");
m_newObj[120] = ("│");
it = msg.find("TareOperater");
if (it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//=========皮重时间======================
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("皮重时间");
m_newObj[120] = ("│");
it = msg.find("TareTime");
if (it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj[384] = ("│");
m_newObj[404] = ("吨");
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[7] = ("┼");
m_newObj[17] = ("┴");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[17] = ("┬");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//=========毛重时间======================
//=========净重======================
m_newObj.clear();
m_newObj[0] = ("│");
m_newObj[26] = ("毛重时间");
m_newObj[144] = ("│");
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("净重");
m_newObj[120] = ("│");
it = msg.find("GrossTime");
if (it != msg.end())
{
m_newObj[170] = it->second;
}
it = msg.find("SuttleWeight");
if (it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj[384] = ("│");
m_newObj[404] = ("吨");
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[7] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//====磅称名称=====================
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[17] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[0] = ("│");
m_newObj[26] = ("汽车衡名称");
m_newObj[144] = ("│");
it = msg.find("TareDeviceName");
if (it != msg.end())
{
m_newObj[170] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//=========扣矸======================
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[7] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("扣矸");
m_newObj[120] = ("│");
//====磅称编号=====================
it = msg.find("duduction1");
if (it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj.clear();
m_newObj[0] = ("│");
m_newObj[26] = ("汽车衡编号");
m_newObj[144] = ("│");
it = msg.find("TareDeviceID");
if (it != msg.end())
{
m_newObj[170] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj[384] = ("│");
m_newObj[404] = ("吨");
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[7] = ("┼");
m_newObj[17] = ("┬");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//=========皮重======================
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[17] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[0] = ("│");
m_newObj[26] = ("皮重");
m_newObj[144] = ("│");
//=========扣水======================
it = msg.find("TareWeight");
if (it != msg.end())
{
m_newObj[170] = it->second;
}
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("扣水");
m_newObj[120] = ("│");
m_newObj[384] = ("│");
m_newObj[404] = ("吨");
it = msg.find("duduction2");
if (it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj[384] = ("│");
m_newObj[404] = ("吨");
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[7] = ("┼");
m_newObj[17] = ("┴");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//=========皮重时间======================
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[17] = ("┼");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[0] = ("│");
m_newObj[26] = ("皮重时间");
m_newObj[144] = ("│");
//=========扣杂======================
it = msg.find("TareTime");
if (it != msg.end())
{
m_newObj[170] = it->second;
}
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("扣杂");
m_newObj[120] = ("│");
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
it = msg.find("duduction3");
if (it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[7] = ("┼");
m_newObj[17] = ("┬");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj[384] = ("│");
m_newObj[404] = ("吨");
//=========净重======================
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
m_newObj.clear();
m_newObj[0] = ("│");
m_newObj[26] = ("净重");
m_newObj[144] = ("│");
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[17] = ("┴");
m_newObj[23] = ("┤");
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
it = msg.find("SuttleWeight");
if (it != msg.end())
{
m_newObj[170] = it->second;
}
//====磅称名称=====================
m_newObj[384] = ("│");
m_newObj[404] = ("吨");
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("磅称编号");
m_newObj[120] = ("│");
it = msg.find("DeviceID");
if(it != msg.end())
{
m_newObj[145] = it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
@ -1236,23 +1023,20 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[7] = ("┴");
m_newObj[17] = ("┴");
m_newObj[23] = ("┤");
blTemp = BuildLine(24,m_newObj);
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//====磅称名称=====================
// 操作员
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[26] = ("磅称名称");
m_newObj[120] = ("│");
it = msg.find("DeviceName");
if(it != msg.end())
m_newObj[0] = ("│");
it = msg.find("GrossOperater");
if (it != msg.end())
{
m_newObj[145] = it->second;
m_newObj[26] = " " + it->second;
}
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
@ -1261,48 +1045,48 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
m_newObj.clear();
m_newObj[1] = ("├");
m_newObj[6] = ("┼");
m_newObj[7] = ("┬");
m_newObj[23] = ("┤");
blTemp = BuildLine(24,m_newObj);
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//=========备注=====================
const size_t MAX_DISPLAY_WIDTH = 32; // 每行最多32个显示位置
const size_t MAX_DISPLAY_WIDTH = 30; // 每行最多32个显示位置
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[0] = ("│");
m_newObj[26] = ("提示");
m_newObj[120] = ("│");
m_newObj[144] = ("│");
it = msg.find("Warning");
if(it != msg.end())
it = msg.find("Tips");
if (it != msg.end())
{
// 检查显示宽度是否超过限制
size_t display_width = get_utf8_display_width(it->second);
if (display_width > MAX_DISPLAY_WIDTH) {
if (display_width > MAX_DISPLAY_WIDTH)
{
// 需要分割成多行显示
// 第一行：显示前32个宽度的内容
std::vector<std::string> lines = split_utf8_by_width(it->second, MAX_DISPLAY_WIDTH);
// 输出第一行（包含前缀）
m_newObj[145] = lines[0];
m_newObj[170] = lines[0];
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
// 输出剩余行（不包含前缀，但有边框）
for (size_t i = 1; i < lines.size(); i++) {
for (size_t i = 1; i < lines.size(); i++)
{
m_newObj.clear();
m_newObj[1] = ("│");
m_newObj[120] = ("│");
m_newObj[145] = lines[i];
m_newObj[0] = ("│");
m_newObj[144] = ("│");
m_newObj[170] = lines[i];
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
@ -1310,19 +1094,21 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
m_PrintData.insert(m_PrintData.end(), {0x0A});
}
}
else {
else
{
// 宽度不超过限制，正常显示
m_newObj[145] = it->second;
m_newObj[170] = it->second;
m_newObj[528] = ("│");
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
}
}
else {
else
{
// 没有找到Warning，显示空内容
m_newObj[170] = "";
m_newObj[528] = ("│");
m_newObj[145] = "";
blTemp = BuildStringLine(m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
@ -1330,12 +1116,25 @@ void MsgHandler::Print1_3(const std::map<std::string, std::string>& msg)
m_newObj.clear();
m_newObj[1] = ("└");
m_newObj[6] = ("┴");
m_newObj[7] = ("┴");
m_newObj[23] = ("┘");
blTemp = BuildLine(24,m_newObj);
blTemp = BuildLine(24, m_newObj);
m_PrintData.insert(m_PrintData.end(), blTemp.begin(), blTemp.end());
m_PrintData.insert(m_PrintData.end(), {0x0A});
//打印、切纸
m_PrintData.insert(m_PrintData.end(), {0x0C, 0x1D, 0x56 ,0x42, 0x00});
//打印页
m_PrintData.insert(m_PrintData.end(), {0x11, 0x0C});
//退出页模式
m_PrintData.insert(m_PrintData.end(), {0x11, 0x22});
//盖章
m_PrintData.insert(m_PrintData.end(), {0x1B, 0x61, 0x02});//设置右对齐
m_PrintData.insert(m_PrintData.end(), {0x1B, 0x4B, 0x60});//向上调整位置
m_PrintData.insert(m_PrintData.end(), {0x1B, 0x4B, 0x60});//向上调整位置
m_PrintData.insert(m_PrintData.end(), {0x1B, 0x4B, 0x60});//向上调整位置
m_PrintData.insert(m_PrintData.end(), {0x1B, 0x4B, 0x60});//向上调整位置
m_PrintData.insert(m_PrintData.end(), {0x1C, 0x70, 0x01, 0x00});//打印下载NV位图
m_PrintData.insert(m_PrintData.end(), {0x1B, 0x64, 0x0A});//空行并打印
m_PrintData.insert(m_PrintData.end(), {0x1B, 0x69});//切纸
}
Write Preview
Loading…
Cancel
Save