Commit 69e33e795a7d7eff4e522d0089595d9456d2baca

Authored by 房远帅
1 parent f9d16cff

目的地:加工合同改回原来(选择)

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