platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java
@@ -27,15 +27,15 @@ @Column(columnDefinition = "VARCHAR(100) comment '企业名称'") private String companyName; @Schema(description = "公司类型") @Column(columnDefinition = "VARCHAR(50) comment '公司类型'") private String companyType; // @Schema(description = "公司类型") // @Column(columnDefinition = "VARCHAR(50) comment '公司类型'") // private String companyType; @Schema(description = "法定代表人") @Column(columnDefinition = "VARCHAR(20) comment '法定代表人'") private String legalPerson; @Schema(description = "注册资本") /* @Schema(description = "注册资本") @Column(columnDefinition = "VARCHAR(30) comment '注册资本'") private String registeredCapital; @@ -57,11 +57,11 @@ @Schema(description = "签发日期") @Column(columnDefinition = "VARCHAR(20) comment '签发日期'") private String issueDate; private String issueDate;*/ @Schema(description = "状态") /* @Schema(description = "状态") @Column(columnDefinition = "VARCHAR(20) default '正常' comment '状态'") private String status; private String status;*/ @Schema(description = "行业Id") @Column(columnDefinition = "VARCHAR(50) comment '行业Id'") @@ -71,25 +71,35 @@ @Column(columnDefinition = "VARCHAR(50) comment '行业'") private String industry; // 煤炭、有色、黑色、电力、其它、氧化铝、化工、水泥、船运 @Schema(description = "开户银行") @Column(columnDefinition = "VARCHAR(20) comment '开户银行'") private String bankName; @Schema(description = "银行账号") @Column(columnDefinition = "VARCHAR(50) comment '银行账号'") private String bankAccount; @Schema(description = "联系电话") @Column(columnDefinition = "VARCHAR(20) comment '联系电话'") private String contactPhone; @Schema(description = "邮箱") /* @Schema(description = "邮箱") @Column(columnDefinition = "VARCHAR(50) comment '邮箱'") private String email; private String email;*/ @Schema(description = "省") @Column(columnDefinition = "VARCHAR(50) comment '省'") private String province; @Schema(description = "市") @Column(columnDefinition = "VARCHAR(50) comment '市'") private String city; @Schema(description = "区") @Column(columnDefinition = "VARCHAR(50) comment '区'") private String district; // @Schema(description = "市") // @Column(columnDefinition = "VARCHAR(50) comment '市'") // private String city; // // @Schema(description = "区") // @Column(columnDefinition = "VARCHAR(50) comment '区'") // private String district; @Schema(description = "所属区域Id") @Column(columnDefinition = "bigint comment '所属区域Id'") @@ -99,4 +109,12 @@ @Column(columnDefinition = "bigint comment '所属区域'") private Long areaName; @Schema(description = "市场类型Id") @Column(columnDefinition = "bigint comment '市场类型Id'") private Long classId; @Schema(description = "市场类型") @Column(columnDefinition = "bigint comment '市场类型'") private Long className; } platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Product.java
@@ -39,9 +39,9 @@ @Column(columnDefinition = "VARCHAR(50) comment '产品型号'") private String productType; @Schema(description = "产品价格") /* @Schema(description = "产品价格") @Column(columnDefinition = "double comment '产品价格'") private Double price; private Double price;*/ @Schema(description = "税率（百分比，如13表示13%）") @Column(columnDefinition = "double default 0.00 comment '税率'") platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java
@@ -25,13 +25,17 @@ @Comment("排产计划") public class ProductionPlan extends BaseModel<BusinessCustomer> { @Schema(description = "所属合同编号") /*@Schema(description = "所属合同编号") @Column(columnDefinition = "VARCHAR(64) comment '合同编号'") private String contractNo; @Schema(description = "所属合同名称") @Column(columnDefinition = "VARCHAR(200) comment '合同名称'") private String contractName; private String contractName;*/ @Schema(description = "合同id") @Column(columnDefinition = "bigint comment '合同id'") private Long contractId; @Schema(description = "排产计划编号") @Column(columnDefinition = "VARCHAR(64) comment '排产计划编号'") @@ -57,7 +61,7 @@ @Column(columnDefinition = "VARCHAR(100) comment '乙方名称'") private String partyb; @Schema(description = "金额") /* @Schema(description = "金额") @Column(columnDefinition = "double comment '金额'") private Double amount; @@ -67,21 +71,25 @@ @Schema(description = "类型（0-生成式 1-备案式）") @Column(columnDefinition = "tinyint(2) default 0 comment '类型'") private Integer contractType; private Integer contractType;*/ @Schema(description = "供应属性 0-成品 1-备件 2-大修 3-其他") /*@Schema(description = "供应属性 0-成品 1-备件 2-大修 3-其他") @Column(columnDefinition = "tinyint(2) default 0 comment '供应属性 0-成品 1-备件 2-大修 3-其他'") private Integer supplyAttribute; private Integer supplyAttribute;*/ @Schema(description = "计划状态（0-草稿 1-已生效 2-已终止 3-已过期）") @Column(columnDefinition = "tinyint(2) default 0 comment '计划状态'") private Integer status; @Schema(description = "服务属性（0-产品销售 1-无形服务）") @Column(columnDefinition = "tinyint(2) default 0 comment '服务属性'") private Integer attribute; @Schema(description = "是否推送erp（0-没有 1-推送）") @Column(columnDefinition = "tinyint(2) default 0 comment '是否推送erp（0-没有 1-推送）'") private Integer sendErp; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") /*@Schema(description = "服务属性（0-产品销售 1-无形服务）") @Column(columnDefinition = "tinyint(2) default 0 comment '服务属性'") private Integer attribute;*/ /* @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "签署日期") @Column(columnDefinition = "VARCHAR(64) comment '签署日期'") @@ -97,23 +105,23 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "到期日期") @Column(columnDefinition = "VARCHAR(64) comment '到期日期'") private String expirationDate; private String expirationDate;*/ @Schema(description = "备注") @Column(columnDefinition = "TEXT comment '备注'") private String remark; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") /*@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "审批时间") @Column(columnDefinition = "datetime comment '审批时间'") private String approveTime; private String approveTime;*/ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") /*@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @Schema(description = "转成合同时间") @Column(columnDefinition = "datetime comment '转成合同时间'") private String contractTime; private String contractTime;*/ /** * 标的物 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/SalesMan.java
@@ -35,4 +35,6 @@ @Column(columnDefinition = "VARCHAR(20) comment '联系电话'") private String phone; } platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/BusinessCustomerController.java
@@ -65,6 +65,7 @@ @PreAuthorize("@pms.hasPermission('business_businessCustomer_view')" ) public R getBusinessCustomerList(@ParameterObject BusinessCustomer businessCustomer) { LambdaQueryWrapper<BusinessCustomer> wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotEmpty(businessCustomer.getCompanyName()),BusinessCustomer::getCompanyName,businessCustomer.getCompanyName()); return R.ok(businessCustomerService.list(wrapper)); }
@@ -8,11 +8,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.by4cloud.platformx.business.entity.ContractSubjectMatter; import com.by4cloud.platformx.business.service.ContractSubjectMatterService; import com.by4cloud.platformx.business.utils.ContractNumberGenerator; import com.by4cloud.platformx.common.core.util.R; import com.by4cloud.platformx.common.data.mybatis.BaseModel; import com.by4cloud.platformx.common.log.annotation.SysLog; import com.by4cloud.platformx.business.entity.ProductionPlan; import com.by4cloud.platformx.business.service.ProductionPlanService; import com.by4cloud.platformx.common.security.util.SecurityUtils; import org.springframework.security.access.prepost.PreAuthorize; import com.by4cloud.platformx.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -117,6 +119,9 @@ if(StrUtil.isEmpty(productionPlan.getProductionPlanName())){ return R.failed("排产计划名称不能为空！"); } productionPlan.setPartybid(SecurityUtils.getUser().getCompId()); productionPlan.setPartyb(SecurityUtils.getUser().getCompName()); productionPlan.setProductionPlanNo("p-"+ContractNumberGenerator.generateContractNumber()); productionPlanService.save(productionPlan); if(productionPlan.getContractSubjectMatterList()!=null){
