Showing
8 changed files
with
8 additions
and
9 deletions
| @@ -1459,6 +1459,6 @@ INSERT INTO sys_data_permission_model_detail | @@ -1459,6 +1459,6 @@ INSERT INTO sys_data_permission_model_detail | ||
| 1459 | VALUES('全部', 2, '6', 99, 'order', 'id', NULL, NULL); | 1459 | VALUES('全部', 2, '6', 99, 'order', 'id', NULL, NULL); |
| 1460 | 1460 | ||
| 1461 | ALTER TABLE tbl_contract_distributor_standard | 1461 | ALTER TABLE tbl_contract_distributor_standard |
| 1462 | - ADD COLUMN foreign_destination varchar(200) COMMENT '目的地(外贸+加工合同)'; | 1462 | + ADD COLUMN foreign_destination varchar(200) COMMENT '目的地(外贸)'; |
| 1463 | 1463 | ||
| 1464 | ALTER TABLE tbl_purchase_order_line ADD COLUMN production_process text COMMENT '生产工艺'; | 1464 | ALTER TABLE tbl_purchase_order_line ADD COLUMN production_process text COMMENT '生产工艺'; |
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/GetContractDistributorStandardBo.java
| @@ -216,7 +216,7 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor | @@ -216,7 +216,7 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor | ||
| 216 | private String districtName; | 216 | private String districtName; |
| 217 | 217 | ||
| 218 | /** | 218 | /** |
| 219 | - * 目的地(外贸+加工合同) | 219 | + * 目的地(外贸) |
| 220 | */ | 220 | */ |
| 221 | @ApiModelProperty(value = "目的地") | 221 | @ApiModelProperty(value = "目的地") |
| 222 | private String foreignDestination; | 222 | private String foreignDestination; |
| @@ -141,7 +141,7 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut | @@ -141,7 +141,7 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut | ||
| 141 | private String districtName; | 141 | private String districtName; |
| 142 | 142 | ||
| 143 | /** | 143 | /** |
| 144 | - * 目的地(外贸+加工合同) | 144 | + * 目的地(外贸) |
| 145 | */ | 145 | */ |
| 146 | @ApiModelProperty(value = "目的地") | 146 | @ApiModelProperty(value = "目的地") |
| 147 | private String foreignDestination; | 147 | private String foreignDestination; |
| @@ -744,8 +744,7 @@ public class ContractDistributorStandardController extends DefaultBaseController | @@ -744,8 +744,7 @@ public class ContractDistributorStandardController extends DefaultBaseController | ||
| 744 | List<String> contractTypes = Arrays.asList( | 744 | List<String> contractTypes = Arrays.asList( |
| 745 | "INTL_STD_CONTRACT", | 745 | "INTL_STD_CONTRACT", |
| 746 | "INTL_INVENTORY_AGMT", | 746 | "INTL_INVENTORY_AGMT", |
| 747 | - "INTL_OPEN_SPEC_AGMT", | ||
| 748 | - "PROCESS_STD_AGMT" | 747 | + "INTL_OPEN_SPEC_AGMT" |
| 749 | ); | 748 | ); |
| 750 | Wrapper<ContractDistributorStandard> wrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class) | 749 | Wrapper<ContractDistributorStandard> wrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class) |
| 751 | .in(ContractDistributorStandard::getType, contractTypes) | 750 | .in(ContractDistributorStandard::getType, contractTypes) |
| @@ -118,7 +118,7 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto { | @@ -118,7 +118,7 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto { | ||
| 118 | private String destination; | 118 | private String destination; |
| 119 | 119 | ||
| 120 | /** | 120 | /** |
| 121 | - * 目的地(外贸+加工合同) | 121 | + * 目的地(外贸) |
| 122 | */ | 122 | */ |
| 123 | private String foreignDestination; | 123 | private String foreignDestination; |
| 124 | 124 |
| @@ -91,7 +91,7 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto { | @@ -91,7 +91,7 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto { | ||
| 91 | private String destination; | 91 | private String destination; |
| 92 | 92 | ||
| 93 | /** | 93 | /** |
| 94 | - * 目的地(外贸+加工合同) | 94 | + * 目的地(外贸) |
| 95 | */ | 95 | */ |
| 96 | @TableField(exist = false) | 96 | @TableField(exist = false) |
| 97 | private String foreignDestination; | 97 | private String foreignDestination; |
| @@ -146,7 +146,7 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable | @@ -146,7 +146,7 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable | ||
| 146 | 146 | ||
| 147 | 147 | ||
| 148 | /** | 148 | /** |
| 149 | - * 目的地(外贸+加工合同) | 149 | + * 目的地(外贸) |
| 150 | */ | 150 | */ |
| 151 | @ApiModelProperty(value = "目的地") | 151 | @ApiModelProperty(value = "目的地") |
| 152 | private String foreignDestination; | 152 | private String foreignDestination; |
| @@ -144,7 +144,7 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable | @@ -144,7 +144,7 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable | ||
| 144 | private String destination; | 144 | private String destination; |
| 145 | 145 | ||
| 146 | /** | 146 | /** |
| 147 | - * 目的地(外贸+加工合同) | 147 | + * 目的地(外贸) |
| 148 | */ | 148 | */ |
| 149 | @ApiModelProperty(value = "目的地") | 149 | @ApiModelProperty(value = "目的地") |
| 150 | private String foreignDestination; | 150 | private String foreignDestination; |