修改android打印文件

android/app/src/main/assets/driver.txt

@@ -6,14 +6,14 @@ SETMAG 3 3
 T 8 0 355 0 汽车人
 SETSP 0
 SETMAG 1 1
-T 8 0 10 80 [logisticsNo]   日期: [createTime]  [sendStationName]
+T 8 0 10 80 [logisticsNo] [createTime] [sendStationName]
 LINE 0 110 576 110 1
-T 8 0 10 120 发:"+[dealerCode]([dealerName]) 电话: [dealerTel]
-T 8 0 10 150 收:"[repairName] 电话:[repairTel]
+T 8 0 10 120 发:[dealerCode][dealerName] 电话: [dealerTel]
+T 8 0 10 150 收:[repairName] 电话:[repairTel]
 T 8 0 10 180 地址:[[endStationName]][goodsLineCode]([goodsLine])[repairAddress]
 LINE 0 215 576 215 1
-T 8 0 10 220 件数:[goodsQuantity] 保险费:[goodsInsurance] 工本费:[goodsFlatCost] 现付:[goodsPaymentMethod]
-T 8 0 10 250 到付:[goodsFreight] 代收:[goodsAgencyFund] 签名:
+T 8 0 10 220 件数:[goodsQuantity] 保险费:[goodsInsurance] 工本费:[goodsFlatCost] 现付:[goodsXFreight]
+T 8 0 10 250 到付:[goodsDFreight] 代收:[goodsAgencyFund] 签名:
 LINE 0 280 576 280 1
 SETSP O
 SETMAG 2 3
@@ -21,10 +21,10 @@ T 8 0 15 285 [repairName]
 LINE 0 365 400 365 1
 SETSP 0
 SETMAG 2 2
-T 8 0 10 370 到应收:[goodsPaymentMethod]
+T 8 0 10 370 到应收:[goodsYs]
 SETSP 0
 SETMAG 1 1
-T 8 0 10 435 打印人:[realName]时间:[currentTime]
+T 8 0 10 420 打印人:[realName]时间:[currentTime]
 SETFF 0 0
 FORM
 PRINT

android/app/src/main/assets/goods.txt

@@ -1,6 +1,6 @@
 ! 0 200 200 460 1
 IN-DOTS
-BARCODE 128 1 1 80 15 0 2#[currentGoodNumber]&[logisticsNo]
+BARCODE 128 1 1 80 15 0 [currentGoodNumber]&[logisticsNo]
 SETSP 0
 SETMAG 3 3
 T 8 0 360 0 汽车人
@@ -10,7 +10,7 @@ T 8 0 15 90 [logisticsNo]
 SETSP 0
 SETMAG 2 3
 T 8 0 15 145 [endStationName][goodsLineCode]([goodsLine])
-T 8 0 75 220 [currentGoodNum]
+T 8 0 75 220 [currentGoodNumber]
 SETSP 0
 SETMAG 1 1
 T 8 0 15 295 日期: [createTime] [sendStationName]

android/app/src/main/assets/sender.txt

@@ -12,8 +12,8 @@ T 8 0 10 125 发:[dealerCode] [dealerName] 电话: [dealerTel]
 T 8 0 10 155 收:[repairName] 电话:[repairTel]
 T 8 0 10 185 地址:[[endStationName]][goodsLineCode]([goodsLine])[repairAddress]
 LINE 0 220 576 220 1
-T 8 0 10 225 件数:[goodsQuantity] 保险费:[goodsInsurance] 工本费:[goodsFlatCost] 现付:[goodsPaymentMethod]
-T 8 0 10 255 到付:[goodsPaymentMethod] 代收:[goodsAgencyFund] 账号:[dealerBankAccount]
+T 8 0 10 225 件数:[goodsQuantity] 保险费:[goodsInsurance] 工本费:[goodsFlatCost] 现付:[goodsXFreight]
+T 8 0 10 255 到付:[goodsDFreight] 代收:[goodsAgencyFund] 账号:[dealerBankAccount]
 LINE 0 285 576 285 1
 T 8 0 10 290 备注:[goodsRemark]
 T 8 0 10 320 客服电话：010-57282902