Forráskód Böngészése

添加打印物流公司名称及物流公司客服电话

daxu0403 7 éve
szülő
commit
b7610ff8ee

+ 1 - 1
android/app/src/main/assets/driver.txt

@@ -3,7 +3,7 @@ IN-DOTS
 BARCODE 128 1 1 70 10 0 [logisticsNo]
 SETSP O
 SETMAG 3 3
-T 8 0 355 0 汽车人
+T 8 0 355 0 [companyName]
 SETSP 0
 SETMAG 1 1
 T 8 0 10 80 [logisticsNo] [createTime] [sendStationName]

+ 1 - 1
android/app/src/main/assets/goods.txt

@@ -3,7 +3,7 @@ IN-DOTS
 BARCODE 128 1 1 80 15 0 [currentGoodNumber]&[logisticsNo]
 SETSP 0
 SETMAG 3 3
-T 8 0 360 0 汽车人
+T 8 0 360 0 [companyName]
 SETSP 0
 SETMAG 2 2
 T 8 0 15 90 [logisticsNo]

+ 2 - 2
android/app/src/main/assets/sender.txt

@@ -3,7 +3,7 @@ IN-DOTS
 BARCODE 128 1 1 70 10 0 [logisticsNo]
 SETSP O
 SETMAG 3 3
-T 8 0 355 0 汽车人
+T 8 0 355 0 [companyName]
 SETSP 0
 SETMAG 1 1
 T 8 0 10 80 [logisticsNo] [createTime] [sendStationName]
@@ -16,7 +16,7 @@ T 8 0 10 225 件数:[goodsQuantity] 保险费:[goodsInsurance] 工本费:[goodsF
 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
+T 8 0 10 320 客服电话:[companyCustomerPhone]
 LINE 0 350 400 350 1
 T 8 0 10 355 货品保丢不保损,请仔细包装
 T 8 0 10 385 请在10天内尽快查款,系统三个月自动关闭

+ 51 - 44
lib/pages/order_management_page.dart

@@ -839,52 +839,59 @@ class _QueryWidgetState extends State < QueryWidget > {
                   getKey('printType').then((printType){
                     getKey('stationName').then((stationName){
                       getKey('nickName').then((nickName){
-                        double goodsYs = (data.goodsFreight/100)+(data.goodsAgencyFund/100);
-                          String nowDate = fromatDate( DateTime.now().millisecondsSinceEpoch);//打印时间
-                          String createTime =  fromatDate(data.createTime);
-                          double goodsAgencyFunds = data.goodsAgencyFund/100;
-                          double goodsDFreight = data.goodsPaymentMethod==1?data.goodsFreight/100:0;
-                          double goodsXFreight = data.goodsPaymentMethod==2?data.goodsFreight/100:0;
-                          String receiptAddress = data.receiptCompanyAddress.length>10?data.receiptCompanyAddress.substring(0,10):data.receiptCompanyAddress;
+                        getKey('companyName').then((companyName){
+                          getKey('companyCustomerPhone').then((companyCustomerPhone){
+                            double goodsYs = (data.goodsFreight/100)+(data.goodsAgencyFund/100);
+                            String nowDate = fromatDate( DateTime.now().millisecondsSinceEpoch);//打印时间
+                            String createTime =  fromatDate(data.createTime);
+                            double goodsAgencyFunds = data.goodsAgencyFund/100;
+                            double goodsDFreight = data.goodsPaymentMethod==1?data.goodsFreight/100:0;
+                            double goodsXFreight = data.goodsPaymentMethod==2?data.goodsFreight/100:0;
+                            String receiptAddress = data.receiptCompanyAddress.length>10?data.receiptCompanyAddress.substring(0,10):data.receiptCompanyAddress;
 
-                          Map<String, String> pum = {
-                            "[logisticsNo]": "${data.orderNo ?? ''}",
-                            "[createTime]": "$createTime",
-                            "[sendStationName]": "$stationName",
-                            "[dealerCode]": "${data.sendCompanyCode ?? ''}",
-                            "[dealerName]": "${data.sendCompanyName}",
-                            "[dealerTel]": "${data.sendCompanyPhone ?? ''}",
-                            "[repairName]": "${data.receiptCompanyName ?? ''}",
-                            "[repairTel]": "${data.receiptCompanyPhone ?? ''}",
-                            "[endStationName]": "${data.receiptStationName}",
-                            "[goodsLineCode]": "${data.lineCode ?? ''}",
-                            "[goodsLine]": "${data.lineName ?? ''}",
-                            "[repairAddress]": "${receiptAddress?? ''}",
-                            "[goodsQuantity]": "${data.goodsQuantity ?? ''}",
-                            "[goodsInsurance]": "${data.goodsInsurance ?? ''}",
-                            "[goodsFlatCost]": "${data.goodsFlatCost ?? ''}",
-                            // 到付 现付 金额
-                            "[goodsDFreight]": "$goodsDFreight",
-                            "[goodsXFreight]": "$goodsXFreight",
-                            "[goodsAgencyFund]": "$goodsAgencyFunds",
-                            "[goodsYs]": "$goodsYs",
-                            "[dealerBankAccount]": "${data.sendCompanyBankCard ?? ''}",
-                            "[goodsRemark]": "${data.memo ?? ''}",
-                            "[realName]": "${nickName?? ''}",
-                            "[currentTime]": "$nowDate",
-                            "[currentGoodNumber]": "1/1",
-                          };
-                          bluetooth.printOrder(pum, int.parse(printType)).then((value){
-                            if(value==null){
-                              showDialog <Null> (
-                                context: context,
-                                barrierDismissible: false,
-                                builder: (BuildContext context) {
-                                  return MyAlertDialog(text: '未连接打印机',childCallback:(val){});
-                                }
-                              );
-                            }
+                            Map<String, String> pum = {
+                              "[logisticsNo]": "${data.orderNo ?? ''}",
+                              "[createTime]": "$createTime",
+                              "[sendStationName]": "$stationName",
+                              "[dealerCode]": "${data.sendCompanyCode ?? ''}",
+                              "[dealerName]": "${data.sendCompanyName}",
+                              "[dealerTel]": "${data.sendCompanyPhone ?? ''}",
+                              "[repairName]": "${data.receiptCompanyName ?? ''}",
+                              "[repairTel]": "${data.receiptCompanyPhone ?? ''}",
+                              "[endStationName]": "${data.receiptStationName}",
+                              "[goodsLineCode]": "${data.lineCode ?? ''}",
+                              "[goodsLine]": "${data.lineName ?? ''}",
+                              "[repairAddress]": "${receiptAddress?? ''}",
+                              "[goodsQuantity]": "${data.goodsQuantity ?? ''}",
+                              "[goodsInsurance]": "${data.goodsInsurance ?? ''}",
+                              "[goodsFlatCost]": "${data.goodsFlatCost ?? ''}",
+                              // 到付 现付 金额
+                              "[goodsDFreight]": "$goodsDFreight",
+                              "[goodsXFreight]": "$goodsXFreight",
+                              "[goodsAgencyFund]": "$goodsAgencyFunds",
+                              "[goodsYs]": "$goodsYs",
+                              "[dealerBankAccount]": "${data.sendCompanyBankCard ?? ''}",
+                              "[goodsRemark]": "${data.memo ?? ''}",
+                              "[realName]": "${nickName?? ''}",
+                              "[currentTime]": "$nowDate",
+                              "[currentGoodNumber]": "1/1",
+                              "[companyCustomerPhone]":"$companyCustomerPhone",
+                              "[companyName]":"$companyName"
+                            };
+                            bluetooth.printOrder(pum, int.parse(printType)).then((value){
+                              if(value==null){
+                                showDialog <Null> (
+                                  context: context,
+                                  barrierDismissible: false,
+                                  builder: (BuildContext context) {
+                                    return MyAlertDialog(text: '未连接打印机',childCallback:(val){});
+                                  }
+                                );
+                              }
+                            });
                           });
+                        });
+                          
                       });
                     });
                   });

+ 51 - 45
lib/pages/order_management_page/order_detail_page.dart

@@ -381,52 +381,58 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
             getKey('printType').then((printType){
                 getKey('stationName').then((stationName){
                   getKey('nickName').then((nickName){
-                      double goodsYs = (data.goodsFreight/100)+(data.goodsAgencyFund/100);
-                      String nowDate = fromatDate( DateTime.now().millisecondsSinceEpoch);//打印时间
-                      String createTime =  fromatDate(data.createTime);
-                      double goodsAgencyFunds = data.goodsAgencyFund/100;
-                      double goodsDFreight = data.goodsPaymentMethod==1?data.goodsFreight/100:0;
-                      double goodsXFreight = data.goodsPaymentMethod==2?data.goodsFreight/100:0;
-                      String receiptAddress = data.receiptCompanyAddress.length>10?data.receiptCompanyAddress.substring(0,10):data.receiptCompanyAddress;
+                    getKey('companyName').then((companyName){
+                          getKey('companyCustomerPhone').then((companyCustomerPhone){
+                            double goodsYs = (data.goodsFreight/100)+(data.goodsAgencyFund/100);
+                            String nowDate = fromatDate( DateTime.now().millisecondsSinceEpoch);//打印时间
+                            String createTime =  fromatDate(data.createTime);
+                            double goodsAgencyFunds = data.goodsAgencyFund/100;
+                            double goodsDFreight = data.goodsPaymentMethod==1?data.goodsFreight/100:0;
+                            double goodsXFreight = data.goodsPaymentMethod==2?data.goodsFreight/100:0;
+                            String receiptAddress = data.receiptCompanyAddress.length>10?data.receiptCompanyAddress.substring(0,10):data.receiptCompanyAddress;
 
-                      Map<String, String> pum = {
-                        "[logisticsNo]": "${data.orderNo ?? ''}",
-                        "[createTime]": "$createTime",
-                        "[sendStationName]": "$stationName",
-                        "[dealerCode]": "${data.sendCompanyCode ?? ''}",
-                        "[dealerName]": "${data.sendCompanyName}",
-                        "[dealerTel]": "${data.sendCompanyPhone ?? ''}",
-                        "[repairName]": "${data.receiptCompanyName ?? ''}",
-                        "[repairTel]": "${data.receiptCompanyPhone ?? ''}",
-                        "[endStationName]": "${data.receiptStationName}",
-                        "[goodsLineCode]": "${data.lineCode ?? ''}",
-                        "[goodsLine]": "${data.lineName ?? ''}",
-                        "[repairAddress]": "${receiptAddress?? ''}",
-                        "[goodsQuantity]": "${data.goodsQuantity ?? ''}",
-                        "[goodsInsurance]": "${data.goodsInsurance ?? ''}",
-                        "[goodsFlatCost]": "${data.goodsFlatCost ?? ''}",
-                        // 到付 现付 金额
-                        "[goodsDFreight]": "$goodsDFreight",
-                        "[goodsXFreight]": "$goodsXFreight",
-                        "[goodsAgencyFund]": "$goodsAgencyFunds",
-                        "[goodsYs]": "$goodsYs",
-                        "[dealerBankAccount]": "${data.sendCompanyBankCard ?? ''}",
-                        "[goodsRemark]": "${data.memo ?? ''}",
-                        "[realName]": "${nickName?? ''}",
-                        "[currentTime]": "$nowDate",
-                        "[currentGoodNumber]": "1/1",
-                      };
-                      bluetooth.printOrder(pum, int.parse(printType)).then((value){
-                        if(value==null){
-                          showDialog <Null> (
-                            context: context,
-                            barrierDismissible: false,
-                            builder: (BuildContext context) {
-                              return MyAlertDialog(text: '未连接打印机',childCallback:(val){});
-                            }
-                          );
-                        }
-                      });
+                            Map<String, String> pum = {
+                              "[logisticsNo]": "${data.orderNo ?? ''}",
+                              "[createTime]": "$createTime",
+                              "[sendStationName]": "$stationName",
+                              "[dealerCode]": "${data.sendCompanyCode ?? ''}",
+                              "[dealerName]": "${data.sendCompanyName}",
+                              "[dealerTel]": "${data.sendCompanyPhone ?? ''}",
+                              "[repairName]": "${data.receiptCompanyName ?? ''}",
+                              "[repairTel]": "${data.receiptCompanyPhone ?? ''}",
+                              "[endStationName]": "${data.receiptStationName}",
+                              "[goodsLineCode]": "${data.lineCode ?? ''}",
+                              "[goodsLine]": "${data.lineName ?? ''}",
+                              "[repairAddress]": "${receiptAddress?? ''}",
+                              "[goodsQuantity]": "${data.goodsQuantity ?? ''}",
+                              "[goodsInsurance]": "${data.goodsInsurance ?? ''}",
+                              "[goodsFlatCost]": "${data.goodsFlatCost ?? ''}",
+                              // 到付 现付 金额
+                              "[goodsDFreight]": "$goodsDFreight",
+                              "[goodsXFreight]": "$goodsXFreight",
+                              "[goodsAgencyFund]": "$goodsAgencyFunds",
+                              "[goodsYs]": "$goodsYs",
+                              "[dealerBankAccount]": "${data.sendCompanyBankCard ?? ''}",
+                              "[goodsRemark]": "${data.memo ?? ''}",
+                              "[realName]": "${nickName?? ''}",
+                              "[currentTime]": "$nowDate",
+                              "[currentGoodNumber]": "1/1",
+                              "[companyCustomerPhone]":"$companyCustomerPhone",
+                              "[companyName]":"$companyName"
+                            };
+                            bluetooth.printOrder(pum, int.parse(printType)).then((value){
+                              if(value==null){
+                                showDialog <Null> (
+                                  context: context,
+                                  barrierDismissible: false,
+                                  builder: (BuildContext context) {
+                                    return MyAlertDialog(text: '未连接打印机',childCallback:(val){});
+                                  }
+                                );
+                              }
+                            });
+                          });
+                    });
                   });
                 });
               });

+ 6 - 0
lib/pages/send_express_page.dart

@@ -832,6 +832,8 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
                   getKey('printType').then((printType){
                       getKey('stationName').then((stationName){
                         getKey('nickName').then((nickName){
+                          getKey('companyName').then((companyName){
+                            getKey('companyCustomerPhone').then((companyCustomerPhone){
                             double goodsYs = (data.goodsFreight/100)+(data.goodsAgencyFund/100);
                             String nowDate = fromatDate( DateTime.now().millisecondsSinceEpoch);//打印时间
                             String createTime =  fromatDate(data.createTime);
@@ -866,6 +868,8 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
                               "[realName]": "${nickName?? ''}",
                               "[currentTime]": "$nowDate",
                               "[currentGoodNumber]": "1/1",
+                               "[companyCustomerPhone]":"$companyCustomerPhone",
+                              "[companyName]":"$companyName"
                             };
                             bluetooth.printOrder(pum, int.parse(printType)).then((value){
                               if(value==null){
@@ -878,6 +882,8 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
                                 );
                               }
                             });
+                            });
+                        });
                         });
                       });
                     });