Commit 0c9a02bfc2c61812b403f936ad94e394789f5fb4
Merge branch 'master_after0225' into master_after0423
Showing
2 changed files
with
3 additions
and
0 deletions
| @@ -1078,6 +1078,9 @@ public class ContractDistributorStandardController extends DefaultBaseController | @@ -1078,6 +1078,9 @@ public class ContractDistributorStandardController extends DefaultBaseController | ||
| 1078 | List<SpecImageCell> specImageCells = new ArrayList<>(); | 1078 | List<SpecImageCell> specImageCells = new ArrayList<>(); |
| 1079 | DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); | 1079 | DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); |
| 1080 | int startRow = 6; | 1080 | int startRow = 6; |
| 1081 | + if ("PROCESS_STD_AGMT".equals(data.getType())) { | ||
| 1082 | + startRow = 7; | ||
| 1083 | + } | ||
| 1081 | String contractTitle = "销售订单（经销）"; | 1084 | String contractTitle = "销售订单（经销）"; |
| 1082 | if ("INTL_STD_CONTRACT".equals(data.getType()) | 1085 | if ("INTL_STD_CONTRACT".equals(data.getType()) |
| 1083 | || "INTL_INVENTORY_AGMT".equals(data.getType()) | 1086 | || "INTL_INVENTORY_AGMT".equals(data.getType()) |
No preview for this file type