Showing
5 changed files
with
22 additions
and
0 deletions
| ... | ... | @@ -763,6 +763,7 @@ create table if not exists `tbl_contract_distributor_standard` |
| 763 | 763 | `price_spec_locked` TINYINT(1) COMMENT '是否已完成锁价/锁规', |
| 764 | 764 | `signed_contract_file_id` VARCHAR(100) COMMENT '双方盖章合同ID', |
| 765 | 765 | `signed_contract_file_name` VARCHAR(255) COMMENT '双方盖章合同名称', |
| 766 | + `changed` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否变更', | |
| 766 | 767 | `formalized_at` datetime comment '转为正式合同时间', |
| 767 | 768 | `standardized_at` datetime comment '转为标准合同时间', |
| 768 | 769 | `title` varchar(20) comment '合同名称(销售合同、销售订单)', |
| ... | ... | @@ -1466,6 +1467,9 @@ ALTER TABLE tbl_purchase_order_line ADD COLUMN production_process text COMMENT ' |
| 1466 | 1467 | ALTER TABLE tbl_contract_distributor_standard |
| 1467 | 1468 | ADD COLUMN change_reason varchar(50) DEFAULT NULL COMMENT '变更原因'; |
| 1468 | 1469 | |
| 1470 | +ALTER TABLE tbl_contract_distributor_standard | |
| 1471 | + ADD COLUMN changed tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否变更'; | |
| 1472 | + | |
| 1469 | 1473 | CREATE TABLE IF NOT EXISTS `tbl_contract_change_application` |
| 1470 | 1474 | ( |
| 1471 | 1475 | `id` varchar(32) NOT NULL COMMENT 'ID', | ... | ... |
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/GetContractDistributorStandardBo.java
| ... | ... | @@ -440,6 +440,12 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor |
| 440 | 440 | @ApiModelProperty(value = "变更原因") |
| 441 | 441 | private String changeReason; |
| 442 | 442 | |
| 443 | + /** | |
| 444 | + * 是否变更 | |
| 445 | + */ | |
| 446 | + @ApiModelProperty(value = "是否变更") | |
| 447 | + private Boolean changed; | |
| 448 | + | |
| 443 | 449 | @ApiModelProperty(value = "剩余数量") |
| 444 | 450 | private BigDecimal remainingQuantity; |
| 445 | 451 | ... | ... |
| ... | ... | @@ -231,6 +231,12 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut |
| 231 | 231 | @ApiModelProperty(value = "变更原因") |
| 232 | 232 | private String changeReason; |
| 233 | 233 | |
| 234 | + /** | |
| 235 | + * 是否变更 | |
| 236 | + */ | |
| 237 | + @ApiModelProperty(value = "是否变更") | |
| 238 | + private Boolean changed; | |
| 239 | + | |
| 234 | 240 | @ApiModelProperty(value = "剩余数量") |
| 235 | 241 | private BigDecimal remainingQuantity; |
| 236 | 242 | ... | ... |
| ... | ... | @@ -319,6 +319,11 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto { |
| 319 | 319 | private String changeReason; |
| 320 | 320 | |
| 321 | 321 | /** |
| 322 | + * 是否变更 | |
| 323 | + */ | |
| 324 | + private Boolean changed; | |
| 325 | + | |
| 326 | + /** | |
| 322 | 327 | * 双方盖章合同ID |
| 323 | 328 | */ |
| 324 | 329 | private String signedContractFileId; | ... | ... |
| ... | ... | @@ -697,6 +697,7 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont |
| 697 | 697 | .set(ContractDistributorStandard::getTotalAmountExcludingTax, vo.getTotalAmountExcludingTax()) |
| 698 | 698 | .set(ContractDistributorStandard::getTotalAmountIncludingTax, vo.getTotalAmountIncludingTax()) |
| 699 | 699 | .set(ContractDistributorStandard::getChangeReason, vo.getChangeReason()) |
| 700 | + .set(ContractDistributorStandard::getChanged, true) | |
| 700 | 701 | .eq(ContractDistributorStandard::getId, application.getContractId()); |
| 701 | 702 | contractDistributorStandardMapper.update(wrapper); |
| 702 | 703 | ... | ... |