songqq/contract-manager
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

refactor(vendor): 重构供应商相关类命名和包结构

Browse Source 
将CompanyVendor前缀的类重命名为Vendor前缀，优化包结构
调整供应商相关控制器、服务、仓库类的命名和位置
修复TableViewUtils中的类型安全警告
更新FXML文件中的控制器引用路径
This commit is contained in:
宋其青
2025-09-23 23:37:44 +08:00
parent 9c3306eea3
commit 9561ad99e6
124 changed files with 613 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/main/java/com/ecep/contract/controller/HomeWindowController.java
View File

@@ -6,6 +6,9 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import com.ecep.contract.controller.cloud.rk.CloudRkManagerWindowController;
import com.ecep.contract.controller.cloud.tyc.CloudTycManagerWindowController;
import com.ecep.contract.controller.cloud.u8.YongYouU8ManagerWindowController;
import org.controlsfx.control.TaskProgressView;
import org.controlsfx.glyphfont.Glyph;
import org.slf4j.Logger;
@@ -29,7 +32,7 @@ import com.ecep.contract.controller.inventory.InventoryManagerWindowController;
import com.ecep.contract.controller.permission.EmployeeFunctionsManagerWindowController;
import com.ecep.contract.controller.permission.EmployeeRoleManagerWindowController;
import com.ecep.contract.controller.project.ProjectManagerWindowController;
import com.ecep.contract.controller.vendor.CompanyVendorManagerWindowController;
import com.ecep.contract.controller.vendor.VendorManagerWindowController;
import com.ecep.contract.service.CloudRkService;
import com.ecep.contract.service.YongYouU8Service;
import com.ecep.contract.task.ContractSyncTask;
@@ -79,7 +82,7 @@ public class HomeWindowController extends BaseController {
openCompanyManagerWindow.setOnAction(event -> showInOwner(CompanyManagerWindowController.class));
openProjectManagerWindow.setOnAction(event -> showInOwner(ProjectManagerWindowController.class));
openContractManagerWindow.setOnAction(event -> showInOwner(ContractManagerWindowController.class));
openVendorManagerWindow.setOnAction(event -> showInOwner(CompanyVendorManagerWindowController.class));
openVendorManagerWindow.setOnAction(event -> showInOwner(VendorManagerWindowController.class));
openCustomManagerWindow.setOnAction(event -> showInOwner(CompanyCustomerManagerWindowController.class));
}

3
client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerSkin.java
View File

@@ -1,6 +1,7 @@
package com.ecep.contract.controller;
package com.ecep.contract.controller.cloud.rk;
import com.ecep.contract.SpringApp;
import com.ecep.contract.controller.AbstEntityManagerSkin;
import com.ecep.contract.controller.company.CompanyWindowController;
import com.ecep.contract.controller.table.cell.CompanyTableCell;
import com.ecep.contract.controller.table.cell.LocalDateTimeTableCell;

3
client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerWindowController.java
View File

@@ -1,9 +1,10 @@
package com.ecep.contract.controller;
package com.ecep.contract.controller.cloud.rk;
import java.time.LocalDateTime;
import java.util.concurrent.ScheduledExecutorService;
import java.util.function.Consumer;
import com.ecep.contract.controller.AbstManagerWindowController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

3
client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerSkin.java
View File

@@ -1,6 +1,7 @@
package com.ecep.contract.controller;
package com.ecep.contract.controller.cloud.tyc;
import com.ecep.contract.SpringApp;
import com.ecep.contract.controller.AbstEntityManagerSkin;
import com.ecep.contract.controller.company.CompanyWindowController;
import com.ecep.contract.controller.table.cell.CompanyTableCell;
import com.ecep.contract.controller.table.cell.LocalDateTimeTableCell;

3
client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerWindowController.java
View File

@@ -1,7 +1,8 @@
package com.ecep.contract.controller;
package com.ecep.contract.controller.cloud.tyc;
import java.time.LocalDateTime;
import com.ecep.contract.controller.AbstManagerWindowController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.context.annotation.Scope;

3
client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ConfigWindowController.java
View File

@@ -1,5 +1,6 @@
package com.ecep.contract.controller;
package com.ecep.contract.controller.cloud.u8;
import com.ecep.contract.controller.BaseController;
import org.controlsfx.control.ToggleSwitch;
import org.springframework.context.annotation.Lazy;
import org.springframework.context.annotation.Scope;

6
client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerSkin.java
View File

@@ -1,12 +1,12 @@
package com.ecep.contract.controller;
package com.ecep.contract.controller.cloud.u8;
import com.ecep.contract.controller.AbstEntityManagerSkin;
import com.ecep.contract.controller.ManagerSkin;
import com.ecep.contract.controller.company.CompanyWindowController;
import com.ecep.contract.controller.table.cell.CompanyTableCell;
import com.ecep.contract.controller.table.cell.LocalDateTimeTableCell;
import com.ecep.contract.model.Company;
import com.ecep.contract.service.CompanyService;
import com.ecep.contract.service.YongYouU8Service;
import com.ecep.contract.util.ProxyUtils;
import com.ecep.contract.vm.CloudYuInfoViewModel;
import com.ecep.contract.vo.CloudYuVo;
import com.ecep.contract.vo.CompanyVo;

9
client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerWindowController.java
View File

@@ -1,7 +1,10 @@
package com.ecep.contract.controller;
package com.ecep.contract.controller.cloud.u8;
import java.time.LocalDateTime;
import com.ecep.contract.controller.AbstManagerWindowController;
import com.ecep.contract.controller.BaseController;
import com.ecep.contract.task.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Lazy;
@@ -10,10 +13,6 @@ import org.springframework.stereotype.Component;
import com.ecep.contract.Desktop;
import com.ecep.contract.service.YongYouU8Service;
import com.ecep.contract.task.ContractSyncTask;
import com.ecep.contract.task.CustomerSyncTask;
import com.ecep.contract.task.EmployeesSyncTask;
import com.ecep.contract.task.VendorSyncTask;
import com.ecep.contract.util.FxmlPath;
import com.ecep.contract.util.UITools;
import com.ecep.contract.vm.CloudYuInfoViewModel;

14
client/src/main/java/com/ecep/contract/controller/company/CompanyWindowController.java
View File

@@ -25,17 +25,17 @@ import com.ecep.contract.controller.tab.CompanyTabSkinInvoice;
import com.ecep.contract.controller.tab.CompanyTabSkinOldName;
import com.ecep.contract.controller.tab.CompanyTabSkinOther;
import com.ecep.contract.controller.tab.CompanyTabSkinPurchaseBillVoucher;
import com.ecep.contract.controller.vendor.CompanyVendorWindowController;
import com.ecep.contract.controller.vendor.VendorWindowController;
import com.ecep.contract.service.CompanyCustomerService;
import com.ecep.contract.service.CompanyService;
import com.ecep.contract.service.CompanyVendorService;
import com.ecep.contract.service.VendorService;
import com.ecep.contract.task.CompanyCompositeUpdateTasker;
import com.ecep.contract.task.CompanyVerifyTasker;
import com.ecep.contract.util.FxmlPath;
import com.ecep.contract.util.UITools;
import com.ecep.contract.vm.CompanyViewModel;
import com.ecep.contract.vo.CompanyCustomerVo;
import com.ecep.contract.vo.CompanyVendorVo;
import com.ecep.contract.vo.VendorVo;
import com.ecep.contract.vo.CompanyVo;
import javafx.beans.property.SimpleObjectProperty;
@@ -78,7 +78,7 @@ public class CompanyWindowController
@Autowired
private CompanyCustomerService companyCustomerService;
@Autowired
private CompanyVendorService companyVendorService;
private VendorService vendorService;
public BorderPane root;
public TabPane tabPane;
@@ -129,7 +129,7 @@ public class CompanyWindowController
// CompanyVendorViewModel();
private final SimpleObjectProperty<CompanyCustomerVo> companyCustomerProperty = new SimpleObjectProperty<>();
private final SimpleObjectProperty<CompanyVendorVo> companyVendorProperty = new SimpleObjectProperty<>();
private final SimpleObjectProperty<VendorVo> companyVendorProperty = new SimpleObjectProperty<>();
public Pane customerTab_pane1;
public Button customerTab_openBtn;
@@ -230,7 +230,7 @@ public class CompanyWindowController
});
vendorTab_openBtn.setOnAction(event -> {
CompanyVendorWindowController.show(companyVendorProperty.get(), root.getScene().getWindow());
VendorWindowController.show(companyVendorProperty.get(), root.getScene().getWindow());
});
}
@@ -242,7 +242,7 @@ public class CompanyWindowController
if (logger.isDebugEnabled()) {
logger.debug("onVendorTabShown company {}", company.getName());
}
companyVendorProperty.set(companyVendorService.findByCompany(company));
companyVendorProperty.set(vendorService.findByCompany(company));
}).exceptionally(ex -> {
UITools.showExceptionAndWait(ex.getMessage(), ex);
return null;

2
client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountBaseTabSkin.java
View File

@@ -1,4 +1,4 @@
package com.ecep.contract.controller.bank.account;
package com.ecep.contract.controller.company.bank_account;
import com.ecep.contract.controller.company.CompanyWindowController;
import com.ecep.contract.controller.tab.AbstEntityBasedTabSkin;

3
client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountWindowController.java
View File

@@ -1,4 +1,4 @@
package com.ecep.contract.controller.bank.account;
package com.ecep.contract.controller.company.bank_account;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
@@ -6,7 +6,6 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import com.ecep.contract.controller.AbstEntityController;
import com.ecep.contract.model.CompanyBankAccount;
import com.ecep.contract.service.CompanyBankAccountService;
import com.ecep.contract.util.FxmlPath;
import com.ecep.contract.vm.CompanyBankAccountViewModel;

2
client/src/main/java/com/ecep/contract/controller/company/old_name/CompanyOldNameTabSkinBase.java
View File

@@ -1,4 +1,4 @@
package com.ecep.contract.controller.company_old_name;
package com.ecep.contract.controller.company.old_name;
import java.time.format.DateTimeFormatter;

5
client/src/main/java/com/ecep/contract/controller/company/old_name/CompanyOldNameTabSkinFile.java
View File

@@ -1,9 +1,7 @@
package com.ecep.contract.controller.company_old_name;
package com.ecep.contract.controller.company.old_name;
import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import org.springframework.util.StringUtils;
@@ -12,7 +10,6 @@ import com.ecep.contract.CompanyFileType;
import com.ecep.contract.DesktopUtils;
import com.ecep.contract.controller.tab.TabSkin;
import com.ecep.contract.controller.table.AbstEntityTableTabSkin;
import com.ecep.contract.model.CompanyOldName;
import com.ecep.contract.service.CompanyFileService;
import com.ecep.contract.service.CompanyOldNameService;
import com.ecep.contract.util.ParamUtils;

2
client/src/main/java/com/ecep/contract/controller/company/old_name/CompanyOldNameWindowController.java
View File

@@ -1,4 +1,4 @@
package com.ecep.contract.controller.company_old_name;
package com.ecep.contract.controller.company.old_name;
import java.io.File;
import java.util.concurrent.CompletableFuture;

6
client/src/main/java/com/ecep/contract/controller/contract/ContractTabSkinExtendVendorInfo.java
View File

@@ -1,11 +1,8 @@
package com.ecep.contract.controller.contract;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import com.ecep.contract.SpringApp;
import com.ecep.contract.controller.ComboBoxUtils;
import com.ecep.contract.model.VendorGroup;
import com.ecep.contract.util.ComboBoxUtils;
import com.ecep.contract.service.ExtendVendorInfoService;
import com.ecep.contract.service.VendorGroupService;
import com.ecep.contract.util.FxmlPath;
@@ -25,7 +22,6 @@ import javafx.scene.control.Label;
import javafx.scene.control.Tab;
import javafx.scene.control.TextField;
import javafx.util.converter.NumberStringConverter;
import lombok.Setter;
@FxmlPath("/ui/contract/contract-tab-ext-vendor-info.fxml")
public class ContractTabSkinExtendVendorInfo extends AbstContractBasedTabSkin {

2
client/src/main/java/com/ecep/contract/controller/project/ProjectManagerSkin.java
View File

@@ -2,7 +2,7 @@ package com.ecep.contract.controller.project;
import com.ecep.contract.controller.AbstEntityManagerSkin;
import com.ecep.contract.controller.BaseController;
import com.ecep.contract.controller.ComboBoxUtils;
import com.ecep.contract.util.ComboBoxUtils;
import com.ecep.contract.controller.ManagerSkin;
import com.ecep.contract.controller.table.cell.CompanyTableCell;
import com.ecep.contract.controller.table.cell.ProductTypeTableCell;

5
client/src/main/java/com/ecep/contract/controller/project/ProjectTabSkinBase.java
View File

@@ -6,10 +6,9 @@ import java.util.stream.Stream;
import org.springframework.util.StringUtils;
import com.ecep.contract.controller.ComboBoxUtils;
import com.ecep.contract.util.ComboBoxUtils;
import com.ecep.contract.controller.tab.TabSkin;
import com.ecep.contract.converter.EmployeeStringConverter;
import com.ecep.contract.converter.EntityStringConverter;
import com.ecep.contract.service.DeliverySignMethodService;
import com.ecep.contract.service.EmployeeService;
import com.ecep.contract.service.ProductTypeService;
@@ -29,11 +28,9 @@ import com.ecep.contract.vo.ProjectTypeVo;
import com.ecep.contract.vo.ProjectVo;
import javafx.beans.binding.Bindings;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.collections.transformation.FilteredList;
import javafx.event.ActionEvent;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Tab;
import javafx.util.converter.LocalDateStringConverter;
import javafx.util.converter.NumberStringConverter;

3
client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinBankAccount.java
View File

@@ -1,11 +1,10 @@
package com.ecep.contract.controller.tab;
import com.ecep.contract.controller.bank.account.BankAccountWindowController;
import com.ecep.contract.controller.company.bank_account.BankAccountWindowController;
import com.ecep.contract.controller.company.AbstCompanyTableTabSkin;
import com.ecep.contract.controller.company.CompanyWindowController;
import com.ecep.contract.controller.table.EditableEntityTableTabSkin;
import com.ecep.contract.controller.table.cell.BankTableCell;
import com.ecep.contract.model.Bank;
import com.ecep.contract.service.BankService;
import com.ecep.contract.service.CompanyBankAccountService;
import com.ecep.contract.util.FxmlPath;

10
client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinContract.java
View File

@@ -6,7 +6,7 @@ import java.time.LocalDateTime;
import java.util.NoSuchElementException;
import java.util.concurrent.CompletableFuture;
import com.ecep.contract.controller.ComboBoxUtils;
import com.ecep.contract.util.ComboBoxUtils;
import org.springframework.util.StringUtils;
import com.ecep.contract.DesktopUtils;
@@ -19,12 +19,6 @@ import com.ecep.contract.controller.table.cell.ContractKindTableCell;
import com.ecep.contract.controller.table.cell.ContractTypeTableCell;
import com.ecep.contract.controller.table.cell.EmployeeTableCell;
import com.ecep.contract.controller.table.cell.LocalDateTimeTableCell;
import com.ecep.contract.converter.ContractGroupStringConverter;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.ContractGroup;
import com.ecep.contract.model.ContractKind;
import com.ecep.contract.model.ContractType;
import com.ecep.contract.model.Employee;
import com.ecep.contract.service.ContractGroupService;
import com.ecep.contract.service.ContractKindService;
import com.ecep.contract.service.ContractService;
@@ -38,8 +32,6 @@ import com.ecep.contract.vo.CompanyVo;
import com.ecep.contract.vo.ContractGroupVo;
import com.ecep.contract.vo.ContractVo;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.event.ActionEvent;
import javafx.scene.control.Button;
import javafx.scene.control.ComboBox;

4
client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinOldName.java
View File

@@ -14,9 +14,7 @@ import org.springframework.util.StringUtils;
import com.ecep.contract.controller.company.AbstCompanyTableTabSkin;
import com.ecep.contract.controller.company.CompanyWindowController;
import com.ecep.contract.controller.company_old_name.CompanyOldNameWindowController;
import com.ecep.contract.model.Company;
import com.ecep.contract.model.CompanyOldName;
import com.ecep.contract.controller.company.old_name.CompanyOldNameWindowController;
import com.ecep.contract.service.CompanyOldNameService;
import com.ecep.contract.util.FxmlPath;
import com.ecep.contract.vm.CompanyOldNameViewModel;

2
client/src/main/java/com/ecep/contract/controller/tab/ContractManagerSkin.java
View File

@@ -5,7 +5,7 @@ import java.time.format.DateTimeFormatter;
import com.ecep.contract.ContractPayWay;
import com.ecep.contract.MyDateTimeUtils;
import com.ecep.contract.controller.AbstEntityManagerSkin;
import com.ecep.contract.controller.ComboBoxUtils;
import com.ecep.contract.util.ComboBoxUtils;
import com.ecep.contract.controller.ManagerSkin;
import com.ecep.contract.controller.contract.ContractManagerWindowController;
import com.ecep.contract.controller.contract.ContractWindowController;

26
client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinBase.java
View File

@@ -8,6 +8,7 @@ import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.Optional;
import com.ecep.contract.service.*;
import org.controlsfx.control.textfield.TextFields;
import org.controlsfx.glyphfont.Glyph;
import org.springframework.util.StringUtils;
@@ -18,24 +19,12 @@ import com.ecep.contract.controller.contract.AbstContractBasedTabSkin;
import com.ecep.contract.controller.contract.ContractWindowController;
import com.ecep.contract.controller.customer.CompanyCustomerWindowController;
import com.ecep.contract.controller.project.ProjectWindowController;
import com.ecep.contract.controller.vendor.CompanyVendorWindowController;
import com.ecep.contract.converter.CompanyStringConverter;
import com.ecep.contract.controller.vendor.VendorWindowController;
import com.ecep.contract.converter.ContractStringConverter;
import com.ecep.contract.converter.ProjectStringConverter;
import com.ecep.contract.model.Project;
import com.ecep.contract.service.CompanyCustomerService;
import com.ecep.contract.service.CompanyVendorService;
import com.ecep.contract.service.ContractGroupService;
import com.ecep.contract.service.ContractKindService;
import com.ecep.contract.service.ContractService;
import com.ecep.contract.service.ContractTypeService;
import com.ecep.contract.service.ExtendVendorInfoService;
import com.ecep.contract.service.ProjectSaleTypeService;
import com.ecep.contract.service.ProjectService;
import com.ecep.contract.service.VendorGroupService;
import com.ecep.contract.service.VendorService;
import com.ecep.contract.util.UITools;
import com.ecep.contract.vo.CompanyCustomerVo;
import com.ecep.contract.vo.CompanyVendorVo;
import com.ecep.contract.vo.VendorVo;
import com.ecep.contract.vo.CompanyVo;
import com.ecep.contract.vo.ContractTypeVo;
import com.ecep.contract.vo.ContractVo;
@@ -49,7 +38,6 @@ import javafx.scene.control.Tab;
import javafx.scene.control.TextField;
import javafx.scene.control.TextInputDialog;
import javafx.stage.DirectoryChooser;
import javafx.util.StringConverter;
import javafx.util.converter.LocalDateStringConverter;
import javafx.util.converter.NumberStringConverter;
@@ -464,9 +452,9 @@ public class ContractTabSkinBase extends AbstContractBasedTabSkin {
public void onContractOpenRelativeCompanyVendorAction(ActionEvent event) {
ContractVo contract = getEntity();
CompanyVo company = controller.getCompanyService().findById(contract.getCompanyId());
CompanyVendorService service = SpringApp.getBean(CompanyVendorService.class);
CompanyVendorVo companyVendor = service.findByCompany(company);
CompanyVendorWindowController.show(companyVendor, null);
VendorService service = SpringApp.getBean(VendorService.class);
VendorVo companyVendor = service.findByCompany(company);
VendorWindowController.show(companyVendor, null);
}
private void initializeBaseTabCompanyFieldAutoCompletion(TextField textField) {

3
client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinPurchaseOrders.java
View File

@@ -6,13 +6,12 @@ import com.ecep.contract.ContractPayWay;
import com.ecep.contract.util.FxmlPath;
import com.ecep.contract.controller.contract.AbstContractTableTabSkin;
import com.ecep.contract.controller.contract.ContractWindowController;
import com.ecep.contract.controller.vendor.PurchaseOrderWindowController;
import com.ecep.contract.controller.vendor.purchase.order.PurchaseOrderWindowController;
import com.ecep.contract.converter.EmployeeStringConverter;
import com.ecep.contract.service.CompanyService;
import com.ecep.contract.service.PurchaseOrdersService;
import com.ecep.contract.vm.PurchaseOrderViewModel;
import com.ecep.contract.vo.PurchaseOrderVo;
import com.ecep.contract.model.PurchaseOrder;
import com.ecep.contract.controller.table.cell.CompanyTableCell;
import com.ecep.contract.controller.table.cell.LocalDateTimeTableCell;

7
client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinVendorBid.java
View File

@@ -11,14 +11,10 @@ import com.ecep.contract.controller.contract.ContractWindowController;
import com.ecep.contract.controller.table.EditableEntityTableTabSkin;
import com.ecep.contract.controller.table.cell.CompanyTableCell;
import com.ecep.contract.controller.table.cell.ContractFileTableCell;
import com.ecep.contract.controller.vendor.VendorBidWindowController;
import com.ecep.contract.model.ContractBidVendor;
import com.ecep.contract.model.ContractFile;
import com.ecep.contract.controller.vendor.bid.VendorBidWindowController;
import com.ecep.contract.service.CompanyService;
import com.ecep.contract.service.ContractBidVendorService;
import com.ecep.contract.service.ContractFileService;
import com.ecep.contract.util.FxmlPath;
import com.ecep.contract.util.ProxyUtils;
import com.ecep.contract.vm.CompanyViewModel;
import com.ecep.contract.vm.ContractBidVendorViewModel;
import com.ecep.contract.vo.CompanyVo;
@@ -32,7 +28,6 @@ import javafx.scene.control.ChoiceDialog;
import javafx.scene.control.ComboBox;
import javafx.scene.control.MenuItem;
import javafx.scene.control.Tab;
import javafx.scene.control.TableCell;
import javafx.scene.control.TableColumn;
import javafx.util.StringConverter;
import lombok.Setter;

15
client/src/main/java/com/ecep/contract/controller/tab/ContractUpdater.java
View File

@@ -3,18 +3,11 @@ package com.ecep.contract.controller.tab;
import java.util.Map;
import java.util.logging.Level;
import com.ecep.contract.service.*;
import org.springframework.beans.BeansException;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.service.CompanyCustomerService;
import com.ecep.contract.service.CompanyService;
import com.ecep.contract.service.CompanyVendorService;
import com.ecep.contract.service.ContractGroupService;
import com.ecep.contract.service.ContractKindService;
import com.ecep.contract.service.ContractService;
import com.ecep.contract.service.ContractTypeService;
import com.ecep.contract.service.EmployeeService;
import com.ecep.contract.service.YongYouU8Service;
import com.ecep.contract.service.VendorService;
import com.ecep.contract.util.BeanCacher;
import com.ecep.contract.vo.ContractGroupVo;
import com.ecep.contract.vo.ContractKindVo;
@@ -153,8 +146,8 @@ public class ContractUpdater implements MessageHolder {
return getEmployeeService().findByName(personName);
}
private CompanyVendorService getVendorService() {
return getBean(CompanyVendorService.class);
private VendorService getVendorService() {
return getBean(VendorService.class);
}
private CompanyCustomerService getCustomerService() {

5
client/src/main/java/com/ecep/contract/controller/tab/VendorBidTabSkinBase.java
View File

@@ -8,10 +8,8 @@ import java.util.Map;
import org.springframework.data.domain.Pageable;
import com.ecep.contract.MyDateTimeUtils;
import com.ecep.contract.SpringApp;
import com.ecep.contract.controller.company.CompanyWindowController;
import com.ecep.contract.controller.vendor.VendorBidWindowController;
import com.ecep.contract.converter.CompanyStringConverter;
import com.ecep.contract.controller.vendor.bid.VendorBidWindowController;
import com.ecep.contract.converter.EntityStringConverter;
import com.ecep.contract.service.CompanyService;
import com.ecep.contract.service.ContractFileService;
@@ -33,7 +31,6 @@ import javafx.beans.property.SimpleObjectProperty;
import javafx.scene.control.Tab;
import javafx.scene.control.TextField;
import javafx.util.converter.LocalDateStringConverter;
import lombok.Setter;
public class VendorBidTabSkinBase
extends AbstEntityBasedTabSkin<VendorBidWindowController, ContractBidVendorVo, ContractBidVendorViewModel>

24
client/src/main/java/com/ecep/contract/controller/table/cell/CompanyVendorTableCell.java
View File

@@ -2,9 +2,9 @@ package com.ecep.contract.controller.table.cell;
import com.ecep.contract.SpringApp;
import com.ecep.contract.service.CompanyService;
import com.ecep.contract.service.CompanyVendorService;
import com.ecep.contract.service.VendorService;
import com.ecep.contract.service.IEntityService;
import com.ecep.contract.vo.CompanyVendorVo;
import com.ecep.contract.vo.VendorVo;
import com.ecep.contract.vo.CompanyVo;
import javafx.scene.control.TableCell;
@@ -14,13 +14,13 @@ import lombok.NoArgsConstructor;
import lombok.Setter;
@NoArgsConstructor
public class CompanyVendorTableCell<T> extends AsyncUpdateTableCell<T, Integer, CompanyVendorVo> {
public class CompanyVendorTableCell<T> extends AsyncUpdateTableCell<T, Integer, VendorVo> {
public static <S> Callback<TableColumn<S, Integer>, TableCell<S, Integer>> forTableColumn() {
return forTableColumn(SpringApp.getBean(CompanyVendorService.class));
return forTableColumn(SpringApp.getBean(VendorService.class));
}
public static <S> Callback<TableColumn<S, Integer>, TableCell<S, Integer>> forTableColumn(
CompanyVendorService sevice) {
VendorService sevice) {
CompanyService companyService = SpringApp.getBean(CompanyService.class);
return param -> new CompanyVendorTableCell<S>(sevice, companyService);
}
@@ -28,14 +28,14 @@ public class CompanyVendorTableCell<T> extends AsyncUpdateTableCell<T, Integer,
@Setter
private CompanyService companyService;
public CompanyVendorTableCell(CompanyVendorService service, CompanyService companyService) {
public CompanyVendorTableCell(VendorService service, CompanyService companyService) {
setService(service);
setCompanyService(companyService);
}
@Override
protected IEntityService<CompanyVendorVo> getServiceBean() {
return SpringApp.getBean(CompanyVendorService.class);
protected IEntityService<VendorVo> getServiceBean() {
return SpringApp.getBean(VendorService.class);
}
protected CompanyService getCompanyService() {
@@ -46,7 +46,7 @@ public class CompanyVendorTableCell<T> extends AsyncUpdateTableCell<T, Integer,
}
@Override
protected boolean isInitialized(CompanyVendorVo proxy) {
protected boolean isInitialized(VendorVo proxy) {
if (!super.isInitialized(proxy)) {
return false;
}
@@ -54,13 +54,13 @@ public class CompanyVendorTableCell<T> extends AsyncUpdateTableCell<T, Integer,
}
@Override
protected CompanyVendorVo initialize() {
CompanyVendorVo vendor = super.initialize();
protected VendorVo initialize() {
VendorVo vendor = super.initialize();
return vendor;
}
@Override
public String format(CompanyVendorVo vendor) {
public String format(VendorVo vendor) {
Integer companyId = vendor.getCompanyId();
CompanyVo company = getCompanyService().findById(companyId);
if (company == null) {

6
client/src/main/java/com/ecep/contract/controller/vendor/AbstVendorTableTabSkin.java vendored
View File

@@ -10,10 +10,10 @@ import com.ecep.contract.vm.CompanyVendorViewModel;
import com.ecep.contract.vm.IdentityViewModel;
import com.ecep.contract.vo.VendorVo;
public abstract class AbstCompanyVendorTableTabSkin<T extends IdentityEntity, TV extends IdentityViewModel<T>>
extends AbstEntityTableTabSkin<CompanyVendorWindowController, VendorVo, CompanyVendorViewModel, T, TV>
public abstract class AbstVendorTableTabSkin<T extends IdentityEntity, TV extends IdentityViewModel<T>>
extends AbstEntityTableTabSkin<VendorWindowController, VendorVo, CompanyVendorViewModel, T, TV>
implements TabSkin {
public AbstCompanyVendorTableTabSkin(CompanyVendorWindowController controller) {
public AbstVendorTableTabSkin(VendorWindowController controller) {
super(controller);
}

10
client/src/main/java/com/ecep/contract/controller/vendor/VendorManagerSkin.java vendored
View File

@@ -2,7 +2,7 @@ package com.ecep.contract.controller.vendor;
import com.ecep.contract.MyDateTimeUtils;
import com.ecep.contract.controller.AbstEntityManagerSkin;
import com.ecep.contract.controller.ComboBoxUtils;
import com.ecep.contract.util.ComboBoxUtils;
import com.ecep.contract.controller.table.cell.CompanyTableCell;
import com.ecep.contract.controller.table.cell.VendorCatalogTableCell;
import com.ecep.contract.controller.table.cell.VendorTypeTableCell;
@@ -16,13 +16,13 @@ import com.ecep.contract.vo.VendorVo;
import javafx.application.Platform;
import lombok.Setter;
public class CompanyVendorManagerSkin
public class VendorManagerSkin
extends
AbstEntityManagerSkin<VendorVo, CompanyVendorViewModel, CompanyVendorManagerSkin, VendorManagerWindowController> {
AbstEntityManagerSkin<VendorVo, CompanyVendorViewModel, VendorManagerSkin, VendorManagerWindowController> {
@Setter
private CompanyService companyService;
public CompanyVendorManagerSkin(VendorManagerWindowController controller) {
public VendorManagerSkin(VendorManagerWindowController controller) {
super(controller);
}
@@ -81,6 +81,6 @@ public class CompanyVendorManagerSkin
}
private void showInOwner(CompanyVendorViewModel model) {
showInOwner(CompanyVendorWindowController.class, model);
showInOwner(VendorWindowController.class, model);
}
}

12
client/src/main/java/com/ecep/contract/controller/vendor/VendorManagerWindowController.java vendored
View File

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.VendorType;
import com.ecep.contract.controller.AbstManagerWindowController;
import com.ecep.contract.controller.vendor.approved_list.CompanyVendorApprovedListManagerWindowController;
import com.ecep.contract.controller.vendor.approved_list.VendorApprovedListManagerWindowController;
import com.ecep.contract.controller.vendor.group.VendorGroupManagerWindowController;
import com.ecep.contract.service.CompanyService;
import com.ecep.contract.task.VendorVerifyAllTasker;
@@ -34,8 +34,8 @@ import javafx.stage.Stage;
@Scope("prototype")
@Component
@FxmlPath("/ui/company/vendor/vendor_manager.fxml")
public class CompanyVendorManagerWindowController
extends AbstManagerWindowController<VendorVo, CompanyVendorViewModel, CompanyVendorManagerSkin> {
public class VendorManagerWindowController
extends AbstManagerWindowController<VendorVo, CompanyVendorViewModel, VendorManagerSkin> {
// columns
public TableColumn<CompanyVendorViewModel, Number> idColumn;
@@ -100,7 +100,7 @@ public class CompanyVendorManagerWindowController
}
public void onOpenApprovedVendorListWindowAction(ActionEvent event) {
show(CompanyVendorApprovedListManagerWindowController.class, null);
show(VendorApprovedListManagerWindowController.class, null);
}
public void onBaseTableRefreshAction(ActionEvent event) {
@@ -112,8 +112,8 @@ public class CompanyVendorManagerWindowController
}
@Override
protected CompanyVendorManagerSkin createDefaultSkin() {
CompanyVendorManagerSkin skin = new CompanyVendorManagerSkin(this);
protected VendorManagerSkin createDefaultSkin() {
VendorManagerSkin skin = new VendorManagerSkin(this);
skin.setCompanyService(companyService);
return skin;
}

8
client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinBase.java vendored
View File

@@ -5,7 +5,7 @@ import java.time.format.DateTimeFormatter;
import com.ecep.contract.MyDateTimeUtils;
import com.ecep.contract.SpringApp;
import com.ecep.contract.VendorType;
import com.ecep.contract.controller.ComboBoxUtils;
import com.ecep.contract.util.ComboBoxUtils;
import com.ecep.contract.controller.company.CompanyWindowController;
import com.ecep.contract.controller.tab.AbstEntityBasedTabSkin;
import com.ecep.contract.service.CompanyContactService;
@@ -26,9 +26,9 @@ import javafx.scene.control.Tab;
import javafx.util.converter.LocalDateStringConverter;
import javafx.util.converter.LocalDateTimeStringConverter;
public class CompanyVendorTabSkinBase
extends AbstEntityBasedTabSkin<CompanyVendorWindowController, VendorVo, CompanyVendorViewModel> {
public CompanyVendorTabSkinBase(CompanyVendorWindowController controller) {
public class VendorTabSkinBase
extends AbstEntityBasedTabSkin<VendorWindowController, VendorVo, CompanyVendorViewModel> {
public VendorTabSkinBase(VendorWindowController controller) {
super(controller);
}

6
client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinEntity.java vendored
View File

@@ -16,8 +16,8 @@ import javafx.scene.control.Tab;
import javafx.scene.control.TableColumn;
@FxmlPath("/ui/company/vendor/vendor-tab-entity.fxml")
public class CompanyVendorTabSkinEntity
extends AbstCompanyVendorTableTabSkin<VendorEntityVo, CompanyVendorEntityViewModel>
public class VendorTabSkinEntity
extends AbstVendorTableTabSkin<VendorEntityVo, CompanyVendorEntityViewModel>
implements TabSkin {
// 关联项 tab
@@ -35,7 +35,7 @@ public class CompanyVendorTabSkinEntity
public MenuItem entityTable_menu_refresh;
public MenuItem entityTable_menu_del;
public CompanyVendorTabSkinEntity(CompanyVendorWindowController controller) {
public VendorTabSkinEntity(VendorWindowController controller) {
super(controller);
}

56
client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinFile.java vendored
View File

@@ -6,8 +6,8 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
import com.ecep.contract.service.VendorFileTypeService;
import com.ecep.contract.vo.CompanyVendorFileVo;
import com.ecep.contract.vo.CompanyVendorVo;
import com.ecep.contract.vo.VendorFileVo;
import com.ecep.contract.vo.VendorVo;
import com.ecep.contract.vo.CompanyVo;
import com.ecep.contract.vo.VendorFileTypeLocalVo;
import org.springframework.util.StringUtils;
@@ -19,7 +19,7 @@ import com.ecep.contract.SpringApp;
import com.ecep.contract.constant.CompanyVendorConstant;
import com.ecep.contract.controller.tab.TabSkin;
import com.ecep.contract.model.BaseEnumEntity;
import com.ecep.contract.service.CompanyVendorFileService;
import com.ecep.contract.service.VendorFileService;
import com.ecep.contract.task.CompanyVendorEvaluationFormUpdateTask;
import com.ecep.contract.util.FxmlPath;
import com.ecep.contract.util.UITools;
@@ -45,7 +45,7 @@ import lombok.Setter;
*/
@FxmlPath("/ui/company/vendor/vendor-tab-file.fxml")
public class VendorTabSkinFile
extends AbstCompanyVendorTableTabSkin<CompanyVendorFileVo, CompanyVendorFileViewModel>
extends AbstVendorTableTabSkin<VendorFileVo, CompanyVendorFileViewModel>
implements TabSkin {
public TableColumn<CompanyVendorFileViewModel, Number> fileTable_idColumn;
@@ -65,9 +65,9 @@ public class VendorTabSkinFile
public Button fileTable_calcNextSignDateBtn;
@Setter
private CompanyVendorFileService companyVendorFileService;
private VendorFileService vendorFileService;
public VendorTabSkinFile(CompanyVendorWindowController controller) {
public VendorTabSkinFile(VendorWindowController controller) {
super(controller);
setDragAndDrop(true);
setDragAndDropFileHandler(this::moveFileToCustomer);
@@ -79,8 +79,8 @@ public class VendorTabSkinFile
}
@Override
protected CompanyVendorFileService getViewModelService() {
return getCompanyVendorFileService();
protected VendorFileService getViewModelService() {
return getVendorFileService();
}
@Override
@@ -127,7 +127,7 @@ public class VendorTabSkinFile
}
private void moveFileToCustomer(List<File> files) {
CompanyVendorVo companyVendor = getParent();
VendorVo companyVendor = getParent();
String path = companyVendor.getPath();
if (!StringUtils.hasText(path)) {
setStatus("未设置目录");
@@ -139,7 +139,7 @@ public class VendorTabSkinFile
return;
}
LocalDate nextSignDate = getCompanyVendorFileService().getNextSignDate(companyVendor, this::setStatus);
LocalDate nextSignDate = getVendorFileService().getNextSignDate(companyVendor, this::setStatus);
if (nextSignDate != null && files.size() == 1) {
File file = files.getFirst();
String fileName = file.getName();
@@ -149,13 +149,13 @@ public class VendorTabSkinFile
+ "." + StringUtils.getFilenameExtension(fileName);
File dest = new File(dir, destFileName);
if (file.renameTo(dest)) {
CompanyVendorFileVo ccf = new CompanyVendorFileVo();
VendorFileVo ccf = new VendorFileVo();
ccf.setVendorId(companyVendor.getId());
ccf.setType(VendorFileType.EvaluationForm);
ccf.setFilePath(dest.getAbsolutePath());
ccf.setSignDate(nextSignDate);
ccf.setValid(true);
CompanyVendorFileVo saved = getCompanyVendorFileService().save(ccf);
VendorFileVo saved = getVendorFileService().save(ccf);
Platform.runLater(() -> {
CompanyVendorFileViewModel model = new CompanyVendorFileViewModel();
model.update(saved);
@@ -169,12 +169,12 @@ public class VendorTabSkinFile
for (File file : files) {
File dest = new File(dir, file.getName());
if (file.renameTo(dest)) {
CompanyVendorFileVo ccf = new CompanyVendorFileVo();
VendorFileVo ccf = new VendorFileVo();
ccf.setVendorId(companyVendor.getId());
ccf.setType(VendorFileType.General);
ccf.setFilePath(dest.getAbsolutePath());
ccf.setValid(false);
CompanyVendorFileVo saved = getCompanyVendorFileService().save(ccf);
VendorFileVo saved = getVendorFileService().save(ccf);
}
}
loadTableDataSet();
@@ -183,7 +183,7 @@ public class VendorTabSkinFile
public void onFileReBuildingAction(ActionEvent event) {
CompletableFuture.runAsync(() -> {
try {
CompanyVendorVo companyVendor = getParent();
VendorVo companyVendor = getParent();
if (getCompanyVendorService().reBuildingFiles(companyVendor, (level, msg) -> setStatus(msg))) {
loadTableDataSet();
}
@@ -194,18 +194,18 @@ public class VendorTabSkinFile
}
@Override
public CompanyVendorFileVo loadRowData(CompanyVendorFileViewModel row) {
return getCompanyVendorFileService().findById(row.getId().get());
public VendorFileVo loadRowData(CompanyVendorFileViewModel row) {
return getVendorFileService().findById(row.getId().get());
}
@Override
public CompanyVendorFileVo saveRowData(CompanyVendorFileVo entity) {
return getCompanyVendorFileService().save(entity);
public VendorFileVo saveRowData(VendorFileVo entity) {
return getVendorFileService().save(entity);
}
@Override
public void deleteRowData(CompanyVendorFileVo entity) {
getCompanyVendorFileService().delete(entity);
public void deleteRowData(VendorFileVo entity) {
getVendorFileService().delete(entity);
}
@Override
@@ -272,7 +272,7 @@ public class VendorTabSkinFile
deleteRow(selectedItem);
// getCompanyVendorService().deleteFileById(selectedItem.getId().get());
// getVendorService().deleteFileById(selectedItem.getId().get());
// dataSet.remove(selectedItem);
}
@@ -285,8 +285,8 @@ public class VendorTabSkinFile
public void onCalcNextSignDateAction(ActionEvent event) {
UITools.showDialogAndWait("计算供应商下一个评价日期", "依据已有的供应商评价表和登记采购的合同计算下一个评价日期", ds -> {
CompanyVendorVo companyVendor = getCompanyVendorService().findById(viewModel.getId().get());
LocalDate nextSignDate = getCompanyVendorFileService().getNextSignDate(companyVendor, msg -> {
VendorVo companyVendor = getCompanyVendorService().findById(viewModel.getId().get());
LocalDate nextSignDate = getVendorFileService().getNextSignDate(companyVendor, msg -> {
Platform.runLater(() -> {
ds.add(msg);
});
@@ -318,11 +318,11 @@ public class VendorTabSkinFile
}
}
public CompanyVendorFileService getCompanyVendorFileService() {
if (companyVendorFileService == null) {
companyVendorFileService = SpringApp.getBean(CompanyVendorFileService.class);
public VendorFileService getVendorFileService() {
if (vendorFileService == null) {
vendorFileService = SpringApp.getBean(VendorFileService.class);
}
return companyVendorFileService;
return vendorFileService;
}
}

10
client/src/main/java/com/ecep/contract/controller/vendor/VendorWindowController.java vendored
View File

@@ -38,14 +38,14 @@ import com.ecep.contract.vo.CompanyVo;
@Scope("prototype")
@Component
@FxmlPath("/ui/company/vendor/vendor.fxml")
public class CompanyVendorWindowController extends AbstEntityController<VendorVo, CompanyVendorViewModel> {
private static final Logger logger = LoggerFactory.getLogger(CompanyVendorWindowController.class);
public class VendorWindowController extends AbstEntityController<VendorVo, CompanyVendorViewModel> {
private static final Logger logger = LoggerFactory.getLogger(VendorWindowController.class);
/**
* 显示界面
*/
public static void show(VendorVo companyVendor, Window window) {
show(CompanyVendorWindowController.class, CompanyVendorViewModel.from(companyVendor), window);
show(VendorWindowController.class, CompanyVendorViewModel.from(companyVendor), window);
}
public BorderPane root;
@@ -85,9 +85,9 @@ public class CompanyVendorWindowController extends AbstEntityController<VendorVo
@Override
protected void registerTabSkins() {
registerTabSkin(baseInfoTab, tab -> new CompanyVendorTabSkinBase(this));
registerTabSkin(baseInfoTab, tab -> new VendorTabSkinBase(this));
registerTabSkin(fileTab, tab -> new VendorTabSkinFile(this));
registerTabSkin(entityTab, tab -> new CompanyVendorTabSkinEntity(this));
registerTabSkin(entityTab, tab -> new VendorTabSkinEntity(this));
}
@Override

10
client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListManagerSkin.java vendored
View File

@@ -9,12 +9,12 @@ import javafx.event.ActionEvent;
import javafx.scene.control.SelectionMode;
import lombok.Setter;
public class CompanyVendorApprovedListManagerSkin
extends AbstEntityManagerSkin<VendorApprovedVo, CompanyVendorApprovedListViewModel, CompanyVendorApprovedListManagerSkin, CompanyVendorApprovedListManagerWindowController> {
public class VendorApprovedListManagerSkin
extends AbstEntityManagerSkin<VendorApprovedVo, CompanyVendorApprovedListViewModel, VendorApprovedListManagerSkin, VendorApprovedListManagerWindowController> {
@Setter
private VendorApprovedService service;
public CompanyVendorApprovedListManagerSkin(CompanyVendorApprovedListManagerWindowController controller) {
public VendorApprovedListManagerSkin(VendorApprovedListManagerWindowController controller) {
super(controller);
}
@@ -35,7 +35,7 @@ public class CompanyVendorApprovedListManagerSkin
@Override
protected void onTableRowDoubleClickedAction(CompanyVendorApprovedListViewModel item) {
showInOwner(CompanyVendorApprovedListWindowController.class, item);
showInOwner(VendorApprovedListWindowController.class, item);
}
@Override
@@ -44,6 +44,6 @@ public class CompanyVendorApprovedListManagerSkin
CompanyVendorApprovedListViewModel viewModel = CompanyVendorApprovedListViewModel.from(list);
dataSet.add(viewModel);
showInOwner(CompanyVendorApprovedListWindowController.class, viewModel);
showInOwner(VendorApprovedListWindowController.class, viewModel);
}
}

8
client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListManagerWindowController.java vendored
View File

@@ -24,8 +24,8 @@ import javafx.stage.WindowEvent;
@Scope("prototype")
@Component
@FxmlPath("/ui/company/vendor/vendor_approved_list_manager.fxml")
public class CompanyVendorApprovedListManagerWindowController
extends AbstManagerWindowController<VendorApprovedVo, CompanyVendorApprovedListViewModel, CompanyVendorApprovedListManagerSkin> {
public class VendorApprovedListManagerWindowController
extends AbstManagerWindowController<VendorApprovedVo, CompanyVendorApprovedListViewModel, VendorApprovedListManagerSkin> {
public TableColumn<CompanyVendorApprovedListViewModel, Number> idColumn;
public TableColumn<CompanyVendorApprovedListViewModel, String> titleColumn;
@@ -36,8 +36,8 @@ public class CompanyVendorApprovedListManagerWindowController
private VendorApprovedService service;
@Override
protected CompanyVendorApprovedListManagerSkin createDefaultSkin() {
CompanyVendorApprovedListManagerSkin skin = new CompanyVendorApprovedListManagerSkin(this);
protected VendorApprovedListManagerSkin createDefaultSkin() {
VendorApprovedListManagerSkin skin = new VendorApprovedListManagerSkin(this);
skin.setService(service);
return skin;
}

6
client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinBase.java vendored
View File

@@ -10,11 +10,11 @@ import com.ecep.contract.vm.CompanyVendorApprovedListViewModel;
import javafx.scene.control.Tab;
import javafx.util.converter.LocalDateStringConverter;
public class CompanyVendorApprovedListTabSkinBase
public class VendorApprovedListTabSkinBase
extends
AbstEntityBasedTabSkin<CompanyVendorApprovedListWindowController, VendorApprovedVo, CompanyVendorApprovedListViewModel>
AbstEntityBasedTabSkin<VendorApprovedListWindowController, VendorApprovedVo, CompanyVendorApprovedListViewModel>
implements TabSkin {
public CompanyVendorApprovedListTabSkinBase(CompanyVendorApprovedListWindowController controller) {
public VendorApprovedListTabSkinBase(VendorApprovedListWindowController controller) {
super(controller);
}

6
client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinFiles.java vendored
View File

@@ -24,9 +24,9 @@ import javafx.scene.control.TableCell;
import javafx.scene.control.TableColumn;
@FxmlPath("/ui/company/vendor/vendor_approved_list-tab-file.fxml")
public class CompanyVendorApprovedListTabSkinFiles
public class VendorApprovedListTabSkinFiles
extends
AbstEntityTableTabSkin<CompanyVendorApprovedListWindowController, VendorApprovedVo, CompanyVendorApprovedListViewModel, VendorApprovedFileVo, CompanyVendorApprovedFileViewModel>
AbstEntityTableTabSkin<VendorApprovedListWindowController, VendorApprovedVo, CompanyVendorApprovedListViewModel, VendorApprovedFileVo, CompanyVendorApprovedFileViewModel>
implements TabSkin {
private VendorApprovedFileService fileService;
@@ -36,7 +36,7 @@ public class CompanyVendorApprovedListTabSkinFiles
public TableColumn<CompanyVendorApprovedFileViewModel, LocalDate> fileTable_signDateColumn;
public TableColumn<CompanyVendorApprovedFileViewModel, String> fileTable_descriptionColumn;
public CompanyVendorApprovedListTabSkinFiles(CompanyVendorApprovedListWindowController controller) {
public VendorApprovedListTabSkinFiles(VendorApprovedListWindowController controller) {
super(controller);
}

14
client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinVendors.java vendored
View File

@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import com.ecep.contract.VendorType;
import com.ecep.contract.controller.ComboBoxUtils;
import com.ecep.contract.util.ComboBoxUtils;
import com.ecep.contract.controller.table.cell.VendorTypeTableCell;
import com.ecep.contract.service.*;
import com.ecep.contract.vo.*;
@@ -12,7 +12,7 @@ import com.ecep.contract.vo.*;
import com.ecep.contract.controller.tab.TabSkin;
import com.ecep.contract.controller.table.AbstEntityTableTabSkin;
import com.ecep.contract.controller.table.cell.CompanyVendorTableCell;
import com.ecep.contract.controller.vendor.CompanyVendorWindowController;
import com.ecep.contract.controller.vendor.VendorWindowController;
import com.ecep.contract.util.BooleanConfigProperty;
import com.ecep.contract.util.FxmlPath;
import com.ecep.contract.util.IntegerConfigProperty;
@@ -36,9 +36,9 @@ import javafx.scene.control.TableColumn;
import lombok.Setter;
@FxmlPath("/ui/company/vendor/vendor_approved_list-tab-vendor.fxml")
public class CompanyVendorApprovedListTabSkinVendors
public class VendorApprovedListTabSkinVendors
extends
AbstEntityTableTabSkin<CompanyVendorApprovedListWindowController, VendorApprovedVo, CompanyVendorApprovedListViewModel, VendorApprovedItemVo, CompanyVendorApprovedItemViewModel>
AbstEntityTableTabSkin<VendorApprovedListWindowController, VendorApprovedVo, CompanyVendorApprovedListViewModel, VendorApprovedItemVo, CompanyVendorApprovedItemViewModel>
implements TabSkin {
@Setter
private VendorApprovedItemService itemService;
@@ -60,7 +60,7 @@ public class CompanyVendorApprovedListTabSkinVendors
public CheckMenuItem logTypicallyVendorNoThreeYearContractDetailChecker;
public Spinner<Integer> qualifiedVendorEveryYearMinContractsSpinner;
public CompanyVendorApprovedListTabSkinVendors(CompanyVendorApprovedListWindowController controller) {
public VendorApprovedListTabSkinVendors(VendorApprovedListWindowController controller) {
super(controller);
}
@@ -203,7 +203,7 @@ public class CompanyVendorApprovedListTabSkinVendors
public void onVendorTableImportAction(ActionEvent event) {
VendorApprovedVo approvedList = getParent();
CompanyVendorApprovedListVendorImportTask task = new CompanyVendorApprovedListVendorImportTask(approvedList);
VendorApprovedListVendorImportTask task = new VendorApprovedListVendorImportTask(approvedList);
task.setLogUnqualifiedVendor(logUnqualifiedVendorChecker.isSelected());
task.setLogTypicallyVendorNoThreeYearContract(logTypicallyVendorNoThreeYearContractChecker.isSelected());
@@ -244,7 +244,7 @@ public class CompanyVendorApprovedListTabSkinVendors
public void onVendorTableShowVendorAction(ActionEvent event) {
CompanyVendorApprovedItemViewModel selectedItem = getTableView().getSelectionModel().getSelectedItem();
VendorVo companyVendor = getVendorService().findById(selectedItem.getVendor().get());
CompanyVendorWindowController.show(companyVendor, null);
VendorWindowController.show(companyVendor, null);
}
public void onVendorTableDeleteAction(ActionEvent event) {

6
client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorExportTask.java vendored
View File

@@ -60,8 +60,8 @@ import lombok.Setter;
/**
* 导出供方名录
*/
public class CompanyVendorApprovedListVendorExportTask extends Tasker<Object> {
private static final Logger logger = LoggerFactory.getLogger(CompanyVendorApprovedListVendorExportTask.class);
public class VendorApprovedListVendorExportTask extends Tasker<Object> {
private static final Logger logger = LoggerFactory.getLogger(VendorApprovedListVendorExportTask.class);
public static final String STR_CHANGE_VENDOR_TYPE_SHEET = "变更供应商类型";
@Setter
@@ -388,7 +388,7 @@ public class CompanyVendorApprovedListVendorExportTask extends Tasker<Object> {
setCellValue(sheet, "G" + (prefixRow + i), "合格").setCellStyle(borderStyle);
setCellValue(sheet, "H" + (prefixRow + i), "").setCellStyle(borderStyle);
if (Objects.equals(item.getDescription(), CompanyVendorApprovedListVendorImportTask.STR_MEET_QUALIFIED)) {
if (Objects.equals(item.getDescription(), VendorApprovedListVendorImportTask.STR_MEET_QUALIFIED)) {
// xx
meetQualified.add(item);
}

6
client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorImportTask.java vendored
View File

@@ -37,8 +37,8 @@ import lombok.Setter;
/**
* 从现有的供应商中导入
*/
public class CompanyVendorApprovedListVendorImportTask extends Tasker<Object> {
private static final Logger logger = LoggerFactory.getLogger(CompanyVendorApprovedListVendorImportTask.class);
public class VendorApprovedListVendorImportTask extends Tasker<Object> {
private static final Logger logger = LoggerFactory.getLogger(VendorApprovedListVendorImportTask.class);
// Meet qualified supplier standards
public static final String STR_MEET_QUALIFIED = "符合合格供方标准";
public static final String STR_MEET_TYPICALLY = "符合一般供方标准";
@@ -54,7 +54,7 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker<Object> {
private final AtomicInteger counter = new AtomicInteger(0);
public CompanyVendorApprovedListVendorImportTask(VendorApprovedVo approvedList) {
public VendorApprovedListVendorImportTask(VendorApprovedVo approvedList) {
this.approvedList = approvedList;
updateTitle("供方名录-供方导入");
}

14
client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListWindowController.java vendored
View File

@@ -34,13 +34,13 @@ import javafx.stage.WindowEvent;
@Scope("prototype")
@Component
@FxmlPath("/ui/company/vendor/vendor_approved_list.fxml")
public class CompanyVendorApprovedListWindowController
public class VendorApprovedListWindowController
extends AbstEntityController<VendorApprovedVo, CompanyVendorApprovedListViewModel> {
private static final Logger logger = LoggerFactory.getLogger(CompanyVendorApprovedListWindowController.class);
private static final Logger logger = LoggerFactory.getLogger(VendorApprovedListWindowController.class);
public static void show(VendorApprovedVo list, Window window) {
CompanyVendorApprovedListViewModel model = CompanyVendorApprovedListViewModel.from(list);
show(CompanyVendorApprovedListWindowController.class, model, window);
show(VendorApprovedListWindowController.class, model, window);
}
@Autowired
@@ -73,9 +73,9 @@ public class CompanyVendorApprovedListWindowController
@Override
protected void registerTabSkins() {
registerTabSkin(baseInfoTab, tab -> new CompanyVendorApprovedListTabSkinBase(this));
registerTabSkin(vendorTab, tab -> new CompanyVendorApprovedListTabSkinVendors(this));
registerTabSkin(fileTab, tab -> new CompanyVendorApprovedListTabSkinFiles(this));
registerTabSkin(baseInfoTab, tab -> new VendorApprovedListTabSkinBase(this));
registerTabSkin(vendorTab, tab -> new VendorApprovedListTabSkinVendors(this));
registerTabSkin(fileTab, tab -> new VendorApprovedListTabSkinFiles(this));
}
@Override
@@ -119,7 +119,7 @@ public class CompanyVendorApprovedListWindowController
}
public void onVendorTableExportAction(ActionEvent event) {
CompanyVendorApprovedListVendorExportTask task = new CompanyVendorApprovedListVendorExportTask();
VendorApprovedListVendorExportTask task = new VendorApprovedListVendorExportTask();
task.setApprovedList(getEntity());
UITools.showTaskDialogAndWait("导出供方", task, null);
}

2
client/src/main/java/com/ecep/contract/controller/vendor/bid/VendorBidWindowController.java vendored
View File

@@ -1,4 +1,4 @@
package com.ecep.contract.controller.vendor;
package com.ecep.contract.controller.vendor.bid;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

1
client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinBase.java vendored
View File

@@ -4,7 +4,6 @@ import com.ecep.contract.MyDateTimeUtils;
import com.ecep.contract.SpringApp;
import com.ecep.contract.controller.tab.AbstEntityBasedTabSkin;
import com.ecep.contract.controller.tab.TabSkin;
import com.ecep.contract.controller.vendor.PurchaseOrderWindowController;
import com.ecep.contract.converter.EmployeeStringConverter;
import com.ecep.contract.service.CompanyService;
import com.ecep.contract.service.ContractFileService;

7
client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinBillVoucher.java vendored
View File

@@ -8,11 +8,8 @@ import com.ecep.contract.controller.table.AbstEntityTableTabSkin;
import com.ecep.contract.controller.table.cell.EmployeeTableCell;
import com.ecep.contract.controller.table.cell.InvoiceTableCell;
import com.ecep.contract.controller.table.cell.LocalDateTimeTableCell;
import com.ecep.contract.controller.vendor.PurchaseBillVoucherWindowController;
import com.ecep.contract.controller.vendor.PurchaseOrderWindowController;
import com.ecep.contract.controller.vendor.purchase.purchase_bill.PurchaseBillVoucherWindowController;
import com.ecep.contract.converter.EmployeeStringConverter;
import com.ecep.contract.converter.EntityStringConverter;
import com.ecep.contract.model.Invoice;
import com.ecep.contract.service.InvoiceService;
import com.ecep.contract.service.PurchaseBillVoucherService;
import com.ecep.contract.util.FxmlPath;
@@ -26,8 +23,6 @@ import javafx.scene.control.ContextMenu;
import javafx.scene.control.MenuItem;
import javafx.scene.control.Tab;
import javafx.scene.control.TableColumn;
import javafx.scene.control.cell.TextFieldTableCell;
import javafx.util.StringConverter;
import lombok.Setter;
@FxmlPath("/ui/contract/purchase-orders-tab-bill-voucher.fxml")

4
client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinItems.java vendored
View File

@@ -3,7 +3,6 @@ package com.ecep.contract.controller.vendor.purchase.order;
import java.time.LocalDate;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -13,20 +12,17 @@ import com.ecep.contract.SpringApp;
import com.ecep.contract.controller.tab.TabSkin;
import com.ecep.contract.controller.table.AbstEntityTableTabSkin;
import com.ecep.contract.controller.table.cell.InventoryTableCell;
import com.ecep.contract.controller.vendor.PurchaseOrderWindowController;
import com.ecep.contract.service.ContractService;
import com.ecep.contract.service.InventoryService;
import com.ecep.contract.service.PurchaseOrderItemService;
import com.ecep.contract.service.PurchaseOrdersService;
import com.ecep.contract.util.FxmlPath;
import com.ecep.contract.util.ProxyUtils;
import com.ecep.contract.util.ParamUtils.Builder;
import com.ecep.contract.vm.ContractItemComposeViewModel;
import com.ecep.contract.vm.PurchaseOrderItemViewModel;
import com.ecep.contract.vm.PurchaseOrderViewModel;
import com.ecep.contract.vo.ContractItemVo;
import com.ecep.contract.vo.ContractVo;
import com.ecep.contract.vo.InventoryVo;
import com.ecep.contract.vo.PurchaseOrderItemVo;
import com.ecep.contract.vo.PurchaseOrderVo;

5
client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderWindowController.java vendored
View File

@@ -1,4 +1,4 @@
package com.ecep.contract.controller.vendor;
package com.ecep.contract.controller.vendor.purchase.order;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -8,9 +8,6 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import com.ecep.contract.controller.AbstEntityController;
import com.ecep.contract.controller.vendor.purchase.order.PurchaseOrderTabSkinBase;
import com.ecep.contract.controller.vendor.purchase.order.PurchaseOrderTabSkinBillVoucher;
import com.ecep.contract.controller.vendor.purchase.order.PurchaseOrderTabSkinItems;
import com.ecep.contract.service.PurchaseOrdersService;
import com.ecep.contract.util.FxmlPath;
import com.ecep.contract.vm.PurchaseOrderViewModel;

9
client/src/main/java/com/ecep/contract/controller/vendor/purchase/purchase_bill/PurchaseBillVoucherTabSkinItems.java vendored
View File

@@ -1,9 +1,5 @@
package com.ecep.contract.controller.vendor.purchase.purchase_bill;
import java.util.Map;
import org.controlsfx.control.spreadsheet.SpreadsheetCellEditor.IntegerEditor;
import com.ecep.contract.SpringApp;
import com.ecep.contract.controller.tab.TabSkin;
import com.ecep.contract.controller.table.AbstEntityTableTabSkin;
@@ -11,7 +7,6 @@ import com.ecep.contract.controller.table.cell.ContractTableCell;
import com.ecep.contract.controller.table.cell.InventoryTableCell;
import com.ecep.contract.controller.table.cell.InvoiceTableCell;
import com.ecep.contract.controller.table.cell.PurchaseOrderItemTableCell;
import com.ecep.contract.controller.vendor.PurchaseBillVoucherWindowController;
import com.ecep.contract.service.ContractService;
import com.ecep.contract.service.InventoryService;
import com.ecep.contract.service.InvoiceService;
@@ -21,12 +16,8 @@ import com.ecep.contract.util.FxmlPath;
import com.ecep.contract.util.ParamUtils.Builder;
import com.ecep.contract.vm.PurchaseBillVoucherItemViewModel;
import com.ecep.contract.vm.PurchaseBillVoucherViewModel;
import com.ecep.contract.vo.ContractVo;
import com.ecep.contract.vo.InventoryVo;
import com.ecep.contract.vo.InvoiceVo;
import com.ecep.contract.vo.PurchaseBillVoucherItemVo;
import com.ecep.contract.vo.PurchaseBillVoucherVo;
import com.ecep.contract.vo.PurchaseOrderItemVo;
import javafx.geometry.Pos;
import javafx.scene.control.Tab;

3
client/src/main/java/com/ecep/contract/controller/vendor/purchase/purchase_bill/PurchaseBillVoucherWindowController.java vendored
View File

@@ -1,4 +1,4 @@
package com.ecep.contract.controller.vendor;
package com.ecep.contract.controller.vendor.purchase.purchase_bill;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
@@ -6,7 +6,6 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import com.ecep.contract.controller.AbstEntityController;
import com.ecep.contract.controller.vendor.purchase.purchase_bill.PurchaseBillVoucherTabSkinItems;
import com.ecep.contract.service.PurchaseBillVoucherService;
import com.ecep.contract.util.FxmlPath;
import com.ecep.contract.vm.PurchaseBillVoucherViewModel;

4
client/src/main/java/com/ecep/contract/converter/VendorStringConverter.java
View File

@@ -11,12 +11,12 @@ import jakarta.annotation.PostConstruct;
@Lazy
@Component
public class CompanyVendorStringConverter extends EntityStringConverter<VendorVo> {
public class VendorStringConverter extends EntityStringConverter<VendorVo> {
@Lazy
@Autowired
private VendorService service;
public CompanyVendorStringConverter() {
public VendorStringConverter() {
}

5
client/src/main/java/com/ecep/contract/service/ContractService.java
View File

@@ -15,10 +15,9 @@ import org.springframework.stereotype.Service;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.constant.ContractConstant;
import com.ecep.contract.model.ContractFile;
import com.ecep.contract.util.ParamUtils;
import com.ecep.contract.vm.ContractViewModel;
import com.ecep.contract.vo.CompanyVendorVo;
import com.ecep.contract.vo.VendorVo;
import com.ecep.contract.vo.ContractFileVo;
import com.ecep.contract.vo.ContractVo;
import com.ecep.contract.vo.ProjectVo;
@@ -138,7 +137,7 @@ public class ContractService extends QueryService<ContractVo, ContractViewModel>
throw new UnsupportedOperationException("Unimplemented method 'makePathAbsent'");
}
public List<ContractVo> findAllByCompanyVendor(CompanyVendorVo vendor, LocalDate beginDate, LocalDate endDate) {
public List<ContractVo> findAllByCompanyVendor(VendorVo vendor, LocalDate beginDate, LocalDate endDate) {
return findAll(ParamUtils.builder()
.equals("company", vendor.getCompanyId())
.between("setupDate", beginDate, endDate)

2
client/src/main/java/com/ecep/contract/service/VendorApprovedFileService.java
View File

@@ -8,7 +8,7 @@ import com.ecep.contract.vo.VendorApprovedFileVo;
import com.ecep.contract.vo.VendorApprovedVo;
@Service
public class CompanyVendorApprovedFileService
public class VendorApprovedFileService
extends QueryService<VendorApprovedFileVo, CompanyVendorApprovedFileViewModel> {
public VendorApprovedFileVo findByName(VendorApprovedVo approvedList, String name) {

2
client/src/main/java/com/ecep/contract/service/VendorApprovedItemService.java
View File

@@ -12,7 +12,7 @@ import com.ecep.contract.vo.VendorApprovedVo;
import com.ecep.contract.vo.VendorVo;
@Service
public class CompanyVendorApprovedItemService
public class VendorApprovedItemService
extends QueryService<VendorApprovedItemVo, CompanyVendorApprovedItemViewModel> {
public List<VendorApprovedItemVo> findAllByListAndVendor(VendorApprovedVo approvedList,

2
client/src/main/java/com/ecep/contract/service/VendorApprovedService.java
View File

@@ -7,7 +7,7 @@ import com.ecep.contract.vm.CompanyVendorApprovedListViewModel;
import com.ecep.contract.vo.VendorApprovedVo;
@Service
public class CompanyVendorApprovedListService
public class VendorApprovedService
extends QueryService<VendorApprovedVo, CompanyVendorApprovedListViewModel> {
public boolean makePathAbsent(VendorApprovedVo list) {

2
client/src/main/java/com/ecep/contract/service/VendorEntityService.java
View File

@@ -11,7 +11,7 @@ import com.ecep.contract.vo.VendorVo;
import com.ecep.contract.vm.CompanyVendorEntityViewModel;
@Service
public class CompanyVendorEntityService extends QueryService<VendorEntityVo, CompanyVendorEntityViewModel> {
public class VendorEntityService extends QueryService<VendorEntityVo, CompanyVendorEntityViewModel> {
/**
* 根据供应商ID查询关联实体列表

2
client/src/main/java/com/ecep/contract/service/VendorFileService.java
View File

@@ -21,7 +21,7 @@ import com.ecep.contract.vo.VendorFileVo;
import com.ecep.contract.vo.VendorVo;
@Service
public class CompanyVendorFileService extends QueryService<VendorFileVo, CompanyVendorFileViewModel> {
public class VendorFileService extends QueryService<VendorFileVo, CompanyVendorFileViewModel> {
public LocalDate getNextSignDate(VendorVo companyVendor, Consumer<String> state) {
// TODO Auto-generated method stub

6
client/src/main/java/com/ecep/contract/service/VendorService.java
View File

@@ -25,13 +25,13 @@ import com.ecep.contract.vo.CompanyVo;
import com.ecep.contract.vo.ContractVo;
@Service
public class CompanyVendorService extends QueryService<VendorVo, CompanyVendorViewModel> {
public class VendorService extends QueryService<VendorVo, CompanyVendorViewModel> {
@Autowired
private CompanyService companyService;
@Autowired
private CompanyFileService companyFileService;
@Autowired
private CompanyVendorFileService companyVendorFileService;
private VendorFileService vendorFileService;
private File basePath;
@@ -102,7 +102,7 @@ public class CompanyVendorService extends QueryService<VendorVo, CompanyVendorVi
companyFileService.verify(company, contract.getSetupDate(), holder);
companyVendorFileService.verify(companyVendor, contract.getSetupDate(), holder);
vendorFileService.verify(companyVendor, contract.getSetupDate(), holder);
}
private boolean verifyAsTypicallyVendor(VendorVo companyVendor, LocalDate verifyDate, MessageHolder holder) {

3
client/src/main/java/com/ecep/contract/task/ContractGroupSyncTask.java
View File

@@ -1,7 +1,6 @@
package com.ecep.contract.controller;
package com.ecep.contract.task;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.task.Tasker;
public class ContractGroupSyncTask extends Tasker<Object>{
@Override

3
client/src/main/java/com/ecep/contract/task/ContractKindSyncTask.java
View File

@@ -1,7 +1,6 @@
package com.ecep.contract.controller;
package com.ecep.contract.task;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.task.Tasker;
public class ContractKindSyncTask extends Tasker<Object> {
@Override

3
client/src/main/java/com/ecep/contract/task/ContractSyncAllTask.java
View File

@@ -1,7 +1,6 @@
package com.ecep.contract.controller;
package com.ecep.contract.task;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.task.Tasker;
public class ContractSyncAllTask extends Tasker<Object> {
@Override

3
client/src/main/java/com/ecep/contract/task/ContractTypeSyncTask.java
View File

@@ -1,7 +1,6 @@
package com.ecep.contract.controller;
package com.ecep.contract.task;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.task.Tasker;
public class ContractTypeSyncTask extends Tasker<Object> {
@Override

35
client/src/main/java/com/ecep/contract/task/ContractVerifyComm.java
View File

@@ -13,6 +13,7 @@ import java.util.Locale;
import java.util.Objects;
import java.util.stream.Collectors;
import com.ecep.contract.service.*;
import com.ecep.contract.vo.*;
import org.springframework.util.StringUtils;
@@ -25,29 +26,9 @@ import com.ecep.contract.SpringApp;
import com.ecep.contract.controller.project.cost.ProjectCostImportItemsFromContractsTasker;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.ContractFileTypeLocal;
import com.ecep.contract.service.CompanyCustomerFileService;
import com.ecep.contract.service.CompanyCustomerService;
import com.ecep.contract.service.CompanyExtendInfoService;
import com.ecep.contract.service.CompanyFileService;
import com.ecep.contract.service.CompanyService;
import com.ecep.contract.service.CompanyVendorService;
import com.ecep.contract.service.ContractBidVendorService;
import com.ecep.contract.service.ContractFileService;
import com.ecep.contract.service.ContractFileTypeService;
import com.ecep.contract.service.ContractService;
import com.ecep.contract.service.EmployeeService;
import com.ecep.contract.service.ExtendVendorInfoService;
import com.ecep.contract.service.ProjectBidService;
import com.ecep.contract.service.ProjectCostService;
import com.ecep.contract.service.ProjectQuotationService;
import com.ecep.contract.service.ProjectSaleTypeRequireFileTypeService;
import com.ecep.contract.service.ProjectSaleTypeService;
import com.ecep.contract.service.ProjectService;
import com.ecep.contract.service.VendorGroupRequireFileTypeService;
import com.ecep.contract.service.VendorGroupService;
import com.ecep.contract.service.VendorService;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.collections.FXCollections;
import javafx.collections.ObservableMap;
import javafx.util.converter.NumberStringConverter;
import lombok.Data;
@@ -71,7 +52,7 @@ public class ContractVerifyComm {
private CompanyService companyService;
private CompanyFileService companyFileService;
// Vendor
private CompanyVendorService companyVendorService;
private VendorService vendorService;
private VendorGroupService vendorGroupService;
private VendorGroupRequireFileTypeService vendorGroupRequireFileTypeService;
private ExtendVendorInfoService extendVendorInfoService;
@@ -187,11 +168,11 @@ public class ContractVerifyComm {
return extendVendorInfoService;
}
private CompanyVendorService getCompanyVendorService() {
if (companyVendorService == null) {
companyVendorService = SpringApp.getBean(CompanyVendorService.class);
private VendorService getVendorService() {
if (vendorService == null) {
vendorService = SpringApp.getBean(VendorService.class);
}
return companyVendorService;
return vendorService;
}
private CompanyCustomerService getCompanyCustomerService() {
@@ -425,7 +406,7 @@ public class ContractVerifyComm {
}
}
if (verifyVendor.get()) {
getCompanyVendorService().verify(contract, holder);
getVendorService().verify(contract, holder);
}
if (verifyVendorFiles.get()) {

3
client/src/main/java/com/ecep/contract/task/CustomerClassSyncTask.java
View File

@@ -1,7 +1,6 @@
package com.ecep.contract.controller;
package com.ecep.contract.task;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.task.Tasker;
public class CustomerClassSyncTask extends Tasker<Object> {

3
client/src/main/java/com/ecep/contract/task/VendorClassSyncTask.java
View File

@@ -1,7 +1,6 @@
package com.ecep.contract.controller;
package com.ecep.contract.task;
import com.ecep.contract.MessageHolder;
import com.ecep.contract.task.Tasker;
public class VendorClassSyncTask extends Tasker<Object> {
@Override

2
client/src/main/java/com/ecep/contract/util/ComboBoxUtils.java
View File

@@ -1,4 +1,4 @@
package com.ecep.contract.controller;
package com.ecep.contract.util;
import java.util.List;

2
client/src/main/java/com/ecep/contract/util/TableViewUtils.java
View File

@@ -34,7 +34,7 @@ public class TableViewUtils {
return new Sort.Order(dir, id);
}).toList();
}
@SuppressWarnings("unchecked")
public static <T> void bindDoubleClicked(TableView<T> table, Consumer<T> consumer) {
table.setOnMouseClicked(event -> {
if (event.getClickCount() == 2 && event.getButton() == MouseButton.PRIMARY) {

10
client/src/main/java/com/ecep/contract/vm/CompanyVendorApprovedFileViewModel.java
View File

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.vo.CompanyVendorApprovedFileVo;
import com.ecep.contract.vo.VendorApprovedFileVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
@@ -14,9 +14,9 @@ import lombok.ToString;
@Data
@EqualsAndHashCode(callSuper = false)
@ToString
public class CompanyVendorApprovedFileViewModel extends IdentityViewModel<CompanyVendorApprovedFileVo> {
public class CompanyVendorApprovedFileViewModel extends IdentityViewModel<VendorApprovedFileVo> {
public static CompanyVendorApprovedFileViewModel from(CompanyVendorApprovedFileVo companyVendorApprovedItemFile) {
public static CompanyVendorApprovedFileViewModel from(VendorApprovedFileVo companyVendorApprovedItemFile) {
CompanyVendorApprovedFileViewModel viewModel = new CompanyVendorApprovedFileViewModel();
viewModel.update(companyVendorApprovedItemFile);
return viewModel;
@@ -35,7 +35,7 @@ public class CompanyVendorApprovedFileViewModel extends IdentityViewModel<Compan
private SimpleStringProperty description = new SimpleStringProperty();
@Override
protected void updateFrom(CompanyVendorApprovedFileVo v) {
protected void updateFrom(VendorApprovedFileVo v) {
super.updateFrom(v);
getList().set(v.getListId());
getFileName().set(v.getFileName());
@@ -44,7 +44,7 @@ public class CompanyVendorApprovedFileViewModel extends IdentityViewModel<Compan
}
@Override
public boolean copyTo(CompanyVendorApprovedFileVo v) {
public boolean copyTo(VendorApprovedFileVo v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(list.get(), v.getListId())) {
v.setListId(list.get());

10
client/src/main/java/com/ecep/contract/vm/CompanyVendorApprovedItemViewModel.java
View File

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
import java.util.Objects;
import com.ecep.contract.VendorType;
import com.ecep.contract.vo.CompanyVendorApprovedItemVo;
import com.ecep.contract.vo.VendorApprovedItemVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
@@ -12,8 +12,8 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class CompanyVendorApprovedItemViewModel extends IdentityViewModel<CompanyVendorApprovedItemVo> {
public static CompanyVendorApprovedItemViewModel from(CompanyVendorApprovedItemVo item) {
public class CompanyVendorApprovedItemViewModel extends IdentityViewModel<VendorApprovedItemVo> {
public static CompanyVendorApprovedItemViewModel from(VendorApprovedItemVo item) {
CompanyVendorApprovedItemViewModel model = new CompanyVendorApprovedItemViewModel();
model.update(item);
return model;
@@ -29,7 +29,7 @@ public class CompanyVendorApprovedItemViewModel extends IdentityViewModel<Compan
private SimpleStringProperty description = new SimpleStringProperty();
@Override
protected void updateFrom(CompanyVendorApprovedItemVo v) {
protected void updateFrom(VendorApprovedItemVo v) {
super.updateFrom(v);
getList().set(v.getListId());
getVendorName().set(v.getVendorName());
@@ -39,7 +39,7 @@ public class CompanyVendorApprovedItemViewModel extends IdentityViewModel<Compan
}
@Override
public boolean copyTo(CompanyVendorApprovedItemVo v) {
public boolean copyTo(VendorApprovedItemVo v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(vendorName.get(), v.getVendorName())) {
v.setVendorName(vendorName.get());

10
client/src/main/java/com/ecep/contract/vm/CompanyVendorApprovedListViewModel.java
View File

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.vo.CompanyVendorApprovedListVo;
import com.ecep.contract.vo.VendorApprovedVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
@@ -13,20 +13,20 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class CompanyVendorApprovedListViewModel
extends IdentityViewModel<CompanyVendorApprovedListVo> {
extends IdentityViewModel<VendorApprovedVo> {
private SimpleStringProperty title = new SimpleStringProperty();
private SimpleObjectProperty<LocalDate> publishDate = new SimpleObjectProperty<>();
private SimpleStringProperty path = new SimpleStringProperty();
private SimpleStringProperty description = new SimpleStringProperty();
public static CompanyVendorApprovedListViewModel from(CompanyVendorApprovedListVo list) {
public static CompanyVendorApprovedListViewModel from(VendorApprovedVo list) {
CompanyVendorApprovedListViewModel model = new CompanyVendorApprovedListViewModel();
model.update(list);
return model;
}
@Override
protected void updateFrom(CompanyVendorApprovedListVo v) {
protected void updateFrom(VendorApprovedVo v) {
super.updateFrom(v);
getTitle().set(v.getTitle());
getPublishDate().set(v.getPublishDate());
@@ -35,7 +35,7 @@ public class CompanyVendorApprovedListViewModel
}
@Override
public boolean copyTo(CompanyVendorApprovedListVo v) {
public boolean copyTo(VendorApprovedVo v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(title.get(), v.getTitle())) {

8
client/src/main/java/com/ecep/contract/vm/CompanyVendorEntityViewModel.java
View File

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
import java.time.LocalDate;
import java.time.LocalDateTime;
import com.ecep.contract.vo.CompanyVendorEntityVo;
import com.ecep.contract.vo.VendorEntityVo;
import javafx.beans.property.SimpleObjectProperty;
import lombok.Data;
@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class CompanyVendorEntityViewModel extends IdentityViewModel<CompanyVendorEntityVo> {
public class CompanyVendorEntityViewModel extends IdentityViewModel<VendorEntityVo> {
private SimpleObjectProperty<Integer> vendorId = new SimpleObjectProperty<>();
private SimpleObjectProperty<String> name = new SimpleObjectProperty<>();
private SimpleObjectProperty<String> abbName = new SimpleObjectProperty<>();
@@ -27,7 +27,7 @@ public class CompanyVendorEntityViewModel extends IdentityViewModel<CompanyVendo
private SimpleObjectProperty<LocalDateTime> fetchedTime = new SimpleObjectProperty<>();
@Override
protected void updateFrom(CompanyVendorEntityVo v) {
protected void updateFrom(VendorEntityVo v) {
super.updateFrom(v);
if (v.getVendorId() != null) {
vendorId.set(v.getVendorId());
@@ -51,7 +51,7 @@ public class CompanyVendorEntityViewModel extends IdentityViewModel<CompanyVendo
}
@Override
public boolean copyTo(CompanyVendorEntityVo v) {
public boolean copyTo(VendorEntityVo v) {
boolean modified = super.copyTo(v);
if (vendorId.get() != 0) {
v.setVendorId(vendorId.get());

10
client/src/main/java/com/ecep/contract/vm/CompanyVendorFileViewModel.java
View File

@@ -4,7 +4,7 @@ import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.VendorFileType;
import com.ecep.contract.vo.CompanyVendorFileVo;
import com.ecep.contract.vo.VendorFileVo;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleObjectProperty;
@@ -16,7 +16,7 @@ import lombok.ToString;
@Data
@EqualsAndHashCode(callSuper = false)
@ToString
public class CompanyVendorFileViewModel extends IdentityViewModel<CompanyVendorFileVo> {
public class CompanyVendorFileViewModel extends IdentityViewModel<VendorFileVo> {
/**
*
*/
@@ -35,7 +35,7 @@ public class CompanyVendorFileViewModel extends IdentityViewModel<CompanyVendorF
private SimpleBooleanProperty valid = new SimpleBooleanProperty(this, "valid", false);
@Override
protected void updateFrom(CompanyVendorFileVo v) {
protected void updateFrom(VendorFileVo v) {
super.updateFrom(v);
getVendor().set(v.getVendorId());
getType().set(v.getType());
@@ -47,7 +47,7 @@ public class CompanyVendorFileViewModel extends IdentityViewModel<CompanyVendorF
}
@Override
public boolean copyTo(CompanyVendorFileVo v) {
public boolean copyTo(VendorFileVo v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(getVendor().get(), v.getVendorId())) {
v.setVendorId(getVendor().get());
@@ -76,7 +76,7 @@ public class CompanyVendorFileViewModel extends IdentityViewModel<CompanyVendorF
return modified;
}
public static CompanyVendorFileViewModel from(CompanyVendorFileVo companyVendorFile) {
public static CompanyVendorFileViewModel from(VendorFileVo companyVendorFile) {
CompanyVendorFileViewModel model = new CompanyVendorFileViewModel();
model.update(companyVendorFile);
return model;

10
client/src/main/java/com/ecep/contract/vm/CompanyVendorViewModel.java
View File

@@ -7,7 +7,7 @@ import java.time.ZonedDateTime;
import java.util.Objects;
import com.ecep.contract.VendorType;
import com.ecep.contract.vo.CompanyVendorVo;
import com.ecep.contract.vo.VendorVo;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleIntegerProperty;
@@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendorVo> {
public class CompanyVendorViewModel extends IdentityViewModel<VendorVo> {
private SimpleStringProperty code = new SimpleStringProperty();
private SimpleStringProperty state = new SimpleStringProperty();
@@ -68,13 +68,13 @@ public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendorVo> {
private SimpleObjectProperty<LocalDateTime> created = new SimpleObjectProperty<>();
private SimpleIntegerProperty version = new SimpleIntegerProperty();
public static CompanyVendorViewModel from(CompanyVendorVo companyVendor) {
public static CompanyVendorViewModel from(VendorVo companyVendor) {
CompanyVendorViewModel model = new CompanyVendorViewModel();
model.update(companyVendor);
return model;
}
public void updateFrom(CompanyVendorVo v) {
public void updateFrom(VendorVo v) {
super.updateFrom(v);
// getState().set(v.getState());
getType().set(v.getType());
@@ -100,7 +100,7 @@ public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendorVo> {
version.set(v.getVersion());
}
public boolean copyTo(CompanyVendorVo v) {
public boolean copyTo(VendorVo v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(type.get(), v.getType())) {
v.setType(type.get());

10
client/src/main/java/com/ecep/contract/vm/VendorEntityViewModel.java
View File

@@ -4,7 +4,7 @@ import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.model.Vendor;
import com.ecep.contract.model.CompanyVendorEntity;
import com.ecep.contract.model.VendorEntity;
import com.ecep.contract.model.Employee;
import com.ecep.contract.model.VendorCatalog;
@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class VendorEntityViewModel extends IdentityViewModel<CompanyVendorEntity> {
public class VendorEntityViewModel extends IdentityViewModel<VendorEntity> {
private SimpleStringProperty name = new SimpleStringProperty();
private SimpleStringProperty abbName = new SimpleStringProperty();
private SimpleStringProperty code = new SimpleStringProperty();
@@ -41,14 +41,14 @@ public class VendorEntityViewModel extends IdentityViewModel<CompanyVendorEntity
public static VendorEntityViewModel from(CompanyVendorEntity cc) {
public static VendorEntityViewModel from(VendorEntity cc) {
VendorEntityViewModel model = new VendorEntityViewModel();
model.update(cc);
return model;
}
@Override
protected void updateFrom(CompanyVendorEntity v) {
protected void updateFrom(VendorEntity v) {
super.updateFrom(v);
getName().set(v.getName());
getAbbName().set(v.getAbbName());
@@ -63,7 +63,7 @@ public class VendorEntityViewModel extends IdentityViewModel<CompanyVendorEntity
}
@Override
public boolean copyTo(CompanyVendorEntity v) {
public boolean copyTo(VendorEntity v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(name.get(), v.getName())) {
v.setName(name.get());

2
client/src/main/resources/ui/cloud/u8_manager.fxml
View File

@@ -3,7 +3,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.VBox?>
<VBox prefHeight="400.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.ecep.contract.controller.YongYouU8ManagerWindowController">
fx:controller="com.ecep.contract.controller.cloud.u8.YongYouU8ManagerWindowController">
<children>
<MenuBar VBox.vgrow="NEVER">
<menus>

2
client/src/main/resources/ui/company/bank-account.fxml
View File

@@ -7,7 +7,7 @@
<?import javafx.scene.text.Font?>
<BorderPane fx:id="root" maxHeight="900" maxWidth="1024" minHeight="300" minWidth="200" prefHeight="600.0"
prefWidth="800.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.ecep.contract.controller.bank.account.BankAccountWindowController">
fx:controller="com.ecep.contract.controller.company.bank_account.BankAccountWindowController">
<center>
<TabPane fx:id="tabPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minWidth="150.0"
tabClosingPolicy="UNAVAILABLE" tabMaxWidth="100.0" tabMinWidth="40.0">

2
client/src/main/resources/ui/company/company_old_name.fxml
View File

@@ -26,7 +26,7 @@
<BorderPane fx:id="root" minHeight="300" minWidth="200" prefHeight="600.0" prefWidth="800.0"
xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.ecep.contract.controller.company_old_name.CompanyOldNameWindowController">
fx:controller="com.ecep.contract.controller.company.old_name.CompanyOldNameWindowController">
<center>
<TabPane fx:id="tabPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minWidth="150.0" tabClosingPolicy="UNAVAILABLE" tabMaxWidth="100.0" tabMinWidth="40.0">
<tabs>

2
client/src/main/resources/ui/company/vendor/vendor-tab-entity.fxml vendored
View File

@@ -5,7 +5,7 @@
<?import javafx.scene.layout.*?>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0"
xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.ecep.contract.controller.vendor.CompanyVendorTabSkinEntity">
fx:controller="com.ecep.contract.controller.vendor.VendorTabSkinEntity">
<children>
<VBox AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0"
AnchorPane.topAnchor="5.0">

2
client/src/main/resources/ui/company/vendor/vendor.fxml vendored
View File

@@ -22,7 +22,7 @@
<?import javafx.scene.paint.Color?>
<?import javafx.scene.text.Font?>
<BorderPane fx:id="root" maxHeight="900" maxWidth="1024" minHeight="300" minWidth="200" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.ecep.contract.controller.vendor.CompanyVendorWindowController">
<BorderPane fx:id="root" maxHeight="900" maxWidth="1024" minHeight="300" minWidth="200" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.ecep.contract.controller.vendor.VendorWindowController">
<center>
<TabPane fx:id="tabPane" tabClosingPolicy="UNAVAILABLE" tabMaxWidth="100.0" tabMinWidth="40.0">
<tabs>

2
client/src/main/resources/ui/company/vendor/vendor_approved_list-tab-file.fxml vendored
View File

@@ -4,7 +4,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.ecep.contract.controller.vendor.approved_list.CompanyVendorApprovedListTabSkinFiles">
fx:controller="com.ecep.contract.controller.vendor.approved_list.VendorApprovedListTabSkinFiles">
<children>
<HBox spacing="3.0">
<children>

2
client/src/main/resources/ui/company/vendor/vendor_approved_list-tab-vendor.fxml vendored
View File

@@ -4,7 +4,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.ecep.contract.controller.vendor.approved_list.CompanyVendorApprovedListTabSkinVendors">
fx:controller="com.ecep.contract.controller.vendor.approved_list.VendorApprovedListTabSkinVendors">
<children>
<HBox spacing="3.0">
<children>

2
client/src/main/resources/ui/company/vendor/vendor_approved_list.fxml vendored
View File

@@ -9,7 +9,7 @@
<?import javafx.scene.text.Font?>
<BorderPane fx:id="root" maxHeight="900" maxWidth="1024" minHeight="300" minWidth="200" prefHeight="600.0"
prefWidth="800.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.ecep.contract.controller.vendor.approved_list.CompanyVendorApprovedListWindowController">
fx:controller="com.ecep.contract.controller.vendor.approved_list.VendorApprovedListWindowController">
<center>
<TabPane fx:id="tabPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minWidth="150.0"
tabClosingPolicy="UNAVAILABLE" tabMaxWidth="100.0" tabMinWidth="40.0">

2
client/src/main/resources/ui/company/vendor/vendor_approved_list_manager.fxml vendored
View File

@@ -3,7 +3,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.VBox?>
<VBox prefHeight="400.0" prefWidth="640.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.ecep.contract.controller.vendor.approved_list.CompanyVendorApprovedListManagerWindowController">
fx:controller="com.ecep.contract.controller.vendor.approved_list.VendorApprovedListManagerWindowController">
<children>
<MenuBar VBox.vgrow="NEVER">
<menus>

2
client/src/main/resources/ui/company/vendor/vendor_manager.fxml vendored
View File

@@ -4,7 +4,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<VBox prefHeight="680.0" prefWidth="1120.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.ecep.contract.controller.vendor.CompanyVendorManagerWindowController">
fx:controller="com.ecep.contract.controller.vendor.VendorManagerWindowController">
<children>
<MenuBar VBox.vgrow="NEVER">
<menus>