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

update carton form ,info and filter

Browse Source
This commit is contained in:
tzw
2024-10-01 18:15:53 +06:30
parent 02e079c514
commit 41fdc3ef43
13 changed files with 123 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/pages/carton/model/carton_model.dart
View File

@@ -117,13 +117,15 @@ class CartonModel extends BaseModel {
Query pageQuery = FirebaseFirestore.instance.collection(path);
if (filterByConsingee != null) {
col = col.where("user_id", isEqualTo: filterByConsingee!.id);
pageQuery = pageQuery.where("user_id", isEqualTo: filterByConsingee!.id);
col = col.where("consignee_user_id", isEqualTo: filterByConsingee!.id);
pageQuery = pageQuery.where("consignee_user_id",
isEqualTo: filterByConsingee!.id);
}
if (filterBySender != null) {
col = col.where("sender_id", isEqualTo: filterBySender!.id);
pageQuery = pageQuery.where("sender_id", isEqualTo: filterBySender!.id);
col = col.where("sender_user_id", isEqualTo: filterBySender!.id);
pageQuery =
pageQuery.where("sender_user_id", isEqualTo: filterBySender!.id);
}
if (filterByStatus != null) {
@@ -208,7 +210,7 @@ class CartonModel extends BaseModel {
}
Future<Carton> createMixCarton(Carton carton) {
return Services.instance.cartonService.createCarton(carton);
return Services.instance.cartonService.createMixCarton(carton);
}
Future<void> updateMixCarton(Carton carton) {

4
lib/pages/carton/model/consignee_selection_model.dart
View File

@@ -91,8 +91,8 @@ class ConsigneeSelectionModel extends BaseModel {
Query query = FirebaseFirestore.instance
.collection(path)
.where("is_sys_admin", isEqualTo: false)
.where("is_deleted", isEqualTo: false)
.orderBy("message_time", descending: true);
.where("delete_time", isEqualTo: 0)
.orderBy("update_time", descending: true);
if (_lastDocument != null) {
query = query.startAfterDocument(_lastDocument!);

4
lib/pages/carton/model/sender_selection_model.dart
View File

@@ -93,8 +93,8 @@ class SenderSelectionModel extends BaseModel {
Query query = FirebaseFirestore.instance
.collection(path)
.where("is_sys_admin", isEqualTo: false)
.where("is_deleted", isEqualTo: false)
.orderBy("message_time", descending: true);
.where("delete_time", isEqualTo: 0)
.orderBy("update_time", descending: true);
if (_lastDocument != null) {
query = query.startAfterDocument(_lastDocument!);