sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
tzw
2024-02-05 11:20:18 +06:30
parent e0d92e8ae0
commit afb980e6ae
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pages/carton/carton_info.dart
View File

@@ -175,19 +175,11 @@ class _CartonInfoState extends State<CartonInfo> {
labelTextKey: "box.number", labelTextKey: "box.number",
//iconData: Ionicons.ios_airplane, //iconData: Ionicons.ios_airplane,
); );
<<<<<<< HEAD
final cartonQrBox = DisplayText( final cartonQrBox = DisplayText(
// text: _box!., // text: _box!.,
//labelTextKey: "box.number", //labelTextKey: "box.number",
iconData: AntDesign.qrcode, iconData: AntDesign.qrcode,
); );
=======
// final cartonQrBox = DisplayText(
// // text: _box!.,
// //labelTextKey: "box.number",
// iconData: AntDesign.qrcode,
// );
>>>>>>> 9bd0c5d484c580feff721ff039b506f107dcb314
final shipmentBox = DisplayText( final shipmentBox = DisplayText(
text: _box!.fcsShipmentNumber, text: _box!.fcsShipmentNumber,
labelTextKey: "box.fcs_shipment_num", labelTextKey: "box.fcs_shipment_num",