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

add fcs shipment in processing,update cargo types for carton

Browse Source
This commit is contained in:
tzw
2025-03-21 18:19:52 +06:30
parent e208734dfa
commit 3bfbca35fc
34 changed files with 1227 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/pages/package/model/package_model.dart
View File

@@ -276,11 +276,6 @@ class PackageModel extends BaseModel {
return pkgs.where((e) => seen.add(e)).toList();
}
Future<void> createPackages(User user, List<Package> packages) {
return Services.instance.packageService
.createPackages(packages, user.fcsID!);
}
Future<void> createReceiving(
User? user, Package package, List<File?>? files) async {
if (user != null) {
@@ -364,14 +359,15 @@ class PackageModel extends BaseModel {
var count =
(package.photoUrls.length) + files.length - (deletedUrls.length);
if (count > uploadPhotoLimit)
if (count > uploadPhotoLimit) {
throw Exception("Exceed number of file upload");
}
package.photoUrls = package.photoUrls;
String path = Path.join(pkg_files_path);
uploadedURL = await uploadFiles(path, files);
uploadedURL.forEach((url) {
for (var url in uploadedURL) {
package.photoUrls.add(url);
});
}
package.photoUrls.removeWhere((e) => deletedUrls.contains(e));
}
try {

26
lib/pages/package/package_info.dart
View File

@@ -70,10 +70,10 @@ class _PackageInfoState extends State<PackageInfo> {
}
_loadShipment() async {
if (widget.package.shipmentId == null) return;
if (widget.package.fcsShipmentId == null) return;
var s = await context
.read<FcsShipmentModel>()
.getFcsShipment(widget.package.shipmentId!);
.getFcsShipment(widget.package.fcsShipmentId!);
_shipment = s;
if (mounted) {
setState(() {});
@@ -178,17 +178,17 @@ class _PackageInfoState extends State<PackageInfo> {
iconData: Ionicons.ios_airplane,
),
),
Flexible(
child: DisplayText(
text: _shipment != null
? _shipment!.processingDate != null
? dateFormatter.format(_shipment!.processingDate!)
: ""
: "",
labelTextKey: "package.processing.date",
iconData: Icons.date_range,
),
),
// Flexible(
// child: DisplayText(
// text: _shipment != null
// ? _shipment!.processingDate != null
// ? dateFormatter.format(_shipment!.processingDate!)
// : ""
// : "",
// labelTextKey: "package.processing.date",
// iconData: Icons.date_range,
// ),
// ),
],
),
Row(

208
lib/pages/package/package_new.dart
View File

@@ -1,208 +0,0 @@
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/entities/user.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/package/tracking_id_page.dart';
import 'package:fcs/pages/user_search/user_search.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/fcs_id_icon.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'model/package_model.dart';
typedef void FindCallBack();
class PackageNew extends StatefulWidget {
const PackageNew();
@override
_PackageNewState createState() => _PackageNewState();
}
class _PackageNewState extends State<PackageNew> {
bool _isLoading = false;
User? user;
List<Package> packages = [];
@override
void initState() {
super.initState();
}
@override
Widget build(BuildContext context) {
var fcsIDBox = Row(
children: <Widget>[
Expanded(
child: DisplayText(
text: user != null ? user!.fcsID : "",
labelTextKey: "package.create.fcs.id",
icon: FcsIDIcon(),
)),
IconButton(
icon: Icon(Icons.search, color: primaryColor),
onPressed: () => searchUser(context, onUserSelect: (u) {
setState(() {
this.user = u;
});
})),
],
);
final namebox = DisplayText(
text: user != null ? user!.name : "",
labelTextKey: "package.create.name",
iconData: Icons.person,
);
final phoneNumberBox = DisplayText(
text: user != null ? user!.phoneNumber : "",
labelTextKey: "package.create.phone",
iconData: Icons.phone,
);
final createButton = fcsButton(
context,
getLocalString(context, 'package.create.packages'),
callack: _create,
);
final packageList = Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: new List.generate(
this.packages.length, (index) => _packageItem(context, index))
.toList(),
);
return LocalProgress(
inAsyncCall: _isLoading,
child: Scaffold(
appBar: AppBar(
centerTitle: true,
leading: new IconButton(
icon: new Icon(CupertinoIcons.back, color: primaryColor, size: 30),
onPressed: () => Navigator.of(context).pop(),
),
shadowColor: Colors.transparent,
backgroundColor: Colors.white,
title: LocalText(
context,
"package.create.title",
fontSize: 20,
color: primaryColor,
),
),
body: Padding(
padding: const EdgeInsets.only(left: 12.0, right: 12),
child: ListView(
children: <Widget>[
fcsIDBox,
phoneNumberBox,
namebox,
Divider(),
Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Text("Packages (${packages.length})"),
SizedBox(
width: 30,
),
IconButton(
icon: Icon(
Icons.add,
color: primaryColor,
),
onPressed: _addPackage,
)
],
)),
packageList,
Divider(),
SizedBox(
height: 20,
),
createButton,
SizedBox(
height: 10,
),
],
),
),
));
}
Widget _packageItem(BuildContext context, int index) {
return Padding(
padding: const EdgeInsets.only(bottom: 8.0, left: 15),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(packages[index].market!),
Text(packages[index].trackingID!),
// DisplayText(
// labelText: "Tracking ID",
// text: packages[index].trackingID,
// ),
],
),
),
IconButton(
icon: Icon(
Icons.remove,
color: primaryColor,
),
onPressed: () {
setState(() {
packages.removeAt(index);
});
},
)
],
),
);
}
_addPackage() async {
Package? package = await Navigator.push<Package>(
context,
CupertinoPageRoute(builder: (context) => TrackingIDPage()),
);
if (package != null) {
if (packages.any((e) => e.trackingID == package.trackingID)) {
showMsgDialog(context, "Error", "Already scanned!");
return;
}
setState(() {
packages.add(package);
});
}
}
_create() async {
if (user == null || packages.length == 0) {
showMsgDialog(context, "Error", "Invalid user!");
return;
}
setState(() {
_isLoading = true;
});
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);
try {
await packageModel.createPackages(user!, packages);
Navigator.pop(context);
} catch (e) {
showMsgDialog(context, "Error", e.toString());
} finally {
setState(() {
_isLoading = false;
});
}
}
}