yinq
/
hwbm-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.1.24 项目表添加订单类型字段，合同关联项目回显字段添加及更新存储维护。

Browse Source
dev
yinq 2 weeks ago
parent d97520281c
commit 2eacebd570
10 changed files with 85 additions and 2 deletions
Show Stats Download Patch File Download Diff File

5
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectInfo.java
Unescape Escape View File

@ -78,6 +78,11 @@ public class ErpProjectInfo extends TenantEntity {
*/
private Long projectTypeId;
/**
* 订单类型（字典 erp_order_type：实施类、备件类、软件服务类）
*/
private String orderType;
/**
* 付款方式
*/

5
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectContractsBo.java
Unescape Escape View File

@ -99,6 +99,11 @@ public class ErpProjectContractsBo extends BaseEntity {
*/
private String projectCategory;
/**
* 项目类型ID
*/
private Long projectTypeId;
/**
* 是否备件类（1是 0否）
*/

5
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectInfoBo.java
Unescape Escape View File

@ -84,6 +84,11 @@ public class ErpProjectInfoBo extends BaseEntity {
*/
private Long projectTypeId;
/**
* 订单类型（字典 erp_order_type）
*/
private String orderType;
/**
* 付款方式
*/

30
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectContractsVo.java
Unescape Escape View File

@ -83,6 +83,36 @@ public class ErpProjectContractsVo implements Serializable {
@ExcelProperty(value = "项目名称")
private String projectName;
/**
* 项目类型ID
*/
private Long projectTypeId;
/**
* 部门ID
*/
private Long deptId;
/**
* 项目经理
*/
private Long managerId;
/**
* 部门负责人
*/
private Long chargeId;
/**
* 分管副总
*/
private Long deputyId;
/**
* 抄送人员
*/
private String peopleId;
/**
* 合同编号
*/

7
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectInfoVo.java
Unescape Escape View File

@ -102,6 +102,13 @@ public class ErpProjectInfoVo implements Serializable {
@ExcelProperty(value = "项目类型ID")
private Long projectTypeId;
/**
* 订单类型（字典 erp_order_type）
*/
@ExcelProperty(value = "订单类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "erp_order_type")
private String orderType;
/**
* 付款方式
*/

22
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java
Unescape Escape View File

@ -210,6 +210,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
.eq(StringUtils.isNotBlank(bo.getBusinessDirection()), ErpProjectInfo::getBusinessDirection, bo.getBusinessDirection())
.eq(StringUtils.isNotBlank(bo.getSpareFlag()), ErpProjectInfo::getSpareFlag, bo.getSpareFlag())
.eq(bo.getProjectTypeId() != null, ErpProjectInfo::getProjectTypeId, bo.getProjectTypeId())
.eq(StringUtils.isNotBlank(bo.getOrderType()), ErpProjectInfo::getOrderType, bo.getOrderType())
.eq(StringUtils.isNotBlank(bo.getPaymentMethod()), ErpProjectInfo::getPaymentMethod, bo.getPaymentMethod())
.eq(bo.getDeptId() != null, ErpProjectInfo::getDeptId, bo.getDeptId())
.eq(bo.getManagerId() != null, ErpProjectInfo::getManagerId, bo.getManagerId())
@ -315,7 +316,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
}
validPartyACustomerForOrderActivate(contractInfoVo.getOneCustomerId());
contractPatch.setSignatureAppendix(Convert.toLong(bo.getOssId().trim()));
contractPatch.setContractDeptId(bo.getDeptId());
// contractPatch.setContractDeptId(bo.getDeptId());
contractPatch.setContractStatus(OAStatusEnum.ACTIVATE.getStatus());
}
contractInfoMapper.updateById(contractPatch);
@ -385,16 +386,33 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
newProject.setDeputyId(projectContractsBo.getDeputyId());
newProject.setPeopleId(projectContractsBo.getPeopleId());
newProject.setAmount(projectContractsBo.getAmount());
newProject.setProjectTypeId(projectContractsBo.getProjectTypeId());
newProject.setProjectCategory(projectContractsBo.getProjectCategory());
newProject.setSpareFlag(projectContractsBo.getSpareFlag());
newProject.setBusinessDirection(bo.getBusinessDirection());
newProject.setProjectTypeId(bo.getProjectTypeId());
newProject.setContractFlag("1");
newProject.setProjectStatus(OAStatusEnum.DRAFT.getStatus());
newProject.setFlowStatus(BusinessStatusEnum.DRAFT.getStatus());
validEntityBeforeSave(newProject);
projectInfoMapper.insert(newProject);
projectContractsBo.setProjectId(newProject.getProjectId());
} else if ("1".equals(projectContractsBo.getProjectSource())) {
// 新增项目在合同订单页面被再次编辑时，同步回写项目主表字段
ErpProjectInfo updateProject = new ErpProjectInfo();
updateProject.setProjectId(projectContractsBo.getProjectId());
updateProject.setProjectCode(projectContractsBo.getProjectCode());
updateProject.setProjectName(projectContractsBo.getProjectName());
updateProject.setDeptId(projectContractsBo.getDeptId());
updateProject.setManagerId(projectContractsBo.getManagerId());
updateProject.setChargeId(projectContractsBo.getChargeId());
updateProject.setDeputyId(projectContractsBo.getDeputyId());
updateProject.setPeopleId(projectContractsBo.getPeopleId());
updateProject.setAmount(projectContractsBo.getAmount());
updateProject.setProjectTypeId(projectContractsBo.getProjectTypeId());
updateProject.setProjectCategory(projectContractsBo.getProjectCategory());
updateProject.setSpareFlag(projectContractsBo.getSpareFlag());
updateProject.setBusinessDirection(bo.getBusinessDirection());
projectInfoMapper.updateById(updateProject);
}
projectContractsBo.setContractId(contractId);

1
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java
Unescape Escape View File

@ -132,6 +132,7 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService {
.eq(StringUtils.isNotBlank(bo.getSpareFlag()), ErpProjectInfo::getSpareFlag, bo.getSpareFlag())
.eq(StringUtils.isNotBlank(bo.getSingleContractFlag()), ErpProjectInfo::getSingleContractFlag, bo.getSingleContractFlag())
.eq(bo.getProjectTypeId() != null, ErpProjectInfo::getProjectTypeId, bo.getProjectTypeId())
.eq(StringUtils.isNotBlank(bo.getOrderType()), ErpProjectInfo::getOrderType, bo.getOrderType())
.eq(StringUtils.isNotBlank(bo.getPaymentMethod()), ErpProjectInfo::getPaymentMethod, bo.getPaymentMethod())
.eq(bo.getDeptId() != null, ErpProjectInfo::getDeptId, bo.getDeptId())
.eq(bo.getManagerId() != null, ErpProjectInfo::getManagerId, bo.getManagerId())

6
ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectContractsMapper.xml
Unescape Escape View File

@ -23,6 +23,12 @@
t.update_time,
e.project_code,
e.project_name,
e.project_type_id projectTypeId,
e.dept_id deptId,
e.manager_id managerId,
e.charge_id chargeId,
e.deputy_id deputyId,
e.people_id peopleId,
d.dept_name deptName,
u.nick_name managerName,
e.amount amount,

1
ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectInfoMapper.xml
Unescape Escape View File

@ -19,6 +19,7 @@
t.spare_flag,
t.single_contract_flag,
t.project_type_id,
t.order_type,
t.payment_method,
t.dept_id,
t.manager_id,

5
ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/ErpProjectInfo.java
Unescape Escape View File

@ -66,6 +66,11 @@ public class ErpProjectInfo extends TenantEntity {
*/
private Long projectTypeId;
/**
* 订单类型（字典 erp_order_type）
*/
private String orderType;
/**
* 付款方式
*/

Write Preview
Loading…
Cancel
Save