feat: 更新项目版本至0.0.129-SNAPSHOT并修复多个问题

fix(ProjectIndustryService): 添加getStringConverter方法
fix(AbstContractRepairTasker): 初始化repository修复同步问题
fix(ProjectTabSkinBase): 处理saleTypeField空值情况
refactor(ProjectTypeService): 优化stringConverter初始化
feat(ProjectTypeStringConverter): 修改toString方法显示编码和名称
fix(CustomerCtx): 初始化repository修复客户更新问题
feat(ProjectCostWindowController): 根据版本控制审批标签显示
fix(DeliverySignMethodService): 添加saleType查询条件
feat: 添加DeliverySignMethodStringConverter
fix(SalesOrderCtx): 使用getRepository修复查询问题
fix(VendorCtx): 初始化repository修复供应商更新问题
refactor(CompanyTabSkinContract): 优化员工表格单元格创建
feat(DeliverySignMethodService): 添加findByCode和findByName方法
refactor(AbstEntityController): 优化视图模型更新逻辑
style(project.fxml): 调整界面布局和字段显示
This commit is contained in:
2025-10-17 15:39:41 +08:00
parent 235269f86f
commit 7d4961dae4
20 changed files with 263 additions and 218 deletions

View File

@@ -82,7 +82,8 @@ public class CustomerCtx extends AbstractYongYouU8Ctx {
public CompanyCustomerEntityVo updateCustomerEntityDetailByCode(CompanyCustomerEntityVo item, String unitCode,
MessageHolder holder) {
CompanyCustomerEntity v0 = getCustomerEntityService().getById(item.getId());
if (applyEntityDetail(v0, repository.findCustomerByCusCode(unitCode), holder)) {
initializeRepository(holder);
if (applyEntityDetail(v0, getRepository().findCustomerByCusCode(unitCode), holder)) {
item = save(v0).toVo();
}
return item;

View File

@@ -137,7 +137,7 @@ public class SalesOrderCtx extends AbstractYongYouU8Ctx {
Collectors.toMap(SalesOrderItem::getCode, item -> item))));
// 查询 U8 数据库
List<Map<String, Object>> ds = repository.findAllSalesOrderItemByContractCode(contract.getCode());
List<Map<String, Object>> ds = getRepository().findAllSalesOrderItemByContractCode(contract.getCode());
holder.debug("查找到 " + ds.size() + " 条销售订单条目记录在 " + CloudServiceConstant.U8_NAME);
Map<SalesOrder, List<SalesOrderItem>> updateMap = new HashMap<>();
@@ -202,7 +202,7 @@ public class SalesOrderCtx extends AbstractYongYouU8Ctx {
for (SalesOrder order : updateMap.keySet()) {
holder.debug("销售订单 #" + order.getCode());
if (applySalesOrderDetail(order, repository.querySalesOrderDetail(order.getCode()), holder)) {
if (applySalesOrderDetail(order, getRepository().querySalesOrderDetail(order.getCode()), holder)) {
saleOrdersService.save(order);
}
}

View File

@@ -78,7 +78,8 @@ public class VendorCtx extends AbstractYongYouU8Ctx {
*/
public VendorEntityVo updateVendorEntityDetailByCode(VendorEntityVo item, String unitCode, MessageHolder holder) {
VendorEntity v1 = getCompanyVendorEntityService().getById(item.getId());
if (applyEntityDetail(v1, repository.findVendorByVendCode(unitCode), holder)) {
initializeRepository(holder);
if (applyEntityDetail(v1, getRepository().findVendorByVendCode(unitCode), holder)) {
item = save(v1).toVo();
}
return item;
@@ -172,7 +173,7 @@ public class VendorCtx extends AbstractYongYouU8Ctx {
}
private boolean updateVendorCatalog(Supplier<VendorCatalog> getter, Consumer<VendorCatalog> setter,
String catalogCode, MessageHolder holder, String topic) {
String catalogCode, MessageHolder holder, String topic) {
VendorCatalogVo catalog = null;
if (StringUtils.hasText(catalogCode)) {
catalog = getCompanyVendorService().findCatalogByCode(catalogCode);
@@ -257,7 +258,7 @@ public class VendorCtx extends AbstractYongYouU8Ctx {
}
private boolean updateCompanyNameAndAbbNameByVendorEntity(Company company, VendorEntity entity,
MessageHolder holder) {
MessageHolder holder) {
CompanyService companyService = getCompanyService();
if (company == null) {
return false;

View File

@@ -285,6 +285,7 @@ public abstract class AbstContractRepairTasker extends Tasker<Object> {
*/
private void syncSaleOrder(ContractVo contract, MessageHolder holder) {
SalesOrderCtx ctx = getSalesOrderCtx();
ctx.initializeRepository(holder);
if (ctx.getRepository() == null) {
return;
}

View File

@@ -2,6 +2,7 @@ package com.ecep.contract.ds.project.service;
import java.util.List;
import com.ecep.contract.util.SpecificationUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
@@ -63,7 +64,7 @@ public class DeliverySignMethodService
spec = getSpecification(paramsNode.get("searchText").asText());
}
// field
// spec = SpecificationUtils.andParam(spec, paramsNode, "company");
spec = SpecificationUtils.andParam(spec, paramsNode, "saleType");
Page<DeliverySignMethod> page = findAll(spec, pageable);
return page.map(DeliverySignMethod::toVo);
}