|
|
@@ -33,7 +33,7 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
//岗位服务
|
|
|
private final ISysPostService sysPostService;
|
|
|
//快递物流服务
|
|
|
-
|
|
|
+ private final IComLogisticsCompanyService comExpressService;
|
|
|
//收入费用服务
|
|
|
private final IComRevenueExpenseService comRevenueExpenseService;
|
|
|
|
|
|
@@ -53,6 +53,9 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
//客户类型服务
|
|
|
private final IComCustomerTypeService comCustomerTypeService;
|
|
|
|
|
|
+ //产品税率服务
|
|
|
+ private final IProductTaxrateService productTaxrateService;
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 同步人员资料
|
|
|
@@ -323,7 +326,19 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean syncExpress(ErpExpressData express) {
|
|
|
- return null;
|
|
|
+ ComLogisticsCompany comLogisticsCompany = comExpressService.getOne(Wrappers.lambdaQuery(ComLogisticsCompany.class)
|
|
|
+ .eq(ComLogisticsCompany::getLogisticsCode, express.getExprId())
|
|
|
+ );
|
|
|
+ if (comLogisticsCompany == null) {
|
|
|
+ comLogisticsCompany = new ComLogisticsCompany();
|
|
|
+ }
|
|
|
+
|
|
|
+ comLogisticsCompany.setDataSource("A10");
|
|
|
+ comLogisticsCompany.setLogisticsCode(express.getExprId());
|
|
|
+ comLogisticsCompany.setLogisticsName(express.getExprNm());
|
|
|
+ comLogisticsCompany.setIsShow("0"); // 默认显示
|
|
|
+
|
|
|
+ return comExpressService.saveOrUpdate(comLogisticsCompany);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -333,7 +348,8 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean deleteExpress(ErpExpressData express) {
|
|
|
- return null;
|
|
|
+ return comExpressService.remove(Wrappers.lambdaQuery(ComLogisticsCompany.class)
|
|
|
+ .eq(ComLogisticsCompany::getLogisticsCode, express.getExprId()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -343,7 +359,20 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean syncIncomeExpense(ErpIncomeExpenseTypeData incomeExpense) {
|
|
|
- return null;
|
|
|
+ ComRevenueExpense comRevenueExpense = comRevenueExpenseService.getOne(Wrappers.lambdaQuery(ComRevenueExpense.class)
|
|
|
+ .eq(ComRevenueExpense::getRevenueCode, incomeExpense.getTypeId())
|
|
|
+ );
|
|
|
+ if (comRevenueExpense == null) {
|
|
|
+ comRevenueExpense = new ComRevenueExpense();
|
|
|
+ }
|
|
|
+
|
|
|
+ comRevenueExpense.setDataSource("A10");
|
|
|
+ comRevenueExpense.setRevenueCode(incomeExpense.getTypeId());
|
|
|
+ comRevenueExpense.setRevenueName(incomeExpense.getTyNm());
|
|
|
+ comRevenueExpense.setExpenseFlag("Y".equals(incomeExpense.getIsCs()) ? "0" : "1"); // Y表示是费用
|
|
|
+ comRevenueExpense.setRevenueFlag("Y".equals(incomeExpense.getIsIcm()) ? "0" : "1"); // Y表示是收入
|
|
|
+
|
|
|
+ return comRevenueExpenseService.saveOrUpdate(comRevenueExpense);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -353,7 +382,8 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean deleteIncomeExpense(ErpIncomeExpenseTypeData incomeExpense) {
|
|
|
- return null;
|
|
|
+ return comRevenueExpenseService.remove(Wrappers.lambdaQuery(ComRevenueExpense.class)
|
|
|
+ .eq(ComRevenueExpense::getRevenueCode, incomeExpense.getTypeId()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -363,7 +393,20 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean syncProvince(ErpProvinceData province) {
|
|
|
- return null;
|
|
|
+ SysAddressArea sysAddressArea = sysAddressAreaService.getOne(Wrappers.lambdaQuery(SysAddressArea.class)
|
|
|
+ .eq(SysAddressArea::getAreaCode, province.getPrvnId())
|
|
|
+ );
|
|
|
+ if (sysAddressArea == null) {
|
|
|
+ sysAddressArea = new SysAddressArea();
|
|
|
+ }
|
|
|
+
|
|
|
+ sysAddressArea.setDataSource("A10");
|
|
|
+ sysAddressArea.setAreaCode(province.getPrvnId());
|
|
|
+ sysAddressArea.setAreaName(province.getPrvnNm());
|
|
|
+ sysAddressArea.setParentCode(province.getCountryId()); // 设置上级国家编码作为父级区域编码
|
|
|
+ sysAddressArea.setLevel(2L); // 省份层级为2
|
|
|
+
|
|
|
+ return sysAddressAreaService.saveOrUpdate(sysAddressArea);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -373,7 +416,8 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean deleteProvince(ErpProvinceData province) {
|
|
|
- return null;
|
|
|
+ return sysAddressAreaService.remove(Wrappers.lambdaQuery(SysAddressArea.class)
|
|
|
+ .eq(SysAddressArea::getAreaCode, province.getPrvnId()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -383,7 +427,20 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean syncTaxCode(ErpTaxCodeData taxCode) {
|
|
|
- return null;
|
|
|
+ ProductTaxrate productTaxrate = productTaxrateService.getOne(Wrappers.lambdaQuery(ProductTaxrate.class)
|
|
|
+ .eq(ProductTaxrate::getTaxrateNo, taxCode.getTaxId())
|
|
|
+ );
|
|
|
+ if (productTaxrate == null) {
|
|
|
+ productTaxrate = new ProductTaxrate();
|
|
|
+ }
|
|
|
+
|
|
|
+ productTaxrate.setDataSource("A10");
|
|
|
+ productTaxrate.setTaxrateNo(taxCode.getTaxId());
|
|
|
+ productTaxrate.setTaxrateName(taxCode.getTaxNm());
|
|
|
+ productTaxrate.setTaxrate(Math.round(taxCode.getTaxRt().doubleValue() * 100)); // 转换为整数百分比
|
|
|
+ productTaxrate.setIsShow("0"); // 默认显示
|
|
|
+
|
|
|
+ return productTaxrateService.saveOrUpdate(productTaxrate);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -393,7 +450,8 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean deleteTaxCode(ErpTaxCodeData taxCode) {
|
|
|
- return null;
|
|
|
+ return productTaxrateService.remove(Wrappers.lambdaQuery(ProductTaxrate.class)
|
|
|
+ .eq(ProductTaxrate::getTaxrateNo, taxCode.getTaxId()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -403,7 +461,21 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean syncDepartment(ErpDepartmentData department) {
|
|
|
- return null;
|
|
|
+ SysDept sysDept = sysDeptService.getOne(Wrappers.lambdaQuery(SysDept.class)
|
|
|
+ .eq(SysDept::getDeptId, department.getDeptId())
|
|
|
+ );
|
|
|
+ if (sysDept == null) {
|
|
|
+ sysDept = new SysDept();
|
|
|
+ }
|
|
|
+
|
|
|
+ sysDept.setDeptId(Long.valueOf(department.getDeptId()));
|
|
|
+ sysDept.setDeptName(department.getDeptNm());
|
|
|
+ sysDept.setParentId(Long.valueOf(department.getPDeptId()));
|
|
|
+ sysDept.setAncestors(department.getRtDeptId());
|
|
|
+ sysDept.setOrderNum(department.getLv() != null ? department.getLv() : 0);
|
|
|
+ sysDept.setStatus("0"); // 默认启用
|
|
|
+
|
|
|
+ return sysDeptService.saveOrUpdate(sysDept);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -413,7 +485,8 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean deleteDepartment(ErpDepartmentData department) {
|
|
|
- return null;
|
|
|
+ return sysDeptService.remove(Wrappers.lambdaQuery(SysDept.class)
|
|
|
+ .eq(SysDept::getDeptId, department.getDeptId()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -423,7 +496,23 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean syncBank(ErpBankData bank) {
|
|
|
- return null;
|
|
|
+ ComBank comBank = comBankService.getOne(Wrappers.lambdaQuery(ComBank.class)
|
|
|
+ .eq(ComBank::getBnId, bank.getBnId())
|
|
|
+ );
|
|
|
+ if (comBank == null) {
|
|
|
+ comBank = new ComBank();
|
|
|
+ }
|
|
|
+
|
|
|
+ comBank.setDataSource("A10");
|
|
|
+ comBank.setBnId(bank.getBnId());
|
|
|
+ comBank.setBnName(bank.getBnNm());
|
|
|
+ comBank.setBnAddr(bank.getBnAddr());
|
|
|
+ comBank.setBnCatgId(bank.getBnCatgId());
|
|
|
+ comBank.setFaxNo(bank.getFaxNo());
|
|
|
+ comBank.setTelNo(bank.getTelNo());
|
|
|
+ comBank.setRemark(bank.getRemark());
|
|
|
+
|
|
|
+ return comBankService.saveOrUpdate(comBank);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -433,7 +522,8 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean deleteBank(ErpBankData bank) {
|
|
|
- return null;
|
|
|
+ return comBankService.remove(Wrappers.lambdaQuery(ComBank.class)
|
|
|
+ .eq(ComBank::getBnId, bank.getBnId()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -443,7 +533,19 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean syncSupplierType(ErpSupplierTypeData supplierType) {
|
|
|
- return null;
|
|
|
+ SupplierType supplierTypeObj = supplierTypeService.getOne(Wrappers.lambdaQuery(SupplierType.class)
|
|
|
+ .eq(SupplierType::getSupplierTypeNo, supplierType.getTypeId())
|
|
|
+ );
|
|
|
+ if (supplierTypeObj == null) {
|
|
|
+ supplierTypeObj = new SupplierType();
|
|
|
+ }
|
|
|
+
|
|
|
+ supplierTypeObj.setDataSource("A10");
|
|
|
+ supplierTypeObj.setSupplierTypeNo(supplierType.getTypeId());
|
|
|
+ supplierTypeObj.setSupplierTypeName(supplierType.getTyNm());
|
|
|
+ supplierTypeObj.setIsShow("0"); // 默认显示
|
|
|
+
|
|
|
+ return supplierTypeService.saveOrUpdate(supplierTypeObj);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -453,7 +555,8 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean deleteSupplierType(ErpSupplierTypeData supplierType) {
|
|
|
- return null;
|
|
|
+ return supplierTypeService.remove(Wrappers.lambdaQuery(SupplierType.class)
|
|
|
+ .eq(SupplierType::getSupplierTypeNo, supplierType.getTypeId()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -463,7 +566,18 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean syncCustomerGrade(ErpCustomerGradeData customerGrade) {
|
|
|
- return null;
|
|
|
+ ComCustomerLevel comCustomerLevel = comCustomerLevelService.getOne(Wrappers.lambdaQuery(ComCustomerLevel.class)
|
|
|
+ .eq(ComCustomerLevel::getLevelCode, customerGrade.getGadId())
|
|
|
+ );
|
|
|
+ if (comCustomerLevel == null) {
|
|
|
+ comCustomerLevel = new ComCustomerLevel();
|
|
|
+ }
|
|
|
+
|
|
|
+ comCustomerLevel.setDataSource("A10");
|
|
|
+ comCustomerLevel.setLevelCode(customerGrade.getGadId());
|
|
|
+ comCustomerLevel.setLevelName(customerGrade.getGadNm());
|
|
|
+
|
|
|
+ return comCustomerLevelService.saveOrUpdate(comCustomerLevel);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -473,7 +587,8 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean deleteCustomerGrade(ErpCustomerGradeData customerGrade) {
|
|
|
- return null;
|
|
|
+ return comCustomerLevelService.remove(Wrappers.lambdaQuery(ComCustomerLevel.class)
|
|
|
+ .eq(ComCustomerLevel::getLevelCode, customerGrade.getGadId()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -483,7 +598,18 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean syncCustomerType(ErpCustomerTypeData customerType) {
|
|
|
- return null;
|
|
|
+ ComCustomerType comCustomerType = comCustomerTypeService.getOne(Wrappers.lambdaQuery(ComCustomerType.class)
|
|
|
+ .eq(ComCustomerType::getTypeCode, customerType.getCustTyId())
|
|
|
+ );
|
|
|
+ if (comCustomerType == null) {
|
|
|
+ comCustomerType = new ComCustomerType();
|
|
|
+ }
|
|
|
+
|
|
|
+ comCustomerType.setDataSource("A10");
|
|
|
+ comCustomerType.setTypeCode(customerType.getCustTyId());
|
|
|
+ comCustomerType.setTypeName(customerType.getCustTyNm());
|
|
|
+
|
|
|
+ return comCustomerTypeService.saveOrUpdate(comCustomerType);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -493,6 +619,7 @@ public class RemoteErpSystemServiceImpl implements RemoteErpSystemService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Boolean deleteCustomerType(ErpCustomerTypeData customerType) {
|
|
|
- return null;
|
|
|
+ return comCustomerTypeService.remove(Wrappers.lambdaQuery(ComCustomerType.class)
|
|
|
+ .eq(ComCustomerType::getTypeCode, customerType.getCustTyId()));
|
|
|
}
|
|
|
}
|