add fcs shipment in processing,update cargo types for carton

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

View File

@@ -14,8 +14,8 @@ class Package {
String? desc;
String? status;
String? shipmentId;
String? shipmentNumber;
String? fcsShipmentId;
String? fcsShipmentNumber;
String? userID;
String? fcsID;
@@ -54,8 +54,8 @@ class Package {
this.userName,
this.fcsID,
this.phoneNumber,
this.shipmentId,
this.shipmentNumber,
this.fcsShipmentId,
this.fcsShipmentNumber,
this.senderFCSID,
this.senderName,
this.boxNumber,
@@ -111,8 +111,8 @@ class Package {
senderFCSID: map['sender_fcs_id'],
senderName: map['sender_name'] ?? "",
senderPhoneNumber: map['sender_phone_number'] ?? "",
shipmentId: map['shipment_id'],
shipmentNumber: map['shipment_number'],
fcsShipmentId: map['fcs_shipment_id'],
fcsShipmentNumber: map['fcs_shipment_number'],
deliveryAddress: da,
currentStatusDate: currentStatusDate?.toDate().toLocal(),
photoUrls: photoUrls,
@@ -120,12 +120,21 @@ class Package {
cartonIds: cartonIds);
}
Map<String, dynamic> toJson() => {
Map<String, dynamic> toJsonForReceiving() => {
'id': id,
'tracking_id': trackingID,
'market': market,
'fcs_id': fcsID,
"remark": remark,
"photo_urls": photoUrls
};
Map<String, dynamic> toJsonForProcessing() => {
'id': id,
'fcs_id': fcsID,
'sender_fcs_id': senderFCSID,
'fcs_shipment_id' : fcsShipmentId,
'tracking_id': trackingID,
'market': market,
"desc": desc,
"remark": remark,
"photo_urls": photoUrls
@@ -158,7 +167,7 @@ class Package {
package.desc != desc ||
package.remark != remark ||
package.photoUrls != photoUrls ||
package.shipmentId != shipmentId;
package.fcsShipmentId != fcsShipmentId;
}
@override