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

Merge branch 'master' of https://git.mokkon.com/tzw/fcs

Browse Source
This commit is contained in:
tzw
2024-02-02 18:02:05 +06:30
parent 891330a59e accacccfed
commit e44bcb889b
6 changed files with 206 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,27 +164,44 @@ class _CartonInfoState extends State<CartonInfo> {
Widget build(BuildContext context) {
var cartonModel = Provider.of<CartonModel>(context);
final cartonTypeBox = LocalRadioButtons(
readOnly: true,
values: cartonModel.cartonTypesInfo,
selectedValue: (_box!.isShipmentCarton ?? false)
? carton_from_shipments
: _box!.cartonType);
// final cartonTypeBox = LocalRadioButtons(
// readOnly: true,
// values: cartonModel.cartonTypesInfo,
// selectedValue: (_box!.isShipmentCarton ?? false)
// ? carton_from_shipments
// : _box!.cartonType);
final cartonTypeBox = DisplayText(
text: _box!.cartonNumber,
labelTextKey: "box.number",
//iconData: Ionicons.ios_airplane,
);
final cartonQrBox = DisplayText(
// text: _box!.,
//labelTextKey: "box.number",
iconData: AntDesign.qrcode,
);
final shipmentBox = DisplayText(
text: _box!.fcsShipmentNumber,
labelTextKey: "box.fcs_shipment_num",
iconData: Ionicons.ios_airplane,
// iconData: Ionicons.ios_airplane,
);
final deliveryBox = DisplayText(
text: "Delivery Carton",
labelTextKey: "box.delivery_type",
//icon: FcsIDIcon(),
);
final fcsIDBox = DisplayText(
text: _box!.fcsID == null ? "" : _box!.fcsID,
labelTextKey: "box.fcs.id",
icon: FcsIDIcon(),
//icon: FcsIDIcon(),
);
final customerNameBox = DisplayText(
text: _box!.userName == null ? "" : _box!.userName,
text1: _box!.fcsID == null ? "" : _box!.fcsID,
labelTextKey: "box.name",
iconData: Icons.person,
//iconData: Icons.person,
);
final consigneefcsIDBox = DisplayText(
@@ -195,9 +212,10 @@ class _CartonInfoState extends State<CartonInfo> {
final consigneeNameBox = DisplayText(
text: _box!.userName != null ? _box!.userName : "",
text1: _box!.fcsID != null ? _box!.fcsID : "",
labelTextKey: "processing.consignee.name",
maxLines: 2,
iconData: Icons.person,
//maxLines: 2,
//iconData: Ionicons.document_text_outline,
);
final consigneeBox = Container(
@@ -264,6 +282,11 @@ class _CartonInfoState extends State<CartonInfo> {
SizedBox(child: heightBox, width: 80),
],
);
final packageBox = DisplayText(
text: "203FVH",
labelTextKey: "box.package",
//iconData: AntDesign.CodeSandbox,
);
final cartonSizeBox = DisplayText(
text: _cartonSizeController.text,
@@ -333,30 +356,82 @@ class _CartonInfoState extends State<CartonInfo> {
body: Padding(
padding: const EdgeInsets.all(10.0),
child: ListView(shrinkWrap: true, children: <Widget>[
Center(child: getCartonNumberStatus(context, _box!)),
LocalTitle(textKey: "box.type.title"),
cartonTypeBox,
LocalTitle(textKey: "box.shipment_info"),
shipmentBox,
// Container(child: Row(children: [
// Column(children: [
// LocalTitle(textKey: "box.type.title"),
// Align(
// alignment: Alignment(-0.1,0.1),
// child: getCartonNumberStatus(context, _box!)),
// ],)
// ]),),
Padding(padding: EdgeInsets.only(left: 30),
child:
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [Expanded(child: cartonTypeBox,
flex: 1,
),
Flexible(
child: cartonQrBox,
),
],)),
Padding(padding: EdgeInsets.only(left: 30),
child:
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [Expanded(child: shipmentBox,
flex: 1,
),
Flexible(
child: deliveryBox,
),
],)),
Padding(padding: EdgeInsets.only(left: 30),
child:
Row(
children: [
Flexible(child: customerNameBox,
),
Flexible(
child: consigneeNameBox,
),
Flexible(child:
Column(
children: [
Icon(Ionicons.document_text_outline),
Text("Bill to",style:TextStyle(color:Colors.blue))
]
)),
],)),
//LocalTitle(textKey: "box.shipment_info"),
// shipmentBox,
// isSmallBag ? mixCartonNumberBox : Container(),
isMixBox
? Container()
: isFromPackages
? fcsIDBox
: Container(),
isMixBox
? Container()
: isFromPackages
? customerNameBox
: Container(),
isFromCartons
? Row(
children: [
Flexible(child: consigneeBox),
Flexible(child: shipperBox)
],
)
: Container(),
// isMixBox
// ? Container()
// : isFromPackages
// ? fcsIDBox
// : Container(),
// isMixBox
// ? Container()
// : isFromPackages
// ? customerNameBox
// : Container(),
// isFromCartons
// ? Row(
// children: [
// Flexible(child: consigneeBox),
// Flexible(child: shipperBox)
// ],
// )
// : Container(),
Padding(padding: EdgeInsets.only(left: 30),
child:
packageBox),
isMixBox ? mixTypeBox : Container(),
isMixBox ? LocalTitle(textKey: "box.mix_caton_title") : Container(),
isMixBox
@@ -367,7 +442,7 @@ class _CartonInfoState extends State<CartonInfo> {
packages: _box!.packages,
)
: Container(),
isMixBox ? Container() : LocalTitle(textKey: "box.cargo.type"),
// isMixBox ? Container() : LocalTitle(textKey: "box.cargo.type"),
isMixBox ? Container() : cargoTableBox,
...(isFromPackages || isFromCartons
? [